Improved documentation for Linux support

Disabled Qt6 build in appveyor - it does not work properly yet
Try to fix Qt6 build
2021-01-03 17:27:01 +01:00 · 2021-01-03 17:14:39 +01:00 · 2021-01-03 17:09:06 +01:00 · 2021-01-03 15:50:16 +01:00 · 2021-01-02 23:17:44 +01:00 · 2021-01-02 21:05:05 +01:00
56 changed files with 898 additions and 270 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -10,52 +10,19 @@ environment:
    # Appveyor doesn't have Qt 12 yet
    LatestQtVersion: 5.13
  matrix:
+
 # 32 bit builds
-# MSVC 2015 builds
-# Dynamic Library builds
-    # LTS version of Qt, dll, 32bit, MSVC 2015, qmake
-  - QT5: C:\Qt\%LatestQtVersion%\msvc2017
-    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
-    targetPlatform: x86
-    use_mingw: "false"
-    use_static: "false"
-    use_cmake: "false"
-    # LTS version of Qt, dll, 32bit, MSVC 2015, cmake
-  - QT5: C:\Qt\%LatestQtVersion%\msvc2017
-    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
-    targetPlatform: x86
-    use_mingw: "false"
-    use_static: "false"
-    use_cmake: "true"
-# end Dynamic Library builds
-# Static Library builds
-    # LTS version of Qt, static, 32bit, MSVC 2015, qmake
-  - QT5: C:\Qt\%LatestQtVersion%\msvc2017
-    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
-    targetPlatform: x86
-    use_mingw: "false"
-    use_static: "true"
-    use_cmake: "false"
-    # LTS version of Qt, static, 32bit, MSVC 2015, cmake
-  - QT5: C:\Qt\%LatestQtVersion%\msvc2017
-    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
-    targetPlatform: x86
-    use_mingw: "false"
-    use_static: "true"
-    use_cmake: "true"
-# end Static Library builds
-# end MSVC 2015 builds
 # MinGW builds
 # Dynamic Library builds
    # LTS version of Qt, dll, 32bit, MinGW, qmake
-  - QT5: C:\Qt\%LatestQtVersion%\mingw73_32
+  - QT: C:\Qt\%LatestQtVersion%\mingw73_32
    COMPILER: C:\Qt\Tools\mingw730_32
    targetPlatform: x86
    use_mingw: "true"
    use_static: "false"
    use_cmake: "false"
    # LTS version of Qt, dll, 32bit, MinGW, cmake
-  - QT5: C:\Qt\%LatestQtVersion%\mingw73_32
+  - QT: C:\Qt\%LatestQtVersion%\mingw73_32
    COMPILER: C:\Qt\Tools\mingw730_32
    targetPlatform: x86
    use_mingw: "true"
@@ -64,14 +31,14 @@ environment:
 # end Dynamic Library builds
 # Static Library builds
    # LTS version of Qt, static, 32bit, MinGW, qmake
-  - QT5: C:\Qt\%LatestQtVersion%\mingw73_32
+  - QT: C:\Qt\%LatestQtVersion%\mingw73_32
    COMPILER: C:\Qt\Tools\mingw730_32
    targetPlatform: x86
    use_mingw: "true"
    use_static: "true"
    use_cmake: "false"
    # LTS version of Qt, static, 32bit, MinGW, cmake
-  - QT5: C:\Qt\%LatestQtVersion%\mingw73_32
+  - QT: C:\Qt\%LatestQtVersion%\mingw73_32
    COMPILER: C:\Qt\Tools\mingw730_32
    targetPlatform: x86
    use_mingw: "true"
@@ -79,19 +46,54 @@ environment:
    use_cmake: "true"
 # end Static Library builds
 # end MinGW builds
-# end 32 bit builds
-# 64 bit builds
-# MSVC 2015 builds
+# MSVC 2017 builds
 # Dynamic Library builds
-    # LTS version of Qt, dll, 64bit, MSVC 2015, qmake
-  - QT5: C:\Qt\%LatestQtVersion%\msvc2017_64
+    # LTS version of Qt, dll, 32bit, MSVC 2017, qmake
+  - QT: C:\Qt\%LatestQtVersion%\msvc2017
+    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
+    targetPlatform: x86
+    use_mingw: "false"
+    use_static: "false"
+    use_cmake: "false"
+    # LTS version of Qt, dll, 32bit, MSVC 2017, cmake
+  - QT: C:\Qt\%LatestQtVersion%\msvc2017
+    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
+    targetPlatform: x86
+    use_mingw: "false"
+    use_static: "false"
+    use_cmake: "true"
+# end Dynamic Library builds
+# Static Library builds
+    # LTS version of Qt, static, 32bit, MSVC 2017, qmake
+  - QT: C:\Qt\%LatestQtVersion%\msvc2017
+    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
+    targetPlatform: x86
+    use_mingw: "false"
+    use_static: "true"
+    use_cmake: "false"
+    # LTS version of Qt, static, 32bit, MSVC 2017, cmake
+  - QT: C:\Qt\%LatestQtVersion%\msvc2017
+    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
+    targetPlatform: x86
+    use_mingw: "false"
+    use_static: "true"
+    use_cmake: "true"
+# end Static Library builds
+# end MSVC 2017 builds
+# end 32 bit builds
+
+# 64 bit builds
+# MSVC 2017 builds
+# Dynamic Library builds
+    # LTS version of Qt, dll, 64bit, MSVC 2017, qmake
+  - QT: C:\Qt\%LatestQtVersion%\msvc2017_64
    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
    targetPlatform: amd64
    use_mingw: "false"
    use_static: "false"
    use_cmake: "false"
-    # LTS version of Qt, dll, 64bit, MSVC 2015, cmake
-  - QT5: C:\Qt\%LatestQtVersion%\msvc2017_64
+    # LTS version of Qt, dll, 64bit, MSVC 2017, cmake
+  - QT: C:\Qt\%LatestQtVersion%\msvc2017_64
    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
    targetPlatform: amd64
    use_mingw: "false"
@@ -99,38 +101,40 @@ environment:
    use_cmake: "true"
 # end Dynamic Library builds
 # Static Library builds
-    # LTS version of Qt, static, 64bit, MSVC 2015, qmake
-  - QT5: C:\Qt\%LatestQtVersion%\msvc2017_64
+    # LTS version of Qt, static, 64bit, MSVC 2017, qmake
+  - QT: C:\Qt\%LatestQtVersion%\msvc2017_64
    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
    targetPlatform: amd64
    use_mingw: "false"
    use_static: "true"
    use_cmake: "false"
-    # LTS version of Qt, static, 64bit, MSVC 2015, cmake
-  - QT5: C:\Qt\%LatestQtVersion%\msvc2017_64
+    # LTS version of Qt, static, 64bit, MSVC 2017, cmake
+  - QT: C:\Qt\%LatestQtVersion%\msvc2017_64
    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build
    targetPlatform: amd64
    use_mingw: "false"
    use_static: "true"
    use_cmake: "true"
 # end Static Library builds
-# end MSVC 2015 builds
+# end MSVC 2017 builds
 # end 64 bit builds

+
 matrix:
  fast_finish: true

 before_build:
 - set originalWD=%CD%
- call "%QT5%\bin\qtenv2.bat"
+- call "%QT%\bin\qtenv2.bat"
 - cd /D %originalWD%
 - if %use_mingw%==false call "%COMPILER%\vcvarsall.bat" %targetPlatform%
 - if %use_static%==true (set USESTATIC=ON) else (set USESTATIC=OFF)
 - if %use_mingw%==true (set CMAKEGENERATOR="MinGW Makefiles") else (set CMAKEGENERATOR="NMake Makefiles")
 - if %use_mingw%==true (set MAKEENGINE=mingw32-make) else (set MAKEENGINE=nmake)
- if %use_mingw%==true set PATH=%PATH:C:\Program Files\Git\usr\bin;=%
+- if %use_mingw%==true set PATH=%PATH%:C:\Program Files\Git\usr\bin;=%

 build_script:
+- echo %PATH%
 - if %use_cmake%==true mkdir build 
 - if %use_cmake%==true cd build
 - if %use_cmake%==true cmake --version
--- a/.settings/language.settings.xml
+++ b/.settings/language.settings.xml
@@ -2,10 +2,13 @@
 <project>
 	<configuration id="cdt.managedbuild.toolchain.gnu.mingw.base.1119687795" name="Default">
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
-			<provider-reference id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorMinGW" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" keep-relative-paths="false" name="CDT GCC Build Output Parser" parameter="(g?cc)|([gc]\+\+)|(clang)" prefer-non-shared="true"/>
+			<provider class="org.eclipse.cdt.managedbuilder.internal.language.settings.providers.GCCBuiltinSpecsDetectorMinGW" console="false" env-hash="-1242828358748104657" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorMinGW" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings MinGW" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+				<language-scope id="org.eclipse.cdt.core.gcc"/>
+				<language-scope id="org.eclipse.cdt.core.g++"/>
+			</provider>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 		</extension>
 	</configuration>
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,8 @@ matrix:
    os: linux
    dist: trusty
    group: stable
+    before_install:
+      - sudo apt-get -y install libqt5x11extras5-dev
    addons:
      apt:
        sources:
@@ -19,6 +21,7 @@ matrix:
        - qt55base
        - qt55tools
        - qt55x11extras
+        - libqt5x11extras5-dev
        - gcc-9
        - g++-9
    script:
@@ -36,6 +39,8 @@ matrix:
    services:
        - xvfb
    compiler: gcc
+    before_install:
+      - sudo apt-get -y install libqt5x11extras5-dev
    addons:
      apt:
        sources:
@@ -46,6 +51,7 @@ matrix:
        - qt514base
        - qt514tools
        - qt514x11extras
+        - libqt5x11extras5-dev
        - gcc-9
        - g++-9
        - libc6-i386
@@ -67,7 +73,9 @@ matrix:
    services:
        - xvfb
    compiler: gcc
-    addons:
+    before_install:
+      - sudo apt-get -y install libqt5x11extras5-dev  
+    addons:  
      apt:
        sources:
        - ubuntu-toolchain-r-test
@@ -77,6 +85,7 @@ matrix:
        - qt514base
        - qt514tools
        - qt514x11extras
+        - libqt5x11extras5-dev
        - gcc-9
        - g++-9
        - libc6-i386
@@ -98,6 +107,8 @@ matrix:
    services:
        - xvfb
    compiler: gcc
+    before_install:
+      - sudo apt-get -y install libqt5x11extras5-dev
    addons:
      apt:
        sources:
@@ -108,6 +119,7 @@ matrix:
        - qt514base
        - qt514tools
        - qt514x11extras
+        - libqt5x11extras5-dev
        - gcc-9
        - g++-9
        - libc6-i386
@@ -135,6 +147,8 @@ matrix:
    services:
        - xvfb
    compiler: gcc
+    before_install:
+      - sudo apt-get -y install libqt5x11extras5-dev
    addons:
      apt:
        sources:
@@ -145,6 +159,7 @@ matrix:
        - qt514base
        - qt514tools
        - qt514x11extras
+        - libqt5x11extras5-dev
        - gcc-9
        - g++-9
        - libc6-i386
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Advanced Docking System for Qt

-[![Build Status](https://travis-ci.org/githubuser0xFFFF/Qt-Advanced-Docking-System.svg?branch=master)](https://travis-ci.org/githubuser0xFFFF/Qt-Advanced-Docking-System)
+[![Build status](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/workflows/linux-builds/badge.svg)](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/actions?query=workflow%3Alinux-builds)
 [![Build status](https://ci.appveyor.com/api/projects/status/qcfb3cy932jw9mpy/branch/master?svg=true)](https://ci.appveyor.com/project/githubuser0xFFFF/qt-advanced-docking-system/branch/master)
 [![License: LGPL v2.1](https://img.shields.io/badge/License-LGPL%20v2.1-blue.svg)](gnu-lgpl-v2.1.md)

@@ -15,6 +15,23 @@ integrated development environments (IDEs) such as Visual Studio.

 ## New and Noteworthy

+The [release 3.7.0](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/releases/tag/3.7.0)
+adds support for Qt6.
+
+The [release 3.6.0](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/releases/tag/3.6.0)
+adds some nice new features:
+
+- support for [central widget](doc/user-guide.md#central-widget) concept
+
+![Central Widget](doc/central_widget.gif)
+
+- support for [native floating widgets](doc/user-guide.md#floatingcontainerforcenativetitlebar-linux-only) on Linux
+
+![FloatingContainerForceNativeTitleBar true](doc/cfg_flag_FloatingContainerForceNativeTitleBar_true.png)
+
+Both features are contributions from ADS users. Read the [documentation](doc/user-guide.md)
+to learn more about both new features.
+
 The [release 3.5.0](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/releases/tag/3.5.0)
 adds the new [focus highlighting](doc/user-guide.md#focushighlighting) feature.
 This optional feature enables highlighting of the focused dock widget like you
@@ -42,6 +59,7 @@ know it from Visual Studio.
  - [Supports deletion of dynamically created dock widgets](#supports-deletion-of-dynamically-created-dock-widgets)
  - [Python PyQt5 Bindings](#python-pyqt5-bindings)
 - [Tested Compatible Environments](#tested-compatible-environments)
+  - [Supported Qt Versions](#supported-qt-versions)
  - [Windows](#windows)
  - [macOS](#macos)
  - [Linux](#linux)
@@ -67,8 +85,8 @@ There is no central widget like in the Qt docking system. You can dock on every
 border of the main window or you can dock into each dock area - so you are
 free to dock almost everywhere.

-![Dropping widgets](doc/preview-dragndrop.png)\
-\
+![Dropping widgets](doc/preview-dragndrop.png)
+
 ![Dropping widgets](doc/preview-dragndrop_dark.png)

 ### Docking inside floating windows
@@ -76,8 +94,8 @@ free to dock almost everywhere.
 There is no difference between the main window and a floating window. Docking
 into floating windows is supported.

-![Docking inside floating windows](doc/floating-widget-dragndrop.png)\
-\
+![Docking inside floating windows](doc/floating-widget-dragndrop.png)
+
 ![Docking inside floating windows](doc/floating-widget-dragndrop_dark.png)

 ### Grouped dragging
@@ -86,8 +104,8 @@ 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.gif)\
-\
+![Grouped dragging](doc/grouped-dragging.gif)
+
 ![Grouped dragging](doc/grouped-dragging_dark.png)

 ### Perspectives for fast switching of the complete main window layout
@@ -98,13 +116,13 @@ 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.gif)\
-\
+![Perspective](doc/perspectives.gif)
+
 ![Perspective](doc/perspectives_dark.png)

 ### Opaque and non-opaque splitter resizing

-The advanced docking system uses standard QSplitters as resize separators and thus supports opaque and non-opaque resizing functionality of QSplitter. In some rare cases, for very complex widgets or on slow machines resizing via separator on the fly may cause flicking and glaring of rendered content inside a widget. The global dock manager flag `OpaqueSplitterResize` configures the resizing behaviour of the splitters. If this flag is set, then widgets are resized dynamically (opaquely) while interactively moving the splitters. 
+The advanced docking system uses standard QSplitters as resize separators and thus supports opaque and non-opaque resizing functionality of QSplitter. In some rare cases, for very complex widgets or on slow machines resizing via separator on the fly may cause flicking and glaring of rendered content inside a widget. The global dock manager flag `OpaqueSplitterResize` configures the resizing behaviour of the splitters. If this flag is set, then widgets are resized dynamically (opaquely) while interactively moving the splitters.

 ![Opaque resizing](doc/opaque_resizing.gif)

@@ -157,6 +175,10 @@ Latest working version: [3.5.2](https://github.com/githubuser0xFFFF/Qt-Advanced-

 ## Tested Compatible Environments

+### Supported Qt Versions
+
+The library supports **Qt5** and **Qt6**.
+
 ### Windows

 Windows 10 [![Build status](https://ci.appveyor.com/api/projects/status/qcfb3cy932jw9mpy/branch/master?svg=true)](https://ci.appveyor.com/project/githubuser0xFFFF/qt-advanced-docking-system/branch/master)
@@ -173,15 +195,23 @@ The application can be compiled for macOS. A user reported, that the library wor

 ### Linux

-Ubuntu [![Build Status](https://travis-ci.org/githubuser0xFFFF/Qt-Advanced-Docking-System.svg?branch=master)](https://travis-ci.org/githubuser0xFFFF/Qt-Advanced-Docking-System)
+[![Build Status](https://travis-ci.org/githubuser0xFFFF/Qt-Advanced-Docking-System.svg?branch=master)](https://travis-ci.org/githubuser0xFFFF/Qt-Advanced-Docking-System)
 [![Build status](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/workflows/linux-builds/badge.svg)](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/actions?query=workflow%3Alinux-builds)

-The application can be compiled for Linux and has been developed and tested with **Kubuntu 18.04** and **Kubuntu 19.10**.
+Unfortunately, there is no such thing as a Linux operating system. Linux is a heterogeneous environment with a variety of different distributions. So it is not possible to support "Linux" like this is possible for Windows. It is only possible to support and test a small subset of Linux distributions. The library can be compiled for and has been developed and tested with the following Linux distributions:

+- **Kubuntu 18.04 and 19.10**
+- **Ubuntu 18.04, 19.10 and 20.04**
+
+There are some requirements for the Linux distribution that have to be met:
+
+- an X server that supports ARGB visuals and a compositing window manager. This is required to display the translucent dock overlays ([https://doc.qt.io/qt-5/qwidget.html#creating-translucent-windows](https://doc.qt.io/qt-5/qwidget.html#creating-translucent-windows)). If your Linux distribution does not support this, or if you disable this feature, you will very likely see issue [#95](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/issues/95).
+- Wayland is not properly supported by Qt yet. If you use Wayland, then you should set the session type to x11: `XDG_SESSION_TYPE=x11 ./AdvancedDockingSystemDemo`. You will find more details about this in issue [#288](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/issues/288).
+
+Screenshot Kubuntu:
 ![Advanced Docking on Kubuntu Linux](doc/linux_kubuntu_1804.png)

-and with **Ubuntu 19.10**
-
+Screenshot Ubuntu:
 ![Advanced Docking on Ubuntu Linux](doc/linux_ubuntu_1910.png)

 ## Build
@@ -357,4 +387,4 @@ of the open editor windows.

 [learn more...](https://github.com/stijnherfst/HiveWE)

-![HiveWE](doc/showcase_hivewe.png)
+![HiveWE](doc/showcase_hivewe.png)
--- a/ads.pri
+++ b/ads.pri
@@ -0,0 +1,28 @@
+
+lessThan(QT_MAJOR_VERSION, 6) {
+    CONFIG(debug, debug|release){
+        win32 {
+            LIBS += -lqtadvanceddockingd
+        }
+        else:mac {
+            LIBS += -lqtadvanceddocking_debug
+        }
+        else {
+            LIBS += -lqtadvanceddocking
+        }
+    }
+    else{
+        LIBS += -lqtadvanceddocking
+    }
+}
+else {
+    # qt$$qtLibraryTarget(qtadvanceddocking) does not produce an advanceddockingd.dll file on Windows
+    # for Qt6 - I don't know if this is a bug and I have to investigate
+    LIBS += -lqtadvanceddocking
+}
+
+
+unix:!macx {
+    LIBS += -lxcb
+    QT += x11extras
+}
--- a/adsConfig.cmake
+++ b/adsConfig.cmake
@@ -2,5 +2,7 @@ include(CMakeFindDependencyMacro)
 find_dependency(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED)
 find_dependency(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED)
 find_dependency(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED)
-find_dependency(Qt5X11Extras ${REQUIRED_QT_VERSION} REQUIRED)
+if(UNIX AND NOT APPLE)
+    find_dependency(Qt5X11Extras ${REQUIRED_QT_VERSION} REQUIRED)
+endif()
 include("${CMAKE_CURRENT_LIST_DIR}/adsTargets.cmake")
--- a/demo/MainWindow.cpp
+++ b/demo/MainWindow.cpp
@@ -58,11 +58,15 @@
 #include <QMessageBox>
 #include <QMenu>
 #include <QToolButton>
+#include <QToolBar>
+#include <QPointer>


 #ifdef Q_OS_WIN
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <QAxWidget>
 #endif
+#endif

 #include <QMap>
 #include <QElapsedTimer>
@@ -109,7 +113,7 @@ static void appendFeaturStringToWindowTitle(ads::CDockWidget* DockWidget)
 static QIcon svgIcon(const QString& File)
 {
 	// This is a workaround, because in item views SVG icons are not
-	// properly scaled an look blurry or pixelate
+	// properly scaled and look blurry or pixelate
 	QIcon SvgIcon(File);
 	SvgIcon.addPixmap(SvgIcon.pixmap(92));
 	return SvgIcon;
@@ -166,6 +170,8 @@ struct MainWindowPrivate
 	QComboBox* PerspectiveComboBox = nullptr;
 	ads::CDockManager* DockManager = nullptr;
 	ads::CDockWidget* WindowTitleTestDockWidget = nullptr;
+	QPointer<ads::CDockWidget> LastDockedEditor;
+	QPointer<ads::CDockWidget> LastCreatedFloatingEditor;

 	MainWindowPrivate(CMainWindow* _public) : _this(_public) {}

@@ -352,6 +358,7 @@ struct MainWindowPrivate


 #ifdef Q_OS_WIN
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
 	/**
 	 * Creates an ActiveX widget on windows
 	 */
@@ -365,6 +372,7 @@ struct MainWindowPrivate
 	   return DockWidget;
 	}
 #endif
+#endif

 };

@@ -443,10 +451,12 @@ void MainWindowPrivate::createContent()
    DockWidget->connect(Action, SIGNAL(triggered()), SLOT(raise()));

 #ifdef Q_OS_WIN
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
    if (!ads::CDockManager::testConfigFlag(ads::CDockManager::OpaqueUndocking))
    {
    	DockManager->addDockWidget(ads::CenterDockWidgetArea, createActiveXWidget(), RighDockArea);
    }
+#endif
 #endif

 	for (auto DockWidget : DockManager->dockWidgetsMap())
@@ -607,8 +617,13 @@ CMainWindow::CMainWindow(QWidget *parent) :
 	// Now create the dock manager and its content
 	d->DockManager = new CDockManager(this);

+ #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
 	connect(d->PerspectiveComboBox, SIGNAL(activated(const QString&)),
 		d->DockManager, SLOT(openPerspective(const QString&)));
+ #else
+    connect(d->PerspectiveComboBox, SIGNAL(textActivated(const QString&)),
+        d->DockManager, SLOT(openPerspective(const QString&)));
+ #endif

 	d->createContent();
 	// Default window geometry - center on screen
@@ -711,16 +726,39 @@ void CMainWindow::createEditor()
 	bool Floating = vFloating.isValid() ? vFloating.toBool() : true;
 	auto DockWidget = d->createEditorWidget();
 	DockWidget->setFeature(ads::CDockWidget::DockWidgetDeleteOnClose, true);
+	DockWidget->setFeature(ads::CDockWidget::DockWidgetForceCloseWithArea, true);
    connect(DockWidget, SIGNAL(closeRequested()), SLOT(onEditorCloseRequested()));

    if (Floating)
    {
 		auto FloatingWidget = d->DockManager->addDockWidgetFloating(DockWidget);
 		FloatingWidget->move(QPoint(20, 20));
+		d->LastCreatedFloatingEditor = DockWidget;
+		d->LastDockedEditor.clear();
    }
    else
    {
-    	d->DockManager->addDockWidget(ads::TopDockWidgetArea, DockWidget);
+    	ads::CDockAreaWidget* EditorArea = d->LastDockedEditor ? d->LastDockedEditor->dockAreaWidget() : nullptr;
+    	if (EditorArea)
+    	{
+    		std::cout << "DockAreaCount before: " << EditorArea->dockContainer()->dockAreaCount() << std::endl;
+    		d->DockManager->setConfigFlag(ads::CDockManager::EqualSplitOnInsertion, true);
+    		d->DockManager->addDockWidget(ads::RightDockWidgetArea, DockWidget, EditorArea);
+    		std::cout << "DockAreaCount after: " << DockWidget->dockContainer()->dockAreaCount() << std::endl;
+    	}
+    	else
+    	{
+    		if (d->LastCreatedFloatingEditor)
+    		{
+    			std::cout << "LastCreated" << std::endl;
+    			d->DockManager->addDockWidget(ads::RightDockWidgetArea, DockWidget, d->LastCreatedFloatingEditor->dockAreaWidget());
+    		}
+    		else
+    		{
+    			d->DockManager->addDockWidget(ads::TopDockWidgetArea, DockWidget);
+    		}
+    	}
+    	d->LastDockedEditor = DockWidget;
    }
 }

--- a/demo/demo.pro
+++ b/demo/demo.pro
@@ -4,8 +4,12 @@ TARGET = AdvancedDockingSystemDemo
 DESTDIR = $${ADS_OUT_ROOT}/lib
 QT += core gui widgets

-win32 {
-QT += axcontainer
+include(../ads.pri)
+
+lessThan(QT_MAJOR_VERSION, 6) {
+    win32 {
+        QT += axcontainer
+    }
 }

 CONFIG += c++14
@@ -34,21 +38,6 @@ RESOURCES += demo.qrc

 LIBS += -L$${ADS_OUT_ROOT}/lib

-# Dependency: AdvancedDockingSystem (shared)
-CONFIG(debug, debug|release){
-    win32 {
-        LIBS += -lqtadvanceddockingd
-    }
-    else:mac {
-        LIBS += -lqtadvanceddocking_debug
-    }
-    else {
-        LIBS += -lqtadvanceddocking
-    }
-}
-else{
-    LIBS += -lqtadvanceddocking
-}

 INCLUDEPATH += ../src
 DEPENDPATH += ../src
--- a/demo/demo.py
+++ b/demo/demo.py
@@ -65,7 +65,7 @@ def append_feature_string_to_window_title(dock_widget: QtAds.CDockWidget):
 def svg_icon(filename: str):
    '''Helper function to create an SVG icon'''
    # This is a workaround, because because in item views SVG icons are not
-    # properly scaled an look blurry or pixelate
+    # properly scaled and look blurry or pixelate
    icon = QIcon(filename)
    icon.addPixmap(icon.pixmap(92))
    return icon
@@ -104,6 +104,8 @@ class MainWindow(MainWindowUI, MainWindowBase):
        self.perspective_list_action = None
        self.perspective_combo_box = None
        self.dock_manager = None
+        self.window_title_test_dock_widget = None
+        self.last_docked_editor = None

        self.setupUi(self)
        self.create_actions()
@@ -184,6 +186,7 @@ class MainWindow(MainWindowUI, MainWindowBase):
        # special_dock_area.setAllowedAreas(QtAds.LeftDockWidgetArea | QtAds.RightDockWidgetArea) # just for testing
        
        dock_widget = self.create_long_text_label_dock_widget()
+        self.window_title_test_dock_widget = dock_widget
        dock_widget.setFeature(QtAds.CDockWidget.DockWidgetFocusable, False)
        self.dock_manager.addDockWidget(QtAds.LeftDockWidgetArea, dock_widget)
        file_system_widget = self.create_file_system_tree_dock_widget()
@@ -203,8 +206,8 @@ class MainWindow(MainWindowUI, MainWindowBase):
        QtAds.CDockComponentsFactory.setFactory(CCustomComponentsFactory())
        top_dock_area = self.dock_manager.addDockWidget(QtAds.TopDockWidgetArea, file_system_widget)
        # Uncomment the next line if you would like to test the
-        # setHideSingleWidgetTitleBar() functionality
-        # top_dock_area.setHideSingleWidgetTitleBar(True)
+        # HideSingleWidgetTitleBar functionality
+        # top_dock_area.setDockAreaFlag(QtAds.CDockAreaWidget.HideSingleWidgetTitleBar, True)
        QtAds.CDockComponentsFactory.resetDefaultFactory()

        # We create a calendar widget and clear all flags to prevent the dock area
@@ -354,7 +357,6 @@ class MainWindow(MainWindowUI, MainWindowBase):
    def create_editor(self):
        sender = self.sender()
        floating = sender.property("Floating")
-        print("Floating:", floating)
        dock_widget = self.create_editor_widget()
        dock_widget.setFeature(QtAds.CDockWidget.DockWidgetDeleteOnClose, True)
        dock_widget.closeRequested.connect(self.on_editor_close_requested)
@@ -363,7 +365,13 @@ class MainWindow(MainWindowUI, MainWindowBase):
            floating_widget = self.dock_manager.addDockWidgetFloating(dock_widget)
            floating_widget.move(QPoint(20, 20))
        else:
-            self.dock_manager.addDockWidget(QtAds.TopDockWidgetArea, dock_widget)
+            editor_area = self.last_docked_editor.dockAreaWidget() if self.last_docked_editor is not None else None
+            if editor_area is not None:
+                self.dock_manager.setConfigFlag(QtAds.CDockManager.EqualSplitOnInsertion, True)
+                self.dock_manager.addDockWidget(QtAds.RightDockWidgetArea, dock_widget, editor_area)
+            else:
+                self.dock_manager.addDockWidget(QtAds.TopDockWidgetArea, dock_widget)
+            self.last_docked_editor = dock_widget
            
    def on_editor_close_requested(self):
        dock_widget = self.sender()
@@ -382,6 +390,16 @@ class MainWindow(MainWindowUI, MainWindowBase):
        dialog = CStatusDialog(self.dock_manager)
        dialog.exec_()

+
+    def toggle_dock_widget_window_title(self):
+        title = self.window_title_test_dock_widget.windowTitle()
+        i = title.find(" (Test) ")
+        if i == -1:
+            title += " (Test) "
+        else:
+            title = title[i]
+        self.window_title_test_dock_widget.setWindowTitle(title)
+
    def save_state(self):
        '''
        Saves the dock manager state and the main window geometry
--- a/demo/main.cpp
+++ b/demo/main.cpp
@@ -35,9 +35,11 @@ void myMessageOutput(QtMsgType type, const QMessageLogContext &context, const QS

 int main(int argc, char *argv[])
 {
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
 	QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
 #if QT_VERSION >= 0x050600
    QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+#endif
 #endif
 	std::shared_ptr<int> b;
 	QApplication a(argc, argv);
--- a/doc/central_widget.gif
+++ b/doc/central_widget.gif
--- a/doc/cfg_flag_EqualSplitOnInsertion_false.png
+++ b/doc/cfg_flag_EqualSplitOnInsertion_false.png
--- a/doc/cfg_flag_EqualSplitOnInsertion_true.png
+++ b/doc/cfg_flag_EqualSplitOnInsertion_true.png
--- a/doc/cfg_flag_FloatingContainerForceNativeTitleBar_false.png
+++ b/doc/cfg_flag_FloatingContainerForceNativeTitleBar_false.png
--- a/doc/cfg_flag_FloatingContainerForceNativeTitleBar_true.png
+++ b/doc/cfg_flag_FloatingContainerForceNativeTitleBar_true.png
--- a/doc/user-guide.md
+++ b/doc/user-guide.md
@@ -24,6 +24,11 @@
  - [`FloatingContainerHasWidgetIcon`](#floatingcontainerhaswidgeticon)
  - [`HideSingleCentralWidgetTitleBar`](#hidesinglecentralwidgettitlebar)
  - [`FocusHighlighting`](#focushighlighting)
+  - [`EqualSplitOnInsertion`](#equalsplitoninsertion)
+  - [`FloatingContainerForceNativeTitleBar` (Linux only)](#floatingcontainerforcenativetitlebar-linux-only)
+  - [`FloatingContainerForceQWidgetTitleBar` (Linux only)](#floatingcontainerforceqwidgettitlebar-linux-only)
+- [Central Widget](#central-widget)
+- [Custom Close Handling](#custom-close-handling)
 - [Styling](#styling)
  - [Disabling the Internal Style Sheet](#disabling-the-internal-style-sheet)

@@ -409,6 +414,98 @@ bool CMainWindow::eventFilter(QObject *watched, QEvent *event)
 }
 ```

+### `EqualSplitOnInsertion`
+
+This flag configures how the space is distributed if a new dock widget is
+inserted into an existing dock area. The flag is disabled by default. If 3 
+dock widgets are inserted with the following code
+
+```c++
+d->DockManager->addDockWidget(ads::RightDockWidgetArea, DockWidget, EditorArea);
+```
+
+then this is the result, if the flag is disabled:
+
+![EqualSplitOnInsertion false](cfg_flag_EqualSplitOnInsertion_false.png)
+
+If the flag is enabled, then the space is equally distributed to all widgets 
+in a  splitter:
+
+![EqualSplitOnInsertion true](cfg_flag_EqualSplitOnInsertion_true.png)
+
+
+### `FloatingContainerForceNativeTitleBar` (Linux only)
+
+Since release 3.6 the library supports native title bars and window decorations
+for floating widgets on Linux (thanks to a user contribution).
+Native title bars and window decorations are supported by most Linux window
+managers, such as Compiz or Xfwm. Some window managers like KWin do not properly
+support this feature. Native floating widgets look better because of the native
+styling and the support all window manager features like snapping to window
+borders or maximizing. The library tries to detect the window manager during
+runtime and activates native window decorations if possible:
+
+![FloatingContainerForceNativeTitleBar true](cfg_flag_FloatingContainerForceNativeTitleBar_true.png)
+
+If you would like to overwrite this autodetection, then you can  activate this
+flag to force native window titlebars. You can overwrite autodetection and this
+flag, if you set the environment variable `ADS_UseNativeTitle` to 0 or 1.
+
+### `FloatingContainerForceQWidgetTitleBar` (Linux only)
+
+If your window manager (i.e. KWin) does not properly support native floating
+windows, the docking library falls back to QWidget based floating widget
+title bars.
+
+![FloatingContainerForceNativeTitleBar false](cfg_flag_FloatingContainerForceNativeTitleBar_false.png)
+
+If you would like to overwrite autodetection, then you can activate this flag
+to force QWidget based title bars. You can overwrite autodetection and this
+flag, if you set the environment variable `ADS_UseNativeTitle` to 0 or 1.
+
+## Central Widget
+
+The Advanced Docking System has been developed to overcome the limitations of
+the native Qt docking system with its central widget concept. This was the
+reason that until version 3.6 of the library, there was no support for such
+thing like a central widget. Thanks to the contribution of a user the library
+now supports a central widget.
+
+In the Advanced Docking System a central widget is a docking widget that is
+neither closable nor movable or floatable. A central widget has no title bar
+and so it is not possible for the user to hide, close or drag the central
+widget. If there is a central widget, then also the distribution of the sizes
+for the dock widgets around the central widget is different:
+
+- **no central widget (default)** - on resizing the available space is
+distributed to all dock widgets - the size of all dock widgets
+shrinks or grows
+- **with central widget** - on resizing only the central widget is resized - the
+dock widgets around the central widget keep their size (see the animation below)
+
+![Central Widget](central_widget.gif)
+
+To set a central widget, you just need to pass your central dock widget
+to the dock manager `setCentralWidget` function:
+
+```c++
+auto* CentralDockArea = DockManager->setCentralWidget(CentralDockWidget);
+```
+
+See the `centralwidget` example to learn how it works.
+
+> ##### Note
+> The central widget needs to be the first dock widget that is added to the
+> dock manager. The function does not work and returns a `nullptr` if there
+> are already other dock widgets registered. So `setCentralWidget` should be
+> the first function that you call when adding dock widgets.
+
+## Custom Close Handling
+
+Normally clicking the close button of a dock widget will just hide the widget and the user can show it again using the `toggleView()` action of the dock widget. This is meant for user interfaces with a static amount of widgets. But the advanced docking system also supports dynamic dock widgets that will get deleted on close. If you set the dock widget flag `DockWidgetDeleteOnClose` for a certain dock widget, then it will be deleted as soon as you close this dock widget. This enables the implementation of user interfaces with dynamically created editors, like in word processing applications or source code development tools.
+
+When an entire area is closed, the default behavior is to hide the dock widgets it contains regardless of the `DockWidgetDeleteOnClose` flag except if there is only one dock widget. In this special case, the `DockWidgetDeleteOnClose` flag is followed. This behavior can be changed by setting the `DockWidgetForceCloseWithArea` flag to all the dock widgets that needs to be closed with their area.
+
 ## Styling

 The Advanced Docking System supports styling via [Qt Style Sheets](https://doc.qt.io/qt-5/stylesheet.html). All components like splitters, tabs, buttons, titlebar and
--- a/examples/centralwidget/centralWidget.py
+++ b/examples/centralwidget/centralWidget.py
@@ -0,0 +1,115 @@
+import os
+import sys
+
+from PyQt5 import uic
+from PyQt5.QtCore import Qt, QTimer, QDir, QSignalBlocker
+from PyQt5.QtGui import QCloseEvent, QIcon
+from PyQt5.QtWidgets import (QApplication, QLabel, QCalendarWidget, QFrame, QTreeView,
+                             QTableWidget, QFileSystemModel, QPlainTextEdit, QToolBar,
+                             QWidgetAction, QComboBox, QAction, QSizePolicy, QInputDialog)
+
+from PyQtAds import QtAds
+
+UI_FILE = os.path.join(os.path.dirname(__file__), 'mainwindow.ui')
+MainWindowUI, MainWindowBase = uic.loadUiType(UI_FILE)
+
+import demo_rc # pyrcc5 demo\demo.qrc -o examples\centralWidget\demo_rc.py
+
+
+def svg_icon(filename: str):
+    '''Helper function to create an SVG icon'''
+    # This is a workaround, because because in item views SVG icons are not
+    # properly scaled and look blurry or pixelate
+    icon = QIcon(filename)
+    icon.addPixmap(icon.pixmap(92))
+    return icon
+    
+
+class MainWindow(MainWindowUI, MainWindowBase):
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+
+        self.setupUi(self)
+ 
+        QtAds.CDockManager.setConfigFlag(QtAds.CDockManager.OpaqueSplitterResize, True)
+        QtAds.CDockManager.setConfigFlag(QtAds.CDockManager.XmlCompressionEnabled, False)
+        QtAds.CDockManager.setConfigFlag(QtAds.CDockManager.FocusHighlighting, True)
+        self.dock_manager = QtAds.CDockManager(self)
+        
+        # Set central widget
+        text_edit = QPlainTextEdit()
+        text_edit.setPlaceholderText("This is the central editor. Enter your text here.")
+        central_dock_widget = QtAds.CDockWidget("CentralWidget")
+        central_dock_widget.setWidget(text_edit)
+        central_dock_area = self.dock_manager.setCentralWidget(central_dock_widget)
+        central_dock_area.setAllowedAreas(QtAds.DockWidgetArea.OuterDockAreas)
+        
+        # create other dock widgets
+        file_tree = QTreeView()
+        file_tree.setFrameShape(QFrame.NoFrame)
+        file_model = QFileSystemModel(file_tree)
+        file_model.setRootPath(QDir.currentPath())
+        file_tree.setModel(file_model)
+        data_dock_widget = QtAds.CDockWidget("File system")
+        data_dock_widget.setWidget(file_tree)
+        data_dock_widget.resize(150, 250)
+        data_dock_widget.setMinimumSize(100, 250)
+        file_area = self.dock_manager.addDockWidget(QtAds.DockWidgetArea.LeftDockWidgetArea, data_dock_widget, central_dock_area)
+        self.menuView.addAction(data_dock_widget.toggleViewAction())
+
+        table = QTableWidget()
+        table.setColumnCount(3)
+        table.setRowCount(10)
+        table_dock_widget = QtAds.CDockWidget("Table")
+        table_dock_widget.setWidget(table)
+        table_dock_widget.setMinimumSizeHintMode(QtAds.CDockWidget.MinimumSizeHintFromDockWidget)
+        table_dock_widget.resize(250, 150)
+        table_dock_widget.setMinimumSize(200, 150)
+        self.dock_manager.addDockWidget(QtAds.DockWidgetArea.BottomDockWidgetArea, table_dock_widget, file_area)
+        self.menuView.addAction(table_dock_widget.toggleViewAction())
+
+        properties_table = QTableWidget()
+        properties_table.setColumnCount(3)
+        properties_table.setRowCount(10)
+        properties_dock_widget = QtAds.CDockWidget("Properties")
+        properties_dock_widget.setWidget(properties_table)
+        properties_dock_widget.setMinimumSizeHintMode(QtAds.CDockWidget.MinimumSizeHintFromDockWidget)
+        properties_dock_widget.resize(250, 150)
+        properties_dock_widget.setMinimumSize(200,150)
+        self.dock_manager.addDockWidget(QtAds.DockWidgetArea.RightDockWidgetArea, properties_dock_widget, central_dock_area)
+        self.menuView.addAction(properties_dock_widget.toggleViewAction())
+        
+        self.create_perspective_ui()
+        
+    def create_perspective_ui(self):
+        save_perspective_action = QAction("Create Perspective", self)
+        save_perspective_action.setIcon(svg_icon(":/adsdemo/images/picture_in_picture.svg"))
+        save_perspective_action.triggered.connect(self.save_perspective)
+        perspective_list_action = QWidgetAction(self)
+        self.perspective_combobox = QComboBox(self)
+        self.perspective_combobox.setSizeAdjustPolicy(QComboBox.AdjustToContents)
+        self.perspective_combobox.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred)
+        self.perspective_combobox.activated[str].connect(self.dock_manager.openPerspective)
+        perspective_list_action.setDefaultWidget(self.perspective_combobox)
+        self.toolBar.addSeparator()
+        self.toolBar.addAction(perspective_list_action)
+        self.toolBar.addAction(save_perspective_action)
+        
+    def save_perspective(self):
+        perspective_name, ok = QInputDialog.getText(self, "Save Perspective", "Enter Unique name:")
+        if not ok or not perspective_name:
+            return
+        
+        self.dock_manager.addPerspective(perspective_name)
+        blocker = QSignalBlocker(self.perspective_combobox)
+        self.perspective_combobox.clear()
+        self.perspective_combobox.addItems(self.dock_manager.perspectiveNames())
+        self.perspective_combobox.setCurrentText(perspective_name)
+
+if __name__ == '__main__':
+    app = QApplication(sys.argv)
+    
+    w = MainWindow()
+    w.show()
+    app.exec_()
--- a/examples/centralwidget/centralwidget.pro
+++ b/examples/centralwidget/centralwidget.pro
@@ -28,23 +28,7 @@ FORMS += \
    mainwindow.ui

 LIBS += -L$${ADS_OUT_ROOT}/lib
-
-# Dependency: AdvancedDockingSystem (shared)
-CONFIG(debug, debug|release){
-    win32 {
-        LIBS += -lqtadvanceddockingd
-    }
-    else:mac {
-        LIBS += -lqtadvanceddocking_debug
-    }
-    else {
-        LIBS += -lqtadvanceddocking
-    }
-}
-else{
-    LIBS += -lqtadvanceddocking
-}
-
+include(../../ads.pri)
 INCLUDEPATH += ../../src
 DEPENDPATH += ../../src

--- a/examples/centralwidget/mainwindow.cpp
+++ b/examples/centralwidget/mainwindow.cpp
@@ -15,6 +15,8 @@
 #include <QFileDialog>
 #include <QSettings>
 #include <QMessageBox>
+#include <QPlainTextEdit>
+#include <QToolBar>

 #include "DockAreaWidget.h"
 #include "DockAreaTitleBar.h"
@@ -24,6 +26,7 @@

 using namespace ads;

+
 CMainWindow::CMainWindow(QWidget *parent)
    : QMainWindow(parent)
    , ui(new Ui::CMainWindow)
@@ -31,12 +34,14 @@ CMainWindow::CMainWindow(QWidget *parent)
    ui->setupUi(this);
    CDockManager::setConfigFlag(CDockManager::OpaqueSplitterResize, true);
    CDockManager::setConfigFlag(CDockManager::XmlCompressionEnabled, false);
+    CDockManager::setConfigFlag(CDockManager::FocusHighlighting, true);
    DockManager = new CDockManager(this);

    // Set central widget
-    QCalendarWidget* calendar = new QCalendarWidget();
+    QPlainTextEdit* w = new QPlainTextEdit();
+	w->setPlaceholderText("This is the central editor. Enter your text here.");
    CDockWidget* CentralDockWidget = new CDockWidget("CentralWidget");
-    CentralDockWidget->setWidget(calendar);
+    CentralDockWidget->setWidget(w);
    auto* CentralDockArea = DockManager->setCentralWidget(CentralDockWidget);
    CentralDockArea->setAllowedAreas(DockWidgetArea::OuterDockAreas);

@@ -65,8 +70,8 @@ CMainWindow::CMainWindow(QWidget *parent)
    ui->menuView->addAction(TableDockWidget->toggleViewAction());

    QTableWidget* propertiesTable = new QTableWidget();
-    table->setColumnCount(3);
-    table->setRowCount(10);
+    propertiesTable->setColumnCount(3);
+    propertiesTable->setRowCount(10);
    CDockWidget* PropertiesDockWidget = new CDockWidget("Properties");
    PropertiesDockWidget->setWidget(propertiesTable);
    PropertiesDockWidget->setMinimumSizeHintMode(CDockWidget::MinimumSizeHintFromDockWidget);
@@ -74,6 +79,8 @@ CMainWindow::CMainWindow(QWidget *parent)
    PropertiesDockWidget->setMinimumSize(200,150);
    DockManager->addDockWidget(DockWidgetArea::RightDockWidgetArea, PropertiesDockWidget, CentralDockArea);
    ui->menuView->addAction(PropertiesDockWidget->toggleViewAction());
+
+    createPerspectiveUi();
 }

 CMainWindow::~CMainWindow()
@@ -81,3 +88,47 @@ CMainWindow::~CMainWindow()
    delete ui;
 }

+
+void CMainWindow::createPerspectiveUi()
+{
+	SavePerspectiveAction = new QAction("Create Perspective", this);
+	connect(SavePerspectiveAction, SIGNAL(triggered()), SLOT(savePerspective()));
+	PerspectiveListAction = new QWidgetAction(this);
+	PerspectiveComboBox = new QComboBox(this);
+	PerspectiveComboBox->setSizeAdjustPolicy(QComboBox::AdjustToContents);
+	PerspectiveComboBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+	connect(PerspectiveComboBox, SIGNAL(activated(const QString&)),
+		DockManager, SLOT(openPerspective(const QString&)));
+	PerspectiveListAction->setDefaultWidget(PerspectiveComboBox);
+	ui->toolBar->addSeparator();
+	ui->toolBar->addAction(PerspectiveListAction);
+	ui->toolBar->addAction(SavePerspectiveAction);
+}
+
+
+void CMainWindow::savePerspective()
+{
+	QString PerspectiveName = QInputDialog::getText(this, "Save Perspective", "Enter unique name:");
+	if (PerspectiveName.isEmpty())
+	{
+		return;
+	}
+
+	DockManager->addPerspective(PerspectiveName);
+	QSignalBlocker Blocker(PerspectiveComboBox);
+	PerspectiveComboBox->clear();
+	PerspectiveComboBox->addItems(DockManager->perspectiveNames());
+	PerspectiveComboBox->setCurrentText(PerspectiveName);
+}
+
+
+//============================================================================
+void CMainWindow::closeEvent(QCloseEvent* event)
+{
+    // Delete dock manager here to delete all floating widgets. This ensures
+    // that all top level windows of the dock manager are properly closed
+    DockManager->deleteLater();
+	QMainWindow::closeEvent(event);
+}
+
+
--- a/examples/centralwidget/mainwindow.h
+++ b/examples/centralwidget/mainwindow.h
@@ -2,6 +2,8 @@
 #define MAINWINDOW_H

 #include <QMainWindow>
+#include <QComboBox>
+#include <QWidgetAction>

 #include "DockManager.h"
 #include "DockAreaWidget.h"
@@ -19,14 +21,23 @@ public:
    CMainWindow(QWidget *parent = nullptr);
    ~CMainWindow();

+protected:
+	virtual void closeEvent(QCloseEvent* event) override;
+
 private:
-    static const QString kTableTopLayout;
-    static const QString kTableBottomLayout;
+	QAction* SavePerspectiveAction = nullptr;
+	QWidgetAction* PerspectiveListAction = nullptr;
+	QComboBox* PerspectiveComboBox = nullptr;

    Ui::CMainWindow *ui;

    ads::CDockManager* DockManager;
    ads::CDockAreaWidget* StatusDockArea;
    ads::CDockWidget* TimelineDockWidget;
+
+    void createPerspectiveUi();
+
+private slots:
+	void savePerspective();
 };
 #endif // MAINWINDOW_H
--- a/examples/centralwidget/mainwindow.ui
+++ b/examples/centralwidget/mainwindow.ui
@@ -30,6 +30,17 @@
   </widget>
   <addaction name="menuView"/>
  </widget>
+  <widget class="QToolBar" name="toolBar">
+   <property name="windowTitle">
+    <string>toolBar</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+  </widget>
 </widget>
 <resources/>
 <connections/>
--- a/examples/deleteonclose/deleteonclose.pro
+++ b/examples/deleteonclose/deleteonclose.pro
@@ -17,23 +17,7 @@ SOURCES += main.cpp


 LIBS += -L$${ADS_OUT_ROOT}/lib
-
-# Dependency: AdvancedDockingSystem (shared)
-CONFIG(debug, debug|release){
-    win32 {
-        LIBS += -lqtadvanceddockingd
-    }
-    else:mac {
-        LIBS += -lqtadvanceddocking_debug
-    }
-    else {
-        LIBS += -lqtadvanceddocking
-    }
-}
-else{
-    LIBS += -lqtadvanceddocking
-}
-
+include(../../ads.pri)
 INCLUDEPATH += ../../src
 DEPENDPATH += ../../src    

--- a/examples/sidebar/sidebar.pro
+++ b/examples/sidebar/sidebar.pro
@@ -25,23 +25,7 @@ FORMS += \
        

 LIBS += -L$${ADS_OUT_ROOT}/lib
-
-# Dependency: AdvancedDockingSystem (shared)
-CONFIG(debug, debug|release){
-    win32 {
-        LIBS += -lqtadvanceddockingd
-    }
-    else:mac {
-        LIBS += -lqtadvanceddocking_debug
-    }
-    else {
-        LIBS += -lqtadvanceddocking
-    }
-}
-else{
-    LIBS += -lqtadvanceddocking
-}
-
+include(../../ads.pri)
 INCLUDEPATH += ../../src
 DEPENDPATH += ../../src    

--- a/examples/simple/simple.pro
+++ b/examples/simple/simple.pro
@@ -25,23 +25,7 @@ FORMS += \
        

 LIBS += -L$${ADS_OUT_ROOT}/lib
-
-# Dependency: AdvancedDockingSystem (shared)
-CONFIG(debug, debug|release){
-    win32 {
-        LIBS += -lqtadvanceddockingd
-    }
-    else:mac {
-        LIBS += -lqtadvanceddocking_debug
-    }
-    else {
-        LIBS += -lqtadvanceddocking
-    }
-}
-else{
-    LIBS += -lqtadvanceddocking
-}
-
+include(../../ads.pri)
 INCLUDEPATH += ../../src
 DEPENDPATH += ../../src    

--- a/examples/simple/simple.py
+++ b/examples/simple/simple.py
@@ -21,7 +21,7 @@ class MainWindow(MainWindowUI, MainWindowBase):
 
        # Create the dock manager. Because the parent parameter is a QMainWindow
        # the dock manager registers itself as the central widget.
-        self.dock_manager1 = QtAds.CDockManager(self)
+        self.dock_manager = QtAds.CDockManager(self)
        
        # Create example content label - this can be any application specific
        # widget
@@ -35,41 +35,13 @@ class MainWindow(MainWindowUI, MainWindowBase):
        dock_widget = QtAds.CDockWidget("Label 1")
        dock_widget.setWidget(l)
        
-        l = QLabel()
-        l.setWordWrap(True)
-        l.setAlignment(Qt.AlignTop | Qt.AlignLeft);
-        l.setText("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. ")
-
-        # Create a dock widget with the title Label 1 and set the created label
-        # as the dock widget content
-        dock_widget2 = QtAds.CDockWidget("Label 2")
-        dock_widget2.setWidget(l)

        # Add the toggleViewAction of the dock widget to the menu to give
        # the user the possibility to show the dock widget if it has been closed
        self.menuView.addAction(dock_widget.toggleViewAction())

        # Add the dock widget to the top dock widget area
-        self.dock_manager1.addDockWidget(QtAds.TopDockWidgetArea, dock_widget)
-        
-        def remove_first_manager():
-            self.dock_manager1.removeDockWidget(dock_widget)
-            del self.dock_manager1
-        QTimer.singleShot(3000, remove_first_manager)
-            
-        def add_second_manager():
-            self.dock_manager2 = QtAds.CDockManager(self)
-            self.dock_manager2.addDockWidget(QtAds.TopDockWidgetArea, dock_widget)
-        QTimer.singleShot(5000, add_second_manager)
-        
-    def closeEvent(self, event: QCloseEvent):
-        super().closeEvent(event)
-        
-        if hasattr(self, 'dock_manager1'):
-            self.dock_manager1.deleteLater()
-            
-        if hasattr(self, 'dock_manager2'):
-            self.dock_manager2.deleteLater()
+        self.dock_manager.addDockWidget(QtAds.TopDockWidgetArea, dock_widget)


 if __name__ == '__main__':
--- a/setup.py
+++ b/setup.py
@@ -227,7 +227,9 @@ class build_ext(sipdistutils.build_ext):
                extension.extra_link_args += ['-F' + self.qtconfig.QT_INSTALL_LIBS,
                    '-mmacosx-version-min=10.9']
            elif sys.platform == 'linux':
-                extension.extra_compile_args += ['-std=c++11']
+                extension.extra_compile_args += ['-D', 'QT_X11EXTRAS_LIB', '-std=c++11']
+                extension.include_dirs += [os.path.join(self.qt_include_dir, 'QtX11Extras')]
+                extension.libraries += ['Qt5X11Extras' + self.qt_libinfix]

        return super().swig_sources(sources, extension)

--- a/sip/DockAreaWidget.sip
+++ b/sip/DockAreaWidget.sip
@@ -28,6 +28,13 @@ protected slots:
 	void toggleView(bool Open);
    
 public:
+    enum eDockAreaFlag
+	{
+		HideSingleWidgetTitleBar,
+		DefaultFlags
+	};
+    typedef QFlags<ads::CDockAreaWidget::eDockAreaFlag> DockAreaFlags;
+    
 	CDockAreaWidget(ads::CDockManager* DockManager /TransferThis/, ads::CDockContainerWidget* parent /TransferThis/);
 	virtual ~CDockAreaWidget();
 	ads::CDockManager* dockManager() const;
@@ -51,8 +58,13 @@ public:

 	void setAllowedAreas(DockWidgetAreas areas);
 	DockWidgetAreas allowedAreas() const;
-	void setHideSingleWidgetTitleBar(bool hide);
 	CDockAreaTitleBar* titleBar() const;
+    
+    DockAreaFlags dockAreaFlags() const;
+    void setDockAreaFlags(DockAreaFlags Flags);
+    void setDockAreaFlag(eDockAreaFlag Flag, bool On);
+    
+    bool isCentralWidgetArea() const;

 public slots:
 	void setCurrentIndex(int index);
--- a/sip/DockContainerWidget.sip
+++ b/sip/DockContainerWidget.sip
@@ -32,6 +32,7 @@ protected:
 	ads::CDockWidget* topLevelDockWidget() const;
 	ads::CDockAreaWidget* topLevelDockArea() const;
    QList<ads::CDockWidget*> dockWidgets() const;
+    void updateSplitterHandles(QSplitter* splitter);
    
 public:
 	/**
--- a/sip/DockFocusController.sip
+++ b/sip/DockFocusController.sip
@@ -20,6 +20,7 @@ public:

 	void notifyWidgetOrAreaRelocation(QWidget* RelocatedWidget);
 	void notifyFloatingWidgetDrop(ads::CFloatingDockContainer* FloatingWidget);
+    ads::CDockWidget* focusedDockWidget() const;

 public slots:
 	void setDockWidgetFocused(ads::CDockWidget* focusedNow);
--- a/sip/DockManager.sip
+++ b/sip/DockManager.sip
@@ -135,6 +135,7 @@ protected:
 	ads::CDockOverlay* dockAreaOverlay() const;
    void notifyWidgetOrAreaRelocation(QWidget* RelocatedWidget);
    void notifyFloatingWidgetDrop(ads::CFloatingDockContainer* FloatingWidget);
+    ads::CDockWidget* focusedDockWidget() const;

    virtual void showEvent(QShowEvent *event);

@@ -170,6 +171,8 @@ public:
 		HideSingleCentralWidgetTitleBar,
        FocusHighlighting,
        EqualSplitOnInsertion,
+        FloatingContainerForceNativeTitleBar,
+        FloatingContainerForceQWidgetTitleBar,
        DefaultDockAreaButtons,
 		DefaultBaseConfig,
        DefaultOpaqueConfig,
@@ -206,6 +209,8 @@ public:
 	QStringList perspectiveNames() const;
 	void savePerspectives(QSettings& Settings) const;
 	void loadPerspectives(QSettings& Settings);
+    CDockWidget* centralWidget() const;
+    CDockAreaWidget* setCentralWidget(CDockWidget* widget /Transfer/);
 	QAction* addToggleViewActionToMenu(QAction* ToggleViewAction /Transfer/,
 		const QString& Group = QString(), const QIcon& GroupIcon = QIcon());
 	QMenu* viewMenu() const;
@@ -226,6 +231,7 @@ signals:
    void perspectiveOpened(const QString& PerspectiveName);
 	void floatingWidgetCreated(ads::CFloatingDockContainer*);
    void dockAreaCreated(ads::CDockAreaWidget*);
+    void dockWidgetAdded(ads::CDockWidget* DockWidget);
    void dockWidgetAboutToBeRemoved(ads::CDockWidget*);
    void dockWidgetRemoved(ads::CDockWidget*);
    void focusedDockWidgetChanged(ads::CDockWidget*, ads::CDockWidget*);
--- a/sip/DockSplitter.sip
+++ b/sip/DockSplitter.sip
@@ -18,6 +18,7 @@ public:
 	bool hasVisibleContent() const;
 	QWidget* firstWidget() const;
 	QWidget* lastWidget() const;
+    bool isResizingWithContainer() const;

 };

--- a/sip/DockWidget.sip
+++ b/sip/DockWidget.sip
@@ -32,6 +32,7 @@ public:
 		DockWidgetDeleteOnClose,
        CustomCloseHandling,
        DockWidgetFocusable,
+        DockWidgetForceCloseWithArea,
        DefaultDockWidgetFeatures,
        AllDockWidgetFeatures,
 		NoDockWidgetFeatures
@@ -84,6 +85,7 @@ public:
 	QAction* toggleViewAction() const;
 	void setToggleViewActionMode(ads::CDockWidget::eToggleViewActionMode Mode);
 	void setMinimumSizeHintMode(ads::CDockWidget::eMinimumSizeHintMode Mode);
+    bool isCentralWidget() const;
 	void setIcon(const QIcon& Icon);
 	QIcon icon() const;
 	QToolBar* toolBar() const;
--- a/sip/FloatingDockContainer.sip
+++ b/sip/FloatingDockContainer.sip
@@ -52,11 +52,20 @@ protected:

 protected:
 	virtual void changeEvent(QEvent *event);
-	virtual void moveEvent(QMoveEvent *event);
-	virtual bool event(QEvent *e);
 	virtual void closeEvent(QCloseEvent *event);
 	virtual void hideEvent(QHideEvent *event);
 	virtual void showEvent(QShowEvent *event);
+    
+    %If (WS_MACX)
+    virtual bool event(QEvent *e);
+	virtual void moveEvent(QMoveEvent *event);
+    %End
+    
+    %If (WS_X11)
+    virtual void moveEvent(QMoveEvent *event);
+	virtual void resizeEvent(QResizeEvent *event);
+    %End
+    
 	%If (WS_WIN)
 	virtual bool nativeEvent(const QByteArray &eventType, void *message, long *result);
 	%End
@@ -72,6 +81,15 @@ public:
    bool hasTopLevelDockWidget() const;
    ads::CDockWidget* topLevelDockWidget() const;
    QList<ads::CDockWidget*> dockWidgets() const;
+    
+    %If (WS_X11)
+    void onMaximizeRequest();
+	void showNormal(bool fixGeometry);
+	void showMaximized();
+	bool isMaximized() const;
+	void show();
+	bool hasNativeTitleBar();
+    %End
 };

 };
--- a/sip/linux/FloatingWidgetTitleBar.sip
+++ b/sip/linux/FloatingWidgetTitleBar.sip
@@ -15,15 +15,24 @@ protected:
 	virtual void mousePressEvent(QMouseEvent *ev);
 	virtual void mouseReleaseEvent(QMouseEvent *ev);
 	virtual void mouseMoveEvent(QMouseEvent *ev);
+    virtual void mouseDoubleClickEvent(QMouseEvent *event);
+    
+    void setMaximizeIcon(const QIcon& Icon);
+    QIcon maximizeIcon() const;
+    void setNormalIcon(const QIcon& Icon);
+    QIcon normalIcon() const;

 public:
 	explicit CFloatingWidgetTitleBar(CFloatingDockContainer *parent /TransferThis/ = 0);
 	virtual ~CFloatingWidgetTitleBar();
 	void enableCloseButton(bool Enable);
 	void setTitle(const QString &Text);
+    void updateStyle();
+    void setMaximizedIcon(bool maximized);

 signals:
 	void closeRequested();
+    void maximizeRequested();
 };

 };
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,9 @@
 cmake_minimum_required(VERSION 3.5)
 project(QtAdvancedDockingSystem LANGUAGES CXX VERSION ${VERSION_SHORT})
 find_package(Qt5 5.5 COMPONENTS Core Gui Widgets REQUIRED)
+if (UNIX AND NOT APPLE)
+	find_package(Qt5 5.5 COMPONENTS X11Extras REQUIRED)
+endif()
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 if(BUILD_STATIC)
    set(CMAKE_STATIC_LIBRARY_SUFFIX "_static${CMAKE_STATIC_LIBRARY_SUFFIX}")
@@ -45,7 +48,8 @@ set(ads_HEADERS
    IconProvider.h
    DockComponentsFactory.h
 )
-if (UNIX)
+add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
+if (UNIX AND NOT APPLE)
    set(ads_SRCS linux/FloatingWidgetTitleBar.cpp ${ads_SRCS})
    set(ads_HEADERS linux/FloatingWidgetTitleBar.h ${ads_HEADERS})
 endif()
@@ -57,6 +61,10 @@ else()
    target_compile_definitions(qtadvanceddocking PRIVATE ADS_SHARED_EXPORT)
 endif()
 target_link_libraries(qtadvanceddocking PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets)
+if(UNIX AND NOT APPLE)
+    target_link_libraries(qtadvanceddocking PUBLIC Qt5::X11Extras)
+	target_link_libraries(qtadvanceddocking PRIVATE xcb)
+endif()
 set_target_properties(qtadvanceddocking PROPERTIES 
    AUTOMOC ON
    AUTORCC ON
--- a/src/DockAreaWidget.cpp
+++ b/src/DockAreaWidget.cpp
@@ -324,7 +324,6 @@ struct DockAreaWidgetPrivate
 		}
 	}
 };
-// struct DockAreaWidgetPrivate


 //============================================================================
@@ -928,17 +927,20 @@ void CDockAreaWidget::closeArea()
 	// If there is only one single dock widget and this widget has the
 	// DeleteOnClose feature, then we delete the dock widget now
 	auto OpenDockWidgets = openedDockWidgets();
-	if (OpenDockWidgets.count() == 1 && OpenDockWidgets[0]->features().testFlag(CDockWidget::DockWidgetDeleteOnClose))
+    if (OpenDockWidgets.count() == 1 && OpenDockWidgets[0]->features().testFlag(CDockWidget::DockWidgetDeleteOnClose))
 	{
 		OpenDockWidgets[0]->closeDockWidgetInternal();
 	}
-	else
+    else
 	{
-		for (auto DockWidget : openedDockWidgets())
-		{
-			DockWidget->toggleView(false);
-		}
-	}
+        for (auto DockWidget : openedDockWidgets())
+        {
+            if (DockWidget->features().testFlag(CDockWidget::DockWidgetDeleteOnClose) && DockWidget->features().testFlag(CDockWidget::DockWidgetForceCloseWithArea))
+                DockWidget->closeDockWidgetInternal();
+            else
+                DockWidget->toggleView(false);
+        }
+    }
 }


@@ -971,7 +973,19 @@ bool CDockAreaWidget::isCentralWidgetArea() const
 //============================================================================
 QSize CDockAreaWidget::minimumSizeHint() const
 {
-	return d->MinSizeHint.isValid() ? d->MinSizeHint : Super::minimumSizeHint();
+	if (!d->MinSizeHint.isValid())
+	{
+		return Super::minimumSizeHint();
+	}
+
+	if (d->TitleBar->isVisible())
+	{
+		return d->MinSizeHint + QSize(0, d->TitleBar->minimumSizeHint().height());
+	}
+	else
+	{
+		return d->MinSizeHint;
+	}
 }


--- a/src/DockContainerWidget.cpp
+++ b/src/DockContainerWidget.cpp
@@ -917,15 +917,15 @@ bool DockContainerWidgetPrivate::restoreSplitter(CDockingStateReader& s,
 	{
 		QWidget* ChildNode = nullptr;
 		bool Result = true;
-		if (s.name() == "Splitter")
+        if (s.name() == QLatin1String("Splitter"))
 		{
 			Result = restoreSplitter(s, ChildNode, Testing);
 		}
-		else if (s.name() == "Area")
+        else if (s.name() == QLatin1String("Area"))
 		{
 			Result = restoreDockArea(s, ChildNode, Testing);
 		}
-		else if (s.name() == "Sizes")
+        else if (s.name() == QLatin1String("Sizes"))
 		{
 			QString sSizes = s.readElementText().trimmed();
            ADS_PRINT("Sizes: " << sSizes);
@@ -1026,7 +1026,7 @@ bool DockContainerWidgetPrivate::restoreDockArea(CDockingStateReader& s,

 	while (s.readNextStartElement())
 	{
-		if (s.name() != "Widget")
+        if (s.name() != QLatin1String("Widget"))
 		{
 			continue;
 		}
@@ -1089,12 +1089,12 @@ bool DockContainerWidgetPrivate::restoreChildNodes(CDockingStateReader& s,
 	bool Result = true;
 	while (s.readNextStartElement())
 	{
-		if (s.name() == "Splitter")
+        if (s.name() == QLatin1String("Splitter"))
 		{
 			Result = restoreSplitter(s, CreatedWidget, Testing);
            ADS_PRINT("Splitter");
 		}
-		else if (s.name() == "Area")
+        else if (s.name() == QLatin1String("Area"))
 		{
 			Result = restoreDockArea(s, CreatedWidget, Testing);
            ADS_PRINT("DockAreaWidget");
@@ -1207,7 +1207,7 @@ void DockContainerWidgetPrivate::dumpRecursive(int level, QWidget* widget)
 		std::cout << (const char*)buf
 			<< (DockArea->isHidden() ? " " : "v")
 			<< (DockArea->openDockWidgetsCount() > 0 ? " " : "c")
-			<< " DockArea" << std::endl;
+			<< " DockArea " << "[hs: " << DockArea->sizePolicy().horizontalStretch() << ", vs: " <<  DockArea->sizePolicy().verticalStretch() << "]" << std::endl;
 		buf.fill(' ', (level + 1) * 4);
 		for (int i = 0; i < DockArea->dockWidgetsCount(); ++i)
 		{
@@ -1253,7 +1253,6 @@ CDockAreaWidget* DockContainerWidgetPrivate::addDockWidgetToDockArea(DockWidgetA
 		{
 			adjustSplitterSizesOnInsertion(TargetAreaSplitter);
 		}
-
 	}
 	else
 	{
@@ -1273,8 +1272,7 @@ CDockAreaWidget* DockContainerWidgetPrivate::addDockWidgetToDockArea(DockWidgetA
 		}
 	}

-	appendDockAreas({NewDockArea});
-	emitDockAreasAdded();
+	addDockAreasToList({NewDockArea});
 	return NewDockArea;
 }

@@ -1666,7 +1664,7 @@ bool CDockContainerWidget::restoreState(CDockingStateReader& s, bool Testing)
 	if (IsFloating)
 	{
        ADS_PRINT("Restore floating widget");
-		if (!s.readNextStartElement() || s.name() != "Geometry")
+        if (!s.readNextStartElement() || s.name() != QLatin1String("Geometry"))
 		{
 			return false;
 		}
--- a/src/DockFocusController.cpp
+++ b/src/DockFocusController.cpp
@@ -240,7 +240,11 @@ void CDockFocusController::onApplicationFocusChanged(QWidget* focusedOld, QWidge
 		auto OtherDockWidgetTab = internal::findParent<CDockWidgetTab*>(focusedNow);
 		if (OtherDockWidgetTab && focusedOld)
 		{
-			focusedOld->setFocus();
+			auto OldFocusedDockWidget = internal::findParent<CDockWidget*>(focusedOld);
+			if (OldFocusedDockWidget)
+			{
+				focusedOld->setFocus();
+			}
 			return;
 		}
 	}
@@ -381,6 +385,13 @@ void CDockFocusController::onStateRestored()
 	}
 }

+
+//==========================================================================
+CDockWidget* CDockFocusController::focusedDockWidget() const
+{
+	return d->FocusedDockWidget.data();
+}
+
 } // namespace ads

 //---------------------------------------------------------------------------
--- a/src/DockFocusController.h
+++ b/src/DockFocusController.h
@@ -77,6 +77,12 @@ public:
 	 */
 	void notifyFloatingWidgetDrop(CFloatingDockContainer* FloatingWidget);

+	/**
+	 * Returns the dock widget that has focus style in the ui or a nullptr if
+	 * not dock widget is painted focused.
+	 */
+	CDockWidget* focusedDockWidget() const;
+
 public slots:
 	/**
 	 * Request a focus change to the given dock widget
--- a/src/DockManager.cpp
+++ b/src/DockManager.cpp
@@ -55,6 +55,7 @@
 #include "DockingStateReader.h"
 #include "DockAreaTitleBar.h"
 #include "DockFocusController.h"
+#include "DockSplitter.h"

 #ifdef Q_OS_LINUX
 #include "linux/FloatingWidgetTitleBar.h"
@@ -249,7 +250,7 @@ bool DockManagerPrivate::restoreStateFromXml(const QByteArray &state,  int versi
    }
    CDockingStateReader s(state);
    s.readNextStartElement();
-    if (s.name() != "QtAdvancedDockingSystem")
+    if (s.name() != QLatin1String("QtAdvancedDockingSystem"))
    {
    	return false;
    }
@@ -279,10 +280,31 @@ bool DockManagerPrivate::restoreStateFromXml(const QByteArray &state,  int versi
    int  DockContainers = s.attributes().value("Containers").toInt();
 #endif
    ADS_PRINT(DockContainers);
+
+    if (CentralWidget)
+    {
+		const auto CentralWidgetAttribute = s.attributes().value("CentralWidget");
+		// If we have a central widget but a state without central widget, then
+		// something is wrong.
+		if (CentralWidgetAttribute.isEmpty())
+		{
+			qWarning() << "Dock manager has central widget but saved state does not have central widget.";
+			return false;
+		}
+
+		// If the object name of the central widget does not match the name of the
+		// saved central widget, the something is wrong
+		if (CentralWidget->objectName() != CentralWidgetAttribute.toString())
+		{
+			qWarning() << "Object name of central widget does not match name of central widget in saved state.";
+			return false;
+		}
+    }
+
    int DockContainerCount = 0;
    while (s.readNextStartElement())
    {
-    	if (s.name() == "Container")
+        if (s.name() == QLatin1String("Container"))
    	{
    		Result = restoreContainer(DockContainerCount, s, Testing);
 			if (!Result)
@@ -405,7 +427,6 @@ bool DockManagerPrivate::restoreState(const QByteArray& State, int version)
    	return false;
    }

-    CentralWidget = nullptr;
    // Hide updates of floating widgets from use
    hideFloatingWidgets();
    markDockWidgetsDirty();
@@ -419,6 +440,7 @@ bool DockManagerPrivate::restoreState(const QByteArray& State, int version)
    restoreDockWidgetsOpenState();
    restoreDockAreasIndices();
    emitTopLevelEvents();
+    _this->dumpLayout();

    return true;
 }
@@ -636,6 +658,10 @@ QByteArray CDockManager::saveState(int version) const
 		s.writeAttribute("Version", QString::number(CurrentVersion));
 		s.writeAttribute("UserVersion", QString::number(version));
 		s.writeAttribute("Containers", QString::number(d->Containers.count()));
+		if (d->CentralWidget)
+		{
+			s.writeAttribute("CentralWidget", d->CentralWidget->objectName());
+		}
 		for (auto Container : d->Containers)
 		{
 			Container->saveState(s);
@@ -706,6 +732,7 @@ CFloatingDockContainer* CDockManager::addDockWidgetFloating(CDockWidget* Dockwid
 	{
 		d->UninitializedFloatingWidgets.append(FloatingWidget);
 	}
+	emit dockWidgetAdded(Dockwidget);
 	return FloatingWidget;
 }

@@ -732,7 +759,10 @@ CDockAreaWidget* CDockManager::addDockWidget(DockWidgetArea area,
 	CDockWidget* Dockwidget, CDockAreaWidget* DockAreaWidget)
 {
 	d->DockWidgetsMap.insert(Dockwidget->objectName(), Dockwidget);
-	return CDockContainerWidget::addDockWidget(area, Dockwidget, DockAreaWidget);
+	auto Container = DockAreaWidget ? DockAreaWidget->dockContainer(): this;
+	auto AreaOfAddedDockWidget = Container->addDockWidget(area, Dockwidget, DockAreaWidget);
+	emit dockWidgetAdded(Dockwidget);
+	return AreaOfAddedDockWidget;
 }


@@ -901,10 +931,20 @@ CDockAreaWidget* CDockManager::setCentralWidget(CDockWidget* widget)
 		return nullptr;
 	}

-	// Setting a new central widget is now allowed if there is alread a central
-	// widget
+	// Setting a new central widget is now allowed if there is already a central
+	// widget or if there are already other dock widgets
 	if (d->CentralWidget)
 	{
+		qWarning("Setting a central widget not possible because there is already a central widget.");
+		return nullptr;
+	}
+
+	// Setting a central widget is now allowed if there are already other
+	// dock widgets.
+	if (!d->DockWidgetsMap.isEmpty())
+	{
+		qWarning("Setting a central widget not possible - the central widget need to be the first "
+			"dock widget that is added to the dock manager.");
 		return nullptr;
 	}

@@ -1042,6 +1082,48 @@ void CDockManager::setDockWidgetFocused(CDockWidget* DockWidget)
 }


+//===========================================================================
+CDockWidget* CDockManager::focusedDockWidget() const
+{
+	if (!d->FocusController)
+	{
+		return nullptr;
+	}
+	else
+	{
+		return d->FocusController->focusedDockWidget();
+	}
+}
+
+//===========================================================================
+QList<int> CDockManager::splitterSizes(CDockAreaWidget *ContainedArea) const
+{
+    if (ContainedArea)
+    {
+        auto Splitter = internal::findParent<CDockSplitter*>(ContainedArea);
+        if (Splitter)
+        {
+            return Splitter->sizes();
+        }
+    }
+    return QList<int>();
+}
+
+//===========================================================================
+void CDockManager::setSplitterSizes(CDockAreaWidget *ContainedArea, const QList<int>& sizes)
+{
+    if (!ContainedArea)
+    {
+        return;
+    }
+
+    auto Splitter = internal::findParent<CDockSplitter*>(ContainedArea);
+    if (Splitter && Splitter->count() == sizes.count())
+    {
+        Splitter->setSizes(sizes);
+    }
+}
+
 } // namespace ads

 //---------------------------------------------------------------------------
--- a/src/DockManager.h
+++ b/src/DockManager.h
@@ -398,9 +398,12 @@ public:
     * movable, floatable or closable and the titlebar of the central
     * dock area is not visible.
     * If the given widget could be set as central widget, the function returns
-     * the created cok area. If the widget could not be set, because there
+     * the created dock area. If the widget could not be set, because there
     * is already a central widget, this function returns a nullptr.
     * To clear the central widget, pass a nullptr to the function.
+     * \note Setting a central widget is only possible if no other dock widgets
+     * have been registered before. That means, this function should be the
+     * first function that you call before you add other dock widgets.
     * \retval != 0 The dock area that contains the central widget
     * \retval nullptr Indicates that the given widget can not be set as central
     *         widget because there is already a central widget.
@@ -476,6 +479,33 @@ public:
 	bool eventFilter(QObject *obj, QEvent *e) override;
 #endif

+	/**
+	 * Returns the dock widget that has focus style in the ui or a nullptr if
+	 * not dock widget is painted focused.
+	 * If the flag FocusHighlighting is disabled, this function always returns
+	 * nullptr.
+	 */
+	CDockWidget* focusedDockWidget() const;
+
+    /**
+     * Returns the sizes of the splitter that contains the dock area.
+     *
+     * If there is no splitter that contains the area, an empty list will be
+     * returned.
+     */
+    QList<int> splitterSizes(CDockAreaWidget *ContainedArea) const;
+
+    /**
+     * Update the sizes of a splitter
+     * Programmatically updates the sizes of a given splitter by calling
+     * QSplitter::setSizes(). The splitter will be the splitter that
+     * contains the supplied dock area widget. If there is not splitter
+     * that contains the dock area, or the sizes supplied does not match
+     * the number of children of the splitter, this method will have no
+     * effect.
+     */
+    void setSplitterSizes(CDockAreaWidget *ContainedArea, const QList<int>& sizes);
+
 public slots:
 	/**
 	 * Opens the perspective with the given name.
@@ -544,6 +574,12 @@ signals:
     */
    void dockAreaCreated(ads::CDockAreaWidget* DockArea);

+    /**
+     * This signal is emitted if a dock widget has been added to this
+     * dock manager instance.
+     */
+    void dockWidgetAdded(ads::CDockWidget* DockWidget);
+
    /**
     * This signal is emitted just before the given dock widget is removed
     * from the dock manager
--- a/src/DockOverlay.cpp
+++ b/src/DockOverlay.cpp
@@ -806,10 +806,15 @@ void CDockOverlayCross::setIconColors(const QString& Colors)
 		{"Arrow", CDockOverlayCross::ArrowColor},
 		{"Shadow", CDockOverlayCross::ShadowColor}};

-	auto ColorList = Colors.split(' ', QString::SkipEmptyParts);
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+    auto SkipEmptyParts = QString::SkipEmptyParts;
+#else
+    auto SkipEmptyParts = Qt::SkipEmptyParts;
+#endif
+    auto ColorList = Colors.split(' ', SkipEmptyParts);
 	for (const auto& ColorListEntry : ColorList)
 	{
-		auto ComponentColor = ColorListEntry.split('=', QString::SkipEmptyParts);
+        auto ComponentColor = ColorListEntry.split('=', SkipEmptyParts);
 		int Component = ColorCompenentStringMap.value(ComponentColor[0], -1);
 		if (Component < 0)
 		{
--- a/src/DockSplitter.cpp
+++ b/src/DockSplitter.cpp
@@ -31,7 +31,7 @@

 #include <QDebug>
 #include <QChildEvent>
-
+#include <QVariant>
 #include "DockAreaWidget.h"

 namespace ads
@@ -52,7 +52,7 @@ CDockSplitter::CDockSplitter(QWidget *parent)
 	: QSplitter(parent),
 	  d(new DockSplitterPrivate(this))
 {
-	setProperty("ads-splitter", true);
+    setProperty("ads-splitter", QVariant(true));
 	setChildrenCollapsible(false);
 }

--- a/src/DockWidget.h
+++ b/src/DockWidget.h
@@ -153,8 +153,10 @@ public:
        DockWidgetDeleteOnClose = 0x08, ///< deletes the dock widget when it is closed
        CustomCloseHandling = 0x10, ///< clicking the close button will not close the dock widget but emits the closeRequested() signal instead
        DockWidgetFocusable = 0x20, ///< if this is enabled, a dock widget can get focus highlighting
+        DockWidgetForceCloseWithArea = 0x40, ///< dock widget will be closed when the dock area hosting it is closed
        DefaultDockWidgetFeatures = DockWidgetClosable | DockWidgetMovable | DockWidgetFloatable | DockWidgetFocusable,
        AllDockWidgetFeatures = DefaultDockWidgetFeatures | DockWidgetDeleteOnClose | CustomCloseHandling,
+        DockWidgetAlwaysCloseAndDelete = DockWidgetForceCloseWithArea | DockWidgetDeleteOnClose,
        NoDockWidgetFeatures = 0x00
    };
    Q_DECLARE_FLAGS(DockWidgetFeatures, DockWidgetFeature)
--- a/src/DockWidgetTab.cpp
+++ b/src/DockWidgetTab.cpp
@@ -51,7 +51,6 @@
 #include "DockManager.h"
 #include "IconProvider.h"

-#include <iostream>

 namespace ads
 {
@@ -77,6 +76,7 @@ struct DockWidgetTabPrivate
 	QAbstractButton* CloseButton = nullptr;
 	QSpacerItem* IconTextSpacer;
 	QPoint TabDragStartPosition;
+	QSize IconSize;

 	/**
 	 * Private data constructor
@@ -146,6 +146,19 @@ struct DockWidgetTabPrivate
 		CloseButton->setVisible(DockWidgetClosable && TabHasCloseButton);
 	}

+	/**
+	 * Update the size policy of the close button depending on the
+	 * RetainTabSizeWhenCloseButtonHidden feature
+	 */
+	void updateCloseButtonSizePolicy()
+	{
+		auto Features = DockWidget->features();
+		auto SizePolicy = CloseButton->sizePolicy();
+		SizePolicy.setRetainSizeWhenHidden(Features.testFlag(CDockWidget::DockWidgetClosable)
+			&& testConfigFlag(CDockManager::RetainTabSizeWhenCloseButtonHidden));
+		CloseButton->setSizePolicy(SizePolicy);
+	}
+
 	template <typename T>
 	IFloatingWidget* createFloatingWidget(T* Widget, bool OpaqueUndocking)
 	{
@@ -173,6 +186,27 @@ struct DockWidgetTabPrivate
 		DragStartMousePosition = _this->mapFromGlobal(GlobalPos);
 	}

+	/**
+	 * Update the icon in case the icon size changed
+	 */
+	void updateIcon()
+	{
+		if (!IconLabel || Icon.isNull())
+		{
+			return;
+		}
+
+		if (IconSize.isValid())
+		{
+			IconLabel->setPixmap(Icon.pixmap(IconSize));
+		}
+		else
+		{
+			IconLabel->setPixmap(Icon.pixmap(_this->style()->pixelMetric(QStyle::PM_SmallIconSize, nullptr, _this)));
+		}
+		IconLabel->setVisible(true);
+	}
+
 };
 // struct DockWidgetTabPrivate

@@ -200,7 +234,7 @@ void DockWidgetTabPrivate::createLayout()
 	CloseButton->setObjectName("tabCloseButton");
 	internal::setButtonIcon(CloseButton, QStyle::SP_TitleBarCloseButton, TabCloseIcon);
    CloseButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-    _this->onDockWidgetFeaturesChanged();
+    updateCloseButtonSizePolicy();
 	internal::setToolTip(CloseButton, QObject::tr("Close Tab"));
 	_this->connect(CloseButton, SIGNAL(clicked()), SIGNAL(closeRequested()));

@@ -225,7 +259,7 @@ void DockWidgetTabPrivate::createLayout()
 void DockWidgetTabPrivate::moveTab(QMouseEvent* ev)
 {
    ev->accept();
-    QPoint Distance = ev->globalPos() - GlobalDragStartMousePosition;
+    QPoint Distance = internal::globalPositionOf(ev) - GlobalDragStartMousePosition;
    Distance.setY(0);
    auto TargetPos = Distance + TabDragStartPosition;
    TargetPos.rx() = qMax(TargetPos.x(), 0);
@@ -317,7 +351,7 @@ void CDockWidgetTab::mousePressEvent(QMouseEvent* ev)
 	if (ev->button() == Qt::LeftButton)
 	{
 		ev->accept();
-        d->saveDragStartMousePosition(ev->globalPos());
+        d->saveDragStartMousePosition(internal::globalPositionOf(ev));
        d->DragState = DraggingMousePressed;
        emit clicked();
 		return;
@@ -343,7 +377,7 @@ void CDockWidgetTab::mouseReleaseEvent(QMouseEvent* ev)
 			// End of tab moving, emit signal
 			if (d->DockArea)
 			{
-				emit moved(ev->globalPos());
+                emit moved(internal::globalPositionOf(ev));
 			}
 			break;

@@ -388,7 +422,7 @@ void CDockWidgetTab::mouseMoveEvent(QMouseEvent* ev)
    auto MappedPos = mapToParent(ev->pos());
    bool MouseOutsideBar = (MappedPos.x() < 0) || (MappedPos.x() > parentWidget()->rect().right());
    // Maybe a fixed drag distance is better here ?
-    int DragDistanceY = qAbs(d->GlobalDragStartMousePosition.y() - ev->globalPos().y());
+    int DragDistanceY = qAbs(d->GlobalDragStartMousePosition.y() - internal::globalPositionOf(ev).y());
    if (DragDistanceY >= CDockManager::startDragDistance() || MouseOutsideBar)
 	{
 		// If this is the last dock area in a dock container with only
@@ -420,7 +454,7 @@ void CDockWidgetTab::mouseMoveEvent(QMouseEvent* ev)
    	return;
 	}
    else if (d->DockArea->openDockWidgetsCount() > 1
-     && (ev->globalPos() - d->GlobalDragStartMousePosition).manhattanLength() >= QApplication::startDragDistance()) // Wait a few pixels before start moving
+     && (internal::globalPositionOf(ev) - 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
@@ -473,7 +507,7 @@ bool CDockWidgetTab::isActiveTab() const
 //============================================================================
 void CDockWidgetTab::setActiveTab(bool active)
 {
-	d->updateCloseButtonVisibility(active);
+    d->updateCloseButtonVisibility(active);

 	// Focus related stuff
 	if (CDockManager::testConfigFlag(CDockManager::FocusHighlighting) && !d->DockWidget->dockManager()->isRestoringState())
@@ -557,11 +591,7 @@ void CDockWidgetTab::setIcon(const QIcon& Icon)
 	}

 	d->Icon = Icon;
-	if (d->IconLabel)
-	{
-		d->IconLabel->setPixmap(Icon.pixmap(style()->pixelMetric(QStyle::PM_SmallIconSize, nullptr, this)));
-		d->IconLabel->setVisible(true);
-	}
+	d->updateIcon();
 }


@@ -588,7 +618,7 @@ void CDockWidgetTab::mouseDoubleClickEvent(QMouseEvent *event)
 	if ((!d->DockArea->dockContainer()->isFloating() || d->DockArea->dockWidgetsCount() > 1)
 		&& d->DockWidget->features().testFlag(CDockWidget::DockWidgetFloatable))
 	{
-		d->saveDragStartMousePosition(event->globalPos());
+        d->saveDragStartMousePosition(internal::globalPositionOf(event));
 		d->startFloating(DraggingInactive);
 	}

@@ -656,12 +686,8 @@ bool CDockWidgetTab::event(QEvent *e)
 //============================================================================
 void CDockWidgetTab::onDockWidgetFeaturesChanged()
 {
-	auto Features = d->DockWidget->features();
-	auto SizePolicy = d->CloseButton->sizePolicy();
-	SizePolicy.setRetainSizeWhenHidden(Features.testFlag(CDockWidget::DockWidgetClosable)
-		&& d->testConfigFlag(CDockManager::RetainTabSizeWhenCloseButtonHidden));
-	d->CloseButton->setSizePolicy(SizePolicy);
-	d->updateCloseButtonVisibility(isActiveTab());
+    d->updateCloseButtonSizePolicy();
+    d->updateCloseButtonVisibility(isActiveTab());
 }


@@ -679,6 +705,21 @@ void CDockWidgetTab::updateStyle()
 }


+//============================================================================
+QSize CDockWidgetTab::iconSize() const
+{
+	return d->IconSize;
+}
+
+
+//============================================================================
+void CDockWidgetTab::setIconSize(const QSize& Size)
+{
+	d->IconSize = Size;
+	d->updateIcon();
+}
+
+


 } // namespace ads
--- a/src/DockWidgetTab.h
+++ b/src/DockWidgetTab.h
@@ -31,6 +31,7 @@
 //                                   INCLUDES
 //============================================================================
 #include <QFrame>
+#include <QSize>

 #include "ads_globals.h"

@@ -50,6 +51,7 @@ class ADS_EXPORT CDockWidgetTab : public QFrame
 {
 	Q_OBJECT
 	Q_PROPERTY(bool activeTab READ isActiveTab WRITE setActiveTab NOTIFY activeTabChanged)
+	Q_PROPERTY(QSize iconSize READ iconSize WRITE setIconSize)

 private:
 	DockWidgetTabPrivate* d; ///< private data (pimpl)
@@ -159,6 +161,20 @@ public:
 	 */
 	void updateStyle();

+	/**
+	 * Returns the icon size.
+	 * If no explicit icon size has been set, the function returns an invalid
+	 * QSize
+	 */
+	QSize iconSize() const;
+
+	/**
+	 * Set an explicit icon size.
+	 * If no icon size has been set explicitely, than the tab sets the icon size
+	 * depending on the style
+	 */
+	void setIconSize(const QSize& Size);
+
 public slots:
 	virtual void setVisible(bool visible) override;

--- a/src/ElidingLabel.cpp
+++ b/src/ElidingLabel.cpp
@@ -163,7 +163,12 @@ void CElidingLabel::resizeEvent(QResizeEvent *event)
 //============================================================================
 QSize CElidingLabel::minimumSizeHint() const
 {
-    if (pixmap() != nullptr || d->isModeElideNone())
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+    bool HasPixmap = !pixmap().isNull();
+#else
+    bool HasPixmap = (pixmap() != nullptr);
+#endif
+    if (HasPixmap || d->isModeElideNone())
    {
        return QLabel::minimumSizeHint();
    }
@@ -180,7 +185,12 @@ QSize CElidingLabel::minimumSizeHint() const
 //============================================================================
 QSize CElidingLabel::sizeHint() const
 {
-    if (pixmap() != nullptr || d->isModeElideNone())
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+    bool HasPixmap = !pixmap().isNull();
+#else
+    bool HasPixmap = (pixmap() != nullptr);
+#endif
+    if (HasPixmap || d->isModeElideNone())
    {
        return QLabel::sizeHint();
    }
--- a/src/ElidingLabel.h
+++ b/src/ElidingLabel.h
@@ -58,8 +58,8 @@ protected:
 public:
    using Super = QLabel;

-	CElidingLabel(QWidget* parent = 0, Qt::WindowFlags f = 0);
-	CElidingLabel(const QString& text, QWidget* parent = 0, Qt::WindowFlags f = 0);
+    CElidingLabel(QWidget* parent = 0, Qt::WindowFlags f = Qt::WindowFlags ());
+    CElidingLabel(const QString& text, QWidget* parent = 0, Qt::WindowFlags f = Qt::WindowFlags ());
 	virtual ~CElidingLabel();

 	/**
--- a/src/FloatingDockContainer.cpp
+++ b/src/FloatingDockContainer.cpp
@@ -733,8 +733,11 @@ void CFloatingDockContainer::changeEvent(QEvent *event)


 #ifdef Q_OS_WIN
-//============================================================================
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
 bool CFloatingDockContainer::nativeEvent(const QByteArray &eventType, void *message, long *result)
+#else
+bool CFloatingDockContainer::nativeEvent(const QByteArray &eventType, void *message, qintptr *result)
+#endif
 {
 	QWidget::nativeEvent(eventType, message, result);
 	MSG *msg = static_cast<MSG*>(message);
@@ -752,7 +755,7 @@ bool CFloatingDockContainer::nativeEvent(const QByteArray &eventType, void *mess
 		case WM_NCLBUTTONDOWN:
 			 if (msg->wParam == HTCAPTION && d->isState(DraggingInactive))
 			 {
-				ADS_PRINT("CFloatingDockContainer::nativeEvent WM_NCLBUTTONDOWN" << e->type());
+				ADS_PRINT("CFloatingDockContainer::nativeEvent WM_NCLBUTTONDOWN");
 				d->DragStartPos = pos();
 				d->setState(DraggingMousePressed);
 			 }
@@ -765,7 +768,7 @@ bool CFloatingDockContainer::nativeEvent(const QByteArray &eventType, void *mess
 		case WM_ENTERSIZEMOVE:
 			 if (d->isState(DraggingMousePressed))
 			 {
-				ADS_PRINT("CFloatingDockContainer::nativeEvent WM_ENTERSIZEMOVE" << e->type());
+				ADS_PRINT("CFloatingDockContainer::nativeEvent WM_ENTERSIZEMOVE");
 				d->setState(DraggingFloatingWidget);
 				d->updateDropOverlays(QCursor::pos());
 			 }
@@ -774,7 +777,7 @@ bool CFloatingDockContainer::nativeEvent(const QByteArray &eventType, void *mess
 		case WM_EXITSIZEMOVE:
 			 if (d->isState(DraggingFloatingWidget))
 			 {
-				ADS_PRINT("CFloatingDockContainer::nativeEvent WM_EXITSIZEMOVE" << e->type());
+				ADS_PRINT("CFloatingDockContainer::nativeEvent WM_EXITSIZEMOVE");
 				if (GetAsyncKeyState(VK_ESCAPE) & 0x8000)
 				{
 					d->handleEscapeKey();
--- a/src/FloatingDockContainer.h
+++ b/src/FloatingDockContainer.h
@@ -194,7 +194,11 @@ protected: // reimplements QWidget
 	/**
 	 * Native event filter for handling WM_MOVING messages on Windows
 	 */
-	virtual bool nativeEvent(const QByteArray &eventType, void *message, long *result) override;
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+    virtual bool nativeEvent(const QByteArray &eventType, void *message, long *result) override;
+#else
+    virtual bool nativeEvent(const QByteArray &eventType, void *message, qintptr *result) override;
+#endif
 #endif


--- a/src/ads_globals.h
+++ b/src/ads_globals.h
@@ -36,6 +36,7 @@
 #include <QWidget>
 #include <QDebug>
 #include <QStyle>
+#include <QMouseEvent>

 #ifdef Q_OS_LINUX
 #include <xcb/xcb.h>
@@ -179,7 +180,7 @@ void hideEmptyParentSplitters(CDockSplitter* FirstParentSplitter);
 class CDockInsertParam : public QPair<Qt::Orientation, bool>
 {
 public:
-	using QPair::QPair;
+    using QPair<Qt::Orientation, bool>::QPair;
 	Qt::Orientation orientation() const {return this->first;}
 	bool append() const {return this->second;}
 	int insertOffset() const {return append() ? 1 : 0;}
@@ -260,6 +261,19 @@ void setToolTip(QObjectPtr obj, const QString &tip)
 }


+/**
+ * Helper function for access to mouse event global position in Qt5 and
+ */
+inline QPoint globalPositionOf(QMouseEvent* ev)
+{
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+    return ev->globalPosition().toPoint();
+#else
+    return ev->globalPos();
+#endif
+}
+
+
 /**
 * Helper function to set the icon of a certain button.
 * Use this function to set the icons for the dock area and dock widget buttons.
--- a/src/src.pro
+++ b/src/src.pro
@@ -23,7 +23,8 @@ windows {
 	}
 	# MSVC
 	*-msvc* {
-	}
+                QMAKE_CXXFLAGS += /utf-8
+        }
 }

 RESOURCES += ads.qrc
@@ -69,10 +70,11 @@ SOURCES += \
    DockFocusController.cpp


-unix {
+unix:!macx {
 HEADERS += linux/FloatingWidgetTitleBar.h
 SOURCES += linux/FloatingWidgetTitleBar.cpp
 QT += x11extras
+LIBS += -lxcb
 }

 isEmpty(PREFIX){
--- a/src/stylesheets/default.css
+++ b/src/stylesheets/default.css
@@ -5,7 +5,7 @@ ads--CDockContainerWidget {
 	background: palette(dark);
 }

-ads--CDockContainerWidget QSplitter::handle {
+ads--CDockContainerWidget ads--CDockSplitter::handle {
 	background: palette(dark);
 }

--- a/src/stylesheets/default_linux.css
+++ b/src/stylesheets/default_linux.css
@@ -5,7 +5,7 @@ ads--CDockContainerWidget {
 	background: palette(dark);
 }

-ads--CDockContainerWidget QSplitter::handle {
+ads--CDockContainerWidget ads--CDockSplitter::handle {
 	background: palette(dark);
 }

--- a/src/stylesheets/focus_highlighting.css
+++ b/src/stylesheets/focus_highlighting.css
@@ -16,6 +16,7 @@ ads--CDockWidgetTab {
 	border-style: solid;
 	border-width: 0 1px 0 0;
 	padding: 0 0px;
+	qproperty-iconSize: 16px 16px;/* this is optional in case you would like to change icon size*/
 }

 ads--CDockWidgetTab[activeTab="true"] {
--- a/src/stylesheets/focus_highlighting_linux.css
+++ b/src/stylesheets/focus_highlighting_linux.css
@@ -5,7 +5,7 @@ ads--CDockContainerWidget {
        background: palette(dark);
 }

-ads--CDockContainerWidget QSplitter::handle {
+ads--CDockContainerWidget ads--CDockSplitter::handle {
        background: palette(dark);
 }

@@ -192,3 +192,4 @@ ads--CFloatingDockContainer[isActiveWindow="true"] #floatingTitleMaximizeButton:
    background: rgba(255, 255, 255, 92);
 }
 */
+
Author	SHA1	Message	Date
Uwe Kindler	cbdf3211d6	Improved documentation for Linux support	2021-01-03 17:27:01 +01:00
Uwe Kindler	6ee97e64d7	Disabled Qt6 build in appveyor - it does not work properly yet	2021-01-03 17:14:39 +01:00
Uwe Kindler	a1c4812619	Try to fix Qt6 build	2021-01-03 17:09:06 +01:00
Uwe Kindler	b0c8edbd82	Added Qt6 MinGW build to .appveyor.yml	2021-01-03 15:50:16 +01:00
Uwe Kindler	a4190ecbf0	Added missing ads.pri fle	2021-01-02 23:17:44 +01:00
Uwe Kindler	d8c6efaada	Fixed signal connection of perspective combobox	2021-01-02 21:05:05 +01:00
Uwe Kindler	0312682e07	Fixed wrong pixmap is null test in ElidingLabel	2021-01-02 20:50:26 +01:00
Uwe Kindler	8d14068df7	Fixed QMouseEvent::globalPos() warning	2021-01-02 20:29:59 +01:00
Uwe Kindler	fe1d9a493f	Fixed warning in centralwidget example because of missing svg file	2021-01-02 19:51:50 +01:00
Uwe Kindler	e55ad49db8	Created ads.pri to ease linking of ads library	2021-01-02 19:48:34 +01:00
Uwe Kindler	018ce2001e	Fixed all Qt6 build issues	2021-01-02 18:06:45 +01:00
Uwe Kindler	c8fe4c46dd	Fixed DockAreaWidget minimumSizeHint	2020-12-23 16:16:13 +01:00
Uwe Kindler	1781fa671d	Updated build settings	2020-12-23 16:15:47 +01:00
Uwe Kindler	75910e910e	Fixed centralwidget example to properly close all floating widgets on main window close	2020-11-26 08:07:31 +01:00
Uwe Kindler	899e06be1c	Merge branch 'master' of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System	2020-11-23 12:57:23 +01:00
spking11	66687dc8b6	Add utf-8 support for msvc within cmake. (#280 ) Co-authored-by: spking11 <spking11@foxmail.com>	2020-11-23 12:55:19 +01:00
Uwe Kindler	b8fe620276	Merge branch 'master' into adddockwidget_fix	2020-11-23 08:04:11 +01:00
spking11	1a50ea9892	Add utf-8 support for msvc to resolve building error in some windows systems. (#277 )	2020-11-21 17:29:36 +01:00
Uwe Kindler	0a096869fe	Fixed adding of dock widgets to floating widget	2020-11-21 15:08:30 +01:00
Uwe Kindler	44dc76bd19	Merge branch 'master' of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System	2020-10-31 13:56:30 +01:00
Uwe Kindler	aedbaec497	Addes support for setting DockWidgetTab icon size via stylesheet	2020-10-31 13:56:16 +01:00
Uwe	04aa622111	Fixed static qmake build	2020-10-30 21:49:28 +01:00
Uwe	3564229482	Fixed CMake static build	2020-10-30 21:13:19 +01:00
githubuser0xFFFF	637db7f4f9	Update CMakeLists.txt	2020-10-27 18:50:54 +01:00
Uwe Kindler	f6d3d6d34a	Merge branch 'master' of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System	2020-10-27 15:07:37 +01:00
Uwe Kindler	92369bdb26	Fixed static CMake build for Linux	2020-10-27 15:04:54 +01:00
Nick D'Ademo	8f95447108	Fix. (#264 )	2020-10-23 21:00:33 +02:00
Christian Seiler	0e3c3bab45	DockManager: add the ability to programmatically update splitter sizes (#266 ) Add the ability to programmatically update splitter sizes. The user must specify the dock area that is contained in a splitter and a list of sizes. The list of sizes will be passed to the splitter that immediately contains the specified dock area. If the dock area is not part of a splitter the method will have no effect. Co-authored-by: Christian Seiler <c.seiler@luxflux.de>	2020-10-23 20:59:50 +02:00
Christian Seiler	3a5c965306	Ensure that the stylesheet doesn't affect all QSplitter instances (#265 ) The stylesheet should only change the style of ads::CDockSplitter instances, but not all QSplitter instances. Otherwise all splitters within any dock widget will also be affected and look different from the default Qt style. Co-authored-by: Christian Seiler <c.seiler@luxflux.de>	2020-10-21 22:07:41 +02:00
Christian Seiler	0c88457037	Fix CMake build on macOS (don't try to link against Qt's X11Extras) (#267 ) macOS is identified as UNIX by CMake, but Qt doesn't actually use X11 there (and X11 support is not available by default anyway). Change the condition that includes X11Extras to if (UNIX AND NOT APPLE) instead of just if (UNIX) to mitigate that. This makes the build on macOS work with CMake. Co-authored-by: Christian Seiler <c.seiler@luxflux.de>	2020-10-21 22:05:36 +02:00
Uwe Kindler	46fa22dc6a	Documented custom close handling	2020-10-13 21:24:04 +02:00
Uwe Kindler	f3d32399e5	Added ads::CDockWidget::DockWidgetForceCloseWithArea test to demo/MainWindow.cpp	2020-10-13 20:55:09 +02:00
Nicolas ELIE	b320bb17d1	Merge remote-tracking branch 'upstream/master' into forceclose	2020-10-02 11:04:18 +02:00
Nicolas Elie	81afe2d3cb	Update Python Bindings again (#262 ) * Update Python bindings * Add X11Extras to setup.py for Linux builds * Update Python Bindings	2020-10-01 19:14:48 +02:00
Uwe Kindler	5fad43377b	Fixed a bug in restoreStateFromXml function The function accessed the objectName from the CentralWidget even if there is no cental widget	2020-09-25 14:40:28 +02:00
Uwe Kindler	f543318232	Updated user-guide.md	2020-09-21 11:07:00 +02:00
Uwe Kindler	ab385a782a	Updated user-guid	2020-09-21 11:02:38 +02:00
Uwe Kindler	c370875128	Properly implemented save and restore with central widget	2020-09-21 10:51:02 +02:00
Uwe Kindler	1c261515db	Improved debug output in DockContainerWidget	2020-09-21 09:39:42 +02:00
Uwe Kindler	37cbae84ca	Fixed debug output in FloatingDockContainer.cpp	2020-09-21 09:39:03 +02:00
Uwe Kindler	f5759716b4	Added support for perspectives to centralwidget example to test save and restore state functionality with central widget	2020-09-21 08:39:39 +02:00
Uwe Kindler	f645fe725a	Added dockWidgetAdded signal to CDockManager	2020-09-18 08:25:47 +02:00
Uwe Kindler	fdedd7d92a	Added focusedDockWidget() function to DockManager	2020-09-07 08:17:07 +02:00
Uwe Kindler	044a43d793	Updated user-guide.md	2020-09-07 08:16:30 +02:00
Uwe Kindler	6846c96146	Fixed some documentation typos	2020-09-03 15:31:11 +02:00
Uwe Kindler	8fe9461872	Removed stylesheet code from centralwidget/mainwindow.cpp	2020-09-03 15:25:44 +02:00
Uwe Kindler	fbde4edcd2	Merge branch 'master' of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System	2020-09-03 15:24:27 +02:00
Uwe Kindler	68742681f7	Added missing documentation images	2020-09-03 15:24:12 +02:00
Uwe Kindler	bbb3f99bc3	Added documentation for new features (central widget and native floating widgets on linux) to user-guide.md	2020-09-03 15:23:39 +02:00
Uwe Kindler	e0f6f3013f	Updated centralwidget example	2020-09-03 15:23:05 +02:00
Uwe Kindler	6eb497fb64	Added test for dock manager flag EqualSplitOnInsertion to demo aplication	2020-09-03 15:22:43 +02:00
githubuser0xFFFF	ae15757765	Update .travis.yml Fixex travis.yml parse error	2020-09-02 22:02:21 +02:00
githubuser0xFFFF	be294b4867	Update .travis.yml Added libqt5x11extras5-dev to travis yml file	2020-09-02 21:25:54 +02:00
Uwe Kindler	70738f7549	Fixed Linux CMake build	2020-09-02 11:48:12 +02:00
Uwe Kindler	42dc529ce1	Merge branch 'master' of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System	2020-09-02 09:05:13 +02:00
Uwe Kindler	65058d3a48	Fixed issue #251 - Window momentarily flashes as floating widget	2020-09-02 09:04:59 +02:00
Nicolas Elie	48c4106b7f	Update Python Bindings (#249 ) * Update Python bindings * Add X11Extras to setup.py for Linux builds	2020-09-01 16:06:43 +02:00
Uwe Kindler	175b48569f	Removed Linux stuff from Mac build	2020-08-31 23:46:42 +02:00
Uwe Kindler	89c6abb5ce	Merge branch 'master' of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System	2020-08-31 23:29:52 +02:00
Uwe Kindler	55f23799bc	Fixed CMake Windows build	2020-08-31 23:29:33 +02:00
Nicolas Elie	646211cc4c	Merge branch 'master' into forceclose	2020-08-31 16:38:16 +02:00
githubuser0xFFFF	423bab9954	Update README.md Some small changes in README.md	2020-08-31 16:30:29 +02:00
Uwe Kindler	831d90ebf5	Added X11Etras package to CMakeLists.txt	2020-08-31 16:20:36 +02:00
githubuser0xFFFF	abdc0dc0dd	Update .travis.yml Added libqt5x11extras5-dev to travis build	2020-08-31 16:10:53 +02:00
Nicolas ELIE	40636d1e05	Add flag to DockWidget to force dw to be closed with the area that contains it	2020-08-04 11:50:32 +02:00