Added dockContainer() function to AutoHideSideBar.cpp

Author: githubuser0xFFFF

src/AutoHideSideBar.cpp

@@ -378,11 +378,19 @@ int CAutoHideSideBar::spacing() const
 	return d->TabsLayout->spacing();
 }
 
+
 //===========================================================================
 void CAutoHideSideBar::setSpacing(int Spacing)
 {
 	d->TabsLayout->setSpacing(Spacing);
 }
 
+
+//===========================================================================
+CDockContainerWidget* CAutoHideSideBar::dockContainer() const
+{
+	return d->ContainerWidget;
+}
+
 } // namespace ads
 

src/AutoHideSideBar.h

@@ -163,6 +163,11 @@ class ADS_EXPORT CAutoHideSideBar : public QScrollArea
 	 * Setter for spacing property - sets the spacing
 	 */
 	void setSpacing(int Spacing);
+
+	/**
+	 * Returns the dock container that hosts this sideBar()
+	 */
+	CDockContainerWidget* dockContainer() const;
 };
 } // namespace ads
 //-----------------------------------------------------------------------------

src/DockWidget.cpp

@@ -248,17 +248,31 @@ void DockWidgetPrivate::updateParentDockArea()
 //============================================================================
 void DockWidgetPrivate::closeAutoHideDockWidgetsIfNeeded()
 {
-	if (_this->dockContainer() && _this->dockContainer()->openedDockWidgets().isEmpty() && !_this->dockManager()->isRestoringState())
+	auto DockContainer = _this->dockContainer();
+	if (!DockContainer)
 	{
-        for (auto autoHideWidget : _this->dockContainer()->autoHideWidgets())
-        {
-            if (autoHideWidget->dockWidget() == _this)
-            {
-                continue;
-            }
+		return;
+	}
+
+	if (_this->dockManager()->isRestoringState())
+	{
+		return;
+	}
+
+	if (!DockContainer->openedDockWidgets().isEmpty())
+	{
+		return;
+	}
+
+	for (auto autoHideWidget : DockContainer->autoHideWidgets())
+	{
+		auto DockWidget = autoHideWidget->dockWidget();
+		if (DockWidget == _this)
+		{
+			continue;
+		}
 
-            autoHideWidget->dockWidget()->toggleView(false);
-        }
+		DockWidget->toggleView(false);
 	}
 }