Merge branch 'originf_auto_hide_feature' into auto_hide_feature

demo/MainWindow.cpp

@@ -655,6 +655,7 @@ CMainWindow::CMainWindow(QWidget *parent) :
 	// uncomment the following line to enable focus highlighting of the dock
 	// widget that has the focus
     CDockManager::setConfigFlag(CDockManager::FocusHighlighting, true);
+    CDockManager::setConfigFlag(CDockManager::AlwaysShowTabs, true);
 
 	// uncomment if you would like to enable dock widget auto hiding
     CDockManager::setAutoHideConfigFlags(CDockManager::DefaultAutoHideConfig);
@@ -746,13 +747,14 @@ void CMainWindow::savePerspective()
 //============================================================================
 void CMainWindow::onViewToggled(bool Open)
 {
+	Q_UNUSED(Open);
 	auto DockWidget = qobject_cast<ads::CDockWidget*>(sender());
 	if (!DockWidget)
 	{
 		return;
 	}
 
-	//qDebug() << DockWidget->objectName() << " viewToggled(" << Open << ")";
+	qDebug() << DockWidget->objectName() << " viewToggled(" << Open << ")";
 }
 
 

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);
+    const auto autoHideContainer = DockManager->addAutoHideDockWidget(SideBarLocation::SideBarLeft, 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);
+    DockManager->addAutoHideDockWidget(SideBarLocation::SideBarLeft, TableDockWidget);
     ui->menuView->addAction(TableDockWidget->toggleViewAction());
 
     QTableWidget* propertiesTable = new QTableWidget();

src/AutoHideDockContainer.cpp

@@ -57,10 +57,12 @@ bool static isHorizontalArea(SideBarLocation Area)
 {
 	switch (Area)
 	{
-	case SideBarLocation::Top:
+	case SideBarLocation::SideBarTop:
-	case SideBarLocation::Bottom: return true;
+	case SideBarLocation::SideBarBottom: return true;
-	case SideBarLocation::Left:
+	case SideBarLocation::SideBarLeft:
-	case SideBarLocation::Right: return false;
+	case SideBarLocation::SideBarRight: return false;
+	default:
+		return true;
 	}
 
 	return true;
@@ -72,10 +74,12 @@ Qt::Edge static edgeFromSideTabBarArea(SideBarLocation Area)
 {
 	switch (Area)
 	{
-	case SideBarLocation::Top: return Qt::BottomEdge;
+	case SideBarLocation::SideBarTop: return Qt::BottomEdge;
-	case SideBarLocation::Bottom: return Qt::TopEdge;
+	case SideBarLocation::SideBarBottom: return Qt::TopEdge;
-	case SideBarLocation::Left: return Qt::RightEdge;
+	case SideBarLocation::SideBarLeft: return Qt::RightEdge;
-	case SideBarLocation::Right: return Qt::LeftEdge;
+	case SideBarLocation::SideBarRight: return Qt::LeftEdge;
+	default:
+		return Qt::LeftEdge;
 	}
 
 	return Qt::LeftEdge;
@@ -87,11 +91,14 @@ int resizeHandleLayoutPosition(SideBarLocation Area)
 {
 	switch (Area)
 	{
-	case SideBarLocation::Bottom:
+	case SideBarLocation::SideBarBottom:
-	case SideBarLocation::Right: return 0;
+	case SideBarLocation::SideBarRight: return 0;
 
-	case SideBarLocation::Top:
+	case SideBarLocation::SideBarTop:
-	case SideBarLocation::Left: return 1;
+	case SideBarLocation::SideBarLeft: return 1;
+
+	default:
+		return 0;
 	}
 
 	return 0;
@@ -106,8 +113,8 @@ struct AutoHideDockContainerPrivate
     CAutoHideDockContainer* _this;
 	CDockAreaWidget* DockArea{nullptr};
 	CDockWidget* DockWidget{nullptr};
-	SideBarLocation SideTabBarArea;
+	SideBarLocation SideTabBarArea = SideBarNone;
-	QBoxLayout* Layout;
+	QBoxLayout* Layout = nullptr;
 	CResizeHandle* ResizeHandle = nullptr;
 	QSize Size; // creates invalid size
 	QPointer<CAutoHideTab> SideTab;
@@ -124,10 +131,12 @@ struct AutoHideDockContainerPrivate
 	{
         switch (area)
         {
-            case SideBarLocation::Left: return LeftDockWidgetArea;
+            case SideBarLocation::SideBarLeft: return LeftDockWidgetArea;
-            case SideBarLocation::Right: return RightDockWidgetArea;
+            case SideBarLocation::SideBarRight: return RightDockWidgetArea;
-            case SideBarLocation::Bottom: return BottomDockWidgetArea;
+            case SideBarLocation::SideBarBottom: return BottomDockWidgetArea;
-            case SideBarLocation::Top: return TopDockWidgetArea;
+            case SideBarLocation::SideBarTop: return TopDockWidgetArea;
+            default:
+            	return LeftDockWidgetArea;
         }
 
 		return LeftDockWidgetArea;
@@ -232,17 +241,17 @@ void CAutoHideDockContainer::updateSize()
 
 	switch (sideBarLocation())
 	{
-	case SideBarLocation::Top:
+	case SideBarLocation::SideBarTop:
 		 resize(rect.width(), qMin(rect.height()  - ResizeMargin, d->Size.height()));
 		 move(rect.topLeft());
 		 break;
 
-	case SideBarLocation::Left:
+	case SideBarLocation::SideBarLeft:
 		 resize(qMin(d->Size.width(), rect.width() - ResizeMargin), rect.height());
 		 move(rect.topLeft());
 		 break;
 
-	case SideBarLocation::Right:
+	case SideBarLocation::SideBarRight:
 		 {
 			 resize(qMin(d->Size.width(), rect.width() - ResizeMargin), rect.height());
 			 QPoint p = rect.topRight();
@@ -251,7 +260,7 @@ void CAutoHideDockContainer::updateSize()
 		 }
 		 break;
 
-	case SideBarLocation::Bottom:
+	case SideBarLocation::SideBarBottom:
 		 {
 			 resize(rect.width(), qMin(rect.height() - ResizeMargin, d->Size.height()));
 			 QPoint p = rect.bottomLeft();
@@ -259,13 +268,15 @@ void CAutoHideDockContainer::updateSize()
 			 move(p);
 		 }
 		 break;
+
+	default:
+		break;
 	}
 }
 
 //============================================================================
 CAutoHideDockContainer::~CAutoHideDockContainer()
 {
-	qDebug() << "~CAutoHideDockContainer()"
 	ADS_PRINT("~CAutoHideDockContainer");
 
 	// Remove event filter in case there are any queued messages

src/AutoHideSideBar.cpp

@@ -45,6 +45,8 @@
 
 namespace ads
 {
+class CTabsWidget;
+
 /**
  * Private data class of CSideTabBar class (pimpl)
  */
@@ -57,9 +59,10 @@ struct AutoHideSideBarPrivate
 
     CAutoHideSideBar* _this;
     CDockContainerWidget* ContainerWidget;
+    CTabsWidget* TabsContainerWidget;
     QBoxLayout* TabsLayout;
     Qt::Orientation Orientation;
-    SideBarLocation SideTabArea = SideBarLocation::Left;
+    SideBarLocation SideTabArea = SideBarLocation::SideBarLeft;
 
     /**
      * Convenience function to check if this is a horizontal side bar
@@ -68,8 +71,43 @@ struct AutoHideSideBarPrivate
     {
     	return Qt::Horizontal == Orientation;
     }
+
+    /**
+     * Called from viewport to forward event handling to this
+     */
+    void handleViewportEvent(QEvent* e);
 }; // struct AutoHideSideBarPrivate
 
+
+/**
+ * This widget stores the tab buttons
+ */
+class CTabsWidget : public QWidget
+{
+public:
+	using QWidget::QWidget;
+	using Super = QWidget;
+	AutoHideSideBarPrivate* EventHandler;
+
+	/**
+	 * Returns the size hint as minimum size hint
+	 */
+	virtual QSize minimumSizeHint() const override
+	{
+		return Super::sizeHint();
+	}
+
+	/**
+	 * Forward event handling to EventHandler
+	 */
+	/*virtual bool event(QEvent* e) override
+	{
+		EventHandler->handleViewportEvent(e);
+		return Super::event(e);
+	}*/
+};
+
+
 //============================================================================
 AutoHideSideBarPrivate::AutoHideSideBarPrivate(CAutoHideSideBar* _public) :
     _this(_public)
@@ -77,6 +115,45 @@ AutoHideSideBarPrivate::AutoHideSideBarPrivate(CAutoHideSideBar* _public) :
 }
 
 
+//============================================================================
+void AutoHideSideBarPrivate::handleViewportEvent(QEvent* e)
+{
+	switch (e->type())
+	{
+	case QEvent::ChildRemoved:
+		if (TabsLayout->isEmpty())
+		{
+			_this->hide();
+		}
+		break;
+
+	case QEvent::Resize:
+		if (_this->tabCount())
+		{
+			auto ev = static_cast<QResizeEvent*>(e);
+			auto Tab = _this->tabAt(0);
+			int Size = isHorizontal() ? ev->size().height() : ev->size().width();
+			int TabSize = isHorizontal() ? Tab->size().height() : Tab->size().width();
+			// If the size of the side bar is less than the size of the first tab
+			// then there are no visible tabs in this side bar. This check will
+			// fail if someone will force a very big border via CSS!!
+			if (Size < TabSize)
+			{
+				_this->hide();
+			}
+		}
+		else
+		{
+			_this->hide();
+		}
+		break;
+
+	default:
+		break;
+	}
+}
+
+
 //============================================================================
 CAutoHideSideBar::CAutoHideSideBar(CDockContainerWidget* parent, SideBarLocation area) :
     Super(parent),
@@ -84,19 +161,27 @@ CAutoHideSideBar::CAutoHideSideBar(CDockContainerWidget* parent, SideBarLocation
 {
 	d->SideTabArea = area;
     d->ContainerWidget = parent;
-    d->Orientation = (area == SideBarLocation::Bottom || area == SideBarLocation::Top)
+    d->Orientation = (area == SideBarLocation::SideBarBottom || area == SideBarLocation::SideBarTop)
     	? Qt::Horizontal : Qt::Vertical;
 
-    auto mainLayout = new QBoxLayout(d->Orientation == Qt::Vertical ? QBoxLayout::TopToBottom : QBoxLayout::LeftToRight);
+	setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+	setFrameStyle(QFrame::NoFrame);
+	setWidgetResizable(true);
+	setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+	setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+
+	d->TabsContainerWidget = new CTabsWidget();
+	d->TabsContainerWidget->EventHandler = d;
+	d->TabsContainerWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+	d->TabsContainerWidget->setObjectName("sideTabsContainerWidget");
+
 
     d->TabsLayout = new QBoxLayout(d->Orientation == Qt::Vertical ? QBoxLayout::TopToBottom : QBoxLayout::LeftToRight);
     d->TabsLayout->setContentsMargins(0, 0, 0, 0);
-    d->TabsLayout->setSpacing(0);
+    d->TabsLayout->setSpacing(12);
-    mainLayout->addLayout(d->TabsLayout);
+    d->TabsLayout->addStretch(1);
-    mainLayout->setContentsMargins(0, 0, 0, 0);
+    d->TabsContainerWidget->setLayout(d->TabsLayout);
-    mainLayout->setSpacing(0);
+	setWidget(d->TabsContainerWidget);
-    mainLayout->addStretch(1);
-    setLayout(mainLayout);
 
     setFocusPolicy(Qt::NoFocus);
 	if (d->isHorizontal())
@@ -115,7 +200,7 @@ CAutoHideSideBar::CAutoHideSideBar(CDockContainerWidget* parent, SideBarLocation
 //============================================================================
 CAutoHideSideBar::~CAutoHideSideBar() 
 {
-	qDebug() << "~CSideTabBar() ";
+	ADS_PRINT("~CSideTabBar()");
 	// The SideTabeBar is not the owner of the tabs and to prevent deletion
 	// we set the parent here to nullptr to remove it from the children
 	auto Tabs = findChildren<CAutoHideTab*>(QString(), Qt::FindDirectChildrenOnly);
@@ -130,9 +215,16 @@ CAutoHideSideBar::~CAutoHideSideBar()
 //============================================================================
 void CAutoHideSideBar::insertTab(int Index, CAutoHideTab* SideTab)
 {
-	SideTab->installEventFilter(this);
     SideTab->setSideBar(this);
-    d->TabsLayout->insertWidget(Index, SideTab);
+	SideTab->installEventFilter(this);
+    if (Index < 0)
+    {
+    	d->TabsLayout->insertWidget(d->TabsLayout->count() - 1, SideTab);
+    }
+    else
+    {
+    	d->TabsLayout->insertWidget(Index, SideTab);
+    }
     show();
 }
 
@@ -161,46 +253,6 @@ void CAutoHideSideBar::removeTab(CAutoHideTab* SideTab)
 }
 
 
-//============================================================================
-bool CAutoHideSideBar::event(QEvent* e)
-{
-	switch (e->type())
-	{
-	case QEvent::ChildRemoved:
-		if (d->TabsLayout->isEmpty())
-		{
-			hide();
-		}
-		break;
-
-	case QEvent::Resize:
-		if (d->TabsLayout->count())
-		{
-			auto ev = static_cast<QResizeEvent*>(e);
-			auto Tab = tabAt(0);
-			int Size = d->isHorizontal() ? ev->size().height() : ev->size().width();
-			int TabSize = d->isHorizontal() ? Tab->size().height() : Tab->size().width();
-			// If the size of the side bar is less than the size of the first tab
-			// then there are no visible tabs in this side bar. This check will
-			// fail if someone will force a very big border via CSS!!
-			if (Size < TabSize)
-			{
-				hide();
-			}
-		}
-		else
-		{
-			hide();
-		}
-		break;
-
-	default:
-		break;
-	}
-	return Super::event(e);
-}
-
-
 //============================================================================
 bool CAutoHideSideBar::eventFilter(QObject *watched, QEvent *event)
 {
@@ -209,7 +261,7 @@ bool CAutoHideSideBar::eventFilter(QObject *watched, QEvent *event)
 		return false;
 	}
 
-	// As soon as on tab is shhown, we need to show the side tab bar
+	// As soon as on tab is shown, we need to show the side tab bar
 	auto Tab = qobject_cast<CAutoHideTab*>(watched);
 	if (Tab)
 	{
@@ -235,7 +287,7 @@ CAutoHideTab* CAutoHideSideBar::tabAt(int index) const
 //============================================================================
 int CAutoHideSideBar::tabCount() const
 {
-    return d->TabsLayout->count();
+    return d->TabsLayout->count() - 1;
 }
 
 
@@ -272,5 +324,33 @@ void CAutoHideSideBar::saveState(QXmlStreamWriter& s) const
 	s.writeEndElement();
 }
 
+//===========================================================================
+QSize CAutoHideSideBar::minimumSizeHint() const
+{
+	QSize Size = sizeHint();
+	Size.setWidth(10);
+	return Size;
+}
+
+
+//===========================================================================
+QSize CAutoHideSideBar::sizeHint() const
+{
+	return d->TabsContainerWidget->sizeHint();
+}
+
+
+//===========================================================================
+int CAutoHideSideBar::spacing() const
+{
+	return d->TabsLayout->spacing();
+}
+
+//===========================================================================
+void CAutoHideSideBar::setSpacing(int Spacing)
+{
+	d->TabsLayout->setSpacing(Spacing);
+}
 
 } // namespace ads
+

src/AutoHideSideBar.h

@@ -29,7 +29,7 @@
 //============================================================================
 //                                   INCLUDES
 //============================================================================
-#include <QFrame>
+#include <QScrollArea>
 #include "ads_globals.h"
 #include "AutoHideTab.h"
 
@@ -50,12 +50,16 @@ class CDockingStateReader;
  * it contains visible tabs. If it is empty or all tabs are hidden, then the
  * side bar is also hidden. As soon as one single tab becomes visible, this
  * tab bar will be shown.
+ * The CAutoHideSideBar uses a QScrollArea here, to enable proper resizing.
+ * If the side bar contains many tabs, then the tabs are simply clipped - this
+ * is the same like in visual studio
  */
-class ADS_EXPORT CAutoHideSideBar : public QFrame
+class ADS_EXPORT CAutoHideSideBar : public QScrollArea
 {
     Q_OBJECT
     Q_PROPERTY(int sideBarLocation READ sideBarLocation)
     Q_PROPERTY(Qt::Orientation orientation READ orientation)
+    Q_PROPERTY(int spacing READ spacing WRITE setSpacing)
 
 private:
     AutoHideSideBarPrivate* d; ///< private data (pimpl)
@@ -64,7 +68,6 @@ private:
 	friend DockContainerWidgetPrivate;
 
 protected:
-	virtual bool event(QEvent* e) override;
 	virtual bool eventFilter(QObject *watched, QEvent *event) override;
 
 	/**
@@ -79,7 +82,7 @@ protected:
 	void insertTab(int Index, CAutoHideTab* SideTab);
 
 public:
-    using Super = QFrame;
+    using Super = QScrollArea;
 
 	/**
 	 * Default Constructor
@@ -123,8 +126,30 @@ public:
 	 */
 	SideBarLocation sideBarLocation() const;
 
-Q_SIGNALS:
+	/**
-	void sideTabAutoHideToggleRequested();
+	 * Overrides the minimumSizeHint() function of QScrollArea
+	 * The minimumSizeHint() is bigger than the sizeHint () for the scroll
+	 * area because even if the scrollbars are invisible, the required speace
+	 * is reserved in the minimumSizeHint(). This override simply returns
+	 * sizeHint();
+	 */
+	virtual QSize minimumSizeHint() const override;
+
+	/**
+	 * The function provides a sizeHint that matches the height of the
+	 * internal viewport.
+	 */
+	virtual QSize sizeHint() const override;
+
+	/**
+	 * Getter for spacing property - returns the spacing of the tabs
+	 */
+	int spacing() const;
+
+	/**
+	 * Setter for spacing property - sets the spacing
+	 */
+	void setSpacing(int Spacing);
 };
 } // namespace ads
 //-----------------------------------------------------------------------------

src/AutoHideTab.cpp

@@ -74,7 +74,7 @@ AutoHideTabPrivate::AutoHideTabPrivate(CAutoHideTab* _public) :
 void AutoHideTabPrivate::updateOrientation()
 {
 	auto area = SideBar->sideBarLocation();
-	_this->setOrientation((area == Bottom || area == Top) ? Qt::Horizontal : Qt::Vertical);
+	_this->setOrientation((area == SideBarBottom || area == SideBarTop) ? Qt::Horizontal : Qt::Vertical);
 
 	if (_this->icon().isNull())
 	{
@@ -84,21 +84,24 @@ void AutoHideTabPrivate::updateOrientation()
 	bool IconOnly = false;
 	switch (area)
 	{
-	case SideBarLocation::Left:
+	case SideBarLocation::SideBarLeft:
 		 IconOnly = CDockManager::testAutoHideConfigFlag(CDockManager::LeftSideBarIconOnly);
 		 break;
 
-	case SideBarLocation::Right:
+	case SideBarLocation::SideBarRight:
 		 IconOnly = CDockManager::testAutoHideConfigFlag(CDockManager::RightSideBarIconOnly);
 		 break;
 
-	case SideBarLocation::Top:
+	case SideBarLocation::SideBarTop:
 		 IconOnly = CDockManager::testAutoHideConfigFlag(CDockManager::BottomSideBarIconOnly);
 		 break;
 
-	case SideBarLocation::Bottom:
+	case SideBarLocation::SideBarBottom:
 		 IconOnly = CDockManager::testAutoHideConfigFlag(CDockManager::TopSideBarIconOnly);
 		 break;
+
+	default:
+		break;
 	}
 
 	if (IconOnly)
@@ -133,7 +136,7 @@ void CAutoHideTab::removeFromSideBar()
 
 //============================================================================
 CAutoHideTab::CAutoHideTab(QWidget* parent) :
-	Super(parent),
+	CPushButton(parent),
 	d(new AutoHideTabPrivate(this))
 {
 	setAttribute(Qt::WA_NoMousePropagation);
@@ -144,7 +147,7 @@ CAutoHideTab::CAutoHideTab(QWidget* parent) :
 //============================================================================
 CAutoHideTab::~CAutoHideTab()
 {
-	qDebug() << "~CDockWidgetSideTab()";
+	ADS_PRINT("~CDockWidgetSideTab()");
 	delete d;
 }
 
@@ -165,7 +168,7 @@ SideBarLocation CAutoHideTab::sideBarLocation() const
         return d->SideBar->sideBarLocation();
 	}
 
-	return Left;
+	return SideBarLeft;
 }
 
 
@@ -173,6 +176,14 @@ SideBarLocation CAutoHideTab::sideBarLocation() const
 void CAutoHideTab::setOrientation(Qt::Orientation Orientation)
 {
 	d->Orientation = Orientation;
+	if (orientation() == Qt::Horizontal)
+	{
+		setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+	}
+	else
+	{
+		setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
+	}
 	CPushButton::setButtonOrientation((Qt::Horizontal == Orientation)
 		? CPushButton::Horizontal : CPushButton::VerticalTopToBottom);
 	updateStyle();

src/DockAreaTitleBar.cpp

@@ -53,11 +53,13 @@
 #include "DockFocusController.h"
 #include "ElidingLabel.h"
 #include "AutoHideDockContainer.h"
+#include "IconProvider.h"
 
 #include <iostream>
 
 namespace ads
 {
+static const char* const LocationProperty = "Location";
 
 /**
  * Private data class of CDockAreaTitleBar class (pimpl)
@@ -146,6 +148,19 @@ struct DockAreaTitleBarPrivate
 	 * Makes the dock area floating
 	 */
 	IFloatingWidget* makeAreaFloating(const QPoint& Offset, eDragState DragState);
+
+	/**
+	 * Helper function to create and initialize the menu entries for
+	 * the "Auto Hide Group To..." menu
+	 */
+	QAction* createAutoHideToAction(const QString& Title, SideBarLocation Location,
+		QMenu* Menu)
+	{
+		auto Action = Menu->addAction(Title);
+		Action->setProperty("Location", Location);
+		QObject::connect(Action, &QAction::triggered, _this, &CDockAreaTitleBar::onAutoHideToActionClicked);
+		return Action;
+	}
 };// struct DockAreaTitleBarPrivate
 
 //============================================================================
@@ -498,7 +513,6 @@ void CDockAreaTitleBar::onAutoHideButtonClicked()
 	}
 	else
 	{
-		qDebug() << "d->DockArea->currentDockWidget()->toggleAutoHide()";
 		d->DockArea->currentDockWidget()->toggleAutoHide();
 	}
 }
@@ -511,6 +525,14 @@ void CDockAreaTitleBar::onAutoHideDockAreaActionClicked()
 }
 
 
+//============================================================================
+void CDockAreaTitleBar::onAutoHideToActionClicked()
+{
+	int Location = sender()->property(LocationProperty).toInt();
+	d->DockArea->toggleAutoHide((SideBarLocation)Location);
+}
+
+
 //============================================================================
 QAbstractButton* CDockAreaTitleBar::button(TitleBarButton which) const
 {
@@ -665,28 +687,38 @@ void CDockAreaTitleBar::contextMenuEvent(QContextMenuEvent* ev)
 		return;
 	}
 
-	bool IsAutoHide = d->DockArea->isAutoHide();
+	const bool isAutoHide = d->DockArea->isAutoHide();
-	bool IsTopLevelArea = d->DockArea->isTopLevelArea();
+	const bool isTopLevelArea = d->DockArea->isTopLevelArea();
 	QAction* Action;
 	QMenu Menu(this);
-	if (!IsTopLevelArea)
+	if (!isTopLevelArea)
 	{
-		Action = Menu.addAction(IsAutoHide ? tr("Detach") : tr("Detach Group"),
+		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(onAutoHideDockAreaActionClicked()));
+			Action = Menu.addAction(isAutoHide ? tr("Dock") : tr("Auto Hide Group"), this, SLOT(onAutoHideDockAreaActionClicked()));
-			Action->setEnabled(d->DockArea->features().testFlag(CDockWidget::DockWidgetPinnable));
+			auto AreaIsPinnable = d->DockArea->features().testFlag(CDockWidget::DockWidgetPinnable);
+			Action->setEnabled(AreaIsPinnable);
+
+			if (!isAutoHide)
+			{
+				auto menu = Menu.addMenu(tr("Auto Hide Group To..."));
+				menu->setEnabled(AreaIsPinnable);
+				d->createAutoHideToAction(tr("Top"), SideBarTop, menu);
+				d->createAutoHideToAction(tr("Left"), SideBarLeft, menu);
+				d->createAutoHideToAction(tr("Right"), SideBarRight, menu);
+				d->createAutoHideToAction(tr("Bottom"), SideBarBottom, menu);
+			}
 		}
 		Menu.addSeparator();
 	}
-	Action = Menu.addAction(IsAutoHide ? tr("Close") : 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));
-	if (!IsAutoHide)
+	if (!isAutoHide && !isTopLevelArea)
 	{
 		Action = Menu.addAction(tr("Close Other Groups"), d->DockArea, SLOT(closeOtherAreas()));
-		Action->setEnabled(!IsTopLevelArea);
 	}
 	Menu.exec(ev->globalPos());
 }

src/DockAreaTitleBar.h

@@ -63,6 +63,7 @@ private Q_SLOTS:
 	void onCurrentTabChanged(int Index);
 	void onAutoHideButtonClicked();
 	void onAutoHideDockAreaActionClicked();
+	void onAutoHideToActionClicked();
 
 protected:
     /**

src/DockAreaWidget.cpp

@@ -537,7 +537,7 @@ void CDockAreaWidget::removeDockWidget(CDockWidget* DockWidget)
 	{
 		setCurrentDockWidget(NextOpenDockWidget);
 	}
-	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
+	else if (d->ContentsLayout->isEmpty() && DockContainer->dockAreaCount() >= 1)
 	{
         ADS_PRINT("Dock Area empty");
 		DockContainer->removeDockArea(this);
@@ -827,22 +827,20 @@ void CDockAreaWidget::updateTitleBarVisibility()
 		return;
 	}
 
-    if (CDockManager::testConfigFlag(CDockManager::AlwaysShowTabs))
-    {
-        return;
-    }
-
     if (!d->TitleBar)
     {
     	return;
     }
 
-	bool Hidden = Container->hasTopLevelDockWidget() && (Container->isFloating()
+    bool IsAutoHide = isAutoHide();
-		|| CDockManager::testConfigFlag(CDockManager::HideSingleCentralWidgetTitleBar));
+    if (!CDockManager::testConfigFlag(CDockManager::AlwaysShowTabs))
-	Hidden |= (d->Flags.testFlag(HideSingleWidgetTitleBar) && openDockWidgetsCount() == 1);
+    {
-	bool IsAutoHide = isAutoHide();
+		bool Hidden = Container->hasTopLevelDockWidget() && (Container->isFloating()
-	Hidden &= !IsAutoHide; // Titlebar must always be visible when auto hidden so it can be dragged
+			|| CDockManager::testConfigFlag(CDockManager::HideSingleCentralWidgetTitleBar));
-	d->TitleBar->setVisible(!Hidden);
+		Hidden |= (d->Flags.testFlag(HideSingleWidgetTitleBar) && openDockWidgetsCount() == 1);
+		Hidden &= !IsAutoHide; // Titlebar must always be visible when auto hidden so it can be dragged
+		d->TitleBar->setVisible(!Hidden);
+    }
 
 	if (isAutoHideFeatureEnabled())
 	{
@@ -986,7 +984,6 @@ bool CDockAreaWidget::restoreState(CDockingStateReader& s, CDockAreaWidget*& Cre
 		// 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);
@@ -1241,60 +1238,60 @@ SideBarLocation CDockAreaWidget::calculateSideTabBarArea() const
 	int BorderDistance[4];
 
 	int Distance = qAbs(ContentRect.topLeft().y() - DockAreaRect.topLeft().y());
-	BorderDistance[SideBarLocation::Top] = (Distance < MinBorderDistance) ? 0 : Distance;
+	BorderDistance[SideBarLocation::SideBarTop] = (Distance < MinBorderDistance) ? 0 : Distance;
-	if (!BorderDistance[SideBarLocation::Top])
+	if (!BorderDistance[SideBarLocation::SideBarTop])
 	{
 		borders |= BorderTop;
 	}
 
 	Distance = qAbs(ContentRect.bottomRight().y() - DockAreaRect.bottomRight().y());
-	BorderDistance[SideBarLocation::Bottom] = (Distance < MinBorderDistance) ? 0 : Distance;
+	BorderDistance[SideBarLocation::SideBarBottom] = (Distance < MinBorderDistance) ? 0 : Distance;
-	if (!BorderDistance[SideBarLocation::Bottom])
+	if (!BorderDistance[SideBarLocation::SideBarBottom])
 	{
 		borders |= BorderBottom;
 	}
 
 	Distance = qAbs(ContentRect.topLeft().x() - DockAreaRect.topLeft().x());
-	BorderDistance[SideBarLocation::Left] = (Distance < MinBorderDistance) ? 0 : Distance;
+	BorderDistance[SideBarLocation::SideBarLeft] = (Distance < MinBorderDistance) ? 0 : Distance;
-	if (!BorderDistance[SideBarLocation::Left])
+	if (!BorderDistance[SideBarLocation::SideBarLeft])
 	{
 		borders |= BorderLeft;
 	}
 
 	Distance = qAbs(ContentRect.bottomRight().x() - DockAreaRect.bottomRight().x());
-	BorderDistance[SideBarLocation::Right] = (Distance < MinBorderDistance) ? 0 : Distance;
+	BorderDistance[SideBarLocation::SideBarRight] = (Distance < MinBorderDistance) ? 0 : Distance;
-	if (!BorderDistance[SideBarLocation::Right])
+	if (!BorderDistance[SideBarLocation::SideBarRight])
 	{
 		borders |= BorderRight;
 	}
 
-	auto SideTab = SideBarLocation::Right;
+	auto SideTab = SideBarLocation::SideBarRight;
 	switch (borders)
 	{
 	// 1. It's touching all borders
-	case BorderAll: SideTab = HorizontalOrientation ? SideBarLocation::Bottom : SideBarLocation::Right; break;
+	case BorderAll: SideTab = HorizontalOrientation ? SideBarLocation::SideBarBottom : SideBarLocation::SideBarRight; break;
 
 	// 2. It's touching 3 borders
-	case BorderVerticalBottom : SideTab = SideBarLocation::Bottom; break;
+	case BorderVerticalBottom : SideTab = SideBarLocation::SideBarBottom; break;
-	case BorderVerticalTop : SideTab = SideBarLocation::Top; break;
+	case BorderVerticalTop : SideTab = SideBarLocation::SideBarTop; break;
-	case BorderHorizontalLeft: SideTab = SideBarLocation::Left; break;
+	case BorderHorizontalLeft: SideTab = SideBarLocation::SideBarLeft; break;
-	case BorderHorizontalRight: SideTab = SideBarLocation::Right; break;
+	case BorderHorizontalRight: SideTab = SideBarLocation::SideBarRight; break;
 
 	// 3. Its touching horizontal or vertical borders
-	case BorderVertical : SideTab = SideBarLocation::Bottom; break;
+	case BorderVertical : SideTab = SideBarLocation::SideBarBottom; break;
-	case BorderHorizontal: SideTab = SideBarLocation::Right; break;
+	case BorderHorizontal: SideTab = SideBarLocation::SideBarRight; break;
 
 	// 4. Its in a corner
-	case BorderTopLeft : SideTab = HorizontalOrientation ? SideBarLocation::Top : SideBarLocation::Left; break;
+	case BorderTopLeft : SideTab = HorizontalOrientation ? SideBarLocation::SideBarTop : SideBarLocation::SideBarLeft; break;
-	case BorderTopRight : SideTab = HorizontalOrientation ? SideBarLocation::Top : SideBarLocation::Right; break;
+	case BorderTopRight : SideTab = HorizontalOrientation ? SideBarLocation::SideBarTop : SideBarLocation::SideBarRight; break;
-	case BorderBottomLeft : SideTab = HorizontalOrientation ? SideBarLocation::Bottom : SideBarLocation::Left; break;
+	case BorderBottomLeft : SideTab = HorizontalOrientation ? SideBarLocation::SideBarBottom : SideBarLocation::SideBarLeft; break;
-	case BorderBottomRight : SideTab = HorizontalOrientation ? SideBarLocation::Bottom : SideBarLocation::Right; break;
+	case BorderBottomRight : SideTab = HorizontalOrientation ? SideBarLocation::SideBarBottom : SideBarLocation::SideBarRight; break;
 
 	// 5 Ists touching only one border
-	case BorderLeft: SideTab = SideBarLocation::Left; break;
+	case BorderLeft: SideTab = SideBarLocation::SideBarLeft; break;
-	case BorderRight: SideTab = SideBarLocation::Right; break;
+	case BorderRight: SideTab = SideBarLocation::SideBarRight; break;
-	case BorderTop: SideTab = SideBarLocation::Top; break;
+	case BorderTop: SideTab = SideBarLocation::SideBarTop; break;
-	case BorderBottom: SideTab = SideBarLocation::Bottom; break;
+	case BorderBottom: SideTab = SideBarLocation::SideBarBottom; break;
 	}
 
 	return SideTab;
@@ -1302,7 +1299,7 @@ SideBarLocation CDockAreaWidget::calculateSideTabBarArea() const
 
 
 //============================================================================
-void CDockAreaWidget::setAutoHide(bool Enable)
+void CDockAreaWidget::setAutoHide(bool Enable, SideBarLocation Location)
 {
 	if (!isAutoHideFeatureEnabled())
 	{
@@ -1318,7 +1315,7 @@ void CDockAreaWidget::setAutoHide(bool Enable)
 		return;
 	}
 
-	auto area = calculateSideTabBarArea();
+	auto area = (SideBarNone == Location) ? calculateSideTabBarArea() : Location;
 	for (const auto DockWidget : openedDockWidgets())
 	{
 		if (Enable == isAutoHide())
@@ -1337,14 +1334,14 @@ void CDockAreaWidget::setAutoHide(bool Enable)
 
 
 //============================================================================
-void CDockAreaWidget::toggleAutoHide()
+void CDockAreaWidget::toggleAutoHide(SideBarLocation Location)
 {
 	if (!isAutoHideFeatureEnabled())
 	{
 		return;
 	}
 
-	setAutoHide(!isAutoHide());
+	setAutoHide(!isAutoHide(), Location);
 }
 
 

src/DockAreaWidget.h

@@ -401,13 +401,13 @@ 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);
+	void setAutoHide(bool Enable, SideBarLocation Location = SideBarNone);
 
 	/**
 	 * Switches the dock area to auto hide mode or vice versa depending on its
 	 * current state.
 	 */
-	void toggleAutoHide();
+	void toggleAutoHide(SideBarLocation Location = SideBarNone);
 
     /**
 	 * This function closes all other areas except of this area

src/DockContainerWidget.cpp

@@ -1842,25 +1842,25 @@ void CDockContainerWidget::createSideTabBarWidgets()
 	}
 
 	{
-		auto Area = SideBarLocation::Left;
+		auto Area = SideBarLocation::SideBarLeft;
         d->SideTabBarWidgets[Area] = new CAutoHideSideBar(this, Area);
 		d->Layout->addWidget(d->SideTabBarWidgets[Area], 1, 0);
 	}
 
 	{
-		auto Area = SideBarLocation::Right;
+		auto Area = SideBarLocation::SideBarRight;
         d->SideTabBarWidgets[Area] = new CAutoHideSideBar(this, Area);
 		d->Layout->addWidget(d->SideTabBarWidgets[Area], 1, 2);
 	}
 
 	{
-		auto Area = SideBarLocation::Bottom;
+		auto Area = SideBarLocation::SideBarBottom;
         d->SideTabBarWidgets[Area] = new CAutoHideSideBar(this, Area);
         d->Layout->addWidget(d->SideTabBarWidgets[Area], 2, 1);
 	}
 
 	{
-		auto Area = SideBarLocation::Top;
+		auto Area = SideBarLocation::SideBarTop;
         d->SideTabBarWidgets[Area] = new CAutoHideSideBar(this, Area);
         d->Layout->addWidget(d->SideTabBarWidgets[Area], 0, 1);
 	}

src/DockManager.cpp

@@ -156,7 +156,7 @@ struct DockManagerPrivate
 	{
 		for (auto DockWidget : DockWidgetsMap)
 		{
-			DockWidget->setProperty("dirty", true);
+			DockWidget->setProperty(internal::DirtyProperty, true);
 		}
 	}
 
@@ -349,6 +349,12 @@ void DockManagerPrivate::restoreDockWidgetsOpenState()
     {
     	if (DockWidget->property(internal::DirtyProperty).toBool())
     	{
+    		// If the DockWidget is an auto hide widget that is not assigned yet,
+    		// then we need to delete the auto hide container now
+    		if (DockWidget->isAutoHide())
+    		{
+    			DockWidget->autoHideDockContainer()->cleanupAndDelete();
+    		}
     		DockWidget->flagAsUnassigned();
             Q_EMIT DockWidget->viewToggled(false);
     	}

src/DockWidget.cpp

@@ -1157,7 +1157,7 @@ void CDockWidget::raise()
 
 
 //============================================================================
-void CDockWidget::setAutoHide(bool Enable)
+void CDockWidget::setAutoHide(bool Enable, SideBarLocation Location)
 {
 	if (!CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled))
 	{
@@ -1177,21 +1177,21 @@ void CDockWidget::setAutoHide(bool Enable)
 	}
 	else
 	{
-		auto area = DockArea->calculateSideTabBarArea();
+		auto area = (SideBarNone == Location) ? DockArea->calculateSideTabBarArea() : Location;
 		dockContainer()->createAndSetupAutoHideContainer(area, this);
 	}
 }
 
 
 //============================================================================
-void CDockWidget::toggleAutoHide()
+void CDockWidget::toggleAutoHide(SideBarLocation Location)
 {
 	if (!CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled))
 	{
 		return;
 	}
 
-	setAutoHide(!isAutoHide());
+	setAutoHide(!isAutoHide(), Location);
 }
 
 

src/DockWidget.h

@@ -596,13 +596,13 @@ public Q_SLOTS:
 	 * Sets the dock widget into auto hide mode if this feature is enabled
 	 * via CDockManager::setAutoHideFlags(CDockManager::AutoHideFeatureEnabled)
 	 */
-	void setAutoHide(bool Enable);
+	void setAutoHide(bool Enable, SideBarLocation Location = SideBarNone);
 
 	/**
 	 * Switches the dock widget to auto hide mode or vice versa depending on its
 	 * current state.
 	 */
-	void toggleAutoHide();
+	void toggleAutoHide(SideBarLocation Location = SideBarNone);
 
 
 Q_SIGNALS:

src/DockWidgetTab.cpp

@@ -56,7 +56,7 @@
 
 namespace ads
 {
-
+static const char* const LocationProperty = "Location";
 using tTabLabel = CElidingLabel;
 
 /**
@@ -217,6 +217,18 @@ struct DockWidgetTabPrivate
 		return DockWidget->dockManager()->dockFocusController();
 	}
 
+	/**
+	 * Helper function to create and initialize the menu entries for
+	 * the "Auto Hide Group To..." menu
+	 */
+	QAction* createAutoHideToAction(const QString& Title, SideBarLocation Location,
+		QMenu* Menu)
+	{
+		auto Action = Menu->addAction(Title);
+		Action->setProperty("Location", Location);
+		QObject::connect(Action, &QAction::triggered, _this, &CDockWidgetTab::onAutoHideToActionClicked);
+		return Action;
+	}
 };
 // struct DockWidgetTabPrivate
 
@@ -506,24 +518,40 @@ void CDockWidgetTab::contextMenuEvent(QContextMenuEvent* ev)
 	}
 
 	d->saveDragStartMousePosition(ev->globalPos());
-	QMenu Menu(this);
 
     const bool isFloatable = d->DockWidget->features().testFlag(CDockWidget::DockWidgetFloatable);
     const bool isNotOnlyTabInContainer =  !d->DockArea->dockContainer()->hasTopLevelDockWidget();
-
+    const bool isTopLevelArea = d->DockArea->isTopLevelArea();
     const bool isDetachable = isFloatable && isNotOnlyTabInContainer;
+	QAction* Action;
+	QMenu Menu(this);
 
-	auto Action = Menu.addAction(tr("Detach"), this, SLOT(detachDockWidget()));
+    if (!isTopLevelArea)
-    Action->setEnabled(isDetachable);
-    if (CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled))
     {
-    	Action = Menu.addAction(tr("Auto Hide"), this, SLOT(autoHideDockWidget()));
+		Action = Menu.addAction(tr("Detach"), this, SLOT(detachDockWidget()));
-    	Action->setEnabled(d->DockWidget->features().testFlag(CDockWidget::DockWidgetPinnable));
+		Action->setEnabled(isDetachable);
+		if (CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled))
+		{
+			Action = Menu.addAction(tr("Auto Hide"), this, SLOT(autoHideDockWidget()));
+			auto IsPinnable = d->DockWidget->features().testFlag(CDockWidget::DockWidgetPinnable);
+			Action->setEnabled(IsPinnable);
+
+			auto menu = Menu.addMenu(tr("Auto Hide To..."));
+			menu->setEnabled(IsPinnable);
+			d->createAutoHideToAction(tr("Top"), SideBarTop, menu);
+			d->createAutoHideToAction(tr("Left"), SideBarLeft, menu);
+			d->createAutoHideToAction(tr("Right"), SideBarRight, menu);
+			d->createAutoHideToAction(tr("Bottom"), SideBarBottom, menu);
+		}
     }
+
 	Menu.addSeparator();
 	Action = Menu.addAction(tr("Close"), this, SIGNAL(closeRequested()));
 	Action->setEnabled(isClosable());
-	Menu.addAction(tr("Close Others"), this, SIGNAL(closeOtherTabsRequested()));
+	if (d->DockArea->openDockWidgetsCount() > 1)
+	{
+		Action = Menu.addAction(tr("Close Others"), this, SIGNAL(closeOtherTabsRequested()));
+	}
 	Menu.exec(ev->globalPos());
 }
 
@@ -712,6 +740,14 @@ void CDockWidgetTab::autoHideDockWidget()
 }
 
 
+//===========================================================================
+void CDockWidgetTab::onAutoHideToActionClicked()
+{
+	int Location = sender()->property(LocationProperty).toInt();
+	d->DockWidget->toggleAutoHide((SideBarLocation)Location);
+}
+
+
 //============================================================================
 bool CDockWidgetTab::event(QEvent *e)
 {

src/DockWidgetTab.h

@@ -64,6 +64,7 @@ private:
 private Q_SLOTS:
 	void detachDockWidget();
 	void autoHideDockWidget();
+	void onAutoHideToActionClicked();
 
 protected:
 	virtual void mousePressEvent(QMouseEvent* ev) override;

src/FloatingDockContainer.cpp

@@ -721,7 +721,6 @@ CFloatingDockContainer::CFloatingDockContainer(CDockWidget *DockWidget) :
 //============================================================================
 CFloatingDockContainer::~CFloatingDockContainer()
 {
-	qDebug() << "~CFloatingDockContainer " << windowTitle();
 	ADS_PRINT("~CFloatingDockContainer");
 	if (d->DockManager)
 	{

src/ads_globals.h

@@ -136,10 +136,11 @@ enum eBitwiseOperator
  */
 enum SideBarLocation
 {
-	Top,
+	SideBarTop,
-	Left,
+	SideBarLeft,
-	Right,
+	SideBarRight,
-	Bottom
+	SideBarBottom,
+	SideBarNone
 };
 Q_ENUMS(SideBarLocation);
 

src/stylesheets/default.css

@@ -131,53 +131,52 @@ QScrollArea#dockWidgetScrollArea {
  * CAutoHideTab
  *****************************************************************************/
 ads--CAutoHideTab {
-        qproperty-iconSize: 16px 16px;/* this is optional in case you would like to change icon size*/
+	qproperty-iconSize: 16px 16px;/* this is optional in case you would like to change icon size*/
 	background: none;
 	border: none;
 	padding-left: 2px;
 	padding-right: 0px;
 	text-align: center;
-        margin-right: 6px;
+	min-height: 20px;
-        min-height: 20;
+	padding-bottom: 2px;
 }
 
 
 ads--CAutoHideTab[sideBarLocation="0"],
 ads--CAutoHideTab[sideBarLocation="2"]  {
-	border-top: 5px solid rgba(0, 0, 0, 48);
+	border-top: 6px solid rgba(0, 0, 0, 48);
-
 }
 
 
 ads--CAutoHideTab[sideBarLocation="1"],
 ads--CAutoHideTab[sideBarLocation="3"] {
-	border-bottom: 5px solid rgba(0, 0, 0, 48);
+	border-bottom: 6px solid rgba(0, 0, 0, 48);
 }
 
 
 
 ads--CAutoHideTab:hover[sideBarLocation="0"],
 ads--CAutoHideTab:hover[sideBarLocation="2"]  {
-	border-top: 5px solid palette(highlight);
+	border-top: 6px solid palette(highlight);
 	color: palette(highlight);
 }
 
 
 ads--CAutoHideTab:hover[sideBarLocation="1"],
 ads--CAutoHideTab:hover[sideBarLocation="3"]  {
-	border-bottom: 5px solid palette(highlight);
+	border-bottom: 6px solid palette(highlight);
 	color: palette(highlight);
 }
 
 ads--CAutoHideTab[sideBarLocation="0"][activeTab="true"],
 ads--CAutoHideTab[sideBarLocation="2"][activeTab="true"]  {
-	border-top: 5px solid palette(highlight);
+	border-top: 6px solid palette(highlight);
 }
 
 
 ads--CAutoHideTab[sideBarLocation="1"][activeTab="true"],
 ads--CAutoHideTab[sideBarLocation="3"][activeTab="true"] {
-	border-bottom: 5px solid palette(highlight);
+	border-bottom: 6px solid palette(highlight);
 }
 
 
@@ -186,6 +185,12 @@ ads--CAutoHideTab[sideBarLocation="3"][activeTab="true"] {
  *****************************************************************************/
 ads--CAutoHideSideBar{
 	background: palette(window);
+	border: none;
+	qproperty-spacing: 12;
+}
+
+#sideTabsContainerWidget {
+	background: transparent;
 }
 
 

src/stylesheets/default_linux.css

@@ -167,49 +167,52 @@ ads--CFloatingWidgetTitleBar {
  * CAutoHideTab
  *****************************************************************************/
 ads--CAutoHideTab {
-    qproperty-iconSize: 16px 16px;/* this is optional in case you would like to change icon size*/
+        qproperty-iconSize: 16px 16px;/* this is optional in case you would like to change icon size*/
-    padding-left: 2px;
+        background: none;
-    padding-right: 0px;
+        border: none;
-    text-align: center;
+        padding-left: 2px;
-    margin-right: 6px;
+        padding-right: 0px;
-    min-height: 20;
+        text-align: center;
-    border: none;
+        min-height: 20px;
-}
+        padding-bottom: 2px;
-
-ads--CAutoHideTab[sideBarLocation="1"],
-ads--CAutoHideTab[sideBarLocation="3"] {
-    border-bottom: 5px solid rgba(0, 0, 0, 48);
 }
 
 
 ads--CAutoHideTab[sideBarLocation="0"],
 ads--CAutoHideTab[sideBarLocation="2"]  {
-    border-top: 5px solid rgba(0, 0, 0, 48);
+        border-top: 6px solid rgba(0, 0, 0, 48);
 }
 
 
+ads--CAutoHideTab[sideBarLocation="1"],
+ads--CAutoHideTab[sideBarLocation="3"] {
+        border-bottom: 6px solid rgba(0, 0, 0, 48);
+}
+
+
+
 ads--CAutoHideTab:hover[sideBarLocation="0"],
 ads--CAutoHideTab:hover[sideBarLocation="2"]  {
-    border-top: 5px solid palette(highlight);
+        border-top: 6px solid palette(highlight);
-    color: palette(highlight);
+        color: palette(highlight);
 }
 
 
 ads--CAutoHideTab:hover[sideBarLocation="1"],
 ads--CAutoHideTab:hover[sideBarLocation="3"]  {
-    border-bottom: 5px solid palette(highlight);
+        border-bottom: 6px solid palette(highlight);
-    color: palette(highlight);
+        color: palette(highlight);
 }
 
 ads--CAutoHideTab[sideBarLocation="0"][activeTab="true"],
 ads--CAutoHideTab[sideBarLocation="2"][activeTab="true"]  {
-    border-top: 5px solid palette(highlight);
+        border-top: 6px solid palette(highlight);
 }
 
 
 ads--CAutoHideTab[sideBarLocation="1"][activeTab="true"],
 ads--CAutoHideTab[sideBarLocation="3"][activeTab="true"] {
-    border-bottom: 5px solid palette(highlight);
+        border-bottom: 6px solid palette(highlight);
 }
 
 
@@ -218,23 +221,29 @@ ads--CAutoHideTab[sideBarLocation="3"][activeTab="true"] {
  *****************************************************************************/
 ads--CAutoHideSideBar{
         background: palette(window);
+        border: none;
+        qproperty-spacing: 12;
+}
+
+#sideTabsContainerWidget {
+        background: transparent;
 }
 
 
 ads--CAutoHideSideBar[sideBarLocation="0"] {
-    border-bottom: 1px solid palette(dark);
+        border-bottom: 1px solid palette(dark);
 }
 
 ads--CAutoHideSideBar[sideBarLocation="1"] {
-    border-right: 1px solid palette(dark);
+        border-right: 1px solid palette(dark);
 }
 
 ads--CAutoHideSideBar[sideBarLocation="2"] {
-    border-left: 1px solid palette(dark);
+        border-left: 1px solid palette(dark);
 }
 
 ads--CAutoHideSideBar[sideBarLocation="3"] {
-    border-top: 1px solid palette(dark);
+        border-top: 1px solid palette(dark);
 }
 
 
@@ -291,10 +300,12 @@ ads--CAutoHideDockContainer #dockAreaCloseButton{
 
 ads--CAutoHideDockContainer ads--CTitleBarButton:hover {
         background: rgba(255, 255, 255, 48);
+        border: none;
 }
 
 ads--CAutoHideDockContainer ads--CTitleBarButton:pressed {
         background: rgba(255, 255, 255, 96);
+        border: none;
 }
 
 /*****************************************************************************

src/stylesheets/focus_highlighting.css

@@ -168,59 +168,52 @@ QScrollArea#dockWidgetScrollArea {
  * CAutoHideTab
  *****************************************************************************/
 ads--CAutoHideTab {
-	/*background: palette(window);*/
 	qproperty-iconSize: 16px 16px;/* this is optional in case you would like to change icon size*/
-}
-
-
-ads--CAutoHideTab {
 	background: none;
 	border: none;
 	padding-left: 2px;
 	padding-right: 0px;
 	text-align: center;
+	min-height: 20px;
+	padding-bottom: 2px;
 }
 
 
 ads--CAutoHideTab[sideBarLocation="0"],
 ads--CAutoHideTab[sideBarLocation="2"]  {
-	border-top: 5px solid rgba(0, 0, 0, 48);
+	border-top: 6px solid rgba(0, 0, 0, 48);
-	margin-right: 6px;
-	min-height: 20;
 }
 
 
 ads--CAutoHideTab[sideBarLocation="1"],
 ads--CAutoHideTab[sideBarLocation="3"] {
-	border-bottom: 5px solid rgba(0, 0, 0, 48);
+	border-bottom: 6px solid rgba(0, 0, 0, 48);
-	margin-right: 6px;
-	min-height: 20;
 }
 
 
 
 ads--CAutoHideTab:hover[sideBarLocation="0"],
 ads--CAutoHideTab:hover[sideBarLocation="2"]  {
-	border-top: 5px solid palette(highlight);
+	border-top: 6px solid palette(highlight);
 	color: palette(highlight);
 }
 
 
 ads--CAutoHideTab:hover[sideBarLocation="1"],
 ads--CAutoHideTab:hover[sideBarLocation="3"]  {
-	border-bottom: 5px solid palette(highlight);
+	border-bottom: 6px solid palette(highlight);
 	color: palette(highlight);
 }
 
 ads--CAutoHideTab[sideBarLocation="0"][activeTab="true"],
 ads--CAutoHideTab[sideBarLocation="2"][activeTab="true"]  {
-	border-top: 5px solid palette(highlight);
+	border-top: 6px solid palette(highlight);
 }
 
 
 ads--CAutoHideTab[sideBarLocation="1"][activeTab="true"],
 ads--CAutoHideTab[sideBarLocation="3"][activeTab="true"] {
-	border-bottom: 5px solid palette(highlight);
+	border-bottom: 6px solid palette(highlight);
 }
 
 
@@ -229,6 +222,12 @@ ads--CAutoHideTab[sideBarLocation="3"][activeTab="true"] {
  *****************************************************************************/
 ads--CAutoHideSideBar{
 	background: palette(window);
+	border: none;
+	qproperty-spacing: 12;
+}
+
+#sideTabsContainerWidget {
+	background: transparent;
 }
 
 
@@ -336,4 +335,3 @@ ads--CAutoHideDockContainer[sideBarLocation="2"] ads--CResizeHandle {
 ads--CAutoHideDockContainer[sideBarLocation="3"] ads--CResizeHandle {
 	border-top: 1px solid palette(dark);
 }
-

src/stylesheets/focus_highlighting_linux.css

@@ -243,74 +243,84 @@ ads--CFloatingDockContainer[isActiveWindow="true"] #floatingTitleMaximizeButton:
  * CAutoHideTab
  *****************************************************************************/
 ads--CAutoHideTab {
-    qproperty-iconSize: 16px 16px;/* this is optional in case you would like to change icon size*/
+        qproperty-iconSize: 16px 16px;/* this is optional in case you would like to change icon size*/
-    padding-left: 2px;
+        background: none;
-    padding-right: 0px;
+        border: none;
-    text-align: center;
+        padding-left: 2px;
-    margin-right: 6px;
+        padding-right: 0px;
-    min-height: 20;
+        text-align: center;
-    border: none;
+        min-height: 20px;
-}
+        padding-bottom: 2px;
-
-ads--CAutoHideTab[sideBarLocation="1"],
-ads--CAutoHideTab[sideBarLocation="3"] {
-    border-bottom: 5px solid rgba(0, 0, 0, 48);
 }
 
 
 ads--CAutoHideTab[sideBarLocation="0"],
 ads--CAutoHideTab[sideBarLocation="2"]  {
-    border-top: 5px solid rgba(0, 0, 0, 48);
+        border-top: 6px solid rgba(0, 0, 0, 48);
 }
 
 
+ads--CAutoHideTab[sideBarLocation="1"],
+ads--CAutoHideTab[sideBarLocation="3"] {
+        border-bottom: 6px solid rgba(0, 0, 0, 48);
+}
+
+
+
 ads--CAutoHideTab:hover[sideBarLocation="0"],
 ads--CAutoHideTab:hover[sideBarLocation="2"]  {
-    border-top: 5px solid palette(highlight);
+        border-top: 6px solid palette(highlight);
-    color: palette(highlight);
+        color: palette(highlight);
 }
 
 
 ads--CAutoHideTab:hover[sideBarLocation="1"],
 ads--CAutoHideTab:hover[sideBarLocation="3"]  {
-    border-bottom: 5px solid palette(highlight);
+        border-bottom: 6px solid palette(highlight);
-    color: palette(highlight);
+        color: palette(highlight);
 }
 
 ads--CAutoHideTab[sideBarLocation="0"][activeTab="true"],
 ads--CAutoHideTab[sideBarLocation="2"][activeTab="true"]  {
-    border-top: 5px solid palette(highlight);
+        border-top: 6px solid palette(highlight);
 }
 
 
 ads--CAutoHideTab[sideBarLocation="1"][activeTab="true"],
 ads--CAutoHideTab[sideBarLocation="3"][activeTab="true"] {
-    border-bottom: 5px solid palette(highlight);
+        border-bottom: 6px solid palette(highlight);
 }
 
 
+
 /*****************************************************************************
  * CAutoHideSideBar
  *****************************************************************************/
 ads--CAutoHideSideBar{
         background: palette(window);
+        border: none;
+        qproperty-spacing: 12;
+}
+
+#sideTabsContainerWidget {
+        background: transparent;
 }
 
 
 ads--CAutoHideSideBar[sideBarLocation="0"] {
-    border-bottom: 1px solid palette(dark);
+        border-bottom: 1px solid palette(dark);
 }
 
 ads--CAutoHideSideBar[sideBarLocation="1"] {
-    border-right: 1px solid palette(dark);
+        border-right: 1px solid palette(dark);
 }
 
 ads--CAutoHideSideBar[sideBarLocation="2"] {
-    border-left: 1px solid palette(dark);
+        border-left: 1px solid palette(dark);
 }
 
 ads--CAutoHideSideBar[sideBarLocation="3"] {
-    border-top: 1px solid palette(dark);
+        border-top: 1px solid palette(dark);
 }
 
 
@@ -367,10 +377,12 @@ ads--CAutoHideDockContainer #dockAreaCloseButton{
 
 ads--CAutoHideDockContainer ads--CTitleBarButton:hover {
         background: rgba(255, 255, 255, 48);
+        border: none;
 }
 
 ads--CAutoHideDockContainer ads--CTitleBarButton:pressed {
         background: rgba(255, 255, 255, 96);
+        border: none;
 }
 
 /*****************************************************************************