Added initial support for inserting dropped dock widgets at a certain sidebar position

Author: githubuser0xFFFF

src/AutoHideDockContainer.cpp

@@ -689,7 +689,8 @@ void CAutoHideDockContainer::resetToInitialDockWidgetSize()
 
 
 //============================================================================
-void CAutoHideDockContainer::moveToNewSideBarLocation(SideBarLocation NewSideBarLocation)
+void CAutoHideDockContainer::moveToNewSideBarLocation(SideBarLocation NewSideBarLocation,
+	int TabIndex)
 {
 	if (NewSideBarLocation == sideBarLocation())
 	{
@@ -698,7 +699,7 @@ void CAutoHideDockContainer::moveToNewSideBarLocation(SideBarLocation NewSideBar
 
 	auto OldOrientation = orientation();
 	auto SideBar = dockContainer()->autoHideSideBar(NewSideBarLocation);
-	SideBar->addAutoHideWidget(this);
+	SideBar->addAutoHideWidget(this, TabIndex);
 	// If we move a horizontal auto hide container to a vertical position
 	// then we resize it to the orginal dock widget size, to avoid
 	// an extremely streched dock widget after insertion

src/AutoHideDockContainer.h

@@ -195,7 +195,7 @@ class ADS_EXPORT CAutoHideDockContainer : public QFrame
 	 * Removes the AutoHide container from the current side bar and adds
 	 * it to the new side bar given in SideBarLocation
 	 */
-	void moveToNewSideBarLocation(SideBarLocation SideBarLocation);
+	void moveToNewSideBarLocation(SideBarLocation SideBarLocation, int TabIndex = -1);
 };
 } // namespace ads
 

src/AutoHideSideBar.cpp

@@ -233,7 +233,8 @@ void CAutoHideSideBar::removeAutoHideWidget(CAutoHideDockContainer* AutoHideWidg
 }
 
 //============================================================================
-void CAutoHideSideBar::addAutoHideWidget(CAutoHideDockContainer* AutoHideWidget)
+void CAutoHideSideBar::addAutoHideWidget(CAutoHideDockContainer* AutoHideWidget,
+	int Index)
 {
 	auto SideBar = AutoHideWidget->autoHideTab()->sideBar();
 	if (SideBar == this)
@@ -248,7 +249,7 @@ void CAutoHideSideBar::addAutoHideWidget(CAutoHideDockContainer* AutoHideWidget)
 	AutoHideWidget->setParent(d->ContainerWidget);
 	AutoHideWidget->setSideBarLocation(d->SideTabArea);
 	d->ContainerWidget->registerAutoHideWidget(AutoHideWidget);
-	insertTab(-1, AutoHideWidget->autoHideTab());
+	insertTab(Index, AutoHideWidget->autoHideTab());
 }
 
 
@@ -302,14 +303,14 @@ Qt::Orientation CAutoHideSideBar::orientation() const
 
 
 //============================================================================
-CAutoHideTab* CAutoHideSideBar::tabAt(int index) const
+CAutoHideTab* CAutoHideSideBar::tab(int index) const
 {
     return qobject_cast<CAutoHideTab*>(d->TabsLayout->itemAt(index)->widget());
 }
 
 
 //============================================================================
-int CAutoHideSideBar::tabCount() const
+int CAutoHideSideBar::count() const
 {
     return d->TabsLayout->count() - 1;
 }
@@ -318,27 +319,27 @@ int CAutoHideSideBar::tabCount() const
 //============================================================================
 int CAutoHideSideBar::visibleTabCount() const
 {
-	int count = 0;
+	int VisibleTabCount = 0;
 	auto ParentWidget = parentWidget();
-	for (auto i = 0; i < tabCount(); i++)
+	for (auto i = 0; i < count(); i++)
 	{
-		if (tabAt(i)->isVisibleTo(ParentWidget))
+		if (tab(i)->isVisibleTo(ParentWidget))
 		{
-			count++;
+			VisibleTabCount++;
 		}
 	}
 
-	return count;
+	return VisibleTabCount;
 }
 
 
 //============================================================================
 bool CAutoHideSideBar::hasVisibleTabs() const
 {
 	auto ParentWidget = parentWidget();
-	for (auto i = 0; i < tabCount(); i++)
+	for (auto i = 0; i < count(); i++)
 	{
-		if (tabAt(i)->isVisibleTo(ParentWidget))
+		if (tab(i)->isVisibleTo(ParentWidget))
 		{
 			return true;
 		}
@@ -358,18 +359,18 @@ SideBarLocation CAutoHideSideBar::sideBarLocation() const
 //============================================================================
 void CAutoHideSideBar::saveState(QXmlStreamWriter& s) const
 {
-	if (!tabCount())
+	if (!count())
 	{
 		return;
 	}
 
 	s.writeStartElement("SideBar");
 	s.writeAttribute("Area", QString::number(sideBarLocation()));
-	s.writeAttribute("Tabs", QString::number(tabCount()));
+	s.writeAttribute("Tabs", QString::number(count()));
 
-	for (auto i = 0; i < tabCount(); ++i)
+	for (auto i = 0; i < count(); ++i)
 	{
-		auto Tab = tabAt(i);
+		auto Tab = tab(i);
 		if (!Tab)
 		{
 			continue;
@@ -417,5 +418,38 @@ CDockContainerWidget* CAutoHideSideBar::dockContainer() const
 	return d->ContainerWidget;
 }
 
+
+//===========================================================================
+int CAutoHideSideBar::tabAt(const QPoint& Pos) const
+{
+	if (!isVisible())
+	{
+		return -2;
+	}
+
+	if (Pos.x() < tab(0)->geometry().x())
+	{
+		return -1;
+	}
+
+	for (int i = 0; i < count(); ++i)
+	{
+		if (tab(i)->geometry().contains(Pos))
+		{
+			return i;
+		}
+	}
+
+	return count();
+}
+
+
+//===========================================================================
+int CAutoHideSideBar::tabInsertIndexAt(const QPoint& Pos) const
+{
+	int Index = tabAt(Pos);
+	return (Index < 0) ? -1 : Index;
+}
+
 } // namespace ads
 

src/AutoHideSideBar.h

@@ -117,7 +117,7 @@ class ADS_EXPORT CAutoHideSideBar : public QScrollArea
 	 * If the AutoHideWidget is in another sidebar, then it will be removed
 	 * from this sidebar.
 	 */
-	void addAutoHideWidget(CAutoHideDockContainer* AutoHideWidget);
+	void addAutoHideWidget(CAutoHideDockContainer* AutoHideWidget, int Index = -1);
 
 	/**
 	 * Returns orientation of side tab.
@@ -127,12 +127,25 @@ class ADS_EXPORT CAutoHideSideBar : public QScrollArea
 	/*
 	 * get the side tab widget at position, returns nullptr if it's out of bounds
 	 */
-	CAutoHideTab* tabAt(int index) const;
+	CAutoHideTab* tab(int index) const;
+
+	/**
+	 * Returns the tab at the given position.
+	 * Returns -1 if the position is left of the first tab and count() if the
+	 * position is right of the last tab. Returns -2 to indicate an invalid
+	 * value.
+	 */
+	int tabAt(const QPoint& Pos) const;
+
+	/**
+	 * Returns the tab insertion index for the given mouse cursor position
+	 */
+	int tabInsertIndexAt(const QPoint& Pos) const;
 
 	/*
 	 * Gets the count of the tab widgets
 	 */
-	int tabCount() const;
+	int count() const;
 
 	/**
 	 * Returns the number of visible tabs to its parent widget.

src/DockAreaWidget.cpp

@@ -1305,7 +1305,7 @@ SideBarLocation CDockAreaWidget::calculateSideTabBarArea() const
 
 
 //============================================================================
-void CDockAreaWidget::setAutoHide(bool Enable, SideBarLocation Location)
+void CDockAreaWidget::setAutoHide(bool Enable, SideBarLocation Location, int TabIndex)
 {
 	if (!isAutoHideFeatureEnabled())
 	{
@@ -1324,7 +1324,7 @@ void CDockAreaWidget::setAutoHide(bool Enable, SideBarLocation Location)
 	// If this is already an auto hide container, then move it to new location
 	if (isAutoHide())
 	{
-		d->AutoHideDockContainer->moveToNewSideBarLocation(Location);
+		d->AutoHideDockContainer->moveToNewSideBarLocation(Location, TabIndex);
 		return;
 	}
 
@@ -1341,7 +1341,7 @@ void CDockAreaWidget::setAutoHide(bool Enable, SideBarLocation Location)
 			continue;
 		}
 
-		dockContainer()->createAndSetupAutoHideContainer(area, DockWidget);
+		dockContainer()->createAndSetupAutoHideContainer(area, DockWidget, TabIndex++);
 	}
 }
 

src/DockAreaWidget.h

@@ -400,7 +400,7 @@ public Q_SLOTS:
 	 * If the dock area is switched to auto hide mode, then all dock widgets
 	 * that are pinable will be added to the sidebar
 	 */
-	void setAutoHide(bool Enable, SideBarLocation Location = SideBarNone);
+	void setAutoHide(bool Enable, SideBarLocation Location = SideBarNone, int TabIndex = -1);
 
 	/**
 	 * Switches the dock area to auto hide mode or vice versa depending on its

src/DockContainerWidget.cpp

@@ -220,7 +220,7 @@ class DockContainerWidgetPrivate
 	 * Moves the dock widget or dock area given in Widget parameter to
 	 * a auto hide sidebar area
 	 */
-	void moveToAutoHideSideBar(QWidget* Widget, DockWidgetArea area);
+	void moveToAutoHideSideBar(QWidget* Widget, DockWidgetArea area, int TabIndex = -2);
 
 
 	/**
@@ -777,7 +777,7 @@ void DockContainerWidgetPrivate::moveToNewSection(QWidget* Widget, CDockAreaWidg
 
 
 //============================================================================
-void DockContainerWidgetPrivate::moveToAutoHideSideBar(QWidget* Widget, DockWidgetArea area)
+void DockContainerWidgetPrivate::moveToAutoHideSideBar(QWidget* Widget, DockWidgetArea area, int TabIndex)
 {
 	CDockWidget* DroppedDockWidget = qobject_cast<CDockWidget*>(Widget);
 	CDockAreaWidget* DroppedDockArea = qobject_cast<CDockAreaWidget*>(Widget);
@@ -787,18 +787,18 @@ void DockContainerWidgetPrivate::moveToAutoHideSideBar(QWidget* Widget, DockWidg
 	{
 		if (_this == DroppedDockWidget->dockContainer())
 		{
-			DroppedDockWidget->setAutoHide(true, SideBarLocation);
+			DroppedDockWidget->setAutoHide(true, SideBarLocation, TabIndex);
 		}
 		else
 		{
-			_this->createAndSetupAutoHideContainer(SideBarLocation, DroppedDockWidget);
+			_this->createAndSetupAutoHideContainer(SideBarLocation, DroppedDockWidget, TabIndex);
 		}
 	}
 	else
 	{
 		if (_this == DroppedDockArea->dockContainer())
 		{
-			DroppedDockArea->setAutoHide(true, SideBarLocation);
+			DroppedDockArea->setAutoHide(true, SideBarLocation, TabIndex);
 		}
 		else
 		{
@@ -811,7 +811,7 @@ void DockContainerWidgetPrivate::moveToAutoHideSideBar(QWidget* Widget, DockWidg
 				}
 
 				_this->createAndSetupAutoHideContainer(SideBarLocation,
-				    DockWidget);
+				    DockWidget, TabIndex++);
 			}
 		}
 	}
@@ -988,7 +988,7 @@ void DockContainerWidgetPrivate::saveAutoHideWidgetsState(QXmlStreamWriter& s)
 {
 	for (const auto sideTabBar : SideTabBarWidgets.values())
     {
-		if (!sideTabBar->tabCount())
+		if (!sideTabBar->count())
 		{
 			continue;
 		}
@@ -1484,7 +1484,7 @@ CDockAreaWidget* CDockContainerWidget::addDockWidget(DockWidgetArea area, CDockW
 
 //============================================================================
 CAutoHideDockContainer* CDockContainerWidget::createAndSetupAutoHideContainer(
-	SideBarLocation area, CDockWidget* DockWidget)
+	SideBarLocation area, CDockWidget* DockWidget, int TabIndex)
 {
 	if (!CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled))
 	{
@@ -1497,7 +1497,8 @@ CAutoHideDockContainer* CDockContainerWidget::createAndSetupAutoHideContainer(
         DockWidget->setDockManager(d->DockManager); // Auto hide Dock Container needs a valid dock manager
 	}
 
-	return autoHideSideBar(area)->insertDockWidget(-1, DockWidget);
+	qDebug() << "CDockContainerWidget::createAndSetupAutoHideContainer TabIndex: " << TabIndex;
+	return autoHideSideBar(area)->insertDockWidget(TabIndex, DockWidget);
 }
 
 
@@ -1794,7 +1795,7 @@ void CDockContainerWidget::dropWidget(QWidget* Widget, DockWidgetArea DropArea,
 	}
 	else if (internal::isSideBarArea(DropArea))
 	{
-		d->moveToAutoHideSideBar(Widget, DropArea);
+		d->moveToAutoHideSideBar(Widget, DropArea, TabIndex);
 	}
 	else
 	{

src/DockContainerWidget.h

@@ -101,7 +101,7 @@ class ADS_EXPORT CDockContainerWidget : public QFrame
 	 * Initializing inserts the tabs into the side tab widget and hides it
 	 * Returns nullptr if you try and insert into an area where the configuration is not enabled
 	 */
-	CAutoHideDockContainer* createAndSetupAutoHideContainer(SideBarLocation area, CDockWidget* DockWidget);
+	CAutoHideDockContainer* createAndSetupAutoHideContainer(SideBarLocation area, CDockWidget* DockWidget, int TabIndex = -1);
 
 	/**
 	 * The funtion does the same like createAndSetupAutoHideContainer() but checks
@@ -133,7 +133,7 @@ class ADS_EXPORT CDockContainerWidget : public QFrame
 	 * TargetAreaWidget
 	 */
 	void dropWidget(QWidget* Widget, DockWidgetArea DropArea, CDockAreaWidget* TargetAreaWidget,
-		int TabIndex = -2);
+		int TabIndex = -1);
 
 	/**
 	 * Adds the given dock area to this container widget