From 96f634393b40e31054136e5ffef0981ad3e9a4ed Mon Sep 17 00:00:00 2001 From: Uwe Kindler Date: Wed, 12 Jul 2023 14:22:05 +0200 Subject: [PATCH] Properly handle dragging of dock widget into DockWidgetTabBar and AutoHideSideBar --- src/AutoHideSideBar.cpp | 7 ++++--- src/AutoHideSideBar.h | 4 +--- src/DockAreaTabBar.cpp | 17 ++++++++++++++++- src/DockAreaTabBar.h | 5 +++++ src/DockContainerWidget.cpp | 15 +++++++-------- src/DockOverlay.cpp | 2 +- src/ads_globals.h | 7 +++++++ 7 files changed, 41 insertions(+), 16 deletions(-) diff --git a/src/AutoHideSideBar.cpp b/src/AutoHideSideBar.cpp index d0628d1..f08172e 100644 --- a/src/AutoHideSideBar.cpp +++ b/src/AutoHideSideBar.cpp @@ -196,6 +196,7 @@ void CAutoHideSideBar::insertTab(int Index, CAutoHideTab* SideTab) { SideTab->setSideBar(this); SideTab->installEventFilter(this); + // Default insertion is append if (Index < 0) { d->TabsLayout->insertWidget(d->TabsLayout->count() - 1, SideTab); @@ -451,7 +452,7 @@ int CAutoHideSideBar::tabAt(const QPoint& Pos) const { if (!isVisible()) { - return InvalidTabIndex; + return TabInvalidIndex; } if (orientation() == Qt::Horizontal) @@ -486,9 +487,9 @@ int CAutoHideSideBar::tabAt(const QPoint& Pos) const int CAutoHideSideBar::tabInsertIndexAt(const QPoint& Pos) const { int Index = tabAt(Pos); - if (Index == InvalidTabIndex) + if (Index == TabInvalidIndex) { - return Append; + return TabDefaultInsertIndex; } else { diff --git a/src/AutoHideSideBar.h b/src/AutoHideSideBar.h index a82034a..cf38bbf 100644 --- a/src/AutoHideSideBar.h +++ b/src/AutoHideSideBar.h @@ -84,8 +84,6 @@ protected: public: using Super = QScrollArea; - static constexpr int Append = -1; - static constexpr int InvalidTabIndex = -2; /** * Default Constructor @@ -119,7 +117,7 @@ public: * If the AutoHideWidget is in another sidebar, then it will be removed * from this sidebar. */ - void addAutoHideWidget(CAutoHideDockContainer* AutoHideWidget, int Index = Append); + void addAutoHideWidget(CAutoHideDockContainer* AutoHideWidget, int Index = TabDefaultInsertIndex); /** * Returns orientation of side tab. diff --git a/src/DockAreaTabBar.cpp b/src/DockAreaTabBar.cpp index 85215a1..6b1739d 100644 --- a/src/DockAreaTabBar.cpp +++ b/src/DockAreaTabBar.cpp @@ -510,7 +510,7 @@ int CDockAreaTabBar::tabAt(const QPoint& Pos) const { if (!isVisible()) { - return -2; + return TabInvalidIndex; } if (Pos.x() < tab(0)->geometry().x()) @@ -529,6 +529,21 @@ int CDockAreaTabBar::tabAt(const QPoint& Pos) const return count(); } + +//=========================================================================== +int CDockAreaTabBar::tabInsertIndexAt(const QPoint& Pos) const +{ + int Index = tabAt(Pos); + if (Index == TabInvalidIndex) + { + return TabDefaultInsertIndex; + } + else + { + return (Index < 0) ? 0 : Index; + } +} + } // namespace ads diff --git a/src/DockAreaTabBar.h b/src/DockAreaTabBar.h index aeab66f..f93094f 100644 --- a/src/DockAreaTabBar.h +++ b/src/DockAreaTabBar.h @@ -121,6 +121,11 @@ public: */ int tabAt(const QPoint& Pos) const; + /** + * Returns the tab insertion index for the given mouse cursor position + */ + int tabInsertIndexAt(const QPoint& Pos) const; + /** * Filters the tab widget events */ diff --git a/src/DockContainerWidget.cpp b/src/DockContainerWidget.cpp index b64b133..081481d 100644 --- a/src/DockContainerWidget.cpp +++ b/src/DockContainerWidget.cpp @@ -190,20 +190,20 @@ public: * Creates a new tab for a widget dropped into the center of a section */ void dropIntoCenterOfSection(CFloatingDockContainer* FloatingWidget, - CDockAreaWidget* TargetArea, int TabIndex = -2); + CDockAreaWidget* TargetArea, int TabIndex = 0); /** * Drop floating widget into dock area */ void dropIntoSection(CFloatingDockContainer* FloatingWidget, - CDockAreaWidget* TargetArea, DockWidgetArea area, int TabIndex = -2); + CDockAreaWidget* TargetArea, DockWidgetArea area, int TabIndex = 0); /** * Moves the dock widget or dock area given in Widget parameter to a * new dock widget area */ void moveToNewSection(QWidget* Widget, CDockAreaWidget* TargetArea, DockWidgetArea area, - int TabIndex = -2); + int TabIndex = 0); /** * Moves the dock widget or dock area given in Widget parameter to a @@ -214,13 +214,13 @@ public: /** * Creates a new tab for a widget dropped into the center of a section */ - void moveIntoCenterOfSection(QWidget* Widget, CDockAreaWidget* TargetArea, int TabIndex = -2); + void moveIntoCenterOfSection(QWidget* Widget, CDockAreaWidget* TargetArea, int TabIndex = 0); /** * Moves the dock widget or dock area given in Widget parameter to * a auto hide sidebar area */ - void moveToAutoHideSideBar(QWidget* Widget, DockWidgetArea area, int TabIndex = -2); + void moveToAutoHideSideBar(QWidget* Widget, DockWidgetArea area, int TabIndex = TabDefaultInsertIndex); /** @@ -543,7 +543,7 @@ void DockContainerWidgetPrivate::dropIntoCenterOfSection( auto NewDockWidgets = FloatingContainer->dockWidgets(); auto TopLevelDockArea = FloatingContainer->topLevelDockArea(); int NewCurrentIndex = -1; - TabIndex = (TabIndex < 0) ? 0 : TabIndex; + TabIndex = qMax(0, TabIndex); // If the floating widget contains only one single dock are, then the // current dock widget of the dock area will also be the future current @@ -675,7 +675,7 @@ void DockContainerWidgetPrivate::moveIntoCenterOfSection(QWidget* Widget, CDockA auto DroppedDockWidget = qobject_cast(Widget); auto DroppedArea = qobject_cast(Widget); - TabIndex = (TabIndex < 0) ? 0 : TabIndex; + TabIndex = qMax(0, TabIndex); if (DroppedDockWidget) { CDockAreaWidget* OldDockArea = DroppedDockWidget->dockAreaWidget(); @@ -1493,7 +1493,6 @@ CAutoHideDockContainer* CDockContainerWidget::createAndSetupAutoHideContainer( DockWidget->setDockManager(d->DockManager); // Auto hide Dock Container needs a valid dock manager } - qDebug() << "CDockContainerWidget::createAndSetupAutoHideContainer TabIndex: " << TabIndex; return autoHideSideBar(area)->insertDockWidget(TabIndex, DockWidget); } diff --git a/src/DockOverlay.cpp b/src/DockOverlay.cpp index eca58f1..3ae43a2 100644 --- a/src/DockOverlay.cpp +++ b/src/DockOverlay.cpp @@ -520,7 +520,7 @@ DockWidgetArea CDockOverlay::dropAreaUnderCursor() const && DockArea->titleBarGeometry().contains(DockArea->mapFromGlobal(CursorPos))) { auto TabBar = DockArea->titleBar()->tabBar(); - d->TabIndex = TabBar->tabAt(TabBar->mapFromGlobal(CursorPos)); + d->TabIndex = TabBar->tabInsertIndexAt(TabBar->mapFromGlobal(CursorPos)); return CenterDockWidgetArea; } diff --git a/src/ads_globals.h b/src/ads_globals.h index e331576..53e612b 100644 --- a/src/ads_globals.h +++ b/src/ads_globals.h @@ -95,6 +95,13 @@ enum DockWidgetArea Q_DECLARE_FLAGS(DockWidgetAreas, DockWidgetArea) +enum eTabIndex +{ + TabDefaultInsertIndex = -1, + TabInvalidIndex = -2 +}; + + enum TitleBarButton { TitleBarButtonTabsMenu,