Merge branch 'focused_dockwidget'

demo/MainWindow.cpp

@@ -196,6 +196,9 @@ static ads::CDockWidget* createFileSystemTreeDockWidget(QMenu* ViewMenu)
 		.arg(FileSystemCount++));
 	DockWidget->setWidget(w);
 	ViewMenu->addAction(DockWidget->toggleViewAction());
+	// We disable focus to test focus highlighting if the dock widget content
+	// does not support focus
+	w->setFocusPolicy(Qt::NoFocus);
     return DockWidget;
 }
 
@@ -571,6 +574,9 @@ CMainWindow::CMainWindow(QWidget *parent) :
 	// dock widget.
 	// CDockManager::setConfigFlag(CDockManager::HideSingleCentralWidgetTitleBar, true);
 
+	//CDockManager::setConfigFlag(CDockManager::AlwaysShowTabs, true);
+	CDockManager::setConfigFlag(CDockManager::FocusHighlighting, true);
+
 	// Now create the dock manager and its content
 	d->DockManager = new CDockManager(this);
 
@@ -656,13 +662,14 @@ void CMainWindow::onViewToggled(bool Open)
 //============================================================================
 void CMainWindow::onViewVisibilityChanged(bool Visible)
 {
+	Q_UNUSED(Visible);
 	auto DockWidget = qobject_cast<ads::CDockWidget*>(sender());
     if (!DockWidget)
     {
         return;
     }
 
-    qDebug() << DockWidget->objectName() << " visibilityChanged(" << Visible << ")";
+    //qDebug() << DockWidget->objectName() << " visibilityChanged(" << Visible << ")";
 }
 
 

examples/deleteonclose/main.cpp

@@ -10,6 +10,7 @@ int main(int argc, char *argv[])
     QApplication a(argc, argv);
     QMainWindow w;
 
+    ads::CDockManager::setConfigFlag(ads::CDockManager::FocusHighlighting, true);
     auto dockManager = new ads::CDockManager(&w);
 
     QAction *action = new QAction("New Delete On Close", &w);

src/CMakeLists.txt

@@ -17,6 +17,7 @@ set(ads_SRCS
     DockWidget.cpp
     DockWidgetTab.cpp
     DockingStateReader.cpp
+    DockFocusController.cpp
     ElidingLabel.cpp
     FloatingDockContainer.cpp
     FloatingDragPreview.cpp
@@ -37,6 +38,7 @@ set(ads_INSTALL_INCLUDE
     DockWidget.h
     DockWidgetTab.h
     DockingStateReader.h
+    DockFocusController.h
     ElidingLabel.h
     FloatingDockContainer.h
     FloatingDragPreview.h

src/DockAreaTitleBar.cpp

@@ -465,6 +465,11 @@ void CDockAreaTitleBar::mousePressEvent(QMouseEvent* ev)
 		ev->accept();
 		d->DragStartMousePos = ev->pos();
 		d->DragState = DraggingMousePressed;
+
+		if (CDockManager::configFlags().testFlag(CDockManager::FocusHighlighting))
+		{
+			d->TabBar->currentTab()->setFocus(Qt::OtherFocusReason);
+		}
 		return;
 	}
 	Super::mousePressEvent(ev);
@@ -485,6 +490,7 @@ void CDockAreaTitleBar::mouseReleaseEvent(QMouseEvent* ev)
 		{
 			d->FloatingWidget->finishDragging();
 		}
+
 		return;
 	}
 	Super::mouseReleaseEvent(ev);

src/DockAreaWidget.cpp

@@ -413,6 +413,7 @@ void CDockAreaWidget::insertDockWidget(int index, CDockWidget* DockWidget,
 	bool Activate)
 {
 	d->ContentsLayout->insertWidget(index, DockWidget);
+	DockWidget->setDockArea(this);
 	DockWidget->tabWidget()->setDockAreaWidget(this);
 	auto TabWidget = DockWidget->tabWidget();
 	// Inserting the tab will change the current index which in turn will
@@ -428,7 +429,6 @@ void CDockAreaWidget::insertDockWidget(int index, CDockWidget* DockWidget,
 	{
 		setCurrentIndex(index);
 	}
-	DockWidget->setDockArea(this);
 	// If this dock area is hidden, then we need to make it visible again
 	// by calling DockWidget->toggleViewInternal(true);
 	if (!this->isVisible() && d->ContentsLayout->count() > 1 && !dockManager()->isRestoringState())

src/DockContainerWidget.cpp

@@ -1459,6 +1459,13 @@ void CDockContainerWidget::dropFloatingWidget(CFloatingDockContainer* FloatingWi
 		// level widget anymore
 		CDockWidget::emitTopLevelEventForWidget(SingleDockWidget, false);
 	}
+
+	window()->activateWindow();
+	if (SingleDroppedDockWidget)
+	{
+		d->DockManager->notifyWidgetOrAreaRelocation(SingleDroppedDockWidget);
+	}
+	d->DockManager->notifyFloatingWidgetDrop(FloatingWidget);
 }
 
 
@@ -1478,6 +1485,19 @@ void CDockContainerWidget::dropWidget(QWidget* Widget, DockWidgetArea DropArea,
 	// If there was a top level widget before the drop, then it is not top
 	// level widget anymore
 	CDockWidget::emitTopLevelEventForWidget(SingleDockWidget, false);
+	CDockWidget* DockWidget = qobject_cast<CDockWidget*>(Widget);
+	if (!DockWidget)
+	{
+		CDockAreaWidget* DockArea = qobject_cast<CDockAreaWidget*>(Widget);
+		auto OpenDockWidgets = DockArea->openedDockWidgets();
+		if (OpenDockWidgets.count() == 1)
+		{
+			DockWidget = OpenDockWidgets[0];
+		}
+	}
+
+	window()->activateWindow();
+	d->DockManager->notifyWidgetOrAreaRelocation(Widget);
 }
 
 

src/DockContainerWidget.h

@@ -193,7 +193,7 @@ public:
 	bool isInFrontOf(CDockContainerWidget* Other) const;
 
 	/**
-	 * Returns the dock area at teh given global position or 0 if there is no
+	 * Returns the dock area at the given global position or 0 if there is no
 	 * dock area at this position
 	 */
 	CDockAreaWidget* dockAreaAt(const QPoint& GlobalPos) const;

src/DockFocusController.cpp

@@ -0,0 +1,322 @@
+//============================================================================
+/// \file   DockFocusController.cpp
+/// \author Uwe Kindler
+/// \date   05.06.2020
+/// \brief  Implementation of CDockFocusController class
+//============================================================================
+
+//============================================================================
+//                                   INCLUDES
+//============================================================================
+#include "DockFocusController.h"
+
+#include <algorithm>
+#include <iostream>
+
+#include <QPointer>
+#include <QApplication>
+
+#include "DockWidget.h"
+#include "DockAreaWidget.h"
+#include "DockWidgetTab.h"
+#include "DockContainerWidget.h"
+#include "FloatingDockContainer.h"
+#include "DockManager.h"
+#include "DockAreaTitleBar.h"
+
+#ifdef Q_OS_LINUX
+#include "linux/FloatingWidgetTitleBar.h"
+#endif
+
+namespace ads
+{
+/**
+ * Private data class of CDockFocusController class (pimpl)
+ */
+struct DockFocusControllerPrivate
+{
+	CDockFocusController *_this;
+	QPointer<CDockWidget> FocusedDockWidget = nullptr;
+	QPointer<CDockAreaWidget> FocusedArea = nullptr;
+#ifdef Q_OS_LINUX
+        QPointer<CFloatingDockContainer> FloatingWidget = nullptr;
+#endif
+	CDockManager* DockManager;
+
+	/**
+	 * Private data constructor
+	 */
+	DockFocusControllerPrivate(CDockFocusController *_public);
+
+	/**
+	 * This function updates the focus style of the given dock widget and
+	 * the dock area that it belongs to
+	 */
+	void updateDockWidgetFocus(CDockWidget* DockWidget);
+};
+// struct DockFocusControllerPrivate
+
+
+//===========================================================================
+static void updateDockWidgetFocusStyle(CDockWidget* DockWidget, bool Focused)
+{
+	DockWidget->setProperty("focused", Focused);
+	DockWidget->tabWidget()->setProperty("focused", Focused);
+	DockWidget->tabWidget()->updateStyle();
+	internal::repolishStyle(DockWidget);
+}
+
+
+//===========================================================================
+static void updateDockAreaFocusStyle(CDockAreaWidget* DockArea, bool Focused)
+{
+	DockArea->setProperty("focused", Focused);
+	internal::repolishStyle(DockArea);
+	internal::repolishStyle(DockArea->titleBar());
+}
+
+
+//===========================================================================
+#ifdef Q_OS_LINUX
+static void updateFloatingWidgetFocusStyle(CFloatingDockContainer* FloatingWidget, bool Focused)
+{
+    auto TitleBar = qobject_cast<CFloatingWidgetTitleBar*>(FloatingWidget->titleBarWidget());
+    if (!TitleBar)
+    {
+        return;
+    }
+    TitleBar->setProperty("focused", Focused);
+    TitleBar->updateStyle();
+}
+#endif
+
+
+//============================================================================
+DockFocusControllerPrivate::DockFocusControllerPrivate(
+    CDockFocusController *_public) :
+	_this(_public)
+{
+
+}
+
+
+//============================================================================
+void DockFocusControllerPrivate::updateDockWidgetFocus(CDockWidget* DockWidget)
+{
+	CDockAreaWidget* NewFocusedDockArea = nullptr;
+	if (FocusedDockWidget)
+	{
+		updateDockWidgetFocusStyle(FocusedDockWidget, false);
+	}
+
+	CDockWidget* old = FocusedDockWidget;
+	FocusedDockWidget = DockWidget;
+	updateDockWidgetFocusStyle(FocusedDockWidget, true);
+	NewFocusedDockArea = FocusedDockWidget->dockAreaWidget();
+	if (NewFocusedDockArea && (FocusedArea != NewFocusedDockArea))
+	{
+		if (FocusedArea)
+		{
+			QObject::disconnect(FocusedArea, SIGNAL(viewToggled(bool)), _this, SLOT(onFocusedDockAreaViewToggled(bool)));
+			updateDockAreaFocusStyle(FocusedArea, false);
+		}
+
+		FocusedArea = NewFocusedDockArea;
+		updateDockAreaFocusStyle(FocusedArea, true);
+		QObject::connect(FocusedArea, SIGNAL(viewToggled(bool)), _this, SLOT(onFocusedDockAreaViewToggled(bool)));
+	}
+
+
+    auto NewFloatingWidget = FocusedDockWidget->dockContainer()->floatingWidget();
+    if (NewFloatingWidget)
+    {
+    	NewFloatingWidget->setProperty("FocusedDockWidget", QVariant::fromValue(DockWidget));
+    }
+
+
+#ifdef Q_OS_LINUX
+	// This code is required for styling the floating widget titlebar for linux
+	// depending on the current focus state
+    if (FloatingWidget == NewFloatingWidget)
+    {
+        return;
+    }
+
+    if (FloatingWidget)
+    {
+        updateFloatingWidgetFocusStyle(FloatingWidget, false);
+    }
+    FloatingWidget = NewFloatingWidget;
+
+    if (FloatingWidget)
+    {
+        updateFloatingWidgetFocusStyle(FloatingWidget, true);
+    }
+#endif
+
+    if (old != DockWidget)
+    {
+    	emit DockManager->focusedDockWidgetChanged(old, DockWidget);
+    }
+}
+
+
+
+//============================================================================
+CDockFocusController::CDockFocusController(CDockManager* DockManager) :
+	Super(DockManager),
+	d(new DockFocusControllerPrivate(this))
+{
+	d->DockManager = DockManager;
+	connect(QApplication::instance(), SIGNAL(focusChanged(QWidget*, QWidget*)),
+			this, SLOT(onApplicationFocusChanged(QWidget*, QWidget*)));
+	connect(d->DockManager, SIGNAL(stateRestored()), SLOT(onStateRestored()));
+}
+
+//============================================================================
+CDockFocusController::~CDockFocusController()
+{
+	delete d;
+}
+
+
+//===========================================================================
+void CDockFocusController::onApplicationFocusChanged(QWidget* focusedOld, QWidget* focusedNow)
+{
+	if (d->DockManager->isRestoringState())
+	{
+		return;
+	}
+
+	Q_UNUSED(focusedOld)
+	if (!focusedNow)
+	{
+		return;
+	}
+
+	CDockWidget* DockWidget = nullptr;
+	auto DockWidgetTab = qobject_cast<CDockWidgetTab*>(focusedNow);
+	if (DockWidgetTab)
+	{
+		DockWidget = DockWidgetTab->dockWidget();
+	}
+
+	if (!DockWidget)
+	{
+		DockWidget = qobject_cast<CDockWidget*>(focusedNow);
+	}
+
+	if (!DockWidget)
+	{
+		DockWidget = internal::findParent<CDockWidget*>(focusedNow);
+	}
+
+#ifdef Q_OS_LINUX
+    if (!DockWidget)
+	{
+		return;
+	}
+#else
+    if (!DockWidget || DockWidget->tabWidget()->isHidden())
+	{
+    	return;
+	}
+#endif
+
+	d->updateDockWidgetFocus(DockWidget);
+}
+
+
+//===========================================================================
+void CDockFocusController::setDockWidgetFocused(CDockWidget* focusedNow)
+{
+	d->updateDockWidgetFocus(focusedNow);
+}
+
+
+//===========================================================================
+void CDockFocusController::onFocusedDockAreaViewToggled(bool Open)
+{
+	if (d->DockManager->isRestoringState())
+	{
+		return;
+	}
+
+	CDockAreaWidget* DockArea = qobject_cast<CDockAreaWidget*>(sender());
+	if (!DockArea || Open)
+	{
+		return;
+	}
+	auto Container = DockArea->dockContainer();
+	auto OpenedDockAreas = Container->openedDockAreas();
+	if (OpenedDockAreas.isEmpty())
+	{
+		return;
+	}
+
+	CDockManager::setWidgetFocus(OpenedDockAreas[0]->currentDockWidget()->tabWidget());
+}
+
+
+//===========================================================================
+void CDockFocusController::notifyWidgetOrAreaRelocation(QWidget* DroppedWidget)
+{
+	if (d->DockManager->isRestoringState())
+	{
+		return;
+	}
+
+	CDockWidget* DockWidget = qobject_cast<CDockWidget*>(DroppedWidget);
+	if (DockWidget)
+	{
+		CDockManager::setWidgetFocus(DockWidget->tabWidget());
+		return;
+	}
+
+	CDockAreaWidget* DockArea = qobject_cast<CDockAreaWidget*>(DroppedWidget);
+	if (!DockArea)
+	{
+		return;
+	}
+
+	DockWidget = DockArea->currentDockWidget();
+	CDockManager::setWidgetFocus(DockWidget->tabWidget());
+}
+
+
+//===========================================================================
+void CDockFocusController::notifyFloatingWidgetDrop(CFloatingDockContainer* FloatingWidget)
+{
+	if (!FloatingWidget || d->DockManager->isRestoringState())
+	{
+		return;
+	}
+
+	auto vDockWidget = FloatingWidget->property("FocusedDockWidget");
+	if (!vDockWidget.isValid())
+	{
+		return;
+	}
+
+	auto DockWidget = vDockWidget.value<CDockWidget*>();
+	if (DockWidget)
+	{
+		DockWidget->dockAreaWidget()->setCurrentDockWidget(DockWidget);
+		CDockManager::setWidgetFocus(DockWidget->tabWidget());
+	}
+}
+
+
+//==========================================================================
+void CDockFocusController::onStateRestored()
+{
+	if (d->FocusedDockWidget)
+	{
+		updateDockWidgetFocusStyle(d->FocusedDockWidget, false);
+	}
+}
+
+} // namespace ads
+
+//---------------------------------------------------------------------------
+// EOF DockFocusController.cpp

src/DockFocusController.h

@@ -0,0 +1,89 @@
+#ifndef DockFocusControllerH
+#define DockFocusControllerH
+//============================================================================
+/// \file   DockFocusController.h
+/// \author Uwe Kindler
+/// \date   05.06.2020
+/// \brief  Declaration of CDockFocusController class
+//============================================================================
+
+//============================================================================
+//                                   INCLUDES
+//============================================================================
+#include <QObject>
+#include "ads_globals.h"
+#include "DockManager.h"
+
+namespace ads
+{
+struct DockFocusControllerPrivate;
+class CDockManager;
+class CFloatingDockContainer;
+
+/**
+ * Manages focus styling of dock widgets and handling of focus changes
+ */
+class ADS_EXPORT CDockFocusController : public QObject
+{
+	Q_OBJECT
+private:
+	DockFocusControllerPrivate* d; ///< private data (pimpl)
+    friend struct DockFocusControllerPrivate;
+
+private slots:
+	void onApplicationFocusChanged(QWidget *old, QWidget *now);
+	void onFocusedDockAreaViewToggled(bool Open);
+	void onStateRestored();
+
+public:
+	using Super = QObject;
+	/**
+	 * Default Constructor
+	 */
+	CDockFocusController(CDockManager* DockManager);
+
+	/**
+	 * Virtual Destructor
+	 */
+	virtual ~CDockFocusController();
+
+	/**
+	 * Helper function to set focus depending on the configuration of the
+	 * FocusStyling flag
+	 */
+	template <class QWidgetPtr>
+	static void setWidgetFocus(QWidgetPtr widget)
+	{
+		if (!CDockManager::configFlags().testFlag(CDockManager::FocusHighlighting))
+		{
+			return;
+		}
+
+		widget->setFocus(Qt::OtherFocusReason);
+	}
+
+	/**
+	 * A container needs to call this function if a widget has been dropped
+	 * into it
+	 */
+	void notifyWidgetOrAreaRelocation(QWidget* RelocatedWidget);
+
+	/**
+	 * This function is called, if a floating widget has been dropped into
+	 * an new position.
+	 * When this function is called, all dock widgets of the FloatingWidget
+	 * are already inserted into its new position
+	 */
+	void notifyFloatingWidgetDrop(CFloatingDockContainer* FloatingWidget);
+
+public slots:
+	/**
+	 * Request a focus change to the given dock widget
+	 */
+	void setDockWidgetFocused(CDockWidget* focusedNow);
+}; // class DockFocusController
+}
+ // namespace ads
+//-----------------------------------------------------------------------------
+#endif // DockFocusControllerH
+

src/DockManager.cpp

@@ -53,6 +53,12 @@
 #include "DockAreaWidget.h"
 #include "IconProvider.h"
 #include "DockingStateReader.h"
+#include "DockAreaTitleBar.h"
+#include "DockFocusController.h"
+
+#ifdef Q_OS_LINUX
+#include "linux/FloatingWidgetTitleBar.h"
+#endif
 
 
 /**
@@ -101,6 +107,7 @@ struct DockManagerPrivate
 	CDockManager::eViewMenuInsertionOrder MenuInsertionOrder = CDockManager::MenuAlphabeticallySorted;
 	bool RestoringState = false;
 	QVector<CFloatingDockContainer*> UninitializedFloatingWidgets;
+	CDockFocusController* FocusController = nullptr;
 
 	/**
 	 * Private data constructor
@@ -459,6 +466,11 @@ CDockManager::CDockManager(QWidget *parent) :
 	d->ContainerOverlay = new CDockOverlay(this, CDockOverlay::ModeContainerOverlay);
 	d->Containers.append(this);
 	d->loadStylesheet();
+
+	if (CDockManager::configFlags().testFlag(CDockManager::FocusHighlighting))
+	{
+		d->FocusController = new CDockFocusController(this);
+	}
 }
 
 //============================================================================
@@ -593,12 +605,11 @@ bool CDockManager::restoreState(const QByteArray &state, int version)
 	emit restoringState();
 	bool Result = d->restoreState(state, version);
 	d->RestoringState = false;
-	emit stateRestored();
 	if (!IsHidden)
 	{
 		show();
 	}
-
+	emit stateRestored();
 	return Result;
 }
 
@@ -895,6 +906,36 @@ CIconProvider& CDockManager::iconProvider()
 }
 
 
+//===========================================================================
+void CDockManager::notifyWidgetOrAreaRelocation(QWidget* DroppedWidget)
+{
+	if (d->FocusController)
+	{
+		d->FocusController->notifyWidgetOrAreaRelocation(DroppedWidget);
+	}
+}
+
+
+//===========================================================================
+void CDockManager::notifyFloatingWidgetDrop(CFloatingDockContainer* FloatingWidget)
+{
+	if (d->FocusController)
+	{
+		d->FocusController->notifyFloatingWidgetDrop(FloatingWidget);
+	}
+}
+
+
+//===========================================================================
+void CDockManager::setDockWidgetFocused(CDockWidget* DockWidget)
+{
+	if (d->FocusController)
+	{
+		d->FocusController->setDockWidgetFocused(DockWidget);
+	}
+}
+
+
 } // namespace ads
 
 //---------------------------------------------------------------------------

src/DockManager.h

@@ -84,6 +84,7 @@ private:
 	friend struct FloatingDragPreviewPrivate;
 	friend class CDockAreaTitleBar;
 
+
 protected:
 	/**
 	 * Registers the given floating widget in the internal list of
@@ -118,6 +119,22 @@ protected:
 	 */
 	CDockOverlay* dockAreaOverlay() const;
 
+
+	/**
+	 * A container needs to call this function if a widget has been dropped
+	 * into it
+	 */
+	void notifyWidgetOrAreaRelocation(QWidget* RelocatedWidget);
+
+	/**
+	 * This function is called, if a floating widget has been dropped into
+	 * an new position.
+	 * When this function is called, all dock widgets of the FloatingWidget
+	 * are already inserted into its new position
+	 */
+	void notifyFloatingWidgetDrop(CFloatingDockContainer* FloatingWidget);
+
+
 	/**
 	 * Show the floating widgets that has been created floating
 	 */
@@ -161,7 +178,7 @@ public:
 		FloatingContainerHasWidgetIcon = 0x80000, //!< If set, the Floating Widget icon reflects the icon of the current dock widget otherwise it displays application icon
 		HideSingleCentralWidgetTitleBar = 0x100000, //!< If there is only one single visible dock widget in the main dock container (the dock manager) and if this flag is set, then the titlebar of this dock widget will be hidden
 		                                            //!< this only makes sense for non draggable and non floatable widgets and enables the creation of some kind of "central" widget
-
+		FocusHighlighting = 0x200000, //!< enables styling of focused dock widget tabs or floating widget titlebar
 
         DefaultDockAreaButtons = DockAreaHasCloseButton
 							   | DockAreaHasUndockButton
@@ -410,12 +427,34 @@ public:
 	 */
 	static int startDragDistance();
 
+	/**
+	 * Helper function to set focus depending on the configuration of the
+	 * FocusStyling flag
+	 */
+	template <class QWidgetPtr>
+	static void setWidgetFocus(QWidgetPtr widget)
+	{
+		if (!CDockManager::configFlags().testFlag(CDockManager::FocusHighlighting))
+		{
+			return;
+		}
+
+		widget->setFocus(Qt::OtherFocusReason);
+	}
+
 public slots:
 	/**
 	 * Opens the perspective with the given name.
 	 */
 	void openPerspective(const QString& PerspectiveName);
 
+	/**
+	 * Request a focus change to the given dock widget.
+	 * This function only has an effect, if the flag CDockManager::FocusStyling
+	 * is enabled
+	 */
+	void setDockWidgetFocused(CDockWidget* DockWidget);
+
 signals:
 	/**
 	 * This signal is emitted if the list of perspectives changed
@@ -484,6 +523,13 @@ signals:
      * docking system but it is not deleted yet.
      */
     void dockWidgetRemoved(CDockWidget* DockWidget);
+
+    /**
+     * This signal is emitted if the focused dock widget changed.
+     * Both old and now can be nullptr.
+     * The focused dock widget is the one that is highlighted in the GUI
+     */
+    void focusedDockWidgetChanged(CDockWidget* old, CDockWidget* now);
 }; // class DockManager
 } // namespace ads
 //-----------------------------------------------------------------------------

src/DockWidget.cpp

@@ -235,6 +235,11 @@ CDockWidget::CDockWidget(const QString &title, QWidget *parent) :
 	connect(d->ToggleViewAction, SIGNAL(triggered(bool)), this,
 		SLOT(toggleView(bool)));
 	setToolbarFloatingStyle(false);
+
+	if (CDockManager::configFlags().testFlag(CDockManager::FocusHighlighting))
+	{
+		setFocusPolicy(Qt::ClickFocus);
+	}
 }
 
 //============================================================================

src/DockWidgetTab.cpp

@@ -160,6 +160,7 @@ struct DockWidgetTabPrivate
 		GlobalDragStartMousePosition = GlobalPos;
 		DragStartMousePosition = _this->mapFromGlobal(GlobalPos);
 	}
+
 };
 // struct DockWidgetTabPrivate
 
@@ -284,6 +285,10 @@ CDockWidgetTab::CDockWidgetTab(CDockWidget* DockWidget, QWidget *parent) :
 	setAttribute(Qt::WA_NoMousePropagation, true);
 	d->DockWidget = DockWidget;
 	d->createLayout();
+	if (CDockManager::configFlags().testFlag(CDockManager::FocusHighlighting))
+	{
+		setFocusPolicy(Qt::ClickFocus);
+	}
 }
 
 //============================================================================
@@ -461,16 +466,33 @@ void CDockWidgetTab::setActiveTab(bool active)
 	bool AllTabsHaveCloseButton = d->testConfigFlag(CDockManager::AllTabsHaveCloseButton);
 	bool TabHasCloseButton = (ActiveTabHasCloseButton && active) | AllTabsHaveCloseButton;
 	d->CloseButton->setVisible(DockWidgetClosable && TabHasCloseButton);
+
+	// Focus related stuff
+	if (CDockManager::configFlags().testFlag(CDockManager::FocusHighlighting) && !d->DockWidget->dockManager()->isRestoringState())
+	{
+		bool UpdateFocusStyle = false;
+		if (active && !hasFocus())
+		{
+			setFocus(Qt::OtherFocusReason);
+			UpdateFocusStyle = true;
+		}
+
 		if (d->IsActiveTab == active)
+		{
+			if (UpdateFocusStyle)
+			{
+				updateStyle();
+			}
+			return;
+		}
+	}
+	else if (d->IsActiveTab == active)
 	{
 		return;
 	}
 
 	d->IsActiveTab = active;
-	style()->unpolish(this);
+	updateStyle();
-	style()->polish(this);
-	d->TitleLabel->style()->unpolish(d->TitleLabel);
-	d->TitleLabel->style()->polish(d->TitleLabel);
 	update();
 	updateGeometry();
 
@@ -641,6 +663,13 @@ void CDockWidgetTab::setElideMode(Qt::TextElideMode mode)
 }
 
 
+//============================================================================
+void CDockWidgetTab::updateStyle()
+{
+	internal::repolishStyle(this, internal::RepolishDirectChildren);
+}
+
+
 
 
 } // namespace ads

src/DockWidgetTab.h

@@ -39,6 +39,7 @@ namespace ads
 class CDockWidget;
 class CDockAreaWidget;
 struct DockWidgetTabPrivate;
+class CDockManager;
 
 /**
  * A dock widget tab that shows a title and an icon.
@@ -54,6 +55,7 @@ private:
 	DockWidgetTabPrivate* d; ///< private data (pimpl)
 	friend struct DockWidgetTabPrivate;
 	friend class CDockWidget;
+	friend class CDockManager;
 	void onDockWidgetFeaturesChanged();
 
 private slots:
@@ -152,6 +154,10 @@ public:
 	 */
 	void setElideMode(Qt::TextElideMode mode);
 
+	/**
+	 * Update stylesheet style if a property changes
+	 */
+	void updateStyle();
 
 public slots:
 	virtual void setVisible(bool visible) override;

src/FloatingDockContainer.cpp

@@ -637,6 +637,8 @@ CFloatingDockContainer::CFloatingDockContainer(CDockAreaWidget *DockArea) :
     {
     	TopLevelDockWidget->emitTopLevelChanged(true);
     }
+
+    d->DockManager->notifyWidgetOrAreaRelocation(DockArea);
 }
 
 //============================================================================
@@ -652,6 +654,8 @@ CFloatingDockContainer::CFloatingDockContainer(CDockWidget *DockWidget) :
     {
     	TopLevelDockWidget->emitTopLevelChanged(true);
     }
+
+    d->DockManager->notifyWidgetOrAreaRelocation(DockWidget);
 }
 
 //============================================================================
@@ -800,10 +804,17 @@ void CFloatingDockContainer::hideEvent(QHideEvent *event)
 	d->Hiding = false;
 }
 
+
 //============================================================================
 void CFloatingDockContainer::showEvent(QShowEvent *event)
 {
 	Super::showEvent(event);
+#ifdef Q_OS_LINUX
+    if (CDockManager::testConfigFlag(CDockManager::FocusHighlighting))
+    {
+        this->window()->activateWindow();
+    }
+#endif
 }
 
 

src/FloatingDockContainer.h

@@ -174,7 +174,6 @@ protected:
 	 */
     void updateWindowTitle();
 
-
 protected: // reimplements QWidget
 	virtual void changeEvent(QEvent *event) override;
 	virtual void closeEvent(QCloseEvent *event) override;

src/ads.qrc

@@ -4,5 +4,6 @@
         <file>images/close-button.svg</file>
         <file>images/close-button-disabled.svg</file>
         <file>stylesheets/default_linux.css</file>
+        <file>images/close-button-focused.svg</file>
     </qresource>
 </RCC>

src/ads_globals.cpp

@@ -31,6 +31,7 @@
 #include <QVariant>
 #include <QPainter>
 #include <QAbstractButton>
+#include <QStyle>
 
 #include "DockSplitter.h"
 #include "DockManager.h"
@@ -118,6 +119,31 @@ void setButtonIcon(QAbstractButton* Button, QStyle::StandardPixmap StandarPixmap
 #endif
 }
 
+
+//============================================================================
+void repolishStyle(QWidget* w, eRepolishChildOptions Options)
+{
+	if (!w)
+	{
+		return;
+	}
+	w->style()->unpolish(w);
+	w->style()->polish(w);
+
+	if (RepolishIgnoreChildren == Options)
+	{
+		return;
+	}
+
+	QList<QWidget*> Children = w->findChildren<QWidget*>(QString(),
+		(RepolishDirectChildren == Options) ? Qt::FindDirectChildrenOnly: Qt::FindChildrenRecursively);
+	for (auto Widget : Children)
+	{
+		Widget->style()->unpolish(Widget);
+		Widget->style()->polish(Widget);
+	}
+}
+
 } // namespace internal
 } // namespace ads
 

src/ads_globals.h

@@ -244,6 +244,21 @@ void setToolTip(QObjectPtr obj, const QString &tip)
 void setButtonIcon(QAbstractButton* Button, QStyle::StandardPixmap StandarPixmap,
 	ads::eIcon CustomIconId);
 
+
+enum eRepolishChildOptions
+{
+	RepolishIgnoreChildren,
+	RepolishDirectChildren,
+	RepolishChildrenRecursively
+};
+
+/**
+ * Calls unpolish() / polish for the style of the given widget to update
+ * stylesheet if a property changes
+ */
+void repolishStyle(QWidget* w, eRepolishChildOptions Options = RepolishIgnoreChildren);
+
+
 } // namespace internal
 } // namespace ads
 

src/images/close-button-disabled.svg

@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -9,114 +7,133 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Capa_1"
-   x="0px"
-   y="0px"
-   width="512"
-   height="512"
-   viewBox="0 0 512 512"
-   xml:space="preserve"
    sodipodi:docname="close-button-disabled.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   id="metadata897"><rdf:RDF><cc:Work
+   version="1.1"
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+   id="svg2"
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   viewBox="0 0 16 16"
-   id="defs895" /><sodipodi:namedview
+   height="16px"
-   pagecolor="#ffffff"
+   width="16px">
-   bordercolor="#666666"
+  <style
-   borderopacity="1"
+     id="style2"></style>
-   objecttolerance="10"
+  <defs
-   gridtolerance="10"
+     id="defs4">
-   guidetolerance="10"
+    <pattern
-   inkscape:pageopacity="0"
+       id="EMFhbasepattern"
-   inkscape:pageshadow="2"
+       patternUnits="userSpaceOnUse"
-   inkscape:window-width="1920"
+       width="6"
-   inkscape:window-height="1017"
+       height="6"
-   id="namedview893"
+       x="0"
-   showgrid="false"
+       y="0" />
-   fit-margin-top="0"
+    <pattern
-   fit-margin-left="0"
+       id="EMFhbasepattern-4"
-   fit-margin-right="0"
+       patternUnits="userSpaceOnUse"
-   fit-margin-bottom="0"
+       width="6"
-   inkscape:zoom="0.85862966"
+       height="6"
-   inkscape:cx="345.29142"
+       x="0"
-   inkscape:cy="32.731258"
+       y="0" />
-   inkscape:window-x="-8"
+    <pattern
-   inkscape:window-y="-8"
+       id="EMFhbasepattern-3"
+       patternUnits="userSpaceOnUse"
+       width="6"
+       height="6"
+       x="0"
+       y="0" />
+    <pattern
+       id="EMFhbasepattern-8"
+       patternUnits="userSpaceOnUse"
+       width="6"
+       height="6"
+       x="0"
+       y="0" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:guide-bbox="true"
+     showguides="true"
+     inkscape:document-rotation="0"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:bbox-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:snap-bbox="true"
      inkscape:window-maximized="1"
-   inkscape:current-layer="Capa_1" />
+     inkscape:window-y="-8"
+     inkscape:window-x="-8"
+     inkscape:window-height="1017"
+     inkscape:window-width="1920"
+     units="px"
+     showgrid="true"
+     inkscape:current-layer="g5228"
+     inkscape:document-units="px"
+     inkscape:cy="13.17691"
+     inkscape:cx="6.2316889"
+     inkscape:zoom="22.627417"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base">
+    <inkscape:grid
+       id="grid3336"
+       type="xygrid" />
+    <sodipodi:guide
+       id="guide883"
+       orientation="1,0"
+       position="4,10" />
+    <sodipodi:guide
+       id="guide885"
+       orientation="0,-1"
+       position="10,12" />
+    <sodipodi:guide
+       id="guide887"
+       orientation="1,0"
+       position="12,2" />
+    <sodipodi:guide
+       id="guide889"
+       orientation="0,-1"
+       position="14,4" />
+  </sodipodi:namedview>
   <g
-   id="g860"
+     transform="translate(0,-1036.3622)"
-   transform="matrix(0.71708683,0,0,0.71708683,128,128)"
+     id="layer1"
-   style="stroke:none;stroke-opacity:1;fill:#000000;fill-opacity:0.50196081">
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
     <g
-   id="close"
+       id="g5228"
-   style="stroke:none;stroke-opacity:1;fill:#000000;fill-opacity:0.50196081">
+       transform="translate(628,-140.49998)">
-		<polygon
+      <path
-   points="357,321.3 214.2,178.5 357,35.7 321.3,0 178.5,142.8 35.7,0 0,35.7 142.8,178.5 0,321.3 35.7,357 178.5,214.2 321.3,357 "
+         id="path846"
-   id="polygon857"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.50196081;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1"
-   style="stroke:none;stroke-opacity:1;fill:#000000;fill-opacity:0.50196081" />
+         d="M 4.4765625 4.0019531 A 0.5 0.5 0 0 0 4.1464844 4.1464844 A 0.5 0.5 0 0 0 4.1464844 4.8535156 L 7.2929688 8 L 4.1464844 11.146484 A 0.5 0.5 0 0 0 4.1464844 11.853516 A 0.5 0.5 0 0 0 4.8535156 11.853516 L 8 8.7070312 L 11.146484 11.853516 A 0.5 0.5 0 0 0 11.853516 11.853516 A 0.5 0.5 0 0 0 11.853516 11.146484 L 8.7070312 8 L 11.853516 4.8535156 A 0.5 0.5 0 0 0 11.853516 4.1464844 A 0.5 0.5 0 0 0 11.476562 4.0019531 A 0.5 0.5 0 0 0 11.146484 4.1464844 L 8 7.2929688 L 4.8535156 4.1464844 A 0.5 0.5 0 0 0 4.4765625 4.0019531 z "
+         transform="translate(-628,1176.8622)" />
     </g>
   </g>
-<g
+  <metadata
-   id="g862"
+     id="metadata12">
-   transform="translate(0,155)">
+    <rdf:RDF>
-</g>
+      <rdf:Description
-<g
+         dc:language="en"
-   id="g864"
+         dc:format="image/svg+xml"
-   transform="translate(0,155)">
+         dc:date="2016-12-14"
-</g>
+         dc:publisher="Iconscout"
-<g
+         dc:description="Menu, Bar, Lines, Option, List, Hamburger, Web"
-   id="g866"
+         dc:title="Menu, Bar, Lines, Option, List, Hamburger, Web"
-   transform="translate(0,155)">
+         about="https://iconscout.com/legal#licenses">
-</g>
+        <dc:creator>
-<g
+          <rdf:Bag>
-   id="g868"
+            <rdf:li>Jemis Mali</rdf:li>
-   transform="translate(0,155)">
+          </rdf:Bag>
-</g>
+        </dc:creator>
-<g
+      </rdf:Description>
-   id="g870"
+      <cc:Work
-   transform="translate(0,155)">
+         rdf:about="">
-</g>
+        <dc:format>image/svg+xml</dc:format>
-<g
+        <dc:type
-   id="g872"
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-   transform="translate(0,155)">
+        <dc:title></dc:title>
-</g>
+      </cc:Work>
-<g
+    </rdf:RDF>
-   id="g874"
+  </metadata>
-   transform="translate(0,155)">
-</g>
-<g
-   id="g876"
-   transform="translate(0,155)">
-</g>
-<g
-   id="g878"
-   transform="translate(0,155)">
-</g>
-<g
-   id="g880"
-   transform="translate(0,155)">
-</g>
-<g
-   id="g882"
-   transform="translate(0,155)">
-</g>
-<g
-   id="g884"
-   transform="translate(0,155)">
-</g>
-<g
-   id="g886"
-   transform="translate(0,155)">
-</g>
-<g
-   id="g888"
-   transform="translate(0,155)">
-</g>
-<g
-   id="g890"
-   transform="translate(0,155)">
-</g>
 </svg>

src/images/close-button-focused.svg

@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="close-button-focused.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   version="1.1"
+   id="svg2"
+   viewBox="0 0 16 16"
+   height="16px"
+   width="16px">
+  <style
+     id="style2"></style>
+  <defs
+     id="defs4">
+    <pattern
+       id="EMFhbasepattern"
+       patternUnits="userSpaceOnUse"
+       width="6"
+       height="6"
+       x="0"
+       y="0" />
+    <pattern
+       id="EMFhbasepattern-4"
+       patternUnits="userSpaceOnUse"
+       width="6"
+       height="6"
+       x="0"
+       y="0" />
+    <pattern
+       id="EMFhbasepattern-3"
+       patternUnits="userSpaceOnUse"
+       width="6"
+       height="6"
+       x="0"
+       y="0" />
+    <pattern
+       id="EMFhbasepattern-8"
+       patternUnits="userSpaceOnUse"
+       width="6"
+       height="6"
+       x="0"
+       y="0" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:guide-bbox="true"
+     showguides="true"
+     inkscape:document-rotation="0"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:bbox-nodes="true"
+     inkscape:bbox-paths="true"
+     inkscape:snap-bbox="true"
+     inkscape:window-maximized="1"
+     inkscape:window-y="-8"
+     inkscape:window-x="-8"
+     inkscape:window-height="1017"
+     inkscape:window-width="1920"
+     units="px"
+     showgrid="true"
+     inkscape:current-layer="g5228"
+     inkscape:document-units="px"
+     inkscape:cy="13.17691"
+     inkscape:cx="6.2316889"
+     inkscape:zoom="22.627417"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base">
+    <inkscape:grid
+       id="grid3336"
+       type="xygrid" />
+    <sodipodi:guide
+       id="guide883"
+       orientation="1,0"
+       position="4,10" />
+    <sodipodi:guide
+       id="guide885"
+       orientation="0,-1"
+       position="10,12" />
+    <sodipodi:guide
+       id="guide887"
+       orientation="1,0"
+       position="12,2" />
+    <sodipodi:guide
+       id="guide889"
+       orientation="0,-1"
+       position="14,4" />
+  </sodipodi:namedview>
+  <g
+     transform="translate(0,-1036.3622)"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <g
+       id="g5228"
+       transform="translate(628,-140.49998)">
+      <path
+         id="path846"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1"
+         d="M 4.4765625 4.0019531 A 0.5 0.5 0 0 0 4.1464844 4.1464844 A 0.5 0.5 0 0 0 4.1464844 4.8535156 L 7.2929688 8 L 4.1464844 11.146484 A 0.5 0.5 0 0 0 4.1464844 11.853516 A 0.5 0.5 0 0 0 4.8535156 11.853516 L 8 8.7070312 L 11.146484 11.853516 A 0.5 0.5 0 0 0 11.853516 11.853516 A 0.5 0.5 0 0 0 11.853516 11.146484 L 8.7070312 8 L 11.853516 4.8535156 A 0.5 0.5 0 0 0 11.853516 4.1464844 A 0.5 0.5 0 0 0 11.476562 4.0019531 A 0.5 0.5 0 0 0 11.146484 4.1464844 L 8 7.2929688 L 4.8535156 4.1464844 A 0.5 0.5 0 0 0 4.4765625 4.0019531 z "
+         transform="translate(-628,1176.8622)" />
+    </g>
+  </g>
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <rdf:Description
+         dc:language="en"
+         dc:format="image/svg+xml"
+         dc:date="2016-12-14"
+         dc:publisher="Iconscout"
+         dc:description="Menu, Bar, Lines, Option, List, Hamburger, Web"
+         dc:title="Menu, Bar, Lines, Option, List, Hamburger, Web"
+         about="https://iconscout.com/legal#licenses">
+        <dc:creator>
+          <rdf:Bag>
+            <rdf:li>Jemis Mali</rdf:li>
+          </rdf:Bag>
+        </dc:creator>
+      </rdf:Description>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+</svg>

src/images/close-button.svg

@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -9,111 +7,133 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16px"
+   height="16px"
+   viewBox="0 0 16 16"
+   id="svg2"
    version="1.1"
-   id="Capa_1"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   x="0px"
+   sodipodi:docname="close-button2.svg">
-   y="0px"
+  <style
-   width="512"
+     id="style2"></style>
-   height="512"
+  <defs
-   viewBox="0 0 512 512"
+     id="defs4">
-   xml:space="preserve"
+    <pattern
-   sodipodi:docname="close-button.svg"
+       y="0"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+       x="0"
-   id="metadata897"><rdf:RDF><cc:Work
+       height="6"
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+       width="6"
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+       patternUnits="userSpaceOnUse"
-   id="defs895" /><sodipodi:namedview
+       id="EMFhbasepattern" />
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern-4" />
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern-3" />
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern-8" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
      pagecolor="#ffffff"
      bordercolor="#666666"
-   borderopacity="1"
+     borderopacity="1.0"
-   objecttolerance="10"
+     inkscape:pageopacity="0.0"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
      inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="6.2316889"
+     inkscape:cy="13.17691"
+     inkscape:document-units="px"
+     inkscape:current-layer="g5228"
+     showgrid="true"
+     units="px"
      inkscape:window-width="1920"
      inkscape:window-height="1017"
-   id="namedview893"
-   showgrid="false"
-   fit-margin-top="0"
-   fit-margin-left="0"
-   fit-margin-right="0"
-   fit-margin-bottom="0"
-   inkscape:zoom="0.85862966"
-   inkscape:cx="345.29142"
-   inkscape:cy="32.731258"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
-   inkscape:current-layer="Capa_1" />
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:document-rotation="0"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3336" />
+    <sodipodi:guide
+       position="4,10"
+       orientation="1,0"
+       id="guide883" />
+    <sodipodi:guide
+       position="10,12"
+       orientation="0,-1"
+       id="guide885" />
+    <sodipodi:guide
+       position="12,2"
+       orientation="1,0"
+       id="guide887" />
+    <sodipodi:guide
+       position="14,4"
+       orientation="0,-1"
+       id="guide889" />
+  </sodipodi:namedview>
   <g
-   id="g860"
+     inkscape:label="Layer 1"
-   transform="matrix(0.71708683,0,0,0.71708683,128,128)">
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
     <g
-   id="close">
+       transform="translate(628,-140.49998)"
-		<polygon
+       id="g5228">
-   points="357,321.3 214.2,178.5 357,35.7 321.3,0 178.5,142.8 35.7,0 0,35.7 142.8,178.5 0,321.3 35.7,357 178.5,214.2 321.3,357 "
+      <path
-   id="polygon857" />
+         transform="translate(-628,1176.8622)"
+         d="M 4.4765625 4.0019531 A 0.5 0.5 0 0 0 4.1464844 4.1464844 A 0.5 0.5 0 0 0 4.1464844 4.8535156 L 7.2929688 8 L 4.1464844 11.146484 A 0.5 0.5 0 0 0 4.1464844 11.853516 A 0.5 0.5 0 0 0 4.8535156 11.853516 L 8 8.7070312 L 11.146484 11.853516 A 0.5 0.5 0 0 0 11.853516 11.853516 A 0.5 0.5 0 0 0 11.853516 11.146484 L 8.7070312 8 L 11.853516 4.8535156 A 0.5 0.5 0 0 0 11.853516 4.1464844 A 0.5 0.5 0 0 0 11.476562 4.0019531 A 0.5 0.5 0 0 0 11.146484 4.1464844 L 8 7.2929688 L 4.8535156 4.1464844 A 0.5 0.5 0 0 0 4.4765625 4.0019531 z "
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1"
+         id="path846" />
     </g>
   </g>
-<g
+  <metadata
-   id="g862"
+     id="metadata12">
-   transform="translate(0,155)">
+    <rdf:RDF>
-</g>
+      <rdf:Description
-<g
+         about="https://iconscout.com/legal#licenses"
-   id="g864"
+         dc:title="Menu, Bar, Lines, Option, List, Hamburger, Web"
-   transform="translate(0,155)">
+         dc:description="Menu, Bar, Lines, Option, List, Hamburger, Web"
-</g>
+         dc:publisher="Iconscout"
-<g
+         dc:date="2016-12-14"
-   id="g866"
+         dc:format="image/svg+xml"
-   transform="translate(0,155)">
+         dc:language="en">
-</g>
+        <dc:creator>
-<g
+          <rdf:Bag>
-   id="g868"
+            <rdf:li>Jemis Mali</rdf:li>
-   transform="translate(0,155)">
+          </rdf:Bag>
-</g>
+        </dc:creator>
-<g
+      </rdf:Description>
-   id="g870"
+      <cc:Work
-   transform="translate(0,155)">
+         rdf:about="">
-</g>
+        <dc:format>image/svg+xml</dc:format>
-<g
+        <dc:type
-   id="g872"
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-   transform="translate(0,155)">
+        <dc:title />
-</g>
+      </cc:Work>
-<g
+    </rdf:RDF>
-   id="g874"
+  </metadata>
-   transform="translate(0,155)">
-</g>
-<g
-   id="g876"
-   transform="translate(0,155)">
-</g>
-<g
-   id="g878"
-   transform="translate(0,155)">
-</g>
-<g
-   id="g880"
-   transform="translate(0,155)">
-</g>
-<g
-   id="g882"
-   transform="translate(0,155)">
-</g>
-<g
-   id="g884"
-   transform="translate(0,155)">
-</g>
-<g
-   id="g886"
-   transform="translate(0,155)">
-</g>
-<g
-   id="g888"
-   transform="translate(0,155)">
-</g>
-<g
-   id="g890"
-   transform="translate(0,155)">
-</g>
 </svg>

src/linux/FloatingWidgetTitleBar.cpp

@@ -115,7 +115,7 @@ void FloatingWidgetTitleBarPrivate::createLayout()
 
 //============================================================================
 CFloatingWidgetTitleBar::CFloatingWidgetTitleBar(CFloatingDockContainer *parent) :
-	QWidget(parent),
+    QFrame(parent),
 	d(new FloatingWidgetTitleBarPrivate(this))
 {
 	d->FloatingWidget = parent;
@@ -172,16 +172,26 @@ void CFloatingWidgetTitleBar::mouseMoveEvent(QMouseEvent *ev)
 	Super::mouseMoveEvent(ev);
 }
 
+
 //============================================================================
 void CFloatingWidgetTitleBar::enableCloseButton(bool Enable)
 {
 	d->CloseButton->setEnabled(Enable);
 }
 
+
 //============================================================================
 void CFloatingWidgetTitleBar::setTitle(const QString &Text)
 {
 	d->TitleLabel->setText(Text);
 }
 
+
+//============================================================================
+void CFloatingWidgetTitleBar::updateStyle()
+{
+    internal::repolishStyle(this);
+    internal::repolishStyle(d->TitleLabel);
+}
+
 } // namespace ads

src/linux/FloatingWidgetTitleBar.h

@@ -29,7 +29,7 @@
 //============================================================================
 //                                   INCLUDES
 //============================================================================
-#include <QWidget>
+#include <QFrame>
 
 namespace ads
 {
@@ -45,7 +45,7 @@ struct FloatingWidgetTitleBarPrivate;
  * for the docking system to work properly, we use our own titlebar here to
  * capture the required mouse events.
  */
-class CFloatingWidgetTitleBar : public QWidget
+class CFloatingWidgetTitleBar : public QFrame
 {
 	Q_OBJECT
 private:
@@ -75,6 +75,11 @@ public:
 	 */
 	void setTitle(const QString &Text);
 
+    /**
+     * Update stylesheet style if a property changes
+     */
+    void updateStyle();
+
 signals:
 	/**
 	 * This signal is emitted, if the close button is clicked.

src/src.pro

@@ -45,7 +45,8 @@ HEADERS += \
     DockAreaTitleBar.h \
     ElidingLabel.h \
     IconProvider.h \
-    DockComponentsFactory.h 
+    DockComponentsFactory.h  \
+    DockFocusController.h
 
 
 SOURCES += \
@@ -64,7 +65,8 @@ SOURCES += \
     DockAreaTitleBar.cpp \
     ElidingLabel.cpp \
     IconProvider.cpp \
-    DockComponentsFactory.cpp
+    DockComponentsFactory.cpp \
+    DockFocusController.cpp
 
 
 unix {

src/stylesheets/default.css

@@ -9,10 +9,6 @@ ads--CDockContainerWidget
     background: palette(dark);
 }
 
-ads--CDockContainerWidget QSplitter::handle
-{
-    background: palette(dark);
-}
 
 ads--CDockAreaWidget
 {
@@ -82,13 +78,74 @@ QScrollArea#dockWidgetScrollArea
 
 #tabCloseButton:hover
 {
-	border: 1px solid rgba(0, 0, 0, 32);
+	/*border: 1px solid rgba(0, 0, 0, 32);*/
-	background: rgba(0, 0, 0, 16);
+	background: rgba(0, 0, 0, 24);
 }
 
 #tabCloseButton:pressed
 {
-	background: rgba(0, 0, 0, 32);
+	background: rgba(0, 0, 0, 48);
+}
+
+#tabCloseButton
+{
+	qproperty-icon: url(:/ads/images/close-button.svg);
+	qproperty-iconSize: 16px;
 }
 
 
+ads--CDockSplitter::handle
+{
+    background-color: palette(dark);
+    /* uncomment the following line if you would like to change the size of
+       the splitter handles */
+    /* height: 1px; */
+}
+
+
+/* Focus related styling */
+ads--CDockWidgetTab[focused="true"]
+{;
+    background: palette(highlight);
+    border-color: palette(highlight);
+}
+
+ads--CDockWidgetTab[focused="true"] > #tabCloseButton
+{
+	qproperty-icon: url(:/ads/images/close-button-focused.svg)
+}
+
+
+
+ads--CDockWidgetTab[focused="true"] > #tabCloseButton:hover
+{
+	background: rgba(255, 255, 255, 48);
+}
+
+
+ads--CDockWidgetTab[focused="true"] > #tabCloseButton:pressed
+{
+	background: rgba(255, 255, 255, 92);
+}
+
+
+ads--CDockWidgetTab[focused="true"] QLabel
+{
+    color: palette(light);
+}
+
+
+ads--CDockAreaTitleBar
+{
+	background: transparent;
+	border-bottom: 2px solid palette(light);
+	padding-bottom: 0px;
+}
+
+ads--CDockAreaWidget[focused="true"] ads--CDockAreaTitleBar
+{
+	background: transparent;
+	border-bottom: 2px solid palette(highlight);
+	padding-bottom: 0px;
+}
+

src/stylesheets/default_linux.css

@@ -84,13 +84,74 @@ QScrollArea#dockWidgetScrollArea
 
 #tabCloseButton:hover
 {
-        border: 1px solid rgba(0, 0, 0, 32);
+        /*border: 1px solid rgba(0, 0, 0, 32);*/
-        background: rgba(0, 0, 0, 16);
+        background: rgba(0, 0, 0, 24);
 }
 
 #tabCloseButton:pressed
 {
-        background: rgba(0, 0, 0, 32);
+        background: rgba(0, 0, 0, 48);
+}
+
+#tabCloseButton
+{
+        qproperty-icon: url(:/ads/images/close-button.svg);
+        qproperty-iconSize: 16px;
+}
+
+/* Focus related styling */
+ads--CDockWidgetTab[focused="true"]
+{
+    background: palette(highlight);
+    border-color: palette(highlight);
+}
+
+ads--CDockWidgetTab[focused="true"] > #tabCloseButton
+{
+        qproperty-icon: url(:/ads/images/close-button-focused.svg)
 }
 
 
+
+ads--CDockWidgetTab[focused="true"] > #tabCloseButton:hover
+{
+        background: rgba(255, 255, 255, 48);
+}
+
+
+ads--CDockWidgetTab[focused="true"] > #tabCloseButton:pressed
+{
+        background: rgba(255, 255, 255, 92);
+}
+
+ads--CDockWidgetTab[focused="true"] QLabel
+{
+    color: palette(light);
+}
+
+
+ads--CDockAreaTitleBar
+{
+        background: transparent;
+        border-bottom: 2px solid palette(light);
+        padding-bottom: 0px;
+}
+
+ads--CDockAreaWidget[focused="true"] ads--CDockAreaTitleBar
+{
+        background: transparent;
+        border-bottom: 2px solid palette(highlight);
+        padding-bottom: 0px;
+}
+
+
+ads--CFloatingDockContainer[isActiveWindow="true"] ads--CFloatingWidgetTitleBar
+{
+    background: palette(highlight);
+}
+
+
+ads--CFloatingDockContainer[isActiveWindow="true"] ads--CFloatingWidgetTitleBar > QLabel
+{
+    color: palette(light);
+}