From 8ef696f6f28560619642aa1e2fb814b09ea4bdfb Mon Sep 17 00:00:00 2001
From: Uwe Kindler <uwe_kindler@web.de>
Date: Tue, 25 Oct 2022 19:49:36 +0200
Subject: [PATCH 01/19] Updated README.md

---
 README.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 9ad198e..414a1e5 100644
--- a/README.md
+++ b/README.md
@@ -8,13 +8,14 @@
 [![Build status](https://ci.appveyor.com/api/projects/status/qcfb3cy932jw9mpy/branch/master?svg=true)](https://ci.appveyor.com/project/githubuser0xFFFF/qt-advanced-docking-system/branch/master)
 [![License: LGPL v2.1](https://img.shields.io/badge/License-LGPL%20v2.1-blue.svg)](gnu-lgpl-v2.1.md)
 
-[What's new](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/releases/latest)
-[Documentation](doc/user-guide.md)
-
 Qt Advanced Docking System lets you create customizable layouts using a full
 featured window docking system similar to what is found in many popular
 integrated development environments (IDEs) such as Visual Studio.
 
+- [What's new](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/releases/latest)
+- [Documentation](doc/user-guide.md)
+- Original Repository: https://github.com/githubuser0xFFFF/Qt-Advanced-Stylesheets
+
 [![Video Advanced Docking](doc/advanced-docking_video.png)](https://www.youtube.com/watch?v=7pdNfafg3Qc)
 
 ## New and Noteworthy
@@ -25,6 +26,7 @@ adds the following features:
 - option to close tabs with the middle mouse button
 - `DeleteContentOnClose` flag for dynamic deletion and creation of dock widget
   content
+- improved focus highlighting functionality
 
 The [release 3.7](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/releases/tag/3.7.2)
 adds the following features:

From 00e4dc14ba384feb579b218b70458dc5fc9de82c Mon Sep 17 00:00:00 2001
From: Uwe Kindler <uwe_kindler@web.de>
Date: Tue, 25 Oct 2022 19:57:40 +0200
Subject: [PATCH 02/19] fixed some documentation typos

---
 README.md         |  4 ++--
 doc/user-guide.md | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 414a1e5..e63f2ec 100644
--- a/README.md
+++ b/README.md
@@ -153,7 +153,7 @@ If this flag is cleared, the widget resizing is deferred until the mouse button
 
 ### Opaque and non-opaque undocking
 
-By default, opaque undocking is active. That means, as soon as you drag a dock widget or a dock area with a number of dock widgets it will be undocked and moved into a floating widget and then the floating widget will be dragged around. That means undocking will take place immediatelly. You can compare this with opaque splitter resizing. If the flag `OpaqueUndocking` is cleared, then non-opaque undocking is active. In this mode, undocking is more like a standard drag and drop operation. That means, the dragged dock widget or dock area is not undocked immediatelly. Instead, a drag preview widget is created and dragged around to indicate the future position of the dock widget or dock area. The actual dock operation is only executed when the mouse button is released. That makes it possible, to cancel an active drag operation with the escape key.
+By default, opaque undocking is active. That means, as soon as you drag a dock widget or a dock area with a number of dock widgets it will be undocked and moved into a floating widget and then the floating widget will be dragged around. That means undocking will take place immediately. You can compare this with opaque splitter resizing. If the flag `OpaqueUndocking` is cleared, then non-opaque undocking is active. In this mode, undocking is more like a standard drag and drop operation. That means, the dragged dock widget or dock area is not undocked immediately. Instead, a drag preview widget is created and dragged around to indicate the future position of the dock widget or dock area. The actual dock operation is only executed when the mouse button is released. That makes it possible, to cancel an active drag operation with the escape key.
 
 The drag preview widget can be configured by a number of global dock manager flags:
 - `DragPreviewIsDynamic`: if this flag is enabled, the preview will be adjusted dynamically to the drop area
@@ -416,7 +416,7 @@ D-Tect X is a X-ray inspection software for industrial radiography. It is a stat
 
 HiveWE is a Warcraft III world editor. It focusses on speed and ease of use,
 especially for large maps where the regular World Editor is often too slow and clunky.
-It has a JASS editor with syntax hightlighting, tabs, code completion and more.
+It has a JASS editor with syntax highlighting, tabs, code completion and more.
 The JASS editor uses the Qt Advanced Docking System for the management and layout
 of the open editor windows.
 
diff --git a/doc/user-guide.md b/doc/user-guide.md
index b6189ad..39a51a1 100644
--- a/doc/user-guide.md
+++ b/doc/user-guide.md
@@ -47,7 +47,7 @@
 ## Configuration Flags
 
 The Advanced Docking System has a number of global configuration options to
-configure the design and the functionality of the docking system. Eachs
+configure the design and the functionality of the docking system. Each
 configuration will be explained in detail in the following sections.
 
 ### Setting Configuration Flags
@@ -67,9 +67,9 @@ d->DockManager = new CDockManager(this);
 If you set the configurations flags, you can set individual flags using the
 function `CDockManager::setConfigFlag` or you can set all flags using
 the function `CDockManager::setConfigFlags`. Instead of settings all
-flags individualy, it is better to pick a predefined set of configuration
+flags individually, it is better to pick a predefined set of configuration
 flags and then modify individual flags. The following predefined
-configurations are avilable
+configurations are available
 
 - `DefaultNonOpaqueConfig` - uses non opaque splitter resizing and non opaque docking
 - `DefaultOpaqueConfig` - uses opaque splitter resizing and opaque docking
@@ -160,11 +160,11 @@ constant, that means, if enabled, the tabs need more space.
 
 ### `OpaqueUndocking`
 
-If this flag is set, opaque undocking is active. That means, as soon as you drag a dock widget or a dock area with a number of dock widgets it will be undocked and moved into a floating widget and then the floating widget will be dragged around. That means undocking will take place immediatelly. You can compare this with opaque splitter resizing.
+If this flag is set, opaque undocking is active. That means, as soon as you drag a dock widget or a dock area with a number of dock widgets it will be undocked and moved into a floating widget and then the floating widget will be dragged around. That means undocking will take place immediately. You can compare this with opaque splitter resizing.
 
 ![OpaqueUndocking true](opaque_undocking.gif)
 
-If you would like to test opaque undocking, you should set the pedefined config
+If you would like to test opaque undocking, you should set the predefined config
 flags `CDockManager::DefaultOpaqueConfig`.
 
 ```c++
@@ -324,7 +324,7 @@ still has a titlebar to drag it out of the main window.
 
 If this is enabled, the docking system is able to highlight the tab and the
 components of a dock area with a different style (i.e. a different color).
-This option is disabled by default and needs to be enabled explicitely
+This option is disabled by default and needs to be enabled explicitly
 because it adds some overhead. The dock manager needs to react on focus
 changes and dock widget dragging to highlight the right dock widget. You should
 enable it only, if you really need it for your application.
@@ -344,7 +344,7 @@ be set to true and you can use this property to style the focused dock
 widget differently. The picture above uses the following styling:
 
 ```css
-/* Color the tab with the nhighlight color */
+/* Color the tab with the highlight color */
 ads--CDockWidgetTab[focused="true"]
 {
     background: palette(highlight);
@@ -626,3 +626,4 @@ just call the function for settings the stylesheet with an empty string.
 ```c++
 DockManager->setStyleSheet("");
 ```
+

From 94b80423d73a38fa1a7110f0522c05d389919d10 Mon Sep 17 00:00:00 2001
From: Uwe Kindler <uwe_kindler@web.de>
Date: Tue, 1 Nov 2022 14:36:09 +0100
Subject: [PATCH 03/19] Made naming of auto hide config flags explicit

---
 src/AutoHideTab.cpp         |  8 ++++----
 src/DockAreaTitleBar.cpp    | 10 +++++-----
 src/DockAreaWidget.cpp      |  2 +-
 src/DockContainerWidget.cpp |  6 +++---
 src/DockManager.cpp         |  2 +-
 src/DockManager.h           |  2 +-
 src/DockWidgetTab.cpp       |  4 ----
 7 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/AutoHideTab.cpp b/src/AutoHideTab.cpp
index b0b4471..461085d 100644
--- a/src/AutoHideTab.cpp
+++ b/src/AutoHideTab.cpp
@@ -85,19 +85,19 @@ void AutoHideTabPrivate::updateOrientation()
 	switch (area)
 	{
 	case SideBarLocation::Left:
-		 IconOnly = CDockManager::testConfigFlag(CDockManager::LeftSideBarIconOnly);
+		 IconOnly = CDockManager::testAutoHideConfigFlag(CDockManager::LeftSideBarIconOnly);
 		 break;
 
 	case SideBarLocation::Right:
-		 IconOnly = CDockManager::testConfigFlag(CDockManager::RightSideBarIconOnly);
+		 IconOnly = CDockManager::testAutoHideConfigFlag(CDockManager::RightSideBarIconOnly);
 		 break;
 
 	case SideBarLocation::Top:
-		 IconOnly = CDockManager::testConfigFlag(CDockManager::BottomSideBarIconOnly);
+		 IconOnly = CDockManager::testAutoHideConfigFlag(CDockManager::BottomSideBarIconOnly);
 		 break;
 
 	case SideBarLocation::Bottom:
-		 IconOnly = CDockManager::testConfigFlag(CDockManager::TopSideBarIconOnly);
+		 IconOnly = CDockManager::testAutoHideConfigFlag(CDockManager::TopSideBarIconOnly);
 		 break;
 	}
 
diff --git a/src/DockAreaTitleBar.cpp b/src/DockAreaTitleBar.cpp
index 95eae21..1ca898e 100644
--- a/src/DockAreaTitleBar.cpp
+++ b/src/DockAreaTitleBar.cpp
@@ -124,9 +124,9 @@ struct DockAreaTitleBarPrivate
 	 * Returns true if the given config flag is set
 	 * Convenience function to ease config flag testing
 	 */
-	static bool testConfigFlag(CDockManager::eAutoHideFlag Flag)
+	static bool testAutoHideConfigFlag(CDockManager::eAutoHideFlag Flag)
 	{
-		return CDockManager::testConfigFlag(Flag);
+		return CDockManager::testAutoHideConfigFlag(Flag);
 	}
 
 	/**
@@ -191,14 +191,14 @@ void DockAreaTitleBarPrivate::createButtons()
 	_this->connect(UndockButton, SIGNAL(clicked()), SLOT(onUndockButtonClicked()));
 
 	// AutoHide Button
-	const auto autoHideEnabled = testConfigFlag(CDockManager::AutoHideFeatureEnabled);
-	AutoHideButton = new CTitleBarButton(testConfigFlag(CDockManager::DockAreaHasAutoHideButton) && autoHideEnabled);
+	const auto autoHideEnabled = testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled);
+	AutoHideButton = new CTitleBarButton(testAutoHideConfigFlag(CDockManager::DockAreaHasAutoHideButton) && autoHideEnabled);
 	AutoHideButton->setObjectName("dockAreaAutoHideButton");
 	AutoHideButton->setAutoRaise(true);
 	internal::setToolTip(AutoHideButton, QObject::tr("Toggle Auto Hide"));
 	internal::setButtonIcon(AutoHideButton, QStyle::SP_DialogOkButton, ads::AutoHideIcon);
 	AutoHideButton->setSizePolicy(ButtonSizePolicy);
-	AutoHideButton->setCheckable(testConfigFlag(CDockManager::AutoHideButtonCheckable));
+	AutoHideButton->setCheckable(testAutoHideConfigFlag(CDockManager::AutoHideButtonCheckable));
 	AutoHideButton->setChecked(false);
 	Layout->addWidget(AutoHideButton, 0);
 	_this->connect(AutoHideButton, SIGNAL(clicked()),  SLOT(onAutoHideButtonClicked()));
diff --git a/src/DockAreaWidget.cpp b/src/DockAreaWidget.cpp
index c6d5523..5035237 100644
--- a/src/DockAreaWidget.cpp
+++ b/src/DockAreaWidget.cpp
@@ -1176,7 +1176,7 @@ void CDockAreaWidget::toggleAutoHideArea(bool Enable)
 
 	const auto area = dockContainer()->calculateSideTabBarArea(this);
 
-	if (dockManager()->testConfigFlag(CDockManager::AutoHideButtonTogglesArea))
+	if (CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideButtonTogglesArea))
 	{
 		for (const auto DockWidget : openedDockWidgets())
 		{
diff --git a/src/DockContainerWidget.cpp b/src/DockContainerWidget.cpp
index 459b166..c50918f 100644
--- a/src/DockContainerWidget.cpp
+++ b/src/DockContainerWidget.cpp
@@ -1045,7 +1045,7 @@ bool DockContainerWidgetPrivate::restoreSideBar(CDockingStateReader& s,
 	Q_UNUSED(CreatedWidget)
 	// Simply ignore side bar auto hide widgets from saved state if
 	// auto hide support is disabled
-	if (!CDockManager::testConfigFlag(CDockManager::AutoHideFeatureEnabled))
+	if (!CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled))
 	{
 		return true;
 	}
@@ -1374,7 +1374,7 @@ CDockAreaWidget* CDockContainerWidget::addDockWidget(DockWidgetArea area, CDockW
 CAutoHideDockContainer* CDockContainerWidget::createAndSetupAutoHideContainer(
 	SideBarLocation area, CDockWidget* DockWidget, CDockWidget::eAutoHideInsertOrder insertOrder)
 {
-	if (!CDockManager::testConfigFlag(CDockManager::AutoHideFeatureEnabled))
+	if (!CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled))
 	{
 		Q_ASSERT_X(false, "CDockContainerWidget::createAndInitializeDockWidgetOverlayContainer",
 			"Requested area does not exist in config");
@@ -1951,7 +1951,7 @@ void CDockContainerWidget::createRootSplitter()
 //============================================================================
 void CDockContainerWidget::createSideTabBarWidgets()
 {
-	if (!CDockManager::testConfigFlag(CDockManager::AutoHideFeatureEnabled))
+	if (!CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled))
 	{
 		return;
 	}
diff --git a/src/DockManager.cpp b/src/DockManager.cpp
index 5b4aefa..d07c4ff 100644
--- a/src/DockManager.cpp
+++ b/src/DockManager.cpp
@@ -1183,7 +1183,7 @@ bool CDockManager::testConfigFlag(eConfigFlag Flag)
 
 
 //===========================================================================
-bool CDockManager::testConfigFlag(eAutoHideFlag Flag)
+bool CDockManager::testAutoHideConfigFlag(eAutoHideFlag Flag)
 {
 	return autoHideConfigFlags().testFlag(Flag);
 }
diff --git a/src/DockManager.h b/src/DockManager.h
index 810ebbf..6af42e5 100644
--- a/src/DockManager.h
+++ b/src/DockManager.h
@@ -307,7 +307,7 @@ public:
 	/**
 	 * Returns true if the given overlay config flag is set
 	 */
-	static bool testConfigFlag(eAutoHideFlag Flag);
+	static bool testAutoHideConfigFlag(eAutoHideFlag Flag);
 
 	/**
 	 * Returns the global icon provider.
diff --git a/src/DockWidgetTab.cpp b/src/DockWidgetTab.cpp
index e82ae77..30c5135 100644
--- a/src/DockWidgetTab.cpp
+++ b/src/DockWidgetTab.cpp
@@ -343,10 +343,6 @@ CDockWidgetTab::CDockWidgetTab(CDockWidget* DockWidget, QWidget *parent) :
 	d->DockWidget = DockWidget;
 	d->createLayout();
 	setFocusPolicy(Qt::NoFocus);
-	/*if (CDockManager::testConfigFlag(CDockManager::FocusHighlighting))
-	{
-		setFocusPolicy(Qt::ClickFocus);
-	}*/
 }
 
 //============================================================================

From 08714ddc3f6d3b5a869179866600e3be77fed23c Mon Sep 17 00:00:00 2001
From: Uwe Kindler <uwe_kindler@web.de>
Date: Tue, 1 Nov 2022 16:11:45 +0100
Subject: [PATCH 04/19] Properly evaluate pinnable flag

---
 src/DockAreaTitleBar.cpp | 5 +----
 src/DockAreaWidget.cpp   | 3 ++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/DockAreaTitleBar.cpp b/src/DockAreaTitleBar.cpp
index 1ca898e..f6e79a7 100644
--- a/src/DockAreaTitleBar.cpp
+++ b/src/DockAreaTitleBar.cpp
@@ -493,10 +493,7 @@ void CDockAreaTitleBar::onCurrentTabChanged(int Index)
 //============================================================================
 void CDockAreaTitleBar::onAutoHideButtonClicked()
 {
-	if (d->DockArea->features().testFlag(CDockWidget::DockWidgetPinnable))
-	{
-        d->DockArea->toggleAutoHideArea(!d->DockArea->isAutoHide());
-	}
+	d->DockArea->toggleAutoHideArea(!d->DockArea->isAutoHide());
 }
 
 
diff --git a/src/DockAreaWidget.cpp b/src/DockAreaWidget.cpp
index 5035237..8b7dc24 100644
--- a/src/DockAreaWidget.cpp
+++ b/src/DockAreaWidget.cpp
@@ -1176,7 +1176,8 @@ void CDockAreaWidget::toggleAutoHideArea(bool Enable)
 
 	const auto area = dockContainer()->calculateSideTabBarArea(this);
 
-	if (CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideButtonTogglesArea))
+	if (CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideButtonTogglesArea)
+	 && features().testFlag(CDockWidget::DockWidgetPinnable))
 	{
 		for (const auto DockWidget : openedDockWidgets())
 		{

From 225b1ff2bb63081c216245e25c2ea7293e0e87ac Mon Sep 17 00:00:00 2001
From: Uwe Kindler <uwe_kindler@web.de>
Date: Tue, 1 Nov 2022 16:12:42 +0100
Subject: [PATCH 05/19] Fixed original repository link in README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e63f2ec..27e86b1 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![ukraine](doc/ukraine.jpg)
+![ukraine](doc/taiwan_ukraine.jpg)
 
 ![logo](doc/ads_logo.svg)
 
@@ -14,7 +14,7 @@ integrated development environments (IDEs) such as Visual Studio.
 
 - [What's new](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/releases/latest)
 - [Documentation](doc/user-guide.md)
-- Original Repository: https://github.com/githubuser0xFFFF/Qt-Advanced-Stylesheets
+- Original Repository: https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System
 
 [![Video Advanced Docking](doc/advanced-docking_video.png)](https://www.youtube.com/watch?v=7pdNfafg3Qc)
 

From 28745fa2f88bd6efbdb147d1ceef54cc96c2ab1a Mon Sep 17 00:00:00 2001
From: Uwe Kindler <uwe_kindler@web.de>
Date: Tue, 1 Nov 2022 17:17:58 +0100
Subject: [PATCH 06/19] Some small improvements and execute auto hide code only
 if config is enabled

---
 src/AutoHideDockContainer.cpp |  2 --
 src/DockAreaWidget.cpp        | 27 +++++++++++++++++++--------
 src/DockAreaWidget.h          | 20 ++++++++++----------
 3 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/AutoHideDockContainer.cpp b/src/AutoHideDockContainer.cpp
index 6256b78..d84d605 100644
--- a/src/AutoHideDockContainer.cpp
+++ b/src/AutoHideDockContainer.cpp
@@ -190,8 +190,6 @@ CAutoHideDockContainer::CAutoHideDockContainer(CDockManager* DockManager, SideBa
 	d->DockArea = new CDockAreaWidget(DockManager, parent);
 	d->DockArea->setObjectName("autoHideDockArea");
 	d->DockArea->setAutoHideDockContainer(this);
-	d->DockArea->updateAutoHideButtonCheckState();
-	d->DockArea->updateTitleBarButtonToolTip();
 
 	setObjectName("autoHideDockContainer");
 
diff --git a/src/DockAreaWidget.cpp b/src/DockAreaWidget.cpp
index 8b7dc24..5f43698 100644
--- a/src/DockAreaWidget.cpp
+++ b/src/DockAreaWidget.cpp
@@ -455,6 +455,8 @@ bool CDockAreaWidget::isAutoHide() const
 void CDockAreaWidget::setAutoHideDockContainer(CAutoHideDockContainer* AutoHideDockContainer)
 {
 	d->AutoHideDockContainer = AutoHideDockContainer;
+	updateAutoHideButtonCheckState();
+	updateTitleBarButtonToolTip();
 }
 
 
@@ -812,16 +814,24 @@ void CDockAreaWidget::updateTitleBarVisibility()
         return;
     }
 
-	if (d->TitleBar)
+    if (!d->TitleBar)
+    {
+    	return;
+    }
+
+	bool Hidden = Container->hasTopLevelDockWidget() && (Container->isFloating()
+		|| CDockManager::testConfigFlag(CDockManager::HideSingleCentralWidgetTitleBar));
+	Hidden |= (d->Flags.testFlag(HideSingleWidgetTitleBar) && openDockWidgetsCount() == 1);
+	bool IsAutoHide = isAutoHide();
+	Hidden &= !IsAutoHide; // Titlebar must always be visible when auto hidden so it can be dragged
+	d->TitleBar->setVisible(!Hidden);
+
+	if (CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled))
 	{
-		bool Hidden = Container->hasTopLevelDockWidget() && (Container->isFloating()
-			|| CDockManager::testConfigFlag(CDockManager::HideSingleCentralWidgetTitleBar));
-		Hidden |= (d->Flags.testFlag(HideSingleWidgetTitleBar) && openDockWidgetsCount() == 1);
-		d->TitleBar->setVisible(isAutoHide() ? true : !Hidden); // Titlebar must always be visible when auto hidden so it can be dragged
 		auto tabBar = d->TitleBar->tabBar();
-        tabBar->setVisible(isAutoHide() ? false : !Hidden);  // Never show tab bar when auto hidden
-        d->TitleBar->autoHideTitleLabel()->setVisible(isAutoHide());  // Always show when auto hidden, never otherwise
-        updateTitleBarButtonVisibility(Container->topLevelDockArea() == this);
+		tabBar->setVisible(!IsAutoHide);  // Never show tab bar when auto hidden
+		d->TitleBar->autoHideTitleLabel()->setVisible(IsAutoHide);  // Always show when auto hidden, never otherwise
+		updateTitleBarButtonVisibility(Container->topLevelDockArea() == this);
 	}
 }
 
@@ -849,6 +859,7 @@ void CDockAreaWidget::updateAutoHideButtonCheckState()
 //============================================================================
 void CDockAreaWidget::updateTitleBarButtonVisibility(bool IsTopLevel) const
 {
+	qDebug() << "CDockAreaWidget::updateTitleBarButtonVisibility IsTopLevel " << IsTopLevel;
 	d->updateTitleBarButtonVisibility(IsTopLevel);
 }
 
diff --git a/src/DockAreaWidget.h b/src/DockAreaWidget.h
index 4059a83..d177fb8 100644
--- a/src/DockAreaWidget.h
+++ b/src/DockAreaWidget.h
@@ -79,6 +79,16 @@ private Q_SLOTS:
 	 */
 	void reorderDockWidget(int fromIndex, int toIndex);
 
+	/*
+	 * Update the auto hide button checked state based on if it's contained in an auto hide container or not
+	 */
+	void updateAutoHideButtonCheckState();
+
+	/*
+	 * Update the title bar button tooltips
+	 */
+	void updateTitleBarButtonToolTip();
+
 protected:
 
 #ifdef Q_OS_WIN
@@ -152,21 +162,11 @@ protected:
 	 */
 	void markTitleBarMenuOutdated();
 
-	/*
-	 * Update the auto hide button checked state based on if it's contained in an auto hide container or not
-	 */
-	void updateAutoHideButtonCheckState();
-
 	/*
 	 * Update the title bar button visibility based on if it's top level or not
 	 */
 	void updateTitleBarButtonVisibility(bool IsTopLevel) const;
 
-	/*
-	 * Update the title bar button tooltips
-	 */
-	void updateTitleBarButtonToolTip();
-
 protected Q_SLOTS:
 	void toggleView(bool Open);
 

From fbd25a83f1b67499de6d9055219ad77afd522517 Mon Sep 17 00:00:00 2001
From: Uwe Kindler <uwe_kindler@web.de>
Date: Tue, 1 Nov 2022 17:31:47 +0100
Subject: [PATCH 07/19] Improved auto hide config flags

---
 src/DockManager.h | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/DockManager.h b/src/DockManager.h
index 6af42e5..008aceb 100644
--- a/src/DockManager.h
+++ b/src/DockManager.h
@@ -236,12 +236,13 @@ public:
 	{
 		AutoHideFeatureEnabled = 0x01, //!< enables / disables auto hide feature
 		DockAreaHasAutoHideButton = 0x02,     //!< If the flag is set each dock area has a auto hide menu button
-		LeftSideBarIconOnly = 0x04,  //!< If the flag is set left side bar will show only icon if a the dock widget has an icon assigned
-		RightSideBarIconOnly = 0x08, //!< If the flag is set right side bar will show only icon if a the dock widget has an icon assigned
-		BottomSideBarIconOnly = 0x10,//!< If the flag is set bottom side show only icon if a the dock widget has an icon assigned
-		TopSideBarIconOnly = 0x20, //!< If the flag is set top side bar show only icon if a the dock widget has an icon assigned
-		AutoHideButtonTogglesArea = 0x40, //!< If the flag is set, the auto hide button enables auto hiding for all dock widgets in an area, if disabled, only the current dock widget will be toggled
-		AutoHideButtonCheckable = 0x80, //!< If the flag is set, the auto hide button will be checked and unchecked depending on the auto hide state. Mainly for styling purposes.
+		AutoHideButtonTogglesArea = 0x04, //!< If the flag is set, the auto hide button enables auto hiding for all dock widgets in an area, if disabled, only the current dock widget will be toggled
+		AutoHideButtonCheckable = 0x08, //!< If the flag is set, the auto hide button will be checked and unchecked depending on the auto hide state. Mainly for styling purposes.
+		LeftSideBarIconOnly = 0x10,  //!< If the flag is set left side bar will show only icon if a the dock widget has an icon assigned
+		RightSideBarIconOnly = 0x20, //!< If the flag is set right side bar will show only icon if a the dock widget has an icon assigned
+		BottomSideBarIconOnly = 0x40,//!< If the flag is set bottom side show only icon if a the dock widget has an icon assigned
+		TopSideBarIconOnly = 0x80, //!< If the flag is set top side bar show only icon if a the dock widget has an icon assigned
+		AutoHideSideBarIconOnly = LeftSideBarIconOnly | RightSideBarIconOnly | BottomSideBarIconOnly | TopSideBarIconOnly,
 
 		DefaultAutoHideConfig = AutoHideFeatureEnabled
 			                  | DockAreaHasAutoHideButton ///< the default configuration for left and right side bars

From 0d7830371331ca6da6eb74769bcac5f21f6c7fdc Mon Sep 17 00:00:00 2001
From: Uwe Kindler <uwe_kindler@web.de>
Date: Tue, 1 Nov 2022 17:41:47 +0100
Subject: [PATCH 08/19] Fixed typo

---
 src/DockManager.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/DockManager.h b/src/DockManager.h
index 008aceb..4726246 100644
--- a/src/DockManager.h
+++ b/src/DockManager.h
@@ -242,7 +242,7 @@ public:
 		RightSideBarIconOnly = 0x20, //!< If the flag is set right side bar will show only icon if a the dock widget has an icon assigned
 		BottomSideBarIconOnly = 0x40,//!< If the flag is set bottom side show only icon if a the dock widget has an icon assigned
 		TopSideBarIconOnly = 0x80, //!< If the flag is set top side bar show only icon if a the dock widget has an icon assigned
-		AutoHideSideBarIconOnly = LeftSideBarIconOnly | RightSideBarIconOnly | BottomSideBarIconOnly | TopSideBarIconOnly,
+		AutoHideSideBarsIconOnly = LeftSideBarIconOnly | RightSideBarIconOnly | BottomSideBarIconOnly | TopSideBarIconOnly,
 
 		DefaultAutoHideConfig = AutoHideFeatureEnabled
 			                  | DockAreaHasAutoHideButton ///< the default configuration for left and right side bars

From fda5887d506752f4cb09c6198142ad93e6d947be Mon Sep 17 00:00:00 2001
From: Uwe Kindler <uwe_kindler@web.de>
Date: Tue, 1 Nov 2022 20:42:52 +0100
Subject: [PATCH 09/19] Removed AutoHideInsertOrder enum - new side tabs are
 always appended.

---
 demo/MainWindow.cpp              |  2 +-
 examples/autohide/mainwindow.cpp |  4 ++--
 src/DockAreaTitleBar.cpp         |  2 +-
 src/DockAreaWidget.cpp           |  6 +++---
 src/DockAreaWidget.h             |  2 +-
 src/DockContainerWidget.cpp      |  6 +++---
 src/DockContainerWidget.h        |  3 +--
 src/DockManager.cpp              |  9 ++++-----
 src/DockManager.h                |  5 ++---
 src/DockWidget.cpp               | 13 -------------
 src/DockWidget.h                 | 33 --------------------------------
 11 files changed, 18 insertions(+), 67 deletions(-)

diff --git a/demo/MainWindow.cpp b/demo/MainWindow.cpp
index f0bf1fe..84ebb88 100644
--- a/demo/MainWindow.cpp
+++ b/demo/MainWindow.cpp
@@ -647,7 +647,7 @@ CMainWindow::CMainWindow(QWidget *parent) :
 	// uncomment the following line if you want a central widget in the main dock container (the dock manager) without a titlebar
 	// If you enable this code, you can test it in the demo with the Calendar 0
 	// dock widget.
-	// CDockManager::setConfigFlag(CDockManager::HideSingleCentralWidgetTitleBar, true);
+	//CDockManager::setConfigFlag(CDockManager::HideSingleCentralWidgetTitleBar, true);
 
 	// uncomment the following line to enable focus highlighting of the dock
 	// widget that has the focus
diff --git a/examples/autohide/mainwindow.cpp b/examples/autohide/mainwindow.cpp
index 4ae68be..56b6eaa 100644
--- a/examples/autohide/mainwindow.cpp
+++ b/examples/autohide/mainwindow.cpp
@@ -46,7 +46,7 @@ CMainWindow::CMainWindow(QWidget *parent)
     TableDockWidget->setWidget(table);
     TableDockWidget->setMinimumSizeHintMode(CDockWidget::MinimumSizeHintFromDockWidget);
     TableDockWidget->setMinimumSize(200,150);
-    const auto autoHideContainer = DockManager->addAutoHideDockWidget(SideBarLocation::Left, TableDockWidget, CDockWidget::Last);
+    const auto autoHideContainer = DockManager->addAutoHideDockWidget(SideBarLocation::Left, TableDockWidget);
     autoHideContainer->setSize(480);
     ui->menuView->addAction(TableDockWidget->toggleViewAction());
 
@@ -58,7 +58,7 @@ CMainWindow::CMainWindow(QWidget *parent)
     TableDockWidget->setMinimumSizeHintMode(CDockWidget::MinimumSizeHintFromDockWidget);
     TableDockWidget->resize(250, 150);
     TableDockWidget->setMinimumSize(200,150);
-    DockManager->addAutoHideDockWidget(SideBarLocation::Left, TableDockWidget, CDockWidget::Last);
+    DockManager->addAutoHideDockWidget(SideBarLocation::Left, TableDockWidget);
     ui->menuView->addAction(TableDockWidget->toggleViewAction());
 
     QTableWidget* propertiesTable = new QTableWidget();
diff --git a/src/DockAreaTitleBar.cpp b/src/DockAreaTitleBar.cpp
index f6e79a7..fdaacd3 100644
--- a/src/DockAreaTitleBar.cpp
+++ b/src/DockAreaTitleBar.cpp
@@ -493,7 +493,7 @@ void CDockAreaTitleBar::onCurrentTabChanged(int Index)
 //============================================================================
 void CDockAreaTitleBar::onAutoHideButtonClicked()
 {
-	d->DockArea->toggleAutoHideArea(!d->DockArea->isAutoHide());
+	d->DockArea->toggleAutoHide(!d->DockArea->isAutoHide());
 }
 
 
diff --git a/src/DockAreaWidget.cpp b/src/DockAreaWidget.cpp
index 5f43698..fc2f70f 100644
--- a/src/DockAreaWidget.cpp
+++ b/src/DockAreaWidget.cpp
@@ -1177,7 +1177,7 @@ void CDockAreaWidget::closeArea()
 }
 
 //============================================================================
-void CDockAreaWidget::toggleAutoHideArea(bool Enable)
+void CDockAreaWidget::toggleAutoHide(bool Enable)
 {
 	if (!Enable)
 	{
@@ -1197,7 +1197,7 @@ void CDockAreaWidget::toggleAutoHideArea(bool Enable)
 				continue;
 			}
 
-			dockContainer()->createAndSetupAutoHideContainer(area, DockWidget, DockWidget->autoHideInsertOrder());
+			dockContainer()->createAndSetupAutoHideContainer(area, DockWidget);
 		}
 	}
 	else
@@ -1207,7 +1207,7 @@ void CDockAreaWidget::toggleAutoHideArea(bool Enable)
 		{
 			return;
 		}
-		dockContainer()->createAndSetupAutoHideContainer(area, DockWidget, DockWidget->autoHideInsertOrder());
+		dockContainer()->createAndSetupAutoHideContainer(area, DockWidget);
 	}
 }
 
diff --git a/src/DockAreaWidget.h b/src/DockAreaWidget.h
index d177fb8..eb9179a 100644
--- a/src/DockAreaWidget.h
+++ b/src/DockAreaWidget.h
@@ -387,7 +387,7 @@ public Q_SLOTS:
 	/**
 	 * Toggles the Auto hides behaviour of the dock area and all dock widgets in this area
 	 */
-	void toggleAutoHideArea(bool Enable);
+	void toggleAutoHide(bool Enable);
 
     /**
 	 * This function closes all other areas except of this area
diff --git a/src/DockContainerWidget.cpp b/src/DockContainerWidget.cpp
index c50918f..af31f2f 100644
--- a/src/DockContainerWidget.cpp
+++ b/src/DockContainerWidget.cpp
@@ -1372,7 +1372,7 @@ CDockAreaWidget* CDockContainerWidget::addDockWidget(DockWidgetArea area, CDockW
 
 //============================================================================
 CAutoHideDockContainer* CDockContainerWidget::createAndSetupAutoHideContainer(
-	SideBarLocation area, CDockWidget* DockWidget, CDockWidget::eAutoHideInsertOrder insertOrder)
+	SideBarLocation area, CDockWidget* DockWidget)
 {
 	if (!CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled))
 	{
@@ -1385,7 +1385,7 @@ CAutoHideDockContainer* CDockContainerWidget::createAndSetupAutoHideContainer(
         DockWidget->setDockManager(d->DockManager); // Auto hide Dock Container needs a valid dock manager
 	}
 
-	return sideTabBar(area)->insertDockWidget(insertOrder == CDockWidget::First ? 0 : -1, DockWidget);
+	return sideTabBar(area)->insertDockWidget(-1, DockWidget);
 }
 
 
@@ -1714,7 +1714,7 @@ void CDockContainerWidget::dropFloatingWidget(CFloatingDockContainer* FloatingWi
 	auto autoHideWidgets = FloatingWidget->dockContainer()->autoHideWidgets();
 	for (const auto autohideWidget : autoHideWidgets)
 	{
-		createAndSetupAutoHideContainer(autohideWidget->sideBarLocation(), autohideWidget->dockWidget(), autohideWidget->dockWidget()->autoHideInsertOrder());
+		createAndSetupAutoHideContainer(autohideWidget->sideBarLocation(), autohideWidget->dockWidget());
 	}
 
 	if (DockArea)
diff --git a/src/DockContainerWidget.h b/src/DockContainerWidget.h
index e8737e8..0f3d3ea 100644
--- a/src/DockContainerWidget.h
+++ b/src/DockContainerWidget.h
@@ -100,8 +100,7 @@ protected:
 	 * 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, CDockWidget::eAutoHideInsertOrder insertOrder);
+	CAutoHideDockContainer* createAndSetupAutoHideContainer(SideBarLocation area, CDockWidget* DockWidget);
 
 	/**
 	 * Helper function for creation of the root splitter
diff --git a/src/DockManager.cpp b/src/DockManager.cpp
index d07c4ff..268dafc 100644
--- a/src/DockManager.cpp
+++ b/src/DockManager.cpp
@@ -867,18 +867,17 @@ CDockAreaWidget* CDockManager::addDockWidgetToContainer(DockWidgetArea area,
 }
 
 //============================================================================
-CAutoHideDockContainer* CDockManager::addAutoHideDockWidget(SideBarLocation area, CDockWidget* Dockwidget,
-	CDockWidget::eAutoHideInsertOrder insertOrder)
+CAutoHideDockContainer* CDockManager::addAutoHideDockWidget(SideBarLocation area, CDockWidget* Dockwidget)
 {
-	return addAutoHideDockWidgetToContainer(area, Dockwidget, this, insertOrder);
+	return addAutoHideDockWidgetToContainer(area, Dockwidget, this);
 }
 
 //============================================================================
 CAutoHideDockContainer* CDockManager::addAutoHideDockWidgetToContainer(SideBarLocation area, CDockWidget* Dockwidget,
-	CDockContainerWidget* DockContainerWidget, CDockWidget::eAutoHideInsertOrder insertOrder)
+	CDockContainerWidget* DockContainerWidget)
 {
 	d->DockWidgetsMap.insert(Dockwidget->objectName(), Dockwidget);
-	auto container = DockContainerWidget->createAndSetupAutoHideContainer(area, Dockwidget, insertOrder);
+	auto container = DockContainerWidget->createAndSetupAutoHideContainer(area, Dockwidget);
 	container->collapseView(true);
 
 	Q_EMIT dockWidgetAdded(Dockwidget);
diff --git a/src/DockManager.h b/src/DockManager.h
index 4726246..ed6d2cf 100644
--- a/src/DockManager.h
+++ b/src/DockManager.h
@@ -347,8 +347,7 @@ public:
 	 * An overlay widget is used for auto hide functionality
 	 * \return Returns the CAutoHideDockContainer that contains the new DockWidget
 	 */
-	CAutoHideDockContainer* addAutoHideDockWidget(SideBarLocation area, CDockWidget* Dockwidget,
-		CDockWidget::eAutoHideInsertOrder insertOrder = CDockWidget::Last);
+	CAutoHideDockContainer* addAutoHideDockWidget(SideBarLocation area, CDockWidget* Dockwidget);
 
 	/**
 	 * Adds dock widget overlayed into the given container based on the CDockWidgetSideTab::SideTabBarArea.
@@ -356,7 +355,7 @@ public:
 	 * \return Returns the CAutoHideDockContainer that contains the new DockWidget
 	 */
 	CAutoHideDockContainer* addAutoHideDockWidgetToContainer(SideBarLocation area,
-		CDockWidget* Dockwidget, CDockContainerWidget* DockContainerWidget, CDockWidget::eAutoHideInsertOrder = CDockWidget::Last);
+		CDockWidget* Dockwidget, CDockContainerWidget* DockContainerWidget);
 
 	/**
 	 * This function will add the given Dockwidget to the given dock area as
diff --git a/src/DockWidget.cpp b/src/DockWidget.cpp
index be44c37..ca3f55b 100644
--- a/src/DockWidget.cpp
+++ b/src/DockWidget.cpp
@@ -94,7 +94,6 @@ struct DockWidgetPrivate
 	QList<QAction*> TitleBarActions;
 	CDockWidget::eMinimumSizeHintMode MinimumSizeHintMode = CDockWidget::MinimumSizeHintFromDockWidget;
 	WidgetFactory* Factory = nullptr;
-	CDockWidget::eAutoHideInsertOrder AutoHideInsertOrder = CDockWidget::Last;
 	QPointer<CAutoHideTab> SideTabWidget;
 	
 	/**
@@ -1139,18 +1138,6 @@ bool CDockWidget::isCurrentTab() const
 }
 
 
-//============================================================================
-void CDockWidget::setAutoHideInsertOrder(eAutoHideInsertOrder insertOrder)
-{
-	d->AutoHideInsertOrder = insertOrder;
-}
-
-CDockWidget::eAutoHideInsertOrder CDockWidget::autoHideInsertOrder() const
-{
-	return d->AutoHideInsertOrder;
-}
-
-
 //============================================================================
 void CDockWidget::raise()
 {
diff --git a/src/DockWidget.h b/src/DockWidget.h
index 76f2dce..b0d9f54 100644
--- a/src/DockWidget.h
+++ b/src/DockWidget.h
@@ -231,17 +231,6 @@ public:
         ActionModeShow   //!< ActionModeShow
     };
 
-    /**
-     * This mode configures the order of pinning and unpinning auto hide widgets
-     * First will add it to the top of the SideTabBar, while Last will append it to the end
-     */
-	enum eAutoHideInsertOrder
-	{
-		First,
-		Last
-	};
-
-
 
     /**
      * This constructor creates a dock widget with the given title.
@@ -537,28 +526,6 @@ public:
      */
     bool isCurrentTab() const;
 
-	/*
-	 * Set default dock proportion when auto hiding
-	 * see *DefaultAutoHideDockProportion()
-	 */
-	void setDefaultAutoHideDockProportion(float Proportion);
-
-	/*
-	 * Set default dock proportion when auto hiding
-	 * 0.25 is a quarter of the size, 0.5 is half the size, 1 is the entire size
-	 */
-	float DefaultAutoHideDockProportion() const;
-
-	/*
-	 * Set auto hide insertion mode
-	 */
-	void setAutoHideInsertOrder(eAutoHideInsertOrder insertOrder);
-
-	/*
-	 * Get auto hide insertion mode
-	 */
-	eAutoHideInsertOrder autoHideInsertOrder() const;
-
 public: // reimplements QFrame -----------------------------------------------
     /**
      * Emits titleChanged signal if title change event occurs

From 540961b8dd7f486575bd9946c23b5179b2df7f5d Mon Sep 17 00:00:00 2001
From: Uwe Kindler <uwe_kindler@web.de>
Date: Tue, 1 Nov 2022 21:31:27 +0100
Subject: [PATCH 10/19] Renamed toggleAutoHide to setAutoHide and added
 toggleAutoHide function

---
 src/DockAreaTitleBar.cpp    |  2 +-
 src/DockAreaWidget.cpp      | 40 ++++++++++++++++++++++++++++++++++---
 src/DockAreaWidget.h        | 18 ++++++++++++++---
 src/DockContainerWidget.cpp |  2 +-
 src/DockContainerWidget.h   |  2 +-
 5 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/src/DockAreaTitleBar.cpp b/src/DockAreaTitleBar.cpp
index fdaacd3..efa93fd 100644
--- a/src/DockAreaTitleBar.cpp
+++ b/src/DockAreaTitleBar.cpp
@@ -493,7 +493,7 @@ void CDockAreaTitleBar::onCurrentTabChanged(int Index)
 //============================================================================
 void CDockAreaTitleBar::onAutoHideButtonClicked()
 {
-	d->DockArea->toggleAutoHide(!d->DockArea->isAutoHide());
+	d->DockArea->setAutoHide(!d->DockArea->isAutoHide());
 }
 
 
diff --git a/src/DockAreaWidget.cpp b/src/DockAreaWidget.cpp
index fc2f70f..ae7c159 100644
--- a/src/DockAreaWidget.cpp
+++ b/src/DockAreaWidget.cpp
@@ -61,6 +61,15 @@ namespace ads
 static const char* const INDEX_PROPERTY = "index";
 static const char* const ACTION_PROPERTY = "action";
 
+/**
+ * Check, if auto hide is enabled
+ */
+static bool isAutoHideFeatureEnabled()
+{
+	return CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled);
+}
+
+
 /**
  * Internal dock area layout mimics stack layout but only inserts the current
  * widget into the internal QLayout object.
@@ -826,7 +835,7 @@ void CDockAreaWidget::updateTitleBarVisibility()
 	Hidden &= !IsAutoHide; // Titlebar must always be visible when auto hidden so it can be dragged
 	d->TitleBar->setVisible(!Hidden);
 
-	if (CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled))
+	if (isAutoHideFeatureEnabled())
 	{
 		auto tabBar = d->TitleBar->tabBar();
 		tabBar->setVisible(!IsAutoHide);  // Never show tab bar when auto hidden
@@ -1176,16 +1185,29 @@ void CDockAreaWidget::closeArea()
     }
 }
 
+
 //============================================================================
-void CDockAreaWidget::toggleAutoHide(bool Enable)
+SideBarLocation CDockAreaWidget::calculateSideTabBarArea() const
 {
+	return dockContainer()->calculateSideTabBarArea(this);
+}
+
+
+//============================================================================
+void CDockAreaWidget::setAutoHide(bool Enable)
+{
+	if (!isAutoHideFeatureEnabled())
+	{
+		return;
+	}
+
 	if (!Enable)
 	{
 		autoHideDockContainer()->moveContentsToParent();
 		return;
 	}
 
-	const auto area = dockContainer()->calculateSideTabBarArea(this);
+	const auto area = calculateSideTabBarArea();
 
 	if (CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideButtonTogglesArea)
 	 && features().testFlag(CDockWidget::DockWidgetPinnable))
@@ -1212,6 +1234,18 @@ void CDockAreaWidget::toggleAutoHide(bool Enable)
 }
 
 
+//============================================================================
+void CDockAreaWidget::toggleAutoHide()
+{
+	if (!isAutoHideFeatureEnabled())
+	{
+		return;
+	}
+
+	setAutoHide(!isAutoHide());
+}
+
+
 //============================================================================
 void CDockAreaWidget::closeOtherAreas()
 {
diff --git a/src/DockAreaWidget.h b/src/DockAreaWidget.h
index eb9179a..65d73de 100644
--- a/src/DockAreaWidget.h
+++ b/src/DockAreaWidget.h
@@ -89,6 +89,12 @@ private Q_SLOTS:
 	 */
 	void updateTitleBarButtonToolTip();
 
+	/**
+	 * Calculate the auto hide side bar location depending on the dock area
+	 * widget position in the container
+	 */
+	SideBarLocation calculateSideTabBarArea() const;
+
 protected:
 
 #ifdef Q_OS_WIN
@@ -211,7 +217,7 @@ public:
 	CAutoHideDockContainer* autoHideDockContainer() const; 
 
 	/**
-	 * Returns true if the dock area exists in an auto hide dock container
+	 * Returns true if the dock area is in an auto hide container
 	 */
 	bool isAutoHide() const;
 
@@ -385,9 +391,15 @@ public Q_SLOTS:
 	void closeArea();
 
 	/**
-	 * Toggles the Auto hides behaviour of the dock area and all dock widgets in this area
+	 * Sets the dock area into auto hide mode or into normal mode
 	 */
-	void toggleAutoHide(bool Enable);
+	void setAutoHide(bool Enable);
+
+	/**
+	 * Switches the dock area to auto hide mode or vice versa depending on its
+	 * current state.
+	 */
+	void toggleAutoHide();
 
     /**
 	 * This function closes all other areas except of this area
diff --git a/src/DockContainerWidget.cpp b/src/DockContainerWidget.cpp
index af31f2f..6bd0df6 100644
--- a/src/DockContainerWidget.cpp
+++ b/src/DockContainerWidget.cpp
@@ -1411,7 +1411,7 @@ enum eBorderLocation
 
 
 //============================================================================
-SideBarLocation CDockContainerWidget::calculateSideTabBarArea(CDockAreaWidget* DockAreaWidget)
+SideBarLocation CDockContainerWidget::calculateSideTabBarArea(const CDockAreaWidget* DockAreaWidget) const
 {
 
 	auto ContentRect = this->contentRect();
diff --git a/src/DockContainerWidget.h b/src/DockContainerWidget.h
index 0f3d3ea..b37494b 100644
--- a/src/DockContainerWidget.h
+++ b/src/DockContainerWidget.h
@@ -220,7 +220,7 @@ public:
 	/**
 	 * Get's the auto hide dock side tab bar area based on the dock area widget position
 	 */
-	SideBarLocation calculateSideTabBarArea(CDockAreaWidget* DockAreaWidget);
+	SideBarLocation calculateSideTabBarArea(const CDockAreaWidget* DockAreaWidget) const;
 
 	/**
 	 * Removes dockwidget

From 983afc4d1e9e337fa45edbdaabd77bbd738ab374 Mon Sep 17 00:00:00 2001
From: Uwe Kindler <uwe_kindler@web.de>
Date: Wed, 2 Nov 2022 07:29:45 +0100
Subject: [PATCH 11/19] Fixed wrong size calculation in CAutoHideDockContainer
 updateSize() function

---
 src/AutoHideDockContainer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/AutoHideDockContainer.cpp b/src/AutoHideDockContainer.cpp
index d84d605..52e9f09 100644
--- a/src/AutoHideDockContainer.cpp
+++ b/src/AutoHideDockContainer.cpp
@@ -228,7 +228,7 @@ void CAutoHideDockContainer::updateSize()
 	switch (sideBarLocation())
 	{
 	case SideBarLocation::Top:
-		 resize(rect.width(), qMin(rect.height(), d->Size.height() - ResizeMargin));
+		 resize(rect.width(), qMin(rect.height()  - ResizeMargin, d->Size.height()));
 		 move(rect.topLeft());
 		 break;
 
@@ -248,7 +248,7 @@ void CAutoHideDockContainer::updateSize()
 
 	case SideBarLocation::Bottom:
 		 {
-			 resize(rect.width(), qMin(rect.height(), d->Size.height() - ResizeMargin));
+			 resize(rect.width(), qMin(rect.height() - ResizeMargin, d->Size.height()));
 			 QPoint p = rect.bottomLeft();
 			 p.ry() -= (height() - 1);
 			 move(p);

From 7d79ea27706471701301757ac2a8bd147f4ad6b2 Mon Sep 17 00:00:00 2001
From: Uwe Kindler <uwe_kindler@web.de>
Date: Wed, 2 Nov 2022 07:46:02 +0100
Subject: [PATCH 12/19] Fixed crash by access to invalid dock parent container
 in CAutoHideDockContainer::updateSize() function

---
 src/AutoHideDockContainer.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/AutoHideDockContainer.cpp b/src/AutoHideDockContainer.cpp
index 52e9f09..1124262 100644
--- a/src/AutoHideDockContainer.cpp
+++ b/src/AutoHideDockContainer.cpp
@@ -223,6 +223,11 @@ CAutoHideDockContainer::CAutoHideDockContainer(CDockWidget* DockWidget, SideBarL
 void CAutoHideDockContainer::updateSize()
 {
 	auto dockContainerParent = parentContainer();
+	if (!dockContainerParent)
+	{
+		return;
+	}
+
 	auto rect = dockContainerParent->contentRect();
 
 	switch (sideBarLocation())

From 9f153af5bbf86e5c7ba0e4c54927eff1170753a4 Mon Sep 17 00:00:00 2001
From: Uwe Kindler <uwe_kindler@web.de>
Date: Wed, 2 Nov 2022 08:08:44 +0100
Subject: [PATCH 13/19] Changed MainWindow to enable ActiveX only for non
 opaque configuration and if AutoHide is disabled

---
 demo/MainWindow.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/demo/MainWindow.cpp b/demo/MainWindow.cpp
index 84ebb88..71bd13d 100644
--- a/demo/MainWindow.cpp
+++ b/demo/MainWindow.cpp
@@ -495,7 +495,10 @@ void MainWindowPrivate::createContent()
 
 #ifdef Q_OS_WIN
 #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
-    if (!ads::CDockManager::testConfigFlag(ads::CDockManager::OpaqueUndocking))
+    // ActiveX widget only works without OpaqueUndocking and without
+    // auto hide feature
+    if (!ads::CDockManager::testConfigFlag(ads::CDockManager::OpaqueUndocking)
+     && !ads::CDockManager::testAutoHideConfigFlag(ads::CDockManager::AutoHideFeatureEnabled))
     {
     	DockManager->addDockWidget(ads::CenterDockWidgetArea, createActiveXWidget(), RighDockArea);
     }

From 7c1d04f7be90df1d5dcc36cdcb978c488afe9dd6 Mon Sep 17 00:00:00 2001
From: Uwe Kindler <uwe_kindler@web.de>
Date: Wed, 2 Nov 2022 08:16:56 +0100
Subject: [PATCH 14/19] Move calculateSideTabBarArea() function from
 DockContainerWidget into DockAreaWidget because it is only required there and
 it depends on dock area position

---
 src/DockAreaWidget.cpp      | 101 +++++++++++++++++++++++++++++++++++-
 src/DockContainerWidget.cpp |  99 -----------------------------------
 src/DockContainerWidget.h   |   5 --
 3 files changed, 99 insertions(+), 106 deletions(-)

diff --git a/src/DockAreaWidget.cpp b/src/DockAreaWidget.cpp
index ae7c159..651b674 100644
--- a/src/DockAreaWidget.cpp
+++ b/src/DockAreaWidget.cpp
@@ -1186,10 +1186,104 @@ void CDockAreaWidget::closeArea()
 }
 
 
+enum eBorderLocation
+{
+	BorderNone = 0,
+	BorderLeft = 0x01,
+	BorderRight = 0x02,
+	BorderTop = 0x04,
+	BorderBottom = 0x08,
+	BorderVertical = BorderLeft | BorderRight,
+	BorderHorizontal = BorderTop | BorderBottom,
+	BorderTopLeft = BorderTop | BorderLeft,
+	BorderTopRight = BorderTop | BorderRight,
+	BorderBottomLeft = BorderBottom | BorderLeft,
+	BorderBottomRight = BorderBottom | BorderRight,
+	BorderVerticalBottom = BorderVertical | BorderBottom,
+	BorderVerticalTop = BorderVertical | BorderTop,
+	BorderHorizontalLeft = BorderHorizontal | BorderLeft,
+	BorderHorizontalRight = BorderHorizontal | BorderRight,
+	BorderAll = BorderVertical | BorderHorizontal
+};
+
+
 //============================================================================
 SideBarLocation CDockAreaWidget::calculateSideTabBarArea() const
 {
-	return dockContainer()->calculateSideTabBarArea(this);
+	auto Container = dockContainer();
+	auto ContentRect = Container->contentRect();
+
+	int borders = BorderNone; // contains all borders that are touched by the dock ware
+	auto DockAreaTopLeft = mapTo(Container, rect().topLeft());
+	auto DockAreaRect = rect();
+	DockAreaRect.moveTo(DockAreaTopLeft);
+	const qreal aspectRatio = DockAreaRect.width() / (qMax(1, DockAreaRect.height()) * 1.0);
+	const qreal sizeRatio = (qreal)ContentRect.width() / DockAreaRect.width();
+	static const int MinBorderDistance = 16;
+	bool HorizontalOrientation = (aspectRatio > 1.0) && (sizeRatio < 3.0);
+
+	// measure border distances - a distance less than 16 px means we touch the
+	// border
+	int BorderDistance[4];
+
+	int Distance = qAbs(ContentRect.topLeft().y() - DockAreaRect.topLeft().y());
+	BorderDistance[SideBarLocation::Top] = (Distance < MinBorderDistance) ? 0 : Distance;
+	if (!BorderDistance[SideBarLocation::Top])
+	{
+		borders |= BorderTop;
+	}
+
+	Distance = qAbs(ContentRect.bottomRight().y() - DockAreaRect.bottomRight().y());
+	BorderDistance[SideBarLocation::Bottom] = (Distance < MinBorderDistance) ? 0 : Distance;
+	if (!BorderDistance[SideBarLocation::Bottom])
+	{
+		borders |= BorderBottom;
+	}
+
+	Distance = qAbs(ContentRect.topLeft().x() - DockAreaRect.topLeft().x());
+	BorderDistance[SideBarLocation::Left] = (Distance < MinBorderDistance) ? 0 : Distance;
+	if (!BorderDistance[SideBarLocation::Left])
+	{
+		borders |= BorderLeft;
+	}
+
+	Distance = qAbs(ContentRect.bottomRight().x() - DockAreaRect.bottomRight().x());
+	BorderDistance[SideBarLocation::Right] = (Distance < MinBorderDistance) ? 0 : Distance;
+	if (!BorderDistance[SideBarLocation::Right])
+	{
+		borders |= BorderRight;
+	}
+
+	auto SideTab = SideBarLocation::Right;
+	switch (borders)
+	{
+	// 1. It's touching all borders
+	case BorderAll: SideTab = HorizontalOrientation ? SideBarLocation::Bottom : SideBarLocation::Right; break;
+
+	// 2. It's touching 3 borders
+	case BorderVerticalBottom : SideTab = SideBarLocation::Bottom; break;
+	case BorderVerticalTop : SideTab = SideBarLocation::Top; break;
+	case BorderHorizontalLeft: SideTab = SideBarLocation::Left; break;
+	case BorderHorizontalRight: SideTab = SideBarLocation::Right; break;
+
+	// 3. Its touching horizontal or vertical borders
+	case BorderVertical : SideTab = SideBarLocation::Bottom; break;
+	case BorderHorizontal: SideTab = SideBarLocation::Right; break;
+
+	// 4. Its in a corner
+	case BorderTopLeft : SideTab = HorizontalOrientation ? SideBarLocation::Top : SideBarLocation::Left; break;
+	case BorderTopRight : SideTab = HorizontalOrientation ? SideBarLocation::Top : SideBarLocation::Right; break;
+	case BorderBottomLeft : SideTab = HorizontalOrientation ? SideBarLocation::Bottom : SideBarLocation::Left; break;
+	case BorderBottomRight : SideTab = HorizontalOrientation ? SideBarLocation::Bottom : SideBarLocation::Right; break;
+
+	// 5 Ists touching only one border
+	case BorderLeft: SideTab = SideBarLocation::Left; break;
+	case BorderRight: SideTab = SideBarLocation::Right; break;
+	case BorderTop: SideTab = SideBarLocation::Top; break;
+	case BorderBottom: SideTab = SideBarLocation::Bottom; break;
+	}
+
+	return SideTab;
 }
 
 
@@ -1203,7 +1297,10 @@ void CDockAreaWidget::setAutoHide(bool Enable)
 
 	if (!Enable)
 	{
-		autoHideDockContainer()->moveContentsToParent();
+		if (isAutoHide())
+		{
+			autoHideDockContainer()->moveContentsToParent();
+		}
 		return;
 	}
 
diff --git a/src/DockContainerWidget.cpp b/src/DockContainerWidget.cpp
index 6bd0df6..ee73817 100644
--- a/src/DockContainerWidget.cpp
+++ b/src/DockContainerWidget.cpp
@@ -1389,105 +1389,6 @@ CAutoHideDockContainer* CDockContainerWidget::createAndSetupAutoHideContainer(
 }
 
 
-enum eBorderLocation
-{
-	BorderNone = 0,
-	BorderLeft = 0x01,
-	BorderRight = 0x02,
-	BorderTop = 0x04,
-	BorderBottom = 0x08,
-	BorderVertical = BorderLeft | BorderRight,
-	BorderHorizontal = BorderTop | BorderBottom,
-	BorderTopLeft = BorderTop | BorderLeft,
-	BorderTopRight = BorderTop | BorderRight,
-	BorderBottomLeft = BorderBottom | BorderLeft,
-	BorderBottomRight = BorderBottom | BorderRight,
-	BorderVerticalBottom = BorderVertical | BorderBottom,
-	BorderVerticalTop = BorderVertical | BorderTop,
-	BorderHorizontalLeft = BorderHorizontal | BorderLeft,
-	BorderHorizontalRight = BorderHorizontal | BorderRight,
-	BorderAll = BorderVertical | BorderHorizontal
-};
-
-
-//============================================================================
-SideBarLocation CDockContainerWidget::calculateSideTabBarArea(const CDockAreaWidget* DockAreaWidget) const
-{
-
-	auto ContentRect = this->contentRect();
-	int borders = BorderNone; // contains all borders that are touched by the dock ware
-	auto DockAreaTopLeft = DockAreaWidget->mapTo(this, DockAreaWidget->rect().topLeft());
-	auto DockAreaRect = DockAreaWidget->rect();
-	DockAreaRect.moveTo(DockAreaTopLeft);
-	const qreal aspectRatio = DockAreaRect.width() / (qMax(1, DockAreaRect.height()) * 1.0);
-	const qreal sizeRatio = (qreal)ContentRect.width() / DockAreaRect.width();
-	static const int MinBorderDistance = 16;
-	bool HorizontalOrientation = (aspectRatio > 1.0) && (sizeRatio < 3.0);
-
-	// measure border distances - a distance less than 16 px means we touch the
-	// border
-	int BorderDistance[4];
-
-	int Distance = qAbs(ContentRect.topLeft().y() - DockAreaRect.topLeft().y());
-	BorderDistance[SideBarLocation::Top] = (Distance < MinBorderDistance) ? 0 : Distance;
-	if (!BorderDistance[SideBarLocation::Top])
-	{
-		borders |= BorderTop;
-	}
-
-	Distance = qAbs(ContentRect.bottomRight().y() - DockAreaRect.bottomRight().y());
-	BorderDistance[SideBarLocation::Bottom] = (Distance < MinBorderDistance) ? 0 : Distance;
-	if (!BorderDistance[SideBarLocation::Bottom])
-	{
-		borders |= BorderBottom;
-	}
-
-	Distance = qAbs(ContentRect.topLeft().x() - DockAreaRect.topLeft().x());
-	BorderDistance[SideBarLocation::Left] = (Distance < MinBorderDistance) ? 0 : Distance;
-	if (!BorderDistance[SideBarLocation::Left])
-	{
-		borders |= BorderLeft;
-	}
-
-	Distance = qAbs(ContentRect.bottomRight().x() - DockAreaRect.bottomRight().x());
-	BorderDistance[SideBarLocation::Right] = (Distance < MinBorderDistance) ? 0 : Distance;
-	if (!BorderDistance[SideBarLocation::Right])
-	{
-		borders |= BorderRight;
-	}
-
-	auto SideTab = SideBarLocation::Right;
-	switch (borders)
-	{
-	// 1. It's touching all borders
-	case BorderAll: SideTab = HorizontalOrientation ? SideBarLocation::Bottom : SideBarLocation::Right; break;
-
-	// 2. It's touching 3 borders
-	case BorderVerticalBottom : SideTab = SideBarLocation::Bottom; break;
-	case BorderVerticalTop : SideTab = SideBarLocation::Top; break;
-	case BorderHorizontalLeft: SideTab = SideBarLocation::Left; break;
-	case BorderHorizontalRight: SideTab = SideBarLocation::Right; break;
-
-	// 3. Its touching horizontal or vertical borders
-	case BorderVertical : SideTab = SideBarLocation::Bottom; break;
-	case BorderHorizontal: SideTab = SideBarLocation::Right; break;
-
-	// 4. Its in a corner
-	case BorderTopLeft : SideTab = HorizontalOrientation ? SideBarLocation::Top : SideBarLocation::Left; break;
-	case BorderTopRight : SideTab = HorizontalOrientation ? SideBarLocation::Top : SideBarLocation::Right; break;
-	case BorderBottomLeft : SideTab = HorizontalOrientation ? SideBarLocation::Bottom : SideBarLocation::Left; break;
-	case BorderBottomRight : SideTab = HorizontalOrientation ? SideBarLocation::Bottom : SideBarLocation::Right; break;
-
-	// 5 Ists touching only one border
-	case BorderLeft: SideTab = SideBarLocation::Left; break;
-	case BorderRight: SideTab = SideBarLocation::Right; break;
-	case BorderTop: SideTab = SideBarLocation::Top; break;
-	case BorderBottom: SideTab = SideBarLocation::Bottom; break;
-	}
-
-	return SideTab;
-}
-
 //============================================================================
 void CDockContainerWidget::removeDockWidget(CDockWidget* Dockwidget)
 {
diff --git a/src/DockContainerWidget.h b/src/DockContainerWidget.h
index b37494b..421939b 100644
--- a/src/DockContainerWidget.h
+++ b/src/DockContainerWidget.h
@@ -217,11 +217,6 @@ public:
 	CDockAreaWidget* addDockWidget(DockWidgetArea area, CDockWidget* Dockwidget,
 		CDockAreaWidget* DockAreaWidget = nullptr);
 
-	/**
-	 * Get's the auto hide dock side tab bar area based on the dock area widget position
-	 */
-	SideBarLocation calculateSideTabBarArea(const CDockAreaWidget* DockAreaWidget) const;
-
 	/**
 	 * Removes dockwidget
 	 */

From 9c14c62637d275fd6ddfb3b758752e3af3616ea8 Mon Sep 17 00:00:00 2001
From: Uwe Kindler <uwe_kindler@web.de>
Date: Wed, 2 Nov 2022 08:27:23 +0100
Subject: [PATCH 15/19] Added setAutoHide() and toggleAutoHide() function to
 CDockWidget

---
 src/DockAreaWidget.cpp | 10 ++--------
 src/DockWidget.cpp     | 39 +++++++++++++++++++++++++++++++++++++++
 src/DockWidget.h       | 12 ++++++++++++
 3 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/src/DockAreaWidget.cpp b/src/DockAreaWidget.cpp
index 651b674..8ec5e0e 100644
--- a/src/DockAreaWidget.cpp
+++ b/src/DockAreaWidget.cpp
@@ -1304,11 +1304,10 @@ void CDockAreaWidget::setAutoHide(bool Enable)
 		return;
 	}
 
-	const auto area = calculateSideTabBarArea();
-
 	if (CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideButtonTogglesArea)
 	 && features().testFlag(CDockWidget::DockWidgetPinnable))
 	{
+		auto area = calculateSideTabBarArea();
 		for (const auto DockWidget : openedDockWidgets())
 		{
 			if (Enable == isAutoHide())
@@ -1321,12 +1320,7 @@ void CDockAreaWidget::setAutoHide(bool Enable)
 	}
 	else
 	{
-		const auto DockWidget = currentDockWidget();
-		if (Enable == isAutoHide())
-		{
-			return;
-		}
-		dockContainer()->createAndSetupAutoHideContainer(area, DockWidget);
+		currentDockWidget()->setAutoHide(true);
 	}
 }
 
diff --git a/src/DockWidget.cpp b/src/DockWidget.cpp
index ca3f55b..31f3cb9 100644
--- a/src/DockWidget.cpp
+++ b/src/DockWidget.cpp
@@ -1156,6 +1156,45 @@ void CDockWidget::raise()
 }
 
 
+//============================================================================
+void CDockWidget::setAutoHide(bool Enable)
+{
+	if (!CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled))
+	{
+		return;
+	}
+
+	// Do nothing if nothing changes
+	if (Enable == isAutoHide())
+	{
+		return;
+	}
+
+	auto DockArea = dockAreaWidget();
+	if (!Enable)
+	{
+		DockArea->setAutoHide(false);
+	}
+	else
+	{
+		auto area = DockArea->calculateSideTabBarArea();
+		dockContainer()->createAndSetupAutoHideContainer(area, this);
+	}
+}
+
+
+//============================================================================
+void CDockWidget::toggleAutoHide()
+{
+	if (!CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled))
+	{
+		return;
+	}
+
+	setAutoHide(!isAutoHide());
+}
+
+
 } // namespace ads
 
 //---------------------------------------------------------------------------
diff --git a/src/DockWidget.h b/src/DockWidget.h
index b0d9f54..115c02c 100644
--- a/src/DockWidget.h
+++ b/src/DockWidget.h
@@ -592,6 +592,18 @@ public Q_SLOTS:
      */
     void showNormal();
 
+	/**
+	 * Sets the dock widget into auto hide mode if this feature is enabled
+	 * via CDockManager::setAutoHideFlags(CDockManager::AutoHideFeatureEnabled)
+	 */
+	void setAutoHide(bool Enable);
+
+	/**
+	 * Switches the dock widget to auto hide mode or vice versa depending on its
+	 * current state.
+	 */
+	void toggleAutoHide();
+
 
 Q_SIGNALS:
     /**

From b5a179555a8576af03d21d447582ca6436d00475 Mon Sep 17 00:00:00 2001
From: Uwe Kindler <uwe_kindler@web.de>
Date: Wed, 2 Nov 2022 12:45:45 +0100
Subject: [PATCH 16/19] Added context menu actions for titleBar and dock widget
 tab auto hide

---
 src/DockAreaTitleBar.cpp | 36 +++++++++++++++++++++++++++++-------
 src/DockAreaTitleBar.h   |  1 +
 src/DockAreaWidget.cpp   | 25 +++++++++++--------------
 src/DockAreaWidget.h     |  4 +++-
 src/DockWidgetTab.cpp    | 12 ++++++++++++
 src/DockWidgetTab.h      |  1 +
 6 files changed, 57 insertions(+), 22 deletions(-)

diff --git a/src/DockAreaTitleBar.cpp b/src/DockAreaTitleBar.cpp
index efa93fd..30314b5 100644
--- a/src/DockAreaTitleBar.cpp
+++ b/src/DockAreaTitleBar.cpp
@@ -27,7 +27,6 @@
 //============================================================================
 //                                   INCLUDES
 //============================================================================
-#include <AutoHideDockContainer.h>
 #include "DockAreaTitleBar.h"
 
 #include <QPushButton>
@@ -53,6 +52,7 @@
 #include "DockComponentsFactory.h"
 #include "DockFocusController.h"
 #include "ElidingLabel.h"
+#include "AutoHideDockContainer.h"
 
 #include <iostream>
 
@@ -137,7 +137,6 @@ struct DockAreaTitleBarPrivate
 		return this->DragState == dragState;
 	}
 
-
 	/**
 	 * Starts floating
 	 */
@@ -493,7 +492,21 @@ void CDockAreaTitleBar::onCurrentTabChanged(int Index)
 //============================================================================
 void CDockAreaTitleBar::onAutoHideButtonClicked()
 {
-	d->DockArea->setAutoHide(!d->DockArea->isAutoHide());
+	if (CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideButtonTogglesArea))
+	{
+		d->DockArea->toggleAutoHide();
+	}
+	else
+	{
+		d->DockArea->currentDockWidget()->toggleAutoHide();
+	}
+}
+
+
+//============================================================================
+void CDockAreaTitleBar::onAutoHideDockAreaClicked()
+{
+	d->DockArea->toggleAutoHide();
 }
 
 
@@ -538,7 +551,6 @@ void CDockAreaTitleBar::mousePressEvent(QMouseEvent* ev)
 
 		if (CDockManager::testConfigFlag(CDockManager::FocusHighlighting))
 		{
-			//d->TabBar->currentTab()->setFocus(Qt::OtherFocusReason);
 			d->dockManager()->dockFocusController()->setDockWidgetTabFocused(d->TabBar->currentTab());
 		}
 		return;
@@ -652,13 +664,23 @@ void CDockAreaTitleBar::contextMenuEvent(QContextMenuEvent* ev)
 		return;
 	}
 
+	bool IsAutoHide = d->DockArea->isAutoHide();
 	QMenu Menu(this);
-	auto Action = Menu.addAction(tr("Detach Group"), this, SLOT(onUndockButtonClicked()));
+	auto Action = Menu.addAction(IsAutoHide ? tr("Detach") : tr("Detach Group"),
+		this, SLOT(onUndockButtonClicked()));
 	Action->setEnabled(d->DockArea->features().testFlag(CDockWidget::DockWidgetFloatable));
+    if (CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled))
+    {
+    	Action = Menu.addAction(IsAutoHide ? tr("Dock") : tr("Auto Hide Group"), this, SLOT(onAutoHideDockAreaClicked()));
+    	Action->setEnabled(d->DockArea->features().testFlag(CDockWidget::DockWidgetPinnable));
+    }
 	Menu.addSeparator();
-	Action = Menu.addAction(tr("Close Group"), this, SLOT(onCloseButtonClicked()));
+	Action = Menu.addAction(IsAutoHide ? tr("Close") : tr("Close Group"), this, SLOT(onCloseButtonClicked()));
 	Action->setEnabled(d->DockArea->features().testFlag(CDockWidget::DockWidgetClosable));
-	Menu.addAction(tr("Close Other Groups"), d->DockArea, SLOT(closeOtherAreas()));
+	if (!IsAutoHide)
+	{
+		Menu.addAction(tr("Close Other Groups"), d->DockArea, SLOT(closeOtherAreas()));
+	}
 	Menu.exec(ev->globalPos());
 }
 
diff --git a/src/DockAreaTitleBar.h b/src/DockAreaTitleBar.h
index 5ccdc4a..88e4fdd 100644
--- a/src/DockAreaTitleBar.h
+++ b/src/DockAreaTitleBar.h
@@ -62,6 +62,7 @@ private Q_SLOTS:
 	void onTabsMenuActionTriggered(QAction* Action);
 	void onCurrentTabChanged(int Index);
 	void onAutoHideButtonClicked();
+	void onAutoHideDockAreaClicked();
 
 protected:
     /**
diff --git a/src/DockAreaWidget.cpp b/src/DockAreaWidget.cpp
index 8ec5e0e..4cfb7ac 100644
--- a/src/DockAreaWidget.cpp
+++ b/src/DockAreaWidget.cpp
@@ -1304,23 +1304,20 @@ void CDockAreaWidget::setAutoHide(bool Enable)
 		return;
 	}
 
-	if (CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideButtonTogglesArea)
-	 && features().testFlag(CDockWidget::DockWidgetPinnable))
+	auto area = calculateSideTabBarArea();
+	for (const auto DockWidget : openedDockWidgets())
 	{
-		auto area = calculateSideTabBarArea();
-		for (const auto DockWidget : openedDockWidgets())
+		if (Enable == isAutoHide())
 		{
-			if (Enable == isAutoHide())
-			{
-				continue;
-			}
-
-			dockContainer()->createAndSetupAutoHideContainer(area, DockWidget);
+			continue;
 		}
-	}
-	else
-	{
-		currentDockWidget()->setAutoHide(true);
+
+		if (!DockWidget->features().testFlag(CDockWidget::DockWidgetPinnable))
+		{
+			continue;
+		}
+
+		dockContainer()->createAndSetupAutoHideContainer(area, DockWidget);
 	}
 }
 
diff --git a/src/DockAreaWidget.h b/src/DockAreaWidget.h
index 65d73de..8e8a0aa 100644
--- a/src/DockAreaWidget.h
+++ b/src/DockAreaWidget.h
@@ -391,7 +391,9 @@ public Q_SLOTS:
 	void closeArea();
 
 	/**
-	 * Sets the dock area into auto hide mode or into normal mode
+	 * Sets the dock area into auto hide mode or into normal mode.
+	 * 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);
 
diff --git a/src/DockWidgetTab.cpp b/src/DockWidgetTab.cpp
index 30c5135..aa904c7 100644
--- a/src/DockWidgetTab.cpp
+++ b/src/DockWidgetTab.cpp
@@ -515,6 +515,11 @@ void CDockWidgetTab::contextMenuEvent(QContextMenuEvent* ev)
 
 	auto Action = Menu.addAction(tr("Detach"), this, SLOT(detachDockWidget()));
     Action->setEnabled(isDetachable);
+    if (CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled))
+    {
+    	Action = Menu.addAction(tr("Auto Hide"), this, SLOT(autoHideDockWidget()));
+    	Action->setEnabled(d->DockWidget->features().testFlag(CDockWidget::DockWidgetPinnable));
+    }
 	Menu.addSeparator();
 	Action = Menu.addAction(tr("Close"), this, SIGNAL(closeRequested()));
 	Action->setEnabled(isClosable());
@@ -700,6 +705,13 @@ void CDockWidgetTab::detachDockWidget()
 }
 
 
+//===========================================================================
+void CDockWidgetTab::autoHideDockWidget()
+{
+	d->DockWidget->setAutoHide(true);
+}
+
+
 //============================================================================
 bool CDockWidgetTab::event(QEvent *e)
 {
diff --git a/src/DockWidgetTab.h b/src/DockWidgetTab.h
index d186c46..df32ef0 100644
--- a/src/DockWidgetTab.h
+++ b/src/DockWidgetTab.h
@@ -63,6 +63,7 @@ private:
 
 private Q_SLOTS:
 	void detachDockWidget();
+	void autoHideDockWidget();
 
 protected:
 	virtual void mousePressEvent(QMouseEvent* ev) override;

From d2c08aca701710c2ee2e3cfe111becd38c551197 Mon Sep 17 00:00:00 2001
From: Uwe Kindler <uwe_kindler@web.de>
Date: Wed, 2 Nov 2022 13:06:42 +0100
Subject: [PATCH 17/19] Improved context menu of DockAreaWidget

---
 src/DockAreaTitleBar.cpp  | 26 ++++++++++++++++----------
 src/DockAreaWidget.cpp    | 13 +++++++++++++
 src/DockAreaWidget.h      |  6 ++++++
 src/DockContainerWidget.h |  3 ++-
 4 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/src/DockAreaTitleBar.cpp b/src/DockAreaTitleBar.cpp
index 30314b5..87d3c51 100644
--- a/src/DockAreaTitleBar.cpp
+++ b/src/DockAreaTitleBar.cpp
@@ -665,21 +665,27 @@ void CDockAreaTitleBar::contextMenuEvent(QContextMenuEvent* ev)
 	}
 
 	bool IsAutoHide = d->DockArea->isAutoHide();
+	bool IsTopLevelArea = d->DockArea->isTopLevelArea();
+	QAction* Action;
 	QMenu Menu(this);
-	auto Action = Menu.addAction(IsAutoHide ? tr("Detach") : tr("Detach Group"),
-		this, SLOT(onUndockButtonClicked()));
-	Action->setEnabled(d->DockArea->features().testFlag(CDockWidget::DockWidgetFloatable));
-    if (CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled))
-    {
-    	Action = Menu.addAction(IsAutoHide ? tr("Dock") : tr("Auto Hide Group"), this, SLOT(onAutoHideDockAreaClicked()));
-    	Action->setEnabled(d->DockArea->features().testFlag(CDockWidget::DockWidgetPinnable));
-    }
-	Menu.addSeparator();
+	if (!IsTopLevelArea)
+	{
+		Action = Menu.addAction(IsAutoHide ? tr("Detach") : tr("Detach Group"),
+			this, SLOT(onUndockButtonClicked()));
+		Action->setEnabled(d->DockArea->features().testFlag(CDockWidget::DockWidgetFloatable));
+		if (CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled))
+		{
+			Action = Menu.addAction(IsAutoHide ? tr("Dock") : tr("Auto Hide Group"), this, SLOT(onAutoHideDockAreaClicked()));
+			Action->setEnabled(d->DockArea->features().testFlag(CDockWidget::DockWidgetPinnable));
+		}
+		Menu.addSeparator();
+	}
 	Action = Menu.addAction(IsAutoHide ? tr("Close") : tr("Close Group"), this, SLOT(onCloseButtonClicked()));
 	Action->setEnabled(d->DockArea->features().testFlag(CDockWidget::DockWidgetClosable));
 	if (!IsAutoHide)
 	{
-		Menu.addAction(tr("Close Other Groups"), d->DockArea, SLOT(closeOtherAreas()));
+		Action = Menu.addAction(tr("Close Other Groups"), d->DockArea, SLOT(closeOtherAreas()));
+		Action->setEnabled(!IsTopLevelArea);
 	}
 	Menu.exec(ev->globalPos());
 }
diff --git a/src/DockAreaWidget.cpp b/src/DockAreaWidget.cpp
index 4cfb7ac..fc90cc7 100644
--- a/src/DockAreaWidget.cpp
+++ b/src/DockAreaWidget.cpp
@@ -1405,6 +1405,19 @@ void CDockAreaWidget::onDockWidgetFeaturesChanged()
 }
 
 
+//============================================================================
+bool CDockAreaWidget::isTopLevelArea() const
+{
+	auto Container = dockContainer();
+	if (!Container)
+	{
+		return false;
+	}
+
+	return (Container->topLevelDockArea() == this);
+}
+
+
 #ifdef Q_OS_WIN
 //============================================================================
 bool CDockAreaWidget::event(QEvent *e)
diff --git a/src/DockAreaWidget.h b/src/DockAreaWidget.h
index 8e8a0aa..b79107c 100644
--- a/src/DockAreaWidget.h
+++ b/src/DockAreaWidget.h
@@ -376,6 +376,12 @@ public:
      */
     bool containsCentralWidget() const;
 
+    /**
+     * If this dock area is the one and only visible area in a container, then
+     * this function returns true
+     */
+    bool isTopLevelArea() const;
+
 
 public Q_SLOTS:
 	/**
diff --git a/src/DockContainerWidget.h b/src/DockContainerWidget.h
index 421939b..6153cd7 100644
--- a/src/DockContainerWidget.h
+++ b/src/DockContainerWidget.h
@@ -163,7 +163,8 @@ protected:
 	CDockWidget* topLevelDockWidget() const;
 
 	/**
-	 * Returns the top level dock area.
+	 * If the container has only one single visible dock area, then this
+	 * functions returns this top level dock area
 	 */
 	CDockAreaWidget* topLevelDockArea() const;
 

From 159579fb48f51bc59ef36afd6f31d2bf6483e386 Mon Sep 17 00:00:00 2001
From: Uwe Kindler <uwe_kindler@web.de>
Date: Wed, 2 Nov 2022 14:29:23 +0100
Subject: [PATCH 18/19] Fixed some auto hide specific bugs

---
 src/AutoHideDockContainer.cpp |  1 +
 src/AutoHideSideBar.cpp       |  1 +
 src/DockAreaTitleBar.cpp      |  5 +++--
 src/DockAreaTitleBar.h        |  2 +-
 src/DockAreaWidget.cpp        | 18 ++++++++++++++++--
 src/DockContainerWidget.cpp   |  1 +
 src/DockManager.cpp           |  1 -
 7 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/AutoHideDockContainer.cpp b/src/AutoHideDockContainer.cpp
index 1124262..1f0f1aa 100644
--- a/src/AutoHideDockContainer.cpp
+++ b/src/AutoHideDockContainer.cpp
@@ -265,6 +265,7 @@ void CAutoHideDockContainer::updateSize()
 //============================================================================
 CAutoHideDockContainer::~CAutoHideDockContainer()
 {
+	qDebug() << "~CAutoHideDockContainer()"
 	ADS_PRINT("~CAutoHideDockContainer");
 
 	// Remove event filter in case there are any queued messages
diff --git a/src/AutoHideSideBar.cpp b/src/AutoHideSideBar.cpp
index 9fd7709..17d25c8 100644
--- a/src/AutoHideSideBar.cpp
+++ b/src/AutoHideSideBar.cpp
@@ -143,6 +143,7 @@ CAutoHideDockContainer* CAutoHideSideBar::insertDockWidget(int Index, CDockWidge
 	auto AutoHideContainer = new CAutoHideDockContainer(DockWidget, d->SideTabArea, d->ContainerWidget);
 	DockWidget->dockManager()->dockFocusController()->clearDockWidgetFocus(DockWidget);
 	auto Tab = AutoHideContainer->autoHideTab();
+	DockWidget->setSideTabWidget(Tab);
 	insertTab(Index, Tab);
 	return AutoHideContainer;
 }
diff --git a/src/DockAreaTitleBar.cpp b/src/DockAreaTitleBar.cpp
index 87d3c51..94781b1 100644
--- a/src/DockAreaTitleBar.cpp
+++ b/src/DockAreaTitleBar.cpp
@@ -498,13 +498,14 @@ void CDockAreaTitleBar::onAutoHideButtonClicked()
 	}
 	else
 	{
+		qDebug() << "d->DockArea->currentDockWidget()->toggleAutoHide()";
 		d->DockArea->currentDockWidget()->toggleAutoHide();
 	}
 }
 
 
 //============================================================================
-void CDockAreaTitleBar::onAutoHideDockAreaClicked()
+void CDockAreaTitleBar::onAutoHideDockAreaActionClicked()
 {
 	d->DockArea->toggleAutoHide();
 }
@@ -675,7 +676,7 @@ void CDockAreaTitleBar::contextMenuEvent(QContextMenuEvent* ev)
 		Action->setEnabled(d->DockArea->features().testFlag(CDockWidget::DockWidgetFloatable));
 		if (CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled))
 		{
-			Action = Menu.addAction(IsAutoHide ? tr("Dock") : tr("Auto Hide Group"), this, SLOT(onAutoHideDockAreaClicked()));
+			Action = Menu.addAction(IsAutoHide ? tr("Dock") : tr("Auto Hide Group"), this, SLOT(onAutoHideDockAreaActionClicked()));
 			Action->setEnabled(d->DockArea->features().testFlag(CDockWidget::DockWidgetPinnable));
 		}
 		Menu.addSeparator();
diff --git a/src/DockAreaTitleBar.h b/src/DockAreaTitleBar.h
index 88e4fdd..b2c81e8 100644
--- a/src/DockAreaTitleBar.h
+++ b/src/DockAreaTitleBar.h
@@ -62,7 +62,7 @@ private Q_SLOTS:
 	void onTabsMenuActionTriggered(QAction* Action);
 	void onCurrentTabChanged(int Index);
 	void onAutoHideButtonClicked();
-	void onAutoHideDockAreaClicked();
+	void onAutoHideDockAreaActionClicked();
 
 protected:
     /**
diff --git a/src/DockAreaWidget.cpp b/src/DockAreaWidget.cpp
index fc90cc7..06424c2 100644
--- a/src/DockAreaWidget.cpp
+++ b/src/DockAreaWidget.cpp
@@ -514,6 +514,15 @@ void CDockAreaWidget::insertDockWidget(int index, CDockWidget* DockWidget,
 void CDockAreaWidget::removeDockWidget(CDockWidget* DockWidget)
 {
     ADS_PRINT("CDockAreaWidget::removeDockWidget");
+
+    // If this dock area is in a auto hide container, then we can delete
+    // the auto hide container now
+    if (isAutoHide())
+    {
+    	autoHideDockContainer()->cleanupAndDelete();
+    	return;
+    }
+
     auto CurrentDockWidget = currentDockWidget();
   	auto NextOpenDockWidget = (DockWidget == CurrentDockWidget) ? nextOpenDockWidget(DockWidget) : nullptr;
 
@@ -528,7 +537,7 @@ void CDockAreaWidget::removeDockWidget(CDockWidget* DockWidget)
 	{
 		setCurrentDockWidget(NextOpenDockWidget);
 	}
-	else if (d->ContentsLayout->isEmpty() && DockContainer->dockAreaCount() >= 1 && !isAutoHide()) // Don't remove empty dock areas that are auto hidden, they'll be deleted by the auto hide dock
+	else if (d->ContentsLayout->isEmpty() && DockContainer->dockAreaCount() >= 1) // Don't remove empty dock areas that are auto hidden, they'll be deleted by the auto hide dock
 	{
         ADS_PRINT("Dock Area empty");
 		DockContainer->removeDockArea(this);
@@ -868,7 +877,6 @@ void CDockAreaWidget::updateAutoHideButtonCheckState()
 //============================================================================
 void CDockAreaWidget::updateTitleBarButtonVisibility(bool IsTopLevel) const
 {
-	qDebug() << "CDockAreaWidget::updateTitleBarButtonVisibility IsTopLevel " << IsTopLevel;
 	d->updateTitleBarButtonVisibility(IsTopLevel);
 }
 
@@ -970,9 +978,15 @@ bool CDockAreaWidget::restoreState(CDockingStateReader& s, CDockAreaWidget*& Cre
 		}
 
         ADS_PRINT("Dock Widget found - parent " << DockWidget->parent());
+        if (DockWidget->autoHideDockContainer())
+        {
+        	DockWidget->autoHideDockContainer()->cleanupAndDelete();
+        }
+
 		// We hide the DockArea here to prevent the short display (the flashing)
 		// of the dock areas during application startup
 		DockArea->hide();
+		qDebug() << "DockArea->addDockWidget " << DockWidget->windowTitle();
         DockArea->addDockWidget(DockWidget);
 		DockWidget->setToggleViewActionChecked(!Closed);
 		DockWidget->setClosedState(Closed);
diff --git a/src/DockContainerWidget.cpp b/src/DockContainerWidget.cpp
index ee73817..b156c2f 100644
--- a/src/DockContainerWidget.cpp
+++ b/src/DockContainerWidget.cpp
@@ -1440,6 +1440,7 @@ void CDockContainerWidget::deleteAutoHideWidgets()
     d->AutoHideWidgets.clear();
 }
 
+
 //============================================================================
 QList<CAutoHideDockContainer*> CDockContainerWidget::autoHideWidgets() const
 {
diff --git a/src/DockManager.cpp b/src/DockManager.cpp
index 268dafc..08b7a9c 100644
--- a/src/DockManager.cpp
+++ b/src/DockManager.cpp
@@ -437,7 +437,6 @@ bool DockManagerPrivate::restoreState(const QByteArray& State, int version)
     // Hide updates of floating widgets from use
     hideFloatingWidgets();
     markDockWidgetsDirty();
-	_this->deleteAutoHideWidgets();
 
     if (!restoreStateFromXml(state, version))
     {

From 716207f600da07874d183df5120d778fc9416485 Mon Sep 17 00:00:00 2001
From: Uwe Kindler <uwe_kindler@web.de>
Date: Wed, 2 Nov 2022 14:41:41 +0100
Subject: [PATCH 19/19] Removed superfluous deleteAutoHideWidgets() function
 from CDockContainerWidget

---
 demo/MainWindow.cpp         |  2 +-
 src/DockContainerWidget.cpp | 17 -----------------
 src/DockContainerWidget.h   |  6 ------
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/demo/MainWindow.cpp b/demo/MainWindow.cpp
index 71bd13d..e0394c4 100644
--- a/demo/MainWindow.cpp
+++ b/demo/MainWindow.cpp
@@ -752,7 +752,7 @@ void CMainWindow::onViewToggled(bool Open)
 		return;
 	}
 
-	qDebug() << DockWidget->objectName() << " viewToggled(" << Open << ")";
+	//qDebug() << DockWidget->objectName() << " viewToggled(" << Open << ")";
 }
 
 
diff --git a/src/DockContainerWidget.cpp b/src/DockContainerWidget.cpp
index b156c2f..a90f990 100644
--- a/src/DockContainerWidget.cpp
+++ b/src/DockContainerWidget.cpp
@@ -1338,12 +1338,6 @@ CDockContainerWidget::~CDockContainerWidget()
 		d->DockManager->removeDockContainer(this);
 	}
 
-	auto AutoHideWidgets = d->AutoHideWidgets;
-	for (auto AutohideWidget : AutoHideWidgets)
-	{
-		delete AutohideWidget;
-	}
-
 	delete d;
 }
 
@@ -1430,17 +1424,6 @@ bool CDockContainerWidget::event(QEvent *e)
 }
 
 
-//============================================================================
-void CDockContainerWidget::deleteAutoHideWidgets()
-{
-    for (auto AutohideWidget : d->AutoHideWidgets)
-    {
-        AutohideWidget->cleanupAndDelete();
-    }
-    d->AutoHideWidgets.clear();
-}
-
-
 //============================================================================
 QList<CAutoHideDockContainer*> CDockContainerWidget::autoHideWidgets() const
 {
diff --git a/src/DockContainerWidget.h b/src/DockContainerWidget.h
index 6153cd7..247c698 100644
--- a/src/DockContainerWidget.h
+++ b/src/DockContainerWidget.h
@@ -84,12 +84,6 @@ protected:
 	 */
 	virtual bool event(QEvent *e) override;
 
-	/*
-	 * Delete function for resetting the auto hide widget list
-	 * Used during restore
-	 */
-	void deleteAutoHideWidgets();
-
 	/**
 	 * Access function for the internal root splitter
 	 */