Fixed a regression in DockWidgetTab that caused wron positioning of FloatingDockContainer when moving the mouse

# Conflicts:
#	demo/MainWindow.cpp

README.md

@@ -53,7 +53,7 @@ When dragging the titlebar of a dock, all the tabs that are tabbed with it are
 going to be dragged. So you can move complete groups of tabbed widgets into
 a floating widget or from one dock area to another one.
 
-![Grouped dragging](doc/grouped-dragging.png)\
+![Grouped dragging](doc/grouped-dragging.gif)\
 \
 ![Grouped dragging](doc/grouped-dragging_dark.png)
 
@@ -64,7 +64,7 @@ perspective to make your own custom perspective. Later you can simply
 select a perspective from the perspective list to quickly switch the complete 
 main window layout.
 
-![Perspective](doc/perspectives.png)\
+![Perspective](doc/perspectives.gif)\
 \
 ![Perspective](doc/perspectives_dark.png)
 

demo/CMakeLists.txt

@@ -19,6 +19,12 @@ set(ads_demo_COMPILE_DEFINE ${ads_demo_COMPILE_DEFINE} ${Qt5Gui_COMPILE_DEFINITI
 set(ads_demo_LIBS ${ads_demo_LIBS} ${Qt5Widgets_LIBRARIES})
 set(ads_demo_INCLUDE ${ads_demo_INCLUDE} ${Qt5Widgets_INCLUDE_DIRS})
 set(ads_demo_COMPILE_DEFINE ${ads_demo_COMPILE_DEFINE} ${Qt5Widgets_COMPILE_DEFINITIONS})
+if(WIN32)
+	find_package(Qt5AxContainer ${REQUIRED_QT_VERSION} REQUIRED)
+	set(ads_demo_LIBS ${ads_demo_LIBS} ${Qt5AxContainer_LIBRARIES})
+	set(ads_demo_INCLUDE ${ads_demo_INCLUDE} ${Qt5AxContainer_INCLUDE_DIRS})
+	set(ads_demo_COMPILE_DEFINE ${ads_demo_COMPILE_DEFINE} ${Qt5AxContainer_COMPILE_DEFINITIONS})
+endif()
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(ads_demo_SRCS
     main.cpp

demo/MainWindow.cpp

@@ -53,6 +53,13 @@
 #include <QRubberBand>
 #include <QPlainTextEdit>
 #include <QTableWidget>
+#include <QScreen>
+#include <QStyle>
+#include <QMessageBox>
+
+#ifdef Q_OS_WIN
+#include <QAxWidget>
+#endif
 
 #include <QMap>
 #include <QElapsedTimer>
@@ -171,6 +178,7 @@ static ads::CDockWidget* createEditorWidget(QMenu* ViewMenu)
 	ads::CDockWidget* DockWidget = new ads::CDockWidget(QString("Editor %1").arg(EditorCount++));
 	DockWidget->setWidget(w);
 	DockWidget->setIcon(svgIcon(":/adsdemo/images/edit.svg"));
+	DockWidget->setFeature(ads::CDockWidget::CustomCloseHandling, true);
 	ViewMenu->addAction(DockWidget->toggleViewAction());
 	return DockWidget;
 }
@@ -200,6 +208,20 @@ static ads::CDockWidget* createTableWidget(QMenu* ViewMenu)
 }
 
 
+#ifdef Q_OS_WIN
+//============================================================================
+static ads::CDockWidget* createActiveXWidget(QMenu* ViewMenu, QWidget* parent = nullptr)
+{
+   static int ActiveXCount = 0;
+   QAxWidget* w = new QAxWidget("{6bf52a52-394a-11d3-b153-00c04f79faa6}", parent);
+   ads::CDockWidget* DockWidget = new ads::CDockWidget(QString("Active X %1").arg(ActiveXCount++));
+   DockWidget->setWidget(w);
+   ViewMenu->addAction(DockWidget->toggleViewAction());
+   return DockWidget;
+}
+#endif
+
+
 //============================================================================
 /**
  * Private data class pimpl
@@ -279,15 +301,23 @@ void MainWindowPrivate::createContent()
 	auto RighDockArea = DockManager->addDockWidget(ads::RightDockWidgetArea, createLongTextLabelDockWidget(ViewMenu), TopDockArea);
 	DockManager->addDockWidget(ads::TopDockWidgetArea, createLongTextLabelDockWidget(ViewMenu), RighDockArea);
 	auto BottomDockArea = DockManager->addDockWidget(ads::BottomDockWidgetArea, createLongTextLabelDockWidget(ViewMenu), RighDockArea);
-	DockManager->addDockWidget(ads::RightDockWidgetArea, createLongTextLabelDockWidget(ViewMenu), RighDockArea);
+	DockManager->addDockWidget(ads::CenterDockWidgetArea, createLongTextLabelDockWidget(ViewMenu), RighDockArea);
 	DockManager->addDockWidget(ads::CenterDockWidgetArea, createLongTextLabelDockWidget(ViewMenu), BottomDockArea);
 
     auto Action = ui.menuView->addAction(QString("Set %1 floating").arg(DockWidget->windowTitle()));
     DockWidget->connect(Action, SIGNAL(triggered()), SLOT(setFloating()));
 
+#ifdef Q_OS_WIN
+    if (!DockManager->configFlags().testFlag(ads::CDockManager::OpaqueUndocking))
+    {
+    	DockManager->addDockWidget(ads::CenterDockWidgetArea, createActiveXWidget(ViewMenu), RighDockArea);
+    }
+#endif
+
 	for (auto DockWidget : DockManager->dockWidgetsMap())
 	{
 		_this->connect(DockWidget, SIGNAL(viewToggled(bool)), SLOT(onViewToggled(bool)));
+		_this->connect(DockWidget, SIGNAL(visibilityChanged(bool)), SLOT(onViewVisibilityChanged(bool)));
 	}
 }
 
@@ -378,18 +408,19 @@ CMainWindow::CMainWindow(QWidget *parent) :
 	// a QToolButton instead of a QPushButton
 	// CDockManager::setConfigFlags(CDockManager::configFlags() | CDockManager::TabCloseButtonIsToolButton);
 
+    // comment the following line if you want to use opaque undocking and
+	// opaque splitter resizing
+    CDockManager::setConfigFlags(CDockManager::DefaultNonOpaqueConfig);
+
     // uncomment the following line if you want a fixed tab width that does
 	// not change if the visibility of the close button changes
-    // CDockManager::setConfigFlag(CDockManager::RetainTabSizeWhenCloseButtonHidden, true);
+    //CDockManager::setConfigFlag(CDockManager::RetainTabSizeWhenCloseButtonHidden, true);
 
-    // uncomment the follwing line if you want to use non opaque undocking and splitter
-    // movements
-    // CDockManager::setConfigFlags(CDockManager::DefaultNonOpaqueConfig);
 
 	// Now create the dock manager and its content
 	d->DockManager = new CDockManager(this);
 
-	// Uncomment the following line to have the old style where the dock
+	// uncomment the following line to have the old style where the dock
 	// area close button closes the active tab
 	// CDockManager::setConfigFlags({CDockManager::DockAreaHasCloseButton
 	//	| CDockManager::DockAreaCloseButtonClosesTab});
@@ -397,8 +428,12 @@ CMainWindow::CMainWindow(QWidget *parent) :
 		d->DockManager, SLOT(openPerspective(const QString&)));
 
 	d->createContent();
-	// Default window geometry
+	// Default window geometry - center on screen
     resize(1280, 720);
+    setGeometry(QStyle::alignedRect(
+        Qt::LeftToRight, Qt::AlignCenter, frameSize(),
+        QGuiApplication::primaryScreen()->availableGeometry()
+    ));
 
 	//d->restoreState();
 	d->restorePerspectives();
@@ -468,6 +503,19 @@ void CMainWindow::onViewToggled(bool Open)
 }
 
 
+//============================================================================
+void CMainWindow::onViewVisibilityChanged(bool Visible)
+{
+	auto DockWidget = qobject_cast<ads::CDockWidget*>(sender());
+    if (!DockWidget)
+    {
+        return;
+    }
+
+    qDebug() << DockWidget->objectName() << " visibilityChanged(" << Visible << ")";
+}
+
+
 //============================================================================
 void CMainWindow::createEditor()
 {
@@ -475,6 +523,21 @@ void CMainWindow::createEditor()
 	DockWidget->setFeature(ads::CDockWidget::DockWidgetDeleteOnClose, true);
 	auto FloatingWidget = d->DockManager->addDockWidgetFloating(DockWidget);
     FloatingWidget->move(QPoint(20, 20));
+    connect(DockWidget, SIGNAL(closeRequested()), SLOT(onEditorCloseRequested()));
+}
+
+
+//============================================================================
+void CMainWindow::onEditorCloseRequested()
+{
+	auto DockWidget = qobject_cast<ads::CDockWidget*>(sender());
+	int Result = QMessageBox::question(this, "Close Editor", QString("Editor %1 "
+		"contains unsaved changes? Would you like to close it?")
+		.arg(DockWidget->windowTitle()));
+	if (QMessageBox::Yes == Result)
+	{
+		DockWidget->closeDockWidget();
+	}
 }
 
 

demo/MainWindow.h

@@ -59,8 +59,10 @@ private slots:
 	void on_actionRestoreState_triggered(bool);
 	void savePerspective();
 	void onViewToggled(bool Open);
+	void onViewVisibilityChanged(bool Visible);
 	void createEditor();
 	void createTable();
+	void onEditorCloseRequested();
 };
 
 #endif // MAINWINDOW_H

demo/demo.pro

@@ -3,6 +3,11 @@ ADS_OUT_ROOT = $${OUT_PWD}/..
 TARGET = AdvancedDockingSystemDemo
 DESTDIR = $${ADS_OUT_ROOT}/lib
 QT += core gui widgets
+
+win32 {
+QT += axcontainer
+}
+
 CONFIG += c++14
 CONFIG += debug_and_release
 DEFINES += QT_DEPRECATED_WARNINGS

sip/DockWidget.sip

@@ -97,6 +97,8 @@ signals:
 	void closed();
 	void titleChanged(const QString& Title);
 	void topLevelChanged(bool topLevel);
+	void visibilityChanged(bool visible);
+    void featuresChanged(ads::CDockWidget::DockWidgetFeatures features);
 };
 
 };

src/DockAreaTabBar.cpp

@@ -478,7 +478,14 @@ void CDockAreaTabBar::onCloseOtherTabsRequested()
 			int Offset = Tab->dockWidget()->features().testFlag(
 				CDockWidget::DockWidgetDeleteOnClose) ? 1 : 0;
 			closeTab(i);
-			i -= Offset;
+
+			// If the the dock widget blocks closing, i.e. if the flag
+			// CustomCloseHandling is set, and the dock widget is still open,
+			// then we do not need to correct the index
+			if (Tab->dockWidget()->isClosed())
+			{
+				i -= Offset;
+			}
 		}
 	}
 }
@@ -569,7 +576,7 @@ void CDockAreaTabBar::closeTab(int Index)
 	{
 		return;
 	}
-	Tab->hide();
+	//Tab->hide();
 	emit tabCloseRequested(Index);
 }
 

src/DockAreaWidget.cpp

@@ -494,7 +494,8 @@ void CDockAreaWidget::onTabCloseRequested(int Index)
     auto* DockWidget = dockWidget(Index);
     if (DockWidget->features().testFlag(CDockWidget::DockWidgetDeleteOnClose))
     {
-    	DockWidget->deleteDockWidget();
+    	//DockWidget->deleteDockWidget();
+    	DockWidget->closeDockWidgetInternal();
     }
     else
     {
@@ -551,6 +552,13 @@ void CDockAreaWidget::setCurrentIndex(int index)
 		return;
     }
 
+	auto cw = d->ContentsLayout->currentWidget();
+	auto nw = d->ContentsLayout->widget(index);
+	if (cw == nw && !nw->isHidden())
+	{
+		return;
+	}
+
     emit currentChanging(index);
     TabBar->setCurrentIndex(index);
 	d->ContentsLayout->setCurrentIndex(index);
@@ -757,15 +765,26 @@ CDockWidget* CDockAreaWidget::nextOpenDockWidget(CDockWidget* DockWidget) const
 
 
 //============================================================================
-CDockWidget::DockWidgetFeatures CDockAreaWidget::features() const
+CDockWidget::DockWidgetFeatures CDockAreaWidget::features(eBitwiseOperator Mode) const
 {
-	CDockWidget::DockWidgetFeatures Features(CDockWidget::AllDockWidgetFeatures);
-	for (const auto DockWidget : dockWidgets())
+	if (BitwiseAnd == Mode)
 	{
-		Features &= DockWidget->features();
+		CDockWidget::DockWidgetFeatures Features(CDockWidget::AllDockWidgetFeatures);
+		for (const auto DockWidget : dockWidgets())
+		{
+			Features &= DockWidget->features();
+		}
+		return Features;
+	}
+	else
+	{
+		CDockWidget::DockWidgetFeatures Features(CDockWidget::NoDockWidgetFeatures);
+		for (const auto DockWidget : dockWidgets())
+		{
+			Features |= DockWidget->features();
+		}
+		return Features;
 	}
-
-	return Features;
 }
 
 
@@ -804,7 +823,7 @@ void CDockAreaWidget::closeArea()
 	auto OpenDockWidgets = openedDockWidgets();
 	if (OpenDockWidgets.count() == 1 && OpenDockWidgets[0]->features().testFlag(CDockWidget::DockWidgetDeleteOnClose))
 	{
-		OpenDockWidgets[0]->deleteDockWidget();
+		OpenDockWidgets[0]->closeDockWidgetInternal();
 	}
 	else
 	{

src/DockAreaWidget.h

@@ -238,10 +238,10 @@ public:
 	 * A bitwise and is used to combine the flags of all dock widgets. That
 	 * means, if only one single dock widget does not support a certain flag,
 	 * the whole dock are does not support the flag. I.e. if one single
-	 * dock widget in this area is not closabe, the whole dock are is not
+	 * dock widget in this area is not closable, the whole dock are is not
 	 * closable.
 	 */
-	CDockWidget::DockWidgetFeatures features() const;
+	CDockWidget::DockWidgetFeatures features(eBitwiseOperator Mode = BitwiseAnd) const;
 
 	/**
 	 * Returns the title bar button corresponding to the given title bar

src/DockContainerWidget.cpp

@@ -1713,10 +1713,23 @@ void CDockContainerWidget::closeOtherAreas(CDockAreaWidget* KeepOpenArea)
 {
 	for (const auto DockArea : d->DockAreas)
 	{
-		if (DockArea != KeepOpenArea && DockArea->features().testFlag(CDockWidget::DockWidgetClosable))
+		if (DockArea == KeepOpenArea)
 		{
-			DockArea->closeArea();
+			continue;
 		}
+
+		if (!DockArea->features(BitwiseAnd).testFlag(CDockWidget::DockWidgetClosable))
+		{
+			continue;
+		}
+
+		// We do not close areas with widgets with custom close handling
+		if (DockArea->features(BitwiseOr).testFlag(CDockWidget::CustomCloseHandling))
+		{
+			continue;
+		}
+
+		DockArea->closeArea();
 	}
 }
 

src/DockWidget.cpp

@@ -31,6 +31,8 @@
 #include "DockWidgetTab.h"
 #include "DockWidget.h"
 
+#include <iostream>
+
 #include <QBoxLayout>
 #include <QAction>
 #include <QSplitter>
@@ -43,6 +45,10 @@
 #include <QToolBar>
 #include <QXmlStreamWriter>
 
+#include <QGuiApplication>
+#include <QScreen>
+#include <QWindow>
+
 #include "DockContainerWidget.h"
 #include "DockAreaWidget.h"
 #include "DockManager.h"
@@ -62,7 +68,7 @@ struct DockWidgetPrivate
 	QBoxLayout* Layout = nullptr;
 	QWidget* Widget = nullptr;
 	CDockWidgetTab* TabWidget = nullptr;
-	CDockWidget::DockWidgetFeatures Features = CDockWidget::AllDockWidgetFeatures;
+	CDockWidget::DockWidgetFeatures Features = CDockWidget::DefaultDockWidgetFeatures;
 	CDockManager* DockManager = nullptr;
 	CDockAreaWidget* DockArea = nullptr;
 	QAction* ToggleViewAction = nullptr;
@@ -128,8 +134,8 @@ void DockWidgetPrivate::showDockWidget()
 	}
 	else
 	{
-		DockArea->toggleView(true);
 		DockArea->setCurrentDockWidget(_this);
+		DockArea->toggleView(true);
 		TabWidget->show();
 		QSplitter* Splitter = internal::findParent<QSplitter*>(DockArea);
 		while (Splitter && !Splitter->isVisible())
@@ -294,6 +300,7 @@ void CDockWidget::setFeatures(DockWidgetFeatures features)
 		return;
 	}
 	d->Features = features;
+	emit featuresChanged(d->Features);
 	d->TabWidget->onDockWidgetFeaturesChanged();
 }
 
@@ -515,23 +522,39 @@ void CDockWidget::flagAsUnassigned()
 //============================================================================
 bool CDockWidget::event(QEvent *e)
 {
-	if (e->type() == QEvent::WindowTitleChange)
+	switch (e->type())
 	{
-		const auto title = windowTitle();
-		if (d->TabWidget)
+	case QEvent::Hide:
+		emit visibilityChanged(false);
+		break;
+
+	case QEvent::Show:
+		emit visibilityChanged(geometry().right() >= 0 && geometry().bottom() >= 0);
+        break;
+
+	case QEvent::WindowTitleChange :
 		{
-			d->TabWidget->setText(title);
+			const auto title = windowTitle();
+			if (d->TabWidget)
+			{
+				d->TabWidget->setText(title);
+			}
+			if (d->ToggleViewAction)
+			{
+				d->ToggleViewAction->setText(title);
+			}
+			if (d->DockArea)
+			{
+				d->DockArea->markTitleBarMenuOutdated();//update tabs menu
+			}
+			emit titleChanged(title);
 		}
-		if (d->ToggleViewAction)
-		{
-			d->ToggleViewAction->setText(title);
-		}
-		if (d->DockArea)
-		{
-			d->DockArea->markTitleBarMenuOutdated();//update tabs menu
-		}
-		emit titleChanged(title);
+		break;
+
+	default:
+		break;
 	}
+
 	return Super::event(e);
 }
 
@@ -742,6 +765,55 @@ void CDockWidget::deleteDockWidget()
 {
 	dockManager()->removeDockWidget(this);
 	deleteLater();
+	d->Closed = true;
+}
+
+
+//============================================================================
+void CDockWidget::closeDockWidget()
+{
+	closeDockWidgetInternal(true);
+}
+
+
+//============================================================================
+bool CDockWidget::closeDockWidgetInternal(bool ForceClose)
+{
+	if (!ForceClose)
+	{
+		emit closeRequested();
+	}
+
+	if (!ForceClose && features().testFlag(CDockWidget::CustomCloseHandling))
+	{
+		return false;
+	}
+
+	if (features().testFlag(CDockWidget::DockWidgetDeleteOnClose))
+    {
+		// If the dock widget is floating, then we check if we also need to
+		// delete the floating widget
+		if (isFloating())
+		{
+			CFloatingDockContainer* FloatingWidget = internal::findParent<
+					CFloatingDockContainer*>(this);
+			if (FloatingWidget->dockWidgets().count() == 1)
+			{
+				FloatingWidget->deleteLater();
+			}
+			else
+			{
+				FloatingWidget->hide();
+			}
+		}
+		deleteDockWidget();
+    }
+    else
+    {
+    	toggleView(false);
+    }
+
+	return true;
 }
 
 

src/DockWidget.h

@@ -53,402 +53,434 @@ class CFloatingDockContainer;
  */
 class ADS_EXPORT CDockWidget : public QFrame
 {
-	Q_OBJECT
+    Q_OBJECT
 private:
-	DockWidgetPrivate* d; ///< private data (pimpl)
-	friend struct DockWidgetPrivate;
+    DockWidgetPrivate* d; ///< private data (pimpl)
+    friend struct DockWidgetPrivate;
 
 private slots:
-	/**
-	 * Adjusts the toolbar icon sizes according to the floating state
-	 */
-	void setToolbarFloatingStyle(bool topLevel);
+    /**
+     * Adjusts the toolbar icon sizes according to the floating state
+     */
+    void setToolbarFloatingStyle(bool topLevel);
 
 protected:
-	friend class CDockContainerWidget;
-	friend class CDockAreaWidget;
-	friend class CFloatingDockContainer;
-	friend class CDockManager;
-	friend struct DockManagerPrivate;
-	friend class DockContainerWidgetPrivate;
-	friend class CDockAreaTabBar;
-	friend class CDockWidgetTab;
-	friend struct DockWidgetTabPrivate;
+    friend class CDockContainerWidget;
+    friend class CDockAreaWidget;
+    friend class CFloatingDockContainer;
+    friend class CDockManager;
+    friend struct DockManagerPrivate;
+    friend class DockContainerWidgetPrivate;
+    friend class CDockAreaTabBar;
+    friend class CDockWidgetTab;
+    friend struct DockWidgetTabPrivate;
 
-	/**
-	 * Assigns the dock manager that manages this dock widget
-	 */
-	void setDockManager(CDockManager* DockManager);
+    /**
+     * Assigns the dock manager that manages this dock widget
+     */
+    void setDockManager(CDockManager* DockManager);
 
-	/**
-	 * If this dock widget is inserted into a dock area, the dock area will
-	 * be registered on this widget via this function. If a dock widget is
-	 * removed from a dock area, this function will be called with nullptr
-	 * value.
-	 */
-	void setDockArea(CDockAreaWidget* DockArea);
+    /**
+     * If this dock widget is inserted into a dock area, the dock area will
+     * be registered on this widget via this function. If a dock widget is
+     * removed from a dock area, this function will be called with nullptr
+     * value.
+     */
+    void setDockArea(CDockAreaWidget* DockArea);
 
-	/**
-	 * This function changes the toggle view action without emitting any
-	 * signal
-	 */
-	void setToggleViewActionChecked(bool Checked);
+    /**
+     * This function changes the toggle view action without emitting any
+     * signal
+     */
+    void setToggleViewActionChecked(bool Checked);
 
-	/**
-	 * Saves the state into the given stream
-	 */
-	void saveState(QXmlStreamWriter& Stream) const;
+    /**
+     * Saves the state into the given stream
+     */
+    void saveState(QXmlStreamWriter& Stream) const;
 
-	/**
-	 * This is a helper function for the dock manager to flag this widget
-	 * as unassigned.
-	 * When calling the restore function, it may happen, that the saved state
-	 * contains less dock widgets then currently available. All widgets whose
-	 * data is not contained in the saved state, are flagged as unassigned
-	 * after the restore process. If the user shows an unassigned dock widget,
-	 * a floating widget will be created to take up the dock widget.
-	 */
-	void flagAsUnassigned();
+    /**
+     * This is a helper function for the dock manager to flag this widget
+     * as unassigned.
+     * When calling the restore function, it may happen, that the saved state
+     * contains less dock widgets then currently available. All widgets whose
+     * data is not contained in the saved state, are flagged as unassigned
+     * after the restore process. If the user shows an unassigned dock widget,
+     * a floating widget will be created to take up the dock widget.
+     */
+    void flagAsUnassigned();
 
-	/**
-	 * Call this function to emit a topLevelChanged() signal and to update
-	 * the dock area tool bar visibility
-	 */
-	static void emitTopLevelEventForWidget(CDockWidget* TopLevelDockWidget, bool Floating);
+    /**
+     * Call this function to emit a topLevelChanged() signal and to update
+     * the dock area tool bar visibility
+     */
+    static void emitTopLevelEventForWidget(CDockWidget* TopLevelDockWidget, bool Floating);
 
-	/**
-	 * Use this function to emit a top level changed event.
-	 * Do never use emit topLevelChanged(). Always use this function because
-	 * it only emits a signal if the floating state has really changed
-	 */
-	void emitTopLevelChanged(bool Floating);
+    /**
+     * Use this function to emit a top level changed event.
+     * Do never use emit topLevelChanged(). Always use this function because
+     * it only emits a signal if the floating state has really changed
+     */
+    void emitTopLevelChanged(bool Floating);
 
-	/**
-	 * Internal function for modifying the closed state when restoring
-	 * a saved docking state
-	 */
-	void setClosedState(bool Closed);
+    /**
+     * Internal function for modifying the closed state when restoring
+     * a saved docking state
+     */
+    void setClosedState(bool Closed);
 
-	/**
-	 * Internal toggle view function that does not check if the widget
-	 * already is in the given state
-	 */
-	void toggleViewInternal(bool Open);
+    /**
+     * Internal toggle view function that does not check if the widget
+     * already is in the given state
+     */
+    void toggleViewInternal(bool Open);
+
+    /**
+     * Internal close dock widget implementation.
+     * The function returns true if the dock widget has been closed or hidden
+     */
+    bool closeDockWidgetInternal(bool ForceClose = false);
 
 public:
-	using Super = QFrame;
+    using Super = QFrame;
 
-	enum DockWidgetFeature
-	{
-		DockWidgetClosable = 0x01,
-		DockWidgetMovable = 0x02,///< this feature is not properly implemented yet and is ignored
-		DockWidgetFloatable = 0x04,
-		DockWidgetDeleteOnClose = 0x08, ///< deletes the dock widget when it is closed
-		AllDockWidgetFeatures = DockWidgetClosable | DockWidgetMovable | DockWidgetFloatable,
-		NoDockWidgetFeatures = 0x00
-	};
-	Q_DECLARE_FLAGS(DockWidgetFeatures, DockWidgetFeature)
+    enum DockWidgetFeature
+    {
+        DockWidgetClosable = 0x01,
+        DockWidgetMovable = 0x02,///< this feature is not properly implemented yet and is ignored
+        DockWidgetFloatable = 0x04,
+        DockWidgetDeleteOnClose = 0x08, ///< deletes the dock widget when it is closed
+        CustomCloseHandling = 0x10,
+        DefaultDockWidgetFeatures = DockWidgetClosable | DockWidgetMovable | DockWidgetFloatable,
+        AllDockWidgetFeatures = DefaultDockWidgetFeatures | DockWidgetDeleteOnClose | CustomCloseHandling,
+        NoDockWidgetFeatures = 0x00
+    };
+    Q_DECLARE_FLAGS(DockWidgetFeatures, DockWidgetFeature)
 
-	enum eState
-	{
-		StateHidden,
-		StateDocked,
-		StateFloating
-	};
+    enum eState
+    {
+        StateHidden,
+        StateDocked,
+        StateFloating
+    };
 
-	/**
-	 * Sets the widget for the dock widget to widget.
-	 * The InsertMode defines how the widget is inserted into the dock widget.
-	 * The content of a dock widget should be resizable do a very small size to
-	 * prevent the dock widget from blocking the resizing. To ensure, that a
-	 * dock widget can be resized very well, it is better to insert the content+
-	 * widget into a scroll area or to provide a widget that is already a scroll
-	 * area or that contains a scroll area.
-	 * If the InsertMode is AutoScrollArea, the DockWidget tries to automatically
-	 * detect how to insert the given widget. If the widget is derived from
-	 * QScrollArea (i.e. an QAbstractItemView), then the widget is inserted
-	 * directly. If the given widget is not a scroll area, the widget will be
-	 * inserted into a scroll area.
-	 * To force insertion into a scroll area, you can also provide the InsertMode
-	 * ForceScrollArea. To prevent insertion into a scroll area, you can
-	 * provide the InsertMode ForceNoScrollArea
-	 */
-	enum eInsertMode
-	{
-		AutoScrollArea,
-		ForceScrollArea,
-		ForceNoScrollArea
-	};
+    /**
+     * Sets the widget for the dock widget to widget.
+     * The InsertMode defines how the widget is inserted into the dock widget.
+     * The content of a dock widget should be resizable do a very small size to
+     * prevent the dock widget from blocking the resizing. To ensure, that a
+     * dock widget can be resized very well, it is better to insert the content+
+     * widget into a scroll area or to provide a widget that is already a scroll
+     * area or that contains a scroll area.
+     * If the InsertMode is AutoScrollArea, the DockWidget tries to automatically
+     * detect how to insert the given widget. If the widget is derived from
+     * QScrollArea (i.e. an QAbstractItemView), then the widget is inserted
+     * directly. If the given widget is not a scroll area, the widget will be
+     * inserted into a scroll area.
+     * To force insertion into a scroll area, you can also provide the InsertMode
+     * ForceScrollArea. To prevent insertion into a scroll area, you can
+     * provide the InsertMode ForceNoScrollArea
+     */
+    enum eInsertMode
+    {
+        AutoScrollArea,
+        ForceScrollArea,
+        ForceNoScrollArea
+    };
 
-	/**
-	 * This mode configures the behavior of the toggle view action.
-	 * If the mode if ActionModeToggle, then the toggle view action is
-	 * a checkable action to show / hide the dock widget. If the mode
-	 * is ActionModeShow, then the action is not checkable an it will
-	 * always show the dock widget if clicked. If the mode is ActionModeShow,
-	 * the user can only close the DockWidget with the close button.
-	 */
-	enum eToggleViewActionMode
-	{
-		ActionModeToggle,//!< ActionModeToggle
-		ActionModeShow   //!< ActionModeShow
-	};
+    /**
+     * This mode configures the behavior of the toggle view action.
+     * If the mode if ActionModeToggle, then the toggle view action is
+     * a checkable action to show / hide the dock widget. If the mode
+     * is ActionModeShow, then the action is not checkable an it will
+     * always show the dock widget if clicked. If the mode is ActionModeShow,
+     * the user can only close the DockWidget with the close button.
+     */
+    enum eToggleViewActionMode
+    {
+        ActionModeToggle,//!< ActionModeToggle
+        ActionModeShow   //!< ActionModeShow
+    };
 
 
-	/**
-	 * This constructor creates a dock widget with the given title.
-	 * The title is the text that is shown in the window title when the dock
-	 * widget is floating and it is the title that is shown in the titlebar
-	 * or the tab of this dock widget if it is tabified.
-	 * The object name of the dock widget is also set to the title. The
-	 * object name is required by the dock manager to properly save and restore
-	 * the state of the dock widget. That means, the title needs to be unique.
-	 * If your title is not unique or if you would like to change the title
-	 * during runtime, you need to set a unique object name explicitely
-	 * by calling setObjectName() after construction.
-	 * Use the layoutFlags to configure the layout of the dock widget.
-	 */
-	CDockWidget(const QString &title, QWidget* parent = 0);
+    /**
+     * This constructor creates a dock widget with the given title.
+     * The title is the text that is shown in the window title when the dock
+     * widget is floating and it is the title that is shown in the titlebar
+     * or the tab of this dock widget if it is tabified.
+     * The object name of the dock widget is also set to the title. The
+     * object name is required by the dock manager to properly save and restore
+     * the state of the dock widget. That means, the title needs to be unique.
+     * If your title is not unique or if you would like to change the title
+     * during runtime, you need to set a unique object name explicitely
+     * by calling setObjectName() after construction.
+     * Use the layoutFlags to configure the layout of the dock widget.
+     */
+    CDockWidget(const QString &title, QWidget* parent = 0);
 
-	/**
-	 * Virtual Destructor
-	 */
-	virtual ~CDockWidget();
+    /**
+     * Virtual Destructor
+     */
+    virtual ~CDockWidget();
 
-	/**
-	 * We return a fixed minimum size hint for all dock widgets
-	 */
-	virtual QSize minimumSizeHint() const override;
+    /**
+     * We return a fixed minimum size hint for all dock widgets
+     */
+    virtual QSize minimumSizeHint() const override;
 
-	/**
-	 * Sets the widget for the dock widget to widget.
-	 * The InsertMode defines how the widget is inserted into the dock widget.
-	 * The content of a dock widget should be resizable do a very small size to
-	 * prevent the dock widget from blocking the resizing. To ensure, that a
-	 * dock widget can be resized very well, it is better to insert the content+
-	 * widget into a scroll area or to provide a widget that is already a scroll
-	 * area or that contains a scroll area.
-	 * If the InsertMode is AutoScrollArea, the DockWidget tries to automatically
-	 * detect how to insert the given widget. If the widget is derived from
-	 * QScrollArea (i.e. an QAbstractItemView), then the widget is inserted
-	 * directly. If the given widget is not a scroll area, the widget will be
-	 * inserted into a scroll area.
-	 * To force insertion into a scroll area, you can also provide the InsertMode
-	 * ForceScrollArea. To prevent insertion into a scroll area, you can
-	 * provide the InsertMode ForceNoScrollArea
-	 */
-	void setWidget(QWidget* widget, eInsertMode InsertMode = AutoScrollArea);
+    /**
+     * Sets the widget for the dock widget to widget.
+     * The InsertMode defines how the widget is inserted into the dock widget.
+     * The content of a dock widget should be resizable do a very small size to
+     * prevent the dock widget from blocking the resizing. To ensure, that a
+     * dock widget can be resized very well, it is better to insert the content+
+     * widget into a scroll area or to provide a widget that is already a scroll
+     * area or that contains a scroll area.
+     * If the InsertMode is AutoScrollArea, the DockWidget tries to automatically
+     * detect how to insert the given widget. If the widget is derived from
+     * QScrollArea (i.e. an QAbstractItemView), then the widget is inserted
+     * directly. If the given widget is not a scroll area, the widget will be
+     * inserted into a scroll area.
+     * To force insertion into a scroll area, you can also provide the InsertMode
+     * ForceScrollArea. To prevent insertion into a scroll area, you can
+     * provide the InsertMode ForceNoScrollArea
+     */
+    void setWidget(QWidget* widget, eInsertMode InsertMode = AutoScrollArea);
 
-	/**
-	 * Remove the widget from the dock and give ownership back to the caller
-	 */
-	QWidget* takeWidget();
+    /**
+     * Remove the widget from the dock and give ownership back to the caller
+     */
+    QWidget* takeWidget();
 
-	/**
-	 * Returns the widget for the dock widget. This function returns zero if
-	 * the widget has not been set.
-	 */
-	QWidget* widget() const;
+    /**
+     * Returns the widget for the dock widget. This function returns zero if
+     * the widget has not been set.
+     */
+    QWidget* widget() const;
 
-	/**
-	 * Returns the tab widget of this dock widget that is shown in the dock
-	 * area title bar
-	 */
-	CDockWidgetTab* tabWidget() const;
+    /**
+     * Returns the tab widget of this dock widget that is shown in the dock
+     * area title bar
+     */
+    CDockWidgetTab* tabWidget() const;
 
-	/**
-	 * Sets, whether the dock widget is movable, closable, and floatable.
-	 */
-	void setFeatures(DockWidgetFeatures features);
+    /**
+     * Sets, whether the dock widget is movable, closable, and floatable.
+     */
+    void setFeatures(DockWidgetFeatures features);
 
-	/**
-	 * Sets the feature flag for this dock widget if on is true; otherwise
-	 * clears the flag.
-	 */
-	void setFeature(DockWidgetFeature flag, bool on);
+    /**
+     * Sets the feature flag for this dock widget if on is true; otherwise
+     * clears the flag.
+     */
+    void setFeature(DockWidgetFeature flag, bool on);
 
-	/**
-	 * This property holds whether the dock widget is movable, closable, and
-	 * floatable.
-	 * By default, this property is set to a combination of DockWidgetClosable,
-	 * DockWidgetMovable and DockWidgetFloatable.
-	 */
-	DockWidgetFeatures features() const;
+    /**
+     * This property holds whether the dock widget is movable, closable, and
+     * floatable.
+     * By default, this property is set to a combination of DockWidgetClosable,
+     * DockWidgetMovable and DockWidgetFloatable.
+     */
+    DockWidgetFeatures features() const;
 
-	/**
-	 * Returns the dock manager that manages the dock widget or 0 if the widget
-	 * has not been assigned to any dock manager yet
-	 */
-	CDockManager* dockManager() const;
+    /**
+     * Returns the dock manager that manages the dock widget or 0 if the widget
+     * has not been assigned to any dock manager yet
+     */
+    CDockManager* dockManager() const;
 
-	/**
-	 * Returns the dock container widget this dock area widget belongs to or 0
-	 * if this dock widget has not been docked yet
-	 */
-	CDockContainerWidget* dockContainer() const;
+    /**
+     * Returns the dock container widget this dock area widget belongs to or 0
+     * if this dock widget has not been docked yet
+     */
+    CDockContainerWidget* dockContainer() const;
 
-	/**
-	 * Returns the dock area widget this dock widget belongs to or 0
-	 * if this dock widget has not been docked yet
-	 */
-	CDockAreaWidget* dockAreaWidget() const;
+    /**
+     * Returns the dock area widget this dock widget belongs to or 0
+     * if this dock widget has not been docked yet
+     */
+    CDockAreaWidget* dockAreaWidget() const;
 
-	/**
-	 * This property holds whether the dock widget is floating.
-	 * A dock widget is only floating, if it is the one and only widget inside
-	 * of a floating container. If there are more than one dock widget in a
-	 * floating container, the all dock widgets are docked and not floating.
-	 */
-	bool isFloating() const;
+    /**
+     * This property holds whether the dock widget is floating.
+     * A dock widget is only floating, if it is the one and only widget inside
+     * of a floating container. If there are more than one dock widget in a
+     * floating container, the all dock widgets are docked and not floating.
+     */
+    bool isFloating() const;
 
-	/**
-	 * This function returns true, if this dock widget is in a floating.
-	 * The function returns true, if the dock widget is floating and it also
-	 * returns true if it is docked inside of a floating container.
-	 */
-	bool isInFloatingContainer() const;
+    /**
+     * This function returns true, if this dock widget is in a floating.
+     * The function returns true, if the dock widget is floating and it also
+     * returns true if it is docked inside of a floating container.
+     */
+    bool isInFloatingContainer() const;
 
-	/**
-	 * Returns true, if this dock widget is closed.
-	 */
-	bool isClosed() const;
+    /**
+     * Returns true, if this dock widget is closed.
+     */
+    bool isClosed() const;
 
-	/**
-	 * Returns a checkable action that can be used to show or close this dock widget.
-	 * The action's text is set to the dock widget's window title.
-	 */
-	QAction* toggleViewAction() const;
+    /**
+     * Returns a checkable action that can be used to show or close this dock widget.
+     * The action's text is set to the dock widget's window title.
+     */
+    QAction* toggleViewAction() const;
 
-	/**
-	 * Configures the behavior of the toggle view action.
-	 * \see eToggleViewActionMode for a detailed description
-	 */
-	void setToggleViewActionMode(eToggleViewActionMode Mode);
+    /**
+     * Configures the behavior of the toggle view action.
+     * \see eToggleViewActionMode for a detailed description
+     */
+    void setToggleViewActionMode(eToggleViewActionMode Mode);
 
-	/**
-	 * Sets the dock widget icon that is shown in tabs and in toggle view
-	 * actions
-	 */
-	void setIcon(const QIcon& Icon);
+    /**
+     * Sets the dock widget icon that is shown in tabs and in toggle view
+     * actions
+     */
+    void setIcon(const QIcon& Icon);
 
-	/**
-	 * Returns the icon that has been assigned to the dock widget
-	 */
-	QIcon icon() const;
+    /**
+     * Returns the icon that has been assigned to the dock widget
+     */
+    QIcon icon() const;
 
-	/**
-	 * If the WithToolBar layout flag is enabled, then this function returns
-	 * the dock widget toolbar. If the flag is disabled, the function returns
-	 * a nullptr.
-	 * This function returns the dock widget top tool bar.
-	 * If no toolbar is assigned, this function returns nullptr. To get a vaild
-	 * toolbar you either need to create a default empty toolbar via
-	 * createDefaultToolBar() function or you need to assign you custom
-	 * toolbar via setToolBar().
-	 */
-	QToolBar* toolBar() const;
+    /**
+     * If the WithToolBar layout flag is enabled, then this function returns
+     * the dock widget toolbar. If the flag is disabled, the function returns
+     * a nullptr.
+     * This function returns the dock widget top tool bar.
+     * If no toolbar is assigned, this function returns nullptr. To get a vaild
+     * toolbar you either need to create a default empty toolbar via
+     * createDefaultToolBar() function or you need to assign you custom
+     * toolbar via setToolBar().
+     */
+    QToolBar* toolBar() const;
 
-	/**
-	 * If you would like to use the default top tool bar, then call this
-	 * function to create the default tool bar.
-	 * After this function the toolBar() function will return a valid toolBar()
-	 * object.
-	 */
-	QToolBar* createDefaultToolBar();
+    /**
+     * If you would like to use the default top tool bar, then call this
+     * function to create the default tool bar.
+     * After this function the toolBar() function will return a valid toolBar()
+     * object.
+     */
+    QToolBar* createDefaultToolBar();
 
-	/**
-	 * Assign a new tool bar that is shown above the content widget.
-	 * The dock widget will become the owner of the tool bar and deletes it
-	 * on destruction
-	 */
-	void setToolBar(QToolBar* ToolBar);
+    /**
+     * Assign a new tool bar that is shown above the content widget.
+     * The dock widget will become the owner of the tool bar and deletes it
+     * on destruction
+     */
+    void setToolBar(QToolBar* ToolBar);
 
-	/**
-	 * This function sets the tool button style for the given dock widget state.
-	 * It is possible to switch the tool button style depending on the state.
-	 * If a dock widget is floating, then here are more space and it is
-	 * possible to select a style that requires more space like
-	 * Qt::ToolButtonTextUnderIcon. For the docked state Qt::ToolButtonIconOnly
-	 * might be better.
-	 */
-	void setToolBarStyle(Qt::ToolButtonStyle Style, eState State);
+    /**
+     * This function sets the tool button style for the given dock widget state.
+     * It is possible to switch the tool button style depending on the state.
+     * If a dock widget is floating, then here are more space and it is
+     * possible to select a style that requires more space like
+     * Qt::ToolButtonTextUnderIcon. For the docked state Qt::ToolButtonIconOnly
+     * might be better.
+     */
+    void setToolBarStyle(Qt::ToolButtonStyle Style, eState State);
 
-	/**
-	 * Returns the tool button style for the given docking state.
-	 * \see setToolBarStyle()
-	 */
-	Qt::ToolButtonStyle toolBarStyle(eState State) const;
+    /**
+     * Returns the tool button style for the given docking state.
+     * \see setToolBarStyle()
+     */
+    Qt::ToolButtonStyle toolBarStyle(eState State) const;
 
-	/**
-	 * This function sets the tool button icon size for the given state.
-	 * If a dock widget is floating, there is more space an increasing the
-	 * icon size is possible. For docked widgets, small icon sizes, eg. 16 x 16
-	 * might be better.
-	 */
-	void setToolBarIconSize(const QSize& IconSize, eState State);
+    /**
+     * This function sets the tool button icon size for the given state.
+     * If a dock widget is floating, there is more space an increasing the
+     * icon size is possible. For docked widgets, small icon sizes, eg. 16 x 16
+     * might be better.
+     */
+    void setToolBarIconSize(const QSize& IconSize, eState State);
 
-	/**
-	 * Returns the icon size for a given docking state.
-	 * \see setToolBarIconSize()
-	 */
-	QSize toolBarIconSize(eState State) const;
+    /**
+     * Returns the icon size for a given docking state.
+     * \see setToolBarIconSize()
+     */
+    QSize toolBarIconSize(eState State) const;
 
 
 #ifndef QT_NO_TOOLTIP
-	/**
-	 * This is function sets text tooltip for title bar widget 
-	 * and tooltip for toggle view action
-	 */
-	void setTabToolTip(const QString &text);
+    /**
+     * This is function sets text tooltip for title bar widget
+     * and tooltip for toggle view action
+     */
+    void setTabToolTip(const QString &text);
 #endif
 
 public: // reimplements QFrame -----------------------------------------------
-	/**
-	 * Emits titleChanged signal if title change event occurs
-	 */
-	virtual bool event(QEvent *e) override;
+    /**
+     * Emits titleChanged signal if title change event occurs
+     */
+    virtual bool event(QEvent *e) override;
 
 public slots:
-	/**
-	 * This property controls whether the dock widget is open or closed.
-	 * The toogleViewAction triggers this slot
-	 */
-	void toggleView(bool Open = true);
+    /**
+     * This property controls whether the dock widget is open or closed.
+     * The toogleViewAction triggers this slot
+     */
+    void toggleView(bool Open = true);
 
-	/**
-	 * This function will make a docked widget floating
-	 */
-	void setFloating();
+    /**
+     * This function will make a docked widget floating
+     */
+    void setFloating();
+
+    /**
+     * This function will delete the dock widget and its content from the
+     * docking system
+     */
+    void deleteDockWidget();
+
+    /**
+     * Closes the dock widget
+     */
+    void closeDockWidget();
 
-	/**
-	 * This function will delete the dock widget and its content from the
-	 * docking system
-	 */
-	void deleteDockWidget();
 
 signals:
-	/**
-	 * This signal is emitted if the dock widget is opened or closed
-	 */
-	void viewToggled(bool Open);
+    /**
+     * This signal is emitted if the dock widget is opened or closed
+     */
+    void viewToggled(bool Open);
 
-	/**
-	 * This signal is emitted if the dock widget is closed
-	 */
-	void closed();
+    /**
+     * This signal is emitted if the dock widget is closed
+     */
+    void closed();
 
-	/**
-	 * This signal is emitted if the window title of this dock widget
-	 * changed
-	 */
-	void titleChanged(const QString& Title);
+    /**
+     * This signal is emitted if the window title of this dock widget
+     * changed
+     */
+    void titleChanged(const QString& Title);
 
-	/**
-	 * This signal is emitted when the floating property changes.
-	 * The topLevel parameter is true if the dock widget is now floating;
-	 * otherwise it is false.
-	 */
-	void topLevelChanged(bool topLevel);
+    /**
+     * This signal is emitted when the floating property changes.
+     * The topLevel parameter is true if the dock widget is now floating;
+     * otherwise it is false.
+     */
+    void topLevelChanged(bool topLevel);
+
+    /**
+     * This signal is emitted, if close is requested
+     */
+    void closeRequested();
+
+    /**
+     * This signal is emitted when the dock widget becomes visible (or invisible).
+     * This happens when the widget is hidden or shown, as well as when it is
+     * docked in a tabbed dock area and its tab becomes selected or unselected.
+     */
+    void visibilityChanged(bool visible);
+
+    /**
+     * This signal is emitted when the features property changes.
+     * The features parameter gives the new value of the property.
+     */
+    void featuresChanged(DockWidgetFeatures features);
 }; // class DockWidget
 }
  // namespace ads

src/DockWidgetTab.cpp

@@ -67,7 +67,7 @@ struct DockWidgetTabPrivate
 	CDockWidget* DockWidget;
 	QLabel* IconLabel = nullptr;
 	tTabLabel* TitleLabel;
-	QPoint DragStartMousePosition;
+	QPoint GlobalDragStartMousePosition;
 	bool IsActiveTab = false;
 	CDockAreaWidget* DockArea = nullptr;
 	eDragState DragState = DraggingInactive;
@@ -219,11 +219,10 @@ void DockWidgetTabPrivate::createLayout()
 void DockWidgetTabPrivate::moveTab(QMouseEvent* ev)
 {
     ev->accept();
-    int left, top, right, bottom;
-    _this->getContentsMargins(&left, &top, &right, &bottom);
-    QPoint moveToPos = _this->mapToParent(ev->pos()) - DragStartMousePosition;
-    moveToPos.setY(0);
-    _this->move(moveToPos);
+    QPoint Distance = ev->globalPos() - GlobalDragStartMousePosition;
+    Distance.setY(0);
+    auto TargetPos = Distance + TabDragStartPosition;
+    _this->move(TargetPos);
     _this->raise();
 }
 
@@ -247,6 +246,7 @@ bool DockWidgetTabPrivate::startFloating(eDragState DraggingState)
 
     ADS_PRINT("startFloating");
 	DragState = DraggingState;
+	auto DragStartMousePosition = _this->mapFromGlobal(GlobalDragStartMousePosition);
 	QSize Size = DockArea->size();
 	IFloatingWidget* FloatingWidget = nullptr;
 	bool OpaqueUndocking = CDockManager::configFlags().testFlag(CDockManager::OpaqueUndocking) ||
@@ -304,7 +304,7 @@ void CDockWidgetTab::mousePressEvent(QMouseEvent* ev)
 	if (ev->button() == Qt::LeftButton)
 	{
 		ev->accept();
-        d->DragStartMousePosition = ev->pos();
+        d->GlobalDragStartMousePosition = ev->globalPos();
         d->DragState = DraggingMousePressed;
         emit clicked();
 		return;
@@ -320,7 +320,7 @@ void CDockWidgetTab::mouseReleaseEvent(QMouseEvent* ev)
 	if (ev->button() == Qt::LeftButton)
 	{
 		auto CurrentDragState = d->DragState;
-		d->DragStartMousePosition = QPoint();
+		d->GlobalDragStartMousePosition = QPoint();
 		d->DragState = DraggingInactive;
 
 		switch (CurrentDragState)
@@ -372,7 +372,7 @@ void CDockWidgetTab::mouseMoveEvent(QMouseEvent* ev)
     }
 
     // Maybe a fixed drag distance is better here ?
-    int DragDistanceY = qAbs(d->DragStartMousePosition.y() - ev->pos().y());
+    int DragDistanceY = qAbs(d->GlobalDragStartMousePosition.y() - ev->globalPos().y());
     if (DragDistanceY >= CDockManager::startDragDistance())
 	{
 		// If this is the last dock area in a dock container with only
@@ -399,7 +399,7 @@ void CDockWidgetTab::mouseMoveEvent(QMouseEvent* ev)
     	return;
 	}
     else if (d->DockArea->openDockWidgetsCount() > 1
-     && (ev->pos() - d->DragStartMousePosition).manhattanLength() >= QApplication::startDragDistance()) // Wait a few pixels before start moving
+     && (ev->globalPos() - d->GlobalDragStartMousePosition).manhattanLength() >= QApplication::startDragDistance()) // Wait a few pixels before start moving
 	{
     	// If we start dragging the tab, we save its inital position to
     	// restore it later
@@ -424,7 +424,7 @@ void CDockWidgetTab::contextMenuEvent(QContextMenuEvent* ev)
 		return;
 	}
 
-	d->DragStartMousePosition = ev->pos();
+	d->GlobalDragStartMousePosition = ev->globalPos();
 	QMenu Menu(this);
 	auto Action = Menu.addAction(tr("Detach"), this, SLOT(detachDockWidget()));
 	Action->setEnabled(d->DockWidget->features().testFlag(CDockWidget::DockWidgetFloatable));
@@ -432,7 +432,7 @@ void CDockWidgetTab::contextMenuEvent(QContextMenuEvent* ev)
 	Action = Menu.addAction(tr("Close"), this, SIGNAL(closeRequested()));
 	Action->setEnabled(isClosable());
 	Menu.addAction(tr("Close Others"), this, SIGNAL(closeOtherTabsRequested()));
-	Menu.exec(mapToGlobal(ev->pos()));
+	Menu.exec(ev->globalPos());
 }
 
 
@@ -549,7 +549,7 @@ void CDockWidgetTab::mouseDoubleClickEvent(QMouseEvent *event)
 	if ((!d->DockArea->dockContainer()->isFloating() || d->DockArea->dockWidgetsCount() > 1)
 		&& d->DockWidget->features().testFlag(CDockWidget::DockWidgetFloatable))
 	{
-		d->DragStartMousePosition = event->pos();
+		d->GlobalDragStartMousePosition = event->globalPos();
 		d->startFloating(DraggingInactive);
 	}
 
@@ -587,7 +587,7 @@ void CDockWidgetTab::detachDockWidget()
 	{
 		return;
 	}
-	d->DragStartMousePosition = mapFromGlobal(QCursor::pos());
+	d->GlobalDragStartMousePosition = QCursor::pos();
 	d->startFloating(DraggingInactive);
 }
 
@@ -595,13 +595,13 @@ void CDockWidgetTab::detachDockWidget()
 //============================================================================
 bool CDockWidgetTab::event(QEvent *e)
 {
-	#ifndef QT_NO_TOOLTIP
+#ifndef QT_NO_TOOLTIP
 	if (e->type() == QEvent::ToolTipChange)
 	{
 		const auto text = toolTip();
 		d->TitleLabel->setToolTip(text);
 	}
-	#endif
+#endif
 	return Super::event(e);
 }
 

src/DockWidgetTab.h

@@ -133,7 +133,7 @@ public:
 	void setText(const QString& title);
 
 	/**
-	 * This function returns true if the assigned dock widget is closeable
+	 * This function returns true if the assigned dock widget is closable
 	 */
 	bool isClosable() const;
 

src/FloatingDockContainer.cpp

@@ -28,6 +28,8 @@
 //============================================================================
 #include "FloatingDockContainer.h"
 
+#include <iostream>
+
 #include <QBoxLayout>
 #include <QApplication>
 #include <QMouseEvent>
@@ -352,14 +354,17 @@ void CFloatingDockContainer::closeEvent(QCloseEvent *event)
 {
 	ADS_PRINT("CFloatingDockContainer closeEvent");
 	d->setState(DraggingInactive);
+	event->ignore();
 
 	if (isClosable())
 	{
 		auto TopLevelDockWidget = topLevelDockWidget();
 		if (TopLevelDockWidget && TopLevelDockWidget->features().testFlag(CDockWidget::DockWidgetDeleteOnClose))
 		{
-			TopLevelDockWidget->deleteDockWidget();
-			this->deleteLater();
+			if (!TopLevelDockWidget->closeDockWidgetInternal())
+			{
+				return;
+			}
 		}
 
 		// In Qt version after 5.9.2 there seems to be a bug that causes the
@@ -371,20 +376,7 @@ void CFloatingDockContainer::closeEvent(QCloseEvent *event)
 		// Starting from Qt version 5.12.2 this seems to work again. But
 		// now the QEvent::NonClientAreaMouseButtonPress function returns always
 		// Qt::RightButton even if the left button was pressed
-#ifndef Q_OS_LINUX
-#if (QT_VERSION > QT_VERSION_CHECK(5, 9, 2) && QT_VERSION < QT_VERSION_CHECK(5, 12, 2))
-        event->ignore();
         this->hide();
-#else
-		Super::closeEvent(event);
-#endif
-#else // Q_OS_LINUX
-        Super::closeEvent(event);
-#endif
-	}
-	else
-	{
-		event->ignore();
 	}
 }
 

src/FloatingDragPreview.h

@@ -30,7 +30,7 @@ class CFloatingDragPreview : public QWidget, public IFloatingWidget
 	Q_OBJECT
 private:
 	FloatingDragPreviewPrivate* d;
-	friend class FloatingDragPreviewPrivate;
+	friend struct FloatingDragPreviewPrivate;
 
 private slots:
 	/**

src/IconProvider.h

@@ -29,7 +29,7 @@ class ADS_EXPORT CIconProvider
 {
 private:
 	IconProviderPrivate* d; ///< private data (pimpl)
-	friend class IconProviderPrivate;
+	friend struct IconProviderPrivate;
 
 public:
 	/**

src/ads_globals.h

@@ -117,6 +117,15 @@ enum eIcon
 	IconCount,         //!< just a delimiter for range checks
 };
 
+/**
+ * For bitwise combination of dock wdget features
+ */
+enum eBitwiseOperator
+{
+	BitwiseAnd,
+	BitwiseOr
+};
+
 namespace internal
 {
 static const bool RestoreTesting = true;