Try to fix appveyour build problem

Properly handle Escape key in native Window event handling function if event WM_EXITSIZEMOVE occurs
Removed eclipe project file, Added VisualStudio.gitignore to .gitignore
2020-05-27 15:26:36 +02:00 · 2020-05-27 13:28:29 +02:00 · 2020-05-27 12:42:59 +02:00 · 2020-05-26 06:41:58 +02:00 · 2020-05-26 06:41:40 +02:00 · 2020-05-24 09:14:33 +02:00
67 changed files with 2304 additions and 946 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,36 +1,28 @@
-version: '2.3.2.{build}'
+version: '{build}'
 branches:
  only:
    - master

-image: Visual Studio 2015
-clone_depth: 1
+image: Visual Studio 2017
+
 environment:
  global:
    # Appveyor doesn't have Qt 12 yet
-    LatestLTSQtVersion: 5.9
-    LatestQtVersion: 5.11
+    LatestQtVersion: 5.13
  matrix:
-    # Latest version of Qt, dll, 64bit, MSVC 2015, qmake
-  - QT5: C:\Qt\%LatestQtVersion%\msvc2015_64
-    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
-    targetPlatform: amd64
-    use_mingw: "false"
-    use_static: "false"
-    use_cmake: "false"
 # 32 bit builds
 # MSVC 2015 builds
 # Dynamic Library builds
    # LTS version of Qt, dll, 32bit, MSVC 2015, qmake
-  - QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015
-    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
+  - 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\%LatestLTSQtVersion%\msvc2015
-    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
+  - 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"
@@ -38,15 +30,15 @@ environment:
 # end Dynamic Library builds
 # Static Library builds
    # LTS version of Qt, static, 32bit, MSVC 2015, qmake
-  - QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015
-    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
+  - 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\%LatestLTSQtVersion%\msvc2015
-    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
+  - 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"
@@ -56,15 +48,15 @@ environment:
 # MinGW builds
 # Dynamic Library builds
    # LTS version of Qt, dll, 32bit, MinGW, qmake
-  - QT5: C:\Qt\%LatestLTSQtVersion%\mingw53_32
-    COMPILER: C:\Qt\Tools\mingw530_32
+  - QT5: 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\%LatestLTSQtVersion%\mingw53_32
-    COMPILER: C:\Qt\Tools\mingw530_32
+  - QT5: C:\Qt\%LatestQtVersion%\mingw73_32
+    COMPILER: C:\Qt\Tools\mingw730_32
    targetPlatform: x86
    use_mingw: "true"
    use_static: "false"
@@ -72,15 +64,15 @@ environment:
 # end Dynamic Library builds
 # Static Library builds
    # LTS version of Qt, static, 32bit, MinGW, qmake
-  - QT5: C:\Qt\%LatestLTSQtVersion%\mingw53_32
-    COMPILER: C:\Qt\Tools\mingw530_32
+  - QT5: 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\%LatestLTSQtVersion%\mingw53_32
-    COMPILER: C:\Qt\Tools\mingw530_32
+  - QT5: C:\Qt\%LatestQtVersion%\mingw73_32
+    COMPILER: C:\Qt\Tools\mingw730_32
    targetPlatform: x86
    use_mingw: "true"
    use_static: "true"
@@ -92,15 +84,15 @@ environment:
 # MSVC 2015 builds
 # Dynamic Library builds
    # LTS version of Qt, dll, 64bit, MSVC 2015, qmake
-  - QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015_64
-    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
+  - QT5: 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\%LatestLTSQtVersion%\msvc2015_64
-    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
+  - QT5: 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"
@@ -108,15 +100,15 @@ environment:
 # end Dynamic Library builds
 # Static Library builds
    # LTS version of Qt, static, 64bit, MSVC 2015, qmake
-  - QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015_64
-    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
+  - QT5: 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\%LatestLTSQtVersion%\msvc2015_64
-    COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
+  - QT5: 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"
@@ -129,10 +121,9 @@ matrix:
  fast_finish: true

 before_build:
- set PATH=%COMPILER%\bin;%QT5%\bin;%PATH%
 - set originalWD=%CD%
 - call "%QT5%\bin\qtenv2.bat"
- cd %originalWD%
+- 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")
@@ -140,8 +131,8 @@ before_build:
 - if %use_mingw%==true set PATH=%PATH:C:\Program Files\Git\usr\bin;=%

 build_script:
- if %use_cmake%==true mkdir .\build 
- if %use_cmake%==true cd .\build
+- if %use_cmake%==true mkdir build 
+- if %use_cmake%==true cd build
 - if %use_cmake%==true cmake --version
 - if %use_cmake%==true cmake -G %CMAKEGENERATOR% -DCMAKE_BUILD_TYPE=DEBUG -DBUILD_EXAMPLES=ON -DCMAKE_DEBUG_POSTFIX=d -DBUILD_STATIC=%USESTATIC% -DCMAKE_INSTALL_PREFIX="./installed" ../
 - if %use_cmake%==true cmake --build .
--- a/.cproject
+++ b/.cproject
@@ -1,359 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="cdt.managedbuild.toolchain.gnu.mingw.base.1119687795">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.mingw.base.1119687795" moduleId="org.eclipse.cdt.core.settings" name="Default">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="${ProjName}" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.mingw.base.1119687795" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
-					<folderInfo id="cdt.managedbuild.toolchain.gnu.mingw.base.1119687795.1949777584" name="/" resourcePath="">
-						<toolChain id="cdt.managedbuild.toolchain.gnu.mingw.base.88699815" name="MinGW GCC" superClass="cdt.managedbuild.toolchain.gnu.mingw.base">
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.PE" id="cdt.managedbuild.target.gnu.platform.mingw.base.519267520" name="Debug Platform" osList="win32" superClass="cdt.managedbuild.target.gnu.platform.mingw.base"/>
-							<builder id="cdt.managedbuild.toolchain.gnu.mingw.base.1119687795.1200539104" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
-							<tool id="cdt.managedbuild.tool.gnu.assembler.mingw.base.1438677059" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.base">
-								<option id="gnu.both.asm.option.include.paths.403127333" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/QtAdvancedDockingSystem/demo}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/QtAdvancedDockingSystem/src}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${QTDIR}/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${QTDIR}/include/QtCore&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${QTDIR}/include/QtWidgets&quot;"/>
-								</option>
-								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1249325593" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.archiver.mingw.base.933824900" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.mingw.base"/>
-							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base.1947822681" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base">
-								<option id="gnu.cpp.compiler.option.include.paths.349616932" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/QtAdvancedDockingSystem/src}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/QtAdvancedDockingSystem/demo}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${QTDIR}/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${QTDIR}/include/QtCore&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${QTDIR}/include/QtWidgets&quot;"/>
-								</option>
-								<option id="gnu.cpp.compiler.option.preprocessor.def.56223209" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false"/>
-								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1318830536" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.c.compiler.mingw.base.389117097" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.base">
-								<option id="gnu.c.compiler.option.include.paths.1871729602" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/QtAdvancedDockingSystem/demo}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/QtAdvancedDockingSystem/src}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${QTDIR}/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${QTDIR}/include/QtCore&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${QTDIR}/include/QtWidgets&quot;"/>
-								</option>
-								<option id="gnu.c.compiler.option.preprocessor.def.symbols.806805509" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false"/>
-								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1568363924" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.c.linker.mingw.base.1734874312" name="MinGW C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.base"/>
-							<tool id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base.985493173" name="MinGW C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base">
-								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.266071128" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
-									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-								</inputType>
-							</tool>
-						</toolChain>
-					</folderInfo>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-	</storageModule>
-	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="QtAdvancedDockingSystem.null.1346550114" name="QtAdvancedDockingSystem"/>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-	<storageModule moduleId="refreshScope"/>
-	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
-		<buildTargets>
-			<target name="Build all" path=" build" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>mingw32-make</buildCommand>
-				<buildArguments>-j</buildArguments>
-				<buildTarget>all</buildTarget>
-				<stopOnError>false</stopOnError>
-				<useDefaultCommand>false</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="Clean" path=" build" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>make</buildCommand>
-				<buildArguments/>
-				<buildTarget>clean</buildTarget>
-				<stopOnError>false</stopOnError>
-				<useDefaultCommand>true</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="Debug Build" path=" build" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>mingw32-make</buildCommand>
-				<buildArguments>-j6</buildArguments>
-				<buildTarget>debug</buildTarget>
-				<stopOnError>false</stopOnError>
-				<useDefaultCommand>false</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="qmake" path=" build" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>qmake</buildCommand>
-				<buildArguments>-recursive ../ads.pro</buildArguments>
-				<stopOnError>true</stopOnError>
-				<useDefaultCommand>false</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="Release Build" path=" build" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>mingw32-make</buildCommand>
-				<buildArguments>-j4</buildArguments>
-				<buildTarget>release</buildTarget>
-				<stopOnError>false</stopOnError>
-				<useDefaultCommand>false</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="Build all" path=" build/src" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>mingw32-make</buildCommand>
-				<buildArguments>-j</buildArguments>
-				<buildTarget>all</buildTarget>
-				<stopOnError>false</stopOnError>
-				<useDefaultCommand>false</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="Clean" path=" build/src" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>make</buildCommand>
-				<buildTarget>clean</buildTarget>
-				<stopOnError>false</stopOnError>
-				<useDefaultCommand>true</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="Debug Build" path=" build/src" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>mingw32-make</buildCommand>
-				<buildArguments>-j6</buildArguments>
-				<buildTarget>debug</buildTarget>
-				<stopOnError>false</stopOnError>
-				<useDefaultCommand>false</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="qmake" path=" build/src" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>qmake</buildCommand>
-				<buildArguments>-recursive ../../src/src.pro</buildArguments>
-				<stopOnError>true</stopOnError>
-				<useDefaultCommand>false</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="Release Build" path=" build/src" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>mingw32-make</buildCommand>
-				<buildArguments>-j4</buildArguments>
-				<buildTarget>release</buildTarget>
-				<stopOnError>false</stopOnError>
-				<useDefaultCommand>false</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="Build all" path=" build/example" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>mingw32-make</buildCommand>
-				<buildArguments>-j</buildArguments>
-				<buildTarget>all</buildTarget>
-				<stopOnError>false</stopOnError>
-				<useDefaultCommand>false</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="Clean" path=" build/example" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>make</buildCommand>
-				<buildArguments/>
-				<buildTarget>clean</buildTarget>
-				<stopOnError>false</stopOnError>
-				<useDefaultCommand>true</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="Debug Build" path=" build/example" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>mingw32-make</buildCommand>
-				<buildArguments>-j6</buildArguments>
-				<buildTarget>debug</buildTarget>
-				<stopOnError>false</stopOnError>
-				<useDefaultCommand>false</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="qmake" path=" build/example" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>qmake</buildCommand>
-				<buildArguments>-recursive ../../example/example.pro</buildArguments>
-				<buildTarget/>
-				<stopOnError>true</stopOnError>
-				<useDefaultCommand>false</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="Release Build" path=" build/example" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>mingw32-make</buildCommand>
-				<buildArguments>-j4</buildArguments>
-				<buildTarget>release</buildTarget>
-				<stopOnError>false</stopOnError>
-				<useDefaultCommand>false</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="Build all" path=" build/demo" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>mingw32-make</buildCommand>
-				<buildArguments>-j</buildArguments>
-				<buildTarget>all</buildTarget>
-				<stopOnError>false</stopOnError>
-				<useDefaultCommand>false</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="Clean" path=" build/demo" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>make</buildCommand>
-				<buildTarget>clean</buildTarget>
-				<stopOnError>false</stopOnError>
-				<useDefaultCommand>true</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="Debug Build" path=" build/demo" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>mingw32-make</buildCommand>
-				<buildArguments>-j6</buildArguments>
-				<buildTarget>debug</buildTarget>
-				<stopOnError>false</stopOnError>
-				<useDefaultCommand>false</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="qmake" path=" build/demo" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>qmake</buildCommand>
-				<buildArguments>-recursive ../../demo/demo.pro</buildArguments>
-				<stopOnError>true</stopOnError>
-				<useDefaultCommand>false</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="Release Build" path=" build/demo" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>mingw32-make</buildCommand>
-				<buildArguments>-j4</buildArguments>
-				<buildTarget>release</buildTarget>
-				<stopOnError>false</stopOnError>
-				<useDefaultCommand>false</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="Build all" path=" build/AdvancedDockingSystemDemo" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>mingw32-make</buildCommand>
-				<buildArguments>-j</buildArguments>
-				<buildTarget>all</buildTarget>
-				<stopOnError>false</stopOnError>
-				<useDefaultCommand>false</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="Clean" path=" build/AdvancedDockingSystemDemo" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>make</buildCommand>
-				<buildArguments/>
-				<buildTarget>clean</buildTarget>
-				<stopOnError>false</stopOnError>
-				<useDefaultCommand>true</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="Debug Build" path=" build/AdvancedDockingSystemDemo" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>mingw32-make</buildCommand>
-				<buildArguments>-j6</buildArguments>
-				<buildTarget>debug</buildTarget>
-				<stopOnError>false</stopOnError>
-				<useDefaultCommand>false</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="qmake" path=" build/AdvancedDockingSystemDemo" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>qmake</buildCommand>
-				<buildArguments>-recursive ../../AdvancedDockingSystemDemo/AdvancedDockingSystemDemo.pro</buildArguments>
-				<stopOnError>true</stopOnError>
-				<useDefaultCommand>false</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="Release Build" path=" build/AdvancedDockingSystemDemo" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>mingw32-make</buildCommand>
-				<buildArguments>-j4</buildArguments>
-				<buildTarget>release</buildTarget>
-				<stopOnError>false</stopOnError>
-				<useDefaultCommand>false</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="Build all" path=" build/AdvancedDockingSystemDemo_v2" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>mingw32-make</buildCommand>
-				<buildArguments>-j</buildArguments>
-				<buildTarget>all</buildTarget>
-				<stopOnError>false</stopOnError>
-				<useDefaultCommand>false</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="Clean" path=" build/AdvancedDockingSystemDemo_v2" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>make</buildCommand>
-				<buildArguments/>
-				<buildTarget>clean</buildTarget>
-				<stopOnError>false</stopOnError>
-				<useDefaultCommand>true</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="Debug Build" path=" build/AdvancedDockingSystemDemo_v2" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>mingw32-make</buildCommand>
-				<buildArguments>-j6</buildArguments>
-				<buildTarget>debug</buildTarget>
-				<stopOnError>false</stopOnError>
-				<useDefaultCommand>false</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="qmake" path=" build/AdvancedDockingSystemDemo_v2" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>qmake</buildCommand>
-				<buildArguments>-recursive ../../AdvancedDockingSystemDemo_v2/AdvancedDockingSystemDemo_v2.pro</buildArguments>
-				<stopOnError>true</stopOnError>
-				<useDefaultCommand>false</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="Release Build" path=" build/AdvancedDockingSystemDemo_v2" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>mingw32-make</buildCommand>
-				<buildArguments>-j4</buildArguments>
-				<buildTarget>release</buildTarget>
-				<stopOnError>false</stopOnError>
-				<useDefaultCommand>false</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="Build all" path=" build/AdvancedDockingSystem" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>mingw32-make</buildCommand>
-				<buildArguments>-j</buildArguments>
-				<buildTarget>all</buildTarget>
-				<stopOnError>false</stopOnError>
-				<useDefaultCommand>false</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="Clean" path=" build/AdvancedDockingSystem" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>make</buildCommand>
-				<buildArguments/>
-				<buildTarget>clean</buildTarget>
-				<stopOnError>false</stopOnError>
-				<useDefaultCommand>true</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="Debug Build" path=" build/AdvancedDockingSystem" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>mingw32-make</buildCommand>
-				<buildArguments>-j6</buildArguments>
-				<buildTarget>debug</buildTarget>
-				<stopOnError>false</stopOnError>
-				<useDefaultCommand>false</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="qmake" path=" build/AdvancedDockingSystem" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>qmake</buildCommand>
-				<buildArguments>-recursive ../../AdvancedDockingSystem/src.pro</buildArguments>
-				<stopOnError>true</stopOnError>
-				<useDefaultCommand>false</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-			<target name="Release Build" path=" build/AdvancedDockingSystem" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>mingw32-make</buildCommand>
-				<buildArguments>-j4</buildArguments>
-				<buildTarget>release</buildTarget>
-				<stopOnError>false</stopOnError>
-				<useDefaultCommand>false</useDefaultCommand>
-				<runAllBuilders>false</runAllBuilders>
-			</target>
-		</buildTargets>
-	</storageModule>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1119687795;cdt.managedbuild.toolchain.gnu.mingw.base.1119687795.1949777584;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base.1947822681;cdt.managedbuild.tool.gnu.cpp.compiler.input.1318830536">
-			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1119687795;cdt.managedbuild.toolchain.gnu.mingw.base.1119687795.1949777584;cdt.managedbuild.tool.gnu.c.compiler.mingw.base.389117097;cdt.managedbuild.tool.gnu.c.compiler.input.1568363924">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-	</storageModule>
-</cproject>
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,368 @@ Makefile
 *.pyd
 __pycache__
 PyQtAds/rc.py
+/.cproject
+
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.rsuser
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Mono auto generated files
+mono_crash.*
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+[Ll]ogs/
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUnit
+*.VisualState.xml
+TestResult.xml
+nunit-*.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
+*.obj
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*_wpftmp.csproj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*[.json, .xml, .info]
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# NuGet Symbol Packages
+*.snupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+*.appxbundle
+*.appxupload
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!?*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+*.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# CodeRush personal settings
+.cr/personal
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
+
+# Local History for Visual Studio
+.localhistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+.ionide/
+
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
+/ build
+/Settings.ini
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,6 @@ language: cpp
 # gcc is clang on mac
 compiler: gcc

-git:
-  depth: 1
-
 matrix:
  fast_finish: true
  include:
@@ -21,74 +18,152 @@ matrix:
        packages:
        - qt55base
        - qt55tools
-        - gcc-6
-        - g++-6
-        - libc6-i386
+        - gcc-9
+        - g++-9
    script:
        - PATH="/opt/qt55/bin:$PATH"
-        - CXX="g++-6"
-        - CC="gcc-6"
+        - CXX="g++-9"
+        - CC="gcc-9"
        - qt55-env.sh
        - qmake
        - make
        - make install
  - name: Ubuntu qmake dll
    os: linux
-    dist: xenial
+    dist: bionic
    group: stable
+    services:
+        - xvfb
+    compiler: gcc
    addons:
      apt:
        sources:
        - ubuntu-toolchain-r-test
-        - sourceline: 'ppa:beineri/opt-qt-5.12.0-xenial'
+        - sourceline: 'ppa:beineri/opt-qt-5.14.2-bionic'
        update: true
        packages:
-        - qt512base
-        - qt512tools
-        - gcc-6
-        - g++-6
+        - qt514base
+        - qt514tools
+        - gcc-9
+        - g++-9
        - libc6-i386
        - libgl-dev
        - libgl1-mesa-dev
        - mesa-common-dev
    script:
-        - PATH="/opt/qt512/bin:$PATH"
-        - CXX="g++-6"
-        - CC="gcc-6"
-        - qt512-env.sh
+        - PATH="/opt/qt514/bin:$PATH"
+        - CXX="g++-9"
+        - CC="gcc-9"
+        - qt514-env.sh
        - qmake
        - make
        - make install
  - name: Ubuntu qmake static
    os: linux
-    dist: xenial
+    dist: bionic
    group: stable
+    services:
+        - xvfb
+    compiler: gcc
    addons:
      apt:
        sources:
        - ubuntu-toolchain-r-test
-        - sourceline: 'ppa:beineri/opt-qt-5.12.0-xenial'
+        - sourceline: 'ppa:beineri/opt-qt-5.14.2-bionic'
        update: true
        packages:
-        - qt512base
-        - qt512tools
-        - gcc-6
-        - g++-6
+        - qt514base
+        - qt514tools
+        - gcc-9
+        - g++-9
        - libc6-i386
        - libgl-dev
        - libgl1-mesa-dev
        - mesa-common-dev
    script:
-        - PATH="/opt/qt512/bin:$PATH"
-        - CXX="g++-6"
-        - CC="gcc-6"
-        - qt512-env.sh
+        - PATH="/opt/qt514/bin:$PATH"
+        - CXX="g++-9"
+        - CC="gcc-9"
+        - qt514-env.sh
        - qmake "CONFIG+=adsBuildStatic"
        - make
        - make install
+  - name: Ubuntu CMake dll
+    os: linux
+    dist: bionic
+    group: stable
+    services:
+        - xvfb
+    compiler: gcc
+    addons:
+      apt:
+        sources:
+        - ubuntu-toolchain-r-test
+        - sourceline: 'ppa:beineri/opt-qt-5.14.2-bionic'
+        update: true
+        packages:
+        - qt514base
+        - qt514tools
+        - gcc-9
+        - g++-9
+        - libc6-i386
+        - libgl-dev
+        - libgl1-mesa-dev
+        - mesa-common-dev
+    script:
+        - PATH="/opt/qt514/bin:$PATH"
+        - CXX="g++-9"
+        - CC="gcc-9"
+        - qt514-env.sh
+        - mkdir ./build
+        - cd ./build
+        - cmake --version
+        - cmake -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_STATIC=OFF -DBUILD_EXAMPLES=ON -DCMAKE_INSTALL_PREFIX="./installed" ../
+        - cmake --build .
+        - cmake --build . --target install
+        - cmake -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=DEBUG -DBUILD_STATIC=OFF -DBUILD_EXAMPLES=ON -DCMAKE_DEBUG_POSTFIX=d -DCMAKE_INSTALL_PREFIX="./installed" ../
+        - cmake --build .
+        - cmake --build . --target install
+  - name: Ubuntu CMake Static
+    os: linux
+    dist: bionic
+    group: stable
+    services:
+        - xvfb
+    compiler: gcc
+    addons:
+      apt:
+        sources:
+        - ubuntu-toolchain-r-test
+        - sourceline: 'ppa:beineri/opt-qt-5.14.2-bionic'
+        update: true
+        packages:
+        - qt514base
+        - qt514tools
+        - gcc-9
+        - g++-9
+        - libc6-i386
+        - libgl-dev
+        - libgl1-mesa-dev
+        - mesa-common-dev
+    script:
+        - PATH="/opt/qt514/bin:$PATH"
+        - CXX="g++-9"
+        - CC="gcc-9"
+        - qt514-env.sh
+        - mkdir ./build
+        - cd ./build
+        - cmake --version
+        - cmake -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_STATIC=ON -DBUILD_EXAMPLES=ON -DCMAKE_INSTALL_PREFIX="./installed" ../
+        - cmake --build .
+        - cmake --build . --target install
+        - cmake -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=DEBUG -DBUILD_STATIC=ON -DBUILD_EXAMPLES=ON -DCMAKE_DEBUG_POSTFIX=d -DCMAKE_INSTALL_PREFIX="./installed" ../
+        - cmake --build .
+        - cmake --build . --target install
  - name: macOS CMake dll
    os: osx
-    osx_image: xcode10.1
+    osx_image: xcode11.3
+    compiler: clang
    addons:
      homebrew:
        packages:
@@ -107,7 +182,8 @@ matrix:
        - cmake --build . --target install
  - name: macOS CMake static
    os: osx
-    osx_image: xcode10.1
+    osx_image: xcode11.3
+    compiler: clang
    addons:
      homebrew:
        packages:
@@ -126,7 +202,8 @@ matrix:
        - cmake --build . --target install
  - name: macOS qmake dll
    os: osx
-    osx_image: xcode10.1
+    osx_image: xcode11.3
+    compiler: clang
    addons:
      homebrew:
        packages:
@@ -139,7 +216,8 @@ matrix:
        - make install
  - name: macOS qmake static
    os: osx
-    osx_image: xcode10.1
+    osx_image: xcode11.3
+    compiler: clang
    addons:
      homebrew:
        packages:
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,129 +1,22 @@
-cmake_minimum_required(VERSION 3.3)
-set(ads_VERSION "2.3.2")
-set(CMAKE_CXX_STANDARD 14)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-project(QtAdvancedDockingSystem VERSION ${ads_VERSION})
+cmake_minimum_required(VERSION 3.5)
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
+include(GetGitRevisionDescription)
+git_describe(GitTagVersion --tags)
+string(REGEX REPLACE "^([0-9]+)\\..*" "\\1" VERSION_MAJOR "${GitTagVersion}")
+string(REGEX REPLACE "^[0-9]+\\.([0-9]+).*" "\\1" VERSION_MINOR "${GitTagVersion}")
+string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" VERSION_PATCH "${GitTagVersion}")
+set(VERSION_SHORT "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
+project(QtADS LANGUAGES CXX VERSION ${VERSION_SHORT})
 option(BUILD_STATIC "Build the static library" OFF)
 option(BUILD_EXAMPLES "Build the examples" ON)
-set(REQUIRED_QT_VERSION 5.5.0)
-find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED)
-find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED)
-find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED)
-message(STATUS "Found Qt ${Qt5Core_VERSION}")
-set(ads_INCLUDE ${ads_INCLUDE} ${Qt5Core_INCLUDE_DIRS})
-set(ads_INCLUDE ${ads_INCLUDE} "${CMAKE_CURRENT_SOURCE_DIR}/src")
-set(ads_LIBS ${ads_LIBS} ${Qt5Core_LIBRARIES})
-set(ads_COMPILE_DEFINE ${ads_COMPILE_DEFINE} ${Qt5Core_COMPILE_DEFINITIONS})
-set(ads_LIBS ${ads_LIBS} ${Qt5Gui_LIBRARIES})
-set(ads_INCLUDE ${ads_INCLUDE} ${Qt5Gui_INCLUDE_DIRS})
-set(ads_COMPILE_DEFINE ${ads_COMPILE_DEFINE} ${Qt5Gui_COMPILE_DEFINITIONS})
-set(ads_LIBS ${ads_LIBS} ${Qt5Widgets_LIBRARIES})
-set(ads_INCLUDE ${ads_INCLUDE} ${Qt5Widgets_INCLUDE_DIRS})
-set(ads_COMPILE_DEFINE ${ads_COMPILE_DEFINE} ${Qt5Widgets_COMPILE_DEFINITIONS})
-if(BUILD_STATIC)
-    set(CMAKE_STATIC_LIBRARY_SUFFIX "_static${CMAKE_STATIC_LIBRARY_SUFFIX}")
-endif()
-set(ads_SRCS
-    src/ads_globals.cpp
-    src/DockAreaTabBar.cpp
-    src/DockAreaTitleBar.cpp
-    src/DockAreaWidget.cpp
-    src/DockContainerWidget.cpp
-    src/DockManager.cpp
-    src/DockOverlay.cpp
-    src/DockSplitter.cpp
-    src/DockWidget.cpp
-    src/DockWidgetTab.cpp
-	src/DockingStateReader.cpp
-    src/ElidingLabel.cpp
-    src/FloatingDockContainer.cpp
-	src/FloatingDragPreview.cpp
-	src/IconProvider.cpp
-	src/DockComponentsFactory.cpp
-    src/ads.qrc
-    src/linux/FloatingWidgetTitleBar.cpp
-)
-set(ads_INSTALL_INCLUDE 
-    src/ads_globals.h
-    src/DockAreaTabBar.h
-    src/DockAreaTitleBar.h
-    src/DockAreaWidget.h
-    src/DockContainerWidget.h
-    src/DockManager.h
-    src/DockOverlay.h
-    src/DockSplitter.h
-    src/DockWidget.h
-    src/DockWidgetTab.h
-	src/DockingStateReader.h
-    src/ElidingLabel.h
-    src/FloatingDockContainer.h
-	src/FloatingDragPreview.h
-	src/IconProvider.h
-	src/DockComponentsFactory.h
-    src/linux/FloatingWidgetTitleBar.h
-)
 if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4")
    set(ads_PlatformDir "x86")
 else()
    set(ads_PlatformDir "x64")
 endif()
-if(BUILD_STATIC)
-    add_library(qtadvanceddocking STATIC ${ads_SRCS})
-    target_compile_definitions(qtadvanceddocking PUBLIC ADS_STATIC)
-else()
-    add_library(qtadvanceddocking SHARED ${ads_SRCS})
-    set(ads_COMPILE_DEFINE ${ads_COMPILE_DEFINE} ADS_SHARED_EXPORT)
-endif()
-install(FILES ${ads_INSTALL_INCLUDE}
-    DESTINATION include 
-    COMPONENT headers
-)
-install(FILES 
-    "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE"
-    "${CMAKE_CURRENT_SOURCE_DIR}/gnu-lgpl-v2.1.md"
-    DESTINATION license 
-    COMPONENT license
-)
-install(TARGETS qtadvanceddocking
-    EXPORT adsTargets
-    RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib
-    INCLUDES DESTINATION include
-)
-
-include(CMakePackageConfigHelpers)
-write_basic_package_version_file("adsConfigVersion.cmake"
-    VERSION ${ads_VERSION}
-    COMPATIBILITY SameMajorVersion
-)
-install(EXPORT adsTargets
-    FILE adsTargets.cmake
-    NAMESPACE ads::
-    DESTINATION lib/cmake/ads
-)
-install(FILES "adsConfig.cmake" "${CMAKE_BINARY_DIR}/adsConfigVersion.cmake"
-    DESTINATION lib/cmake/ads
-)
-
-target_include_directories(qtadvanceddocking PUBLIC 
-    "$<BUILD_INTERFACE:${ads_INCLUDE}>"
-    $<INSTALL_INTERFACE:include>
-    )
-target_link_libraries(qtadvanceddocking PUBLIC ${ads_LIBS})
-target_compile_definitions(qtadvanceddocking PRIVATE ${ads_COMPILE_DEFINE})
-set_target_properties(qtadvanceddocking PROPERTIES 
-    VERSION ${ads_VERSION}
-    EXPORT_NAME "QtAdvancedDockingSystem"
-    ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib"
-    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib"
-    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/bin"
-)
+add_subdirectory(src)
 if(BUILD_EXAMPLES)
-    add_subdirectory(example)
+    add_subdirectory(examples)
    add_subdirectory(demo)
 endif()

--- a/README.md
+++ b/README.md
@@ -54,6 +54,7 @@ of his docking system project.
  - [Qt Creator IDE](#qt-creator-ide)
  - [Qt Design Studio](#qt-design-studio)
  - [QmixElements](#qmixelements)
+  - [ezEditor](#ezeditor)

 ### Docking everywhere - no central widget

@@ -304,3 +305,11 @@ plugin-based and modular laboratory automation software for controlling CETONI d
 Advanced Docking System in the QmixElements sofware.

 ![QmixElements](doc/qmix_elements.png)
+
+### [ezEditor](https://github.com/ezEngine/ezEngine)
+
+The ezEditor is a full blown graphical editor used for editing scenes and
+importing and authoring assets for the [ezEngine](https://github.com/ezEngine/ezEngine) -
+an open source C++ game engine in active development.
+
+![ezEditor](doc/ezEngine_editor.png)
--- a/ads.pro
+++ b/ads.pro
@@ -3,7 +3,7 @@ TEMPLATE = subdirs
 SUBDIRS = \
 	src \
 	demo \
-	example
+	examples

 demo.depends = src
-example.depends = src
+examples.depends = src
--- a/cmake/modules/GetGitRevisionDescription.cmake
+++ b/cmake/modules/GetGitRevisionDescription.cmake
@@ -0,0 +1,172 @@
+# - Returns a version string from Git
+#
+# These functions force a re-configure on each git commit so that you can
+# trust the values of the variables in your build system.
+#
+#  get_git_head_revision(<refspecvar> <hashvar> [<additional arguments to git describe> ...])
+#
+# Returns the refspec and sha hash of the current head revision
+#
+#  git_describe(<var> [<additional arguments to git describe> ...])
+#
+# Returns the results of git describe on the source tree, and adjusting
+# the output so that it tests false if an error occurs.
+#
+#  git_get_exact_tag(<var> [<additional arguments to git describe> ...])
+#
+# Returns the results of git describe --exact-match on the source tree,
+# and adjusting the output so that it tests false if there was no exact
+# matching tag.
+#
+#  git_local_changes(<var>)
+#
+# Returns either "CLEAN" or "DIRTY" with respect to uncommitted changes.
+# Uses the return code of "git diff-index --quiet HEAD --".
+# Does not regard untracked files.
+#
+# Requires CMake 2.6 or newer (uses the 'function' command)
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+if(__get_git_revision_description)
+	return()
+endif()
+set(__get_git_revision_description YES)
+
+# We must run the following at "include" time, not at function call time,
+# to find the path to this module rather than the path to a calling list file
+get_filename_component(_gitdescmoddir ${CMAKE_CURRENT_LIST_FILE} PATH)
+
+function(get_git_head_revision _refspecvar _hashvar)
+	set(GIT_PARENT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
+	set(GIT_DIR "${GIT_PARENT_DIR}/.git")
+	while(NOT EXISTS "${GIT_DIR}")	# .git dir not found, search parent directories
+		set(GIT_PREVIOUS_PARENT "${GIT_PARENT_DIR}")
+		get_filename_component(GIT_PARENT_DIR ${GIT_PARENT_DIR} PATH)
+		if(GIT_PARENT_DIR STREQUAL GIT_PREVIOUS_PARENT)
+			# We have reached the root directory, we are not in git
+			set(${_refspecvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
+			set(${_hashvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
+			return()
+		endif()
+		set(GIT_DIR "${GIT_PARENT_DIR}/.git")
+	endwhile()
+	# check if this is a submodule
+	if(NOT IS_DIRECTORY ${GIT_DIR})
+		file(READ ${GIT_DIR} submodule)
+		string(REGEX REPLACE "gitdir: (.*)\n$" "\\1" GIT_DIR_RELATIVE ${submodule})
+		get_filename_component(SUBMODULE_DIR ${GIT_DIR} PATH)
+		get_filename_component(GIT_DIR ${SUBMODULE_DIR}/${GIT_DIR_RELATIVE} ABSOLUTE)
+	endif()
+	if(NOT IS_DIRECTORY "${GIT_DIR}")
+		file(READ ${GIT_DIR} worktree)
+ 		string(REGEX REPLACE "gitdir: (.*)worktrees(.*)\n$" "\\1" GIT_DIR ${worktree})
+ 	endif()
+	set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data")
+	if(NOT EXISTS "${GIT_DATA}")
+		file(MAKE_DIRECTORY "${GIT_DATA}")
+	endif()
+
+	if(NOT EXISTS "${GIT_DIR}/HEAD")
+		return()
+	endif()
+	set(HEAD_FILE "${GIT_DATA}/HEAD")
+	configure_file("${GIT_DIR}/HEAD" "${HEAD_FILE}" COPYONLY)
+
+	configure_file("${_gitdescmoddir}/GetGitRevisionDescription.cmake.in"
+		"${GIT_DATA}/grabRef.cmake"
+		@ONLY)
+	include("${GIT_DATA}/grabRef.cmake")
+
+	set(${_refspecvar} "${HEAD_REF}" PARENT_SCOPE)
+	set(${_hashvar} "${HEAD_HASH}" PARENT_SCOPE)
+endfunction()
+
+function(git_describe _var)
+	if(NOT GIT_FOUND)
+		find_package(Git QUIET)
+	endif()
+	get_git_head_revision(refspec hash)
+	if(NOT GIT_FOUND)
+		set(${_var} "GIT-NOTFOUND" PARENT_SCOPE)
+		return()
+	endif()
+	if(NOT hash)
+		set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE)
+		return()
+	endif()
+
+	# TODO sanitize
+	#if((${ARGN}" MATCHES "&&") OR
+	#	(ARGN MATCHES "||") OR
+	#	(ARGN MATCHES "\\;"))
+	#	message("Please report the following error to the project!")
+	#	message(FATAL_ERROR "Looks like someone's doing something nefarious with git_describe! Passed arguments ${ARGN}")
+	#endif()
+
+	#message(STATUS "Arguments to execute_process: ${ARGN}")
+
+	execute_process(COMMAND
+		"${GIT_EXECUTABLE}"
+		describe
+		${hash}
+		${ARGN}
+		WORKING_DIRECTORY
+		"${CMAKE_CURRENT_SOURCE_DIR}"
+		RESULT_VARIABLE
+		res
+		OUTPUT_VARIABLE
+		out
+		ERROR_QUIET
+		OUTPUT_STRIP_TRAILING_WHITESPACE)
+	if(NOT res EQUAL 0)
+		set(out "${out}-${res}-NOTFOUND")
+	endif()
+
+	set(${_var} "${out}" PARENT_SCOPE)
+endfunction()
+
+function(git_get_exact_tag _var)
+	git_describe(out --exact-match ${ARGN})
+	set(${_var} "${out}" PARENT_SCOPE)
+endfunction()
+
+function(git_local_changes _var)
+	if(NOT GIT_FOUND)
+		find_package(Git QUIET)
+	endif()
+	get_git_head_revision(refspec hash)
+	if(NOT GIT_FOUND)
+		set(${_var} "GIT-NOTFOUND" PARENT_SCOPE)
+		return()
+	endif()
+	if(NOT hash)
+		set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE)
+		return()
+	endif()
+
+	execute_process(COMMAND
+		"${GIT_EXECUTABLE}"
+		diff-index --quiet HEAD --
+		WORKING_DIRECTORY
+		"${CMAKE_CURRENT_SOURCE_DIR}"
+		RESULT_VARIABLE
+		res
+		OUTPUT_VARIABLE
+		out
+		ERROR_QUIET
+		OUTPUT_STRIP_TRAILING_WHITESPACE)
+	if(res EQUAL 0)
+		set(${_var} "CLEAN" PARENT_SCOPE)
+	else()
+		set(${_var} "DIRTY" PARENT_SCOPE)
+	endif()
+endfunction()
--- a/cmake/modules/GetGitRevisionDescription.cmake.in
+++ b/cmake/modules/GetGitRevisionDescription.cmake.in
@@ -0,0 +1,41 @@
+#
+# Internal file for GetGitRevisionDescription.cmake
+#
+# Requires CMake 2.6 or newer (uses the 'function' command)
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+set(HEAD_HASH)
+
+file(READ "@HEAD_FILE@" HEAD_CONTENTS LIMIT 1024)
+
+string(STRIP "${HEAD_CONTENTS}" HEAD_CONTENTS)
+if(HEAD_CONTENTS MATCHES "ref")
+	# named branch
+	string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}")
+	if(EXISTS "@GIT_DIR@/${HEAD_REF}")
+		configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
+	else()
+		configure_file("@GIT_DIR@/packed-refs" "@GIT_DATA@/packed-refs" COPYONLY)
+		file(READ "@GIT_DATA@/packed-refs" PACKED_REFS)
+		if(${PACKED_REFS} MATCHES "([0-9a-z]*) ${HEAD_REF}")
+			set(HEAD_HASH "${CMAKE_MATCH_1}")
+		endif()
+	endif()
+else()
+	# detached HEAD
+	configure_file("@GIT_DIR@/HEAD" "@GIT_DATA@/head-ref" COPYONLY)
+endif()
+
+if(NOT HEAD_HASH)
+	file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 1024)
+	string(STRIP "${HEAD_HASH}" HEAD_HASH)
+endif()
--- a/demo/CMakeLists.txt
+++ b/demo/CMakeLists.txt
@@ -1,29 +1,9 @@
-cmake_minimum_required(VERSION 3.3)
-set (CMAKE_CXX_STANDARD 14)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-project(ads_demo VERSION "1.0") 
-set(REQUIRED_QT_VERSION 5.5.0)
-find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED)
-find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED)
-find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED)
-set(ads_demo_LIBS ${ads_demo_LIBS} ${Qt5Core_LIBRARIES})
-set(ads_demo_INCLUDE ${ads_demo_INCLUDE} ${Qt5Core_INCLUDE_DIRS})
-set(ads_demo_COMPILE_DEFINE ${ads_demo_COMPILE_DEFINE} ${Qt5Core_COMPILE_DEFINITIONS} )
-set(ads_demo_LIBS ${ads_demo_LIBS} ${Qt5Gui_LIBRARIES})
-set(ads_demo_INCLUDE ${ads_demo_INCLUDE} ${Qt5Gui_INCLUDE_DIRS})
-set(ads_demo_COMPILE_DEFINE ${ads_demo_COMPILE_DEFINE} ${Qt5Gui_COMPILE_DEFINITIONS})
-set(ads_demo_LIBS ${ads_demo_LIBS} ${Qt5Widgets_LIBRARIES})
-set(ads_demo_INCLUDE ${ads_demo_INCLUDE} ${Qt5Widgets_INCLUDE_DIRS})
-set(ads_demo_COMPILE_DEFINE ${ads_demo_COMPILE_DEFINE} ${Qt5Widgets_COMPILE_DEFINITIONS})
+cmake_minimum_required(VERSION 3.5)
+project(ads_demo VERSION ${VERSION_SHORT}) 
+
+find_package(Qt5 5.5 COMPONENTS Core Gui Widgets REQUIRED)
 if(WIN32)
-	find_package(Qt5AxContainer ${REQUIRED_QT_VERSION} REQUIRED)
-	set(ads_demo_LIBS ${ads_demo_LIBS} ${Qt5AxContainer_LIBRARIES})
-	set(ads_demo_INCLUDE ${ads_demo_INCLUDE} ${Qt5AxContainer_INCLUDE_DIRS})
-	set(ads_demo_COMPILE_DEFINE ${ads_demo_COMPILE_DEFINE} ${Qt5AxContainer_COMPILE_DEFINITIONS})
+    find_package(Qt5 5.5 COMPONENTS AxContainer REQUIRED)
 endif()
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(ads_demo_SRCS
@@ -35,22 +15,26 @@ set(ads_demo_SRCS
 	demo.qrc
 )
 add_executable(AdvancedDockingSystemDemo WIN32 ${ads_demo_SRCS})
-if(BUILD_STATIC)
-    set(ads_demo_DEFINE ${ads_demo_DEFINE} ADS_STATIC)
+target_include_directories(AdvancedDockingSystemDemo PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../src")
+target_link_libraries(AdvancedDockingSystemDemo PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets)
+if(WIN32)
+    target_link_libraries(AdvancedDockingSystemDemo PUBLIC Qt5::AxContainer)
 endif()
-add_dependencies(AdvancedDockingSystemDemo qtadvanceddocking)
-target_include_directories(AdvancedDockingSystemDemo PUBLIC 
-    $<BUILD_INTERFACE:${ads_demo_INCLUDE}>
-    $<INSTALL_INTERFACE:include>
-    )
-target_include_directories(AdvancedDockingSystemDemo PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../src"  ${ads_demo_INCLUDE})
-target_link_libraries(AdvancedDockingSystemDemo PRIVATE qtadvanceddocking ${ads_demo_LIBS})
-target_compile_definitions(AdvancedDockingSystemDemo PRIVATE ${ads_demo_DEFINE})
+target_link_libraries(AdvancedDockingSystemDemo PRIVATE qtadvanceddocking)
 set_target_properties(AdvancedDockingSystemDemo PROPERTIES 
-    VERSION "1.0"
-    SOVERSION 1
+    AUTOMOC ON
+    AUTORCC ON
+    AUTOUIC ON
+    CXX_STANDARD 14
+    CXX_STANDARD_REQUIRED ON
+    CXX_EXTENSIONS OFF
+    VERSION ${VERSION_SHORT}
    EXPORT_NAME "Qt Advanced Docking System Demo"
    ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib"
    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib"
    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/bin"
 )
+#if(BUILD_STATIC)
+#    target_compile_definitions(AdvancedDockingSystemDemo PRIVATE ADS_STATIC)
+#endif()
+
--- a/demo/MainWindow.cpp
+++ b/demo/MainWindow.cpp
@@ -456,13 +456,21 @@ void MainWindowPrivate::createActions()
 	ui.toolBar->addAction(PerspectiveListAction);
 	ui.toolBar->addAction(SavePerspectiveAction);

-	QAction* a = ui.toolBar->addAction("Create Editor");
+	QAction* a = ui.toolBar->addAction("Create Floating Editor");
+	a->setProperty("Floating", true);
 	a->setToolTip("Creates floating dynamic dockable editor windows that are deleted on close");
 	a->setIcon(svgIcon(":/adsdemo/images/note_add.svg"));
 	_this->connect(a, SIGNAL(triggered()), SLOT(createEditor()));
 	ui.menuTests->addAction(a);

-	a = ui.toolBar->addAction("Create Table");
+	a = ui.toolBar->addAction("Create Docked Editor");
+	a->setProperty("Floating", false);
+	a->setToolTip("Creates a docked editor windows that are deleted on close");
+	a->setIcon(svgIcon(":/adsdemo/images/docked_editor.svg"));
+	_this->connect(a, SIGNAL(triggered()), SLOT(createEditor()));
+	ui.menuTests->addAction(a);
+
+	a = ui.toolBar->addAction("Create Floating Table");
 	a->setToolTip("Creates floating dynamic dockable table with millions of entries");
 	a->setIcon(svgIcon(":/adsdemo/images/grid_on.svg"));
 	_this->connect(a, SIGNAL(triggered()), SLOT(createTable()));
@@ -661,11 +669,22 @@ void CMainWindow::onViewVisibilityChanged(bool Visible)
 //============================================================================
 void CMainWindow::createEditor()
 {
+	QObject* Sender = sender();
+	QVariant vFloating = Sender->property("Floating");
+	bool Floating = vFloating.isValid() ? vFloating.toBool() : true;
 	auto DockWidget = createEditorWidget(d->ui.menuView);
 	DockWidget->setFeature(ads::CDockWidget::DockWidgetDeleteOnClose, true);
-	auto FloatingWidget = d->DockManager->addDockWidgetFloating(DockWidget);
-    FloatingWidget->move(QPoint(20, 20));
    connect(DockWidget, SIGNAL(closeRequested()), SLOT(onEditorCloseRequested()));
+
+    if (Floating)
+    {
+		auto FloatingWidget = d->DockManager->addDockWidgetFloating(DockWidget);
+		FloatingWidget->move(QPoint(20, 20));
+    }
+    else
+    {
+    	d->DockManager->addDockWidget(ads::TopDockWidgetArea, DockWidget);
+    }
 }


--- a/demo/StatusDialog.h
+++ b/demo/StatusDialog.h
@@ -23,7 +23,7 @@ class CStatusDialog : public QDialog
 	Q_OBJECT
 private:
 	StatusDialogPrivate* d; ///< private data (pimpl)
-	friend class StatusDialogPrivate;
+    friend struct StatusDialogPrivate;

 private slots:
 	void on_dockWidgetsComboBox_currentIndexChanged(int index);
--- a/demo/demo.py
+++ b/demo/demo.py
@@ -7,7 +7,7 @@ from PyQt5 import uic
 from PyQt5.QtCore import (QCoreApplication, QDir, Qt, QSettings, QSignalBlocker,
                          QRect, QPoint, qDebug, qInstallMessageHandler,
                          QtDebugMsg, QtInfoMsg, QtWarningMsg,
-                          QtCriticalMsg, QtFatalMsg)
+                          QtCriticalMsg, QtFatalMsg, QSize)
 from PyQt5.QtGui import (QGuiApplication, QIcon, QCloseEvent)
 from PyQt5.QtWidgets import (QCalendarWidget, QFileSystemModel, QFrame, QLabel,
                            QMenu, QTreeView, QAction, QWidgetAction,
@@ -25,6 +25,7 @@ else:
 from PyQtAds import QtAds

 import rc  # pyrcc5 demo.qrc -o rc.py
+from status_dialog import CStatusDialog

 UI_FILE = os.path.join(os.path.dirname(__file__), 'mainwindow.ui')
 MainWindowUI, MainWindowBase = uic.loadUiType(UI_FILE)
@@ -100,7 +101,12 @@ def create_calendar_dock_widget(view_menu: QMenu) -> QtAds.CDockWidget:

    dock_widget = QtAds.CDockWidget("Calendar {}".format(_State.calendar_count))
    _State.calendar_count += 1
+    # The following lines are for testing the setWidget() and takeWidget()
+    # functionality
    dock_widget.setWidget(widget)
+    dock_widget.setWidget(widget)  # what happens if we set a widget if a widget is already set
+    dock_widget.takeWidget()  # we remove the widget
+    dock_widget.setWidget(widget)  # and set the widget again - there should be no error
    dock_widget.setToggleViewActionMode(QtAds.CDockWidget.ActionModeShow)
    dock_widget.setIcon(svg_icon(":/adsdemo/images/date_range.svg"))
    view_menu.addAction(dock_widget.toggleViewAction())
@@ -149,9 +155,15 @@ def create_editor_widget(view_menu: QMenu) -> QtAds.CDockWidget:

    return dock_widget

+class CMinSizeTableWidget(QTableWidget):
+    """Custom QTableWidget with a minimum size hint to test CDockWidget
+    setMinimumSizeHintMode() function of CDockWidget"""
+    
+    def minimumSizeHint(self) -> QSize:
+        return QSize(300, 100)

 def create_table_widget(view_menu: QMenu) -> QtAds.CDockWidget: 
-    widget = QTableWidget()
+    widget = CMinSizeTableWidget()
    dock_widget = QtAds.CDockWidget("Table {}".format(_State.table_count))
    _State.table_count += 1
    COLCOUNT = 5
@@ -165,6 +177,15 @@ def create_table_widget(view_menu: QMenu) -> QtAds.CDockWidget:
    
    dock_widget.setWidget(widget)
    dock_widget.setIcon(svg_icon(":/adsdemo/images/grid_on.svg"))
+    dock_widget.setMinimumSizeHintMode(QtAds.CDockWidget.MinimumSizeHintFromContent)
+    toolbar = dock_widget.createDefaultToolBar()
+    action = toolbar.addAction(svg_icon(":/adsdemo/images/fullscreen.svg"), "Toggle Fullscreen")
+    def on_toggle_fullscreen():
+        if dock_widget.isFullScreen():
+            dock_widget.showNormal()
+        else:
+            dock_widget.showFullScreen()
+    action.triggered.connect(on_toggle_fullscreen)
    view_menu.addAction(dock_widget.toggleViewAction())
    return dock_widget
    
@@ -179,7 +200,7 @@ if ACTIVEX_AVAILABLE:
        return dock_widget
    
    
-class CustomComponentsFactory(QtAds.CDockComponentsFactory):
+class CCustomComponentsFactory(QtAds.CDockComponentsFactory):

    def createDockAreaTitleBar(self, dock_area: QtAds.CDockAreaWidget) -> QtAds.CDockAreaTitleBar:
        title_bar = QtAds.CDockAreaTitleBar(dock_area)
@@ -192,7 +213,6 @@ class CustomComponentsFactory(QtAds.CDockComponentsFactory):
        return title_bar


-
 class MainWindow(MainWindowUI, MainWindowBase):
    save_perspective_action: QAction
    perspective_list_action: QWidgetAction
@@ -213,13 +233,39 @@ class MainWindow(MainWindowUI, MainWindowBase):
        # a QToolButton instead of a QPushButton
        # QtAds.CDockManager.setConfigFlags(QtAds.CDockManager.configFlags() | QtAds.CDockManager.TabCloseButtonIsToolButton)
        
+        # uncomment the following line if you want to use opaque undocking and
+        # opaque splitter resizing
+        #QtAds.CDockManager.setConfigFlags(QtAds.CDockManager.DefaultOpaqueConfig);
+        
        # uncomment the following line if you want a fixed tab width that does
        # not change if the visibility of the close button changes
-        # QtAds.CDockManager.setConfigFlag(QtAds.CDockManager.RetainTabSizeWhenCloseButtonHidden, True)
+        #QtAds.CDockManager.setConfigFlag(QtAds.CDockManager.RetainTabSizeWhenCloseButtonHidden, True)

-        # uncomment the follwing line if you want to use non opaque undocking and splitter
-        # movements
-        # QtAds.CDockManager.setConfigFlags(QtAds.CDockManager.DefaultNonOpaqueConfig)
+        # uncomment the following line if you don't want close button on DockArea's title bar
+        #QtAds.CDockManager.setConfigFlag(QtAds.CDockManager.DockAreaHasCloseButton, false);
+
+        # uncomment the following line if you don't want undock button on DockArea's title bar
+        #QtAds.CDockManager.setConfigFlag(QtAds.CDockManager.DockAreaHasUndockButton, false);
+
+        # uncomment the following line if you don't want tabs menu button on DockArea's title bar
+        #QtAds.CDockManager.setConfigFlag(QtAds.CDockManager.DockAreaHasTabsMenuButton, false);
+
+        # uncomment the following line if you don't want disabled buttons to appear on DockArea's title bar
+        #QtAds.CDockManager.setConfigFlag(QtAds.CDockManager.DockAreaHideDisabledButtons, true);
+
+        # uncomment the following line if you want to show tabs menu button on DockArea's title bar only when there are more than one tab and at least of them has elided title
+        #QtAds.CDockManager.setConfigFlag(QtAds.CDockManager.DockAreaDynamicTabsMenuButtonVisibility, true);
+
+        # uncomment the following line if you want floating container to always show application title instead of active dock widget's title
+        #QtAds.CDockManager.setConfigFlag(QtAds.CDockManager.FloatingContainerHasWidgetTitle, false);
+
+        # uncomment the following line if you want floating container to show active dock widget's icon instead of always showing application icon
+        #QtAds.CDockManager.setConfigFlag(QtAds.CDockManager.FloatingContainerHasWidgetIcon, true);
+
+        # uncomment the following line if you want a central widget in the main dock container (the dock manager) without a titlebar
+        # If you enable this code, you can test it in the demo with the Calendar 0
+        # dock widget.
+        #QtAds.CDockManager.setConfigFlag(QtAds.CDockManager.HideSingleCentralWidgetTitleBar, true);

        # Now create the dock manager and its content
        self.dock_manager = QtAds.CDockManager(self)
@@ -245,8 +291,6 @@ class MainWindow(MainWindowUI, MainWindowBase):
        view_menu = self.menuView
        dock_widget = create_calendar_dock_widget(view_menu)
        dock_widget.setFeature(QtAds.CDockWidget.DockWidgetClosable, False)
-        dock_widget.setFeature(QtAds.CDockWidget.DockWidgetMovable, False)
-        dock_widget.setFeature(QtAds.CDockWidget.DockWidgetFloatable, False)
        special_dock_area = self.dock_manager.addDockWidget(QtAds.LeftDockWidgetArea, dock_widget)
        
        # For this Special Dock Area we want to avoid dropping on the center of it (i.e. we don't want this widget to be ever tabbified):
@@ -271,18 +315,13 @@ class MainWindow(MainWindowUI, MainWindowBase):
        append_feature_string_to_window_title(file_system_widget)
        
        # Test custom factory - we inject a help button into the title bar
-        self.factory = CustomComponentsFactory()
-        QtAds.CDockComponentsFactory.setFactory(self.factory)
+        QtAds.CDockComponentsFactory.setFactory(CCustomComponentsFactory())
        top_dock_area = self.dock_manager.addDockWidget(QtAds.TopDockWidgetArea, file_system_widget)
        QtAds.CDockComponentsFactory.resetDefaultFactory()

-
        # We create a calendar widget and clear all flags to prevent the dock area
        # from closing
        dock_widget = create_calendar_dock_widget(view_menu)
-        dock_widget.setFeature(QtAds.CDockWidget.DockWidgetClosable, False)
-        dock_widget.setFeature(QtAds.CDockWidget.DockWidgetMovable, False)
-        dock_widget.setFeature(QtAds.CDockWidget.DockWidgetFloatable, False)
        dock_widget.setTabToolTip("Tab ToolTip\nHodie est dies magna")
        dock_area = self.dock_manager.addDockWidget(QtAds.CenterDockWidgetArea, dock_widget, top_dock_area)

@@ -292,6 +331,7 @@ class MainWindow(MainWindowUI, MainWindowBase):
        custom_button.setToolTip("Create Editor")
        custom_button.setIcon(svg_icon(":/adsdemo/images/plus.svg"))
        custom_button.setAutoRaise(True)
+        
        title_bar = dock_area.titleBar()
        index = title_bar.indexOf(title_bar.tabBar())
        title_bar.insertWidget(index + 1, custom_button)
@@ -309,7 +349,7 @@ class MainWindow(MainWindowUI, MainWindowBase):
        self.dock_manager.addDockWidget(
            QtAds.TopDockWidgetArea,
            create_long_text_label_dock_widget(view_menu), right_dock_area)
-
+    
        bottom_dock_area = self.dock_manager.addDockWidget(
            QtAds.BottomDockWidgetArea,
            create_long_text_label_dock_widget(view_menu), right_dock_area)
@@ -320,9 +360,14 @@ class MainWindow(MainWindowUI, MainWindowBase):
        self.dock_manager.addDockWidget(
            QtAds.CenterDockWidgetArea,
            create_long_text_label_dock_widget(view_menu), bottom_dock_area)
-            
-        action = self.menuView.addAction("Set {} floating".format(dock_widget.windowTitle()))
+
+        
+        action = self.menuTests.addAction("Set {} Floating".format(dock_widget.windowTitle()))
        action.triggered.connect(dock_widget.setFloating)
+        action = self.menuTests.addAction("Set {} As Current Tab".format(dock_widget.windowTitle()))
+        action.triggered.connect(dock_widget.setAsCurrentTab)
+        action = self.menuTests.addAction("Raise {}".format(dock_widget.windowTitle()))
+        action.triggered.connect(dock_widget.raise_)
        
        if ACTIVEX_AVAILABLE:
            flags = self.dock_manager.configFlags()
@@ -353,25 +398,40 @@ class MainWindow(MainWindowUI, MainWindowBase):
        self.toolBar.addAction(self.perspective_list_action)
        self.toolBar.addAction(self.save_perspective_action)
        
-        a = self.toolBar.addAction("Create Editor")
+        a = self.toolBar.addAction("Create Floating Editor")
+        a.setProperty("Floating", True)
        a.setToolTip("Creates floating dynamic dockable editor windows that are deleted on close")
        a.setIcon(svg_icon(":/adsdemo/images/note_add.svg"))
        a.triggered.connect(self.create_editor)
+        self.menuTests.addAction(a)
+        
+        a = self.toolBar.addAction("Create Docked Editor")
+        a.setProperty("Floating", False)
+        a.setToolTip("Creates a docked editor windows that are deleted on close")
+        a.setIcon(svg_icon(":/adsdemo/images/docked_editor.svg"))
+        a.triggered.connect(self.create_editor)
+        self.menuTests.addAction(a)

-        a = self.toolBar.addAction("Create Table")
+        a = self.toolBar.addAction("Create Floating Table")
        a.setToolTip("Creates floating dynamic dockable table with millions of entries")
        a.setIcon(svg_icon(":/adsdemo/images/grid_on.svg"))
        a.triggered.connect(self.create_table)
+        self.menuTests.addAction(a)
+        
+        self.menuTests.addSeparator()
+        a = self.menuTests.addAction("Show Status Dialog")
+        a.triggered.connect(self.show_status_dialog)
+        self.menuTests.addSeparator()
        
    def closeEvent(self, event: QCloseEvent):
        self.save_state()
        super().closeEvent(event)
        
-    def on_action_save_state_triggered(state: bool):
+    def on_actionSaveState_triggered(self, state: bool):
        qDebug("MainWindow::on_action_save_state_triggered")
        self.save_state()
        
-    def on_action_restore_state_triggered(state: bool):
+    def on_actionRestoreState_triggered(self, state: bool):
        qDebug("MainWindow::on_action_restore_state_triggered")
        self.restore_state()
        
@@ -403,11 +463,18 @@ class MainWindow(MainWindowUI, MainWindowBase):
        qDebug("{} visibility_changed({})".format(dock_widget.objectName(), visible))
            
    def create_editor(self):
+        sender = self.sender()
+        floating = sender.property("Floating")
+        print("Floating:", floating)
        dock_widget = create_editor_widget(self.menuView)
        dock_widget.setFeature(QtAds.CDockWidget.DockWidgetDeleteOnClose, True)
-        floating_widget = self.dock_manager.addDockWidgetFloating(dock_widget)
-        floating_widget.move(QPoint(20, 20))
        dock_widget.closeRequested.connect(self.on_editor_close_requested)
+        
+        if floating:
+            floating_widget = self.dock_manager.addDockWidgetFloating(dock_widget)
+            floating_widget.move(QPoint(20, 20))
+        else:
+            self.dock_manager.addDockWidget(QtAds.TopDockWidgetArea, dock_widget)
            
    def on_editor_close_requested(self):
        dock_widget = self.sender()
@@ -421,6 +488,10 @@ class MainWindow(MainWindowUI, MainWindowBase):
        dock_widget.setFeature(QtAds.CDockWidget.DockWidgetDeleteOnClose, True)
        floating_widget = self.dock_manager.addDockWidgetFloating(dock_widget)
        floating_widget.move(QPoint(40, 40))
+        
+    def show_status_dialog(self):
+        dialog = CStatusDialog(self.dock_manager)
+        dialog.exec_()

    def save_state(self):
        '''
--- a/demo/demo.qrc
+++ b/demo/demo.qrc
@@ -14,5 +14,8 @@
        <file>images/plus.svg</file>
        <file>images/help_outline.svg</file>
        <file>images/fullscreen.svg</file>
+        <file>images/create_floating_editor.svg</file>
+        <file>images/create_floating_table.svg</file>
+        <file>images/docked_editor.svg</file>
    </qresource>
 </RCC>
--- a/demo/images/create_floating_editor.svg
+++ b/demo/images/create_floating_editor.svg
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0,0,1024,1024"
+   id="svg2562"
+   sodipodi:docname="create_floating_editor.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <metadata
+     id="metadata2568">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs2566" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     id="namedview2564"
+     showgrid="false"
+     inkscape:zoom="0.23046875"
+     inkscape:cx="512"
+     inkscape:cy="512"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2562" />
+  <desc
+     id="desc2556">note_add icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.)</desc>
+  <g
+     style="mix-blend-mode:normal;fill:#03b8e5;fill-rule:nonzero"
+     id="g2560"
+     transform="matrix(0.73242903,0,0,0.73242903,136.99634,136.99634)">
+    <path
+       d="m 853.33,341.33 v 512 c 0,46.93 -38.4,85.34 -85.33,85.34 H 255.57 c -46.93,0 -84.9,-38.41 -84.9,-85.34 l 0.42,-682.66 c 0,-46.93 37.98,-85.34 84.91,-85.34 h 341.33 z m -170.66,256 h -128 v -128 h -85.34 v 128 h -128 v 85.34 h 128 v 128 h 85.34 v -128 h 128 z M 789.33,384 554.67,149.33 V 384 Z"
+       id="path2558"
+       inkscape:connector-curvature="0" />
+  </g>
+  <path
+     style="mix-blend-mode:normal;fill:#03b8e5;fill-rule:nonzero"
+     d="M 426.6699,917.33988 512.4297,1024 597.3301,917.33988 Z"
+     id="path3115"
+     inkscape:connector-curvature="0" />
+  <path
+     style="mix-blend-mode:normal;fill:#03b8e5;fill-rule:nonzero"
+     d="M 426.6699,106.66012 512.4297,0 597.3301,106.66012 Z"
+     id="path3115-7"
+     inkscape:connector-curvature="0" />
+  <path
+     style="mix-blend-mode:normal;fill:#03b8e5;fill-rule:nonzero"
+     d="M 917.33988,426.6699 1024,512.4297 917.33988,597.3301 Z"
+     id="path3115-7-9"
+     inkscape:connector-curvature="0" />
+  <path
+     style="mix-blend-mode:normal;fill:#03b8e5;fill-rule:nonzero"
+     d="M 106.66016,426.6699 0,512.4297 106.66016,597.3301 Z"
+     id="path3115-7-9-4"
+     inkscape:connector-curvature="0" />
+</svg>
--- a/demo/images/create_floating_table.svg
+++ b/demo/images/create_floating_table.svg
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0,0,1024,1024"
+   id="svg2562"
+   sodipodi:docname="create_floating_table.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <metadata
+     id="metadata2568">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs2566" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     id="namedview2564"
+     showgrid="false"
+     inkscape:zoom="0.23046875"
+     inkscape:cx="512"
+     inkscape:cy="512"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2562" />
+  <desc
+     id="desc2556">note_add icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.)</desc>
+  <path
+     style="mix-blend-mode:normal;fill:#03b8e5;fill-rule:nonzero"
+     d="M 426.6699,917.33988 512.4297,1024 597.3301,917.33988 Z"
+     id="path3115"
+     inkscape:connector-curvature="0" />
+  <path
+     style="mix-blend-mode:normal;fill:#03b8e5;fill-rule:nonzero"
+     d="M 426.6699,106.66012 512.4297,0 597.3301,106.66012 Z"
+     id="path3115-7"
+     inkscape:connector-curvature="0" />
+  <path
+     style="mix-blend-mode:normal;fill:#03b8e5;fill-rule:nonzero"
+     d="M 917.33988,426.6699 1024,512.4297 917.33988,597.3301 Z"
+     id="path3115-7-9"
+     inkscape:connector-curvature="0" />
+  <path
+     style="mix-blend-mode:normal;fill:#03b8e5;fill-rule:nonzero"
+     d="M 106.66016,426.6699 0,512.4297 106.66016,597.3301 Z"
+     id="path3115-7-9-4"
+     inkscape:connector-curvature="0" />
+  <g
+     id="g3198"
+     style="mix-blend-mode:normal;fill:#03b8e5;fill-rule:nonzero"
+     transform="matrix(0.73241615,0,0,0.73241615,137.00293,137.00293)">
+    <path
+       id="path3196"
+       d="m 938.67,170.67 v 682.66 c 0,46.93 -38.41,85.34 -85.34,85.34 H 170.67 c -46.93,0 -85.34,-38.41 -85.34,-85.34 V 170.67 c 0,-46.93 38.41,-85.34 85.34,-85.34 h 682.66 c 46.93,0 85.34,38.41 85.34,85.34 z m -597.34,0 H 170.67 v 170.66 h 170.66 z m 0,512 H 170.67 v 170.66 h 170.66 z m 0,-256 H 170.67 v 170.66 h 170.66 z m 256,-256 H 426.67 v 170.66 h 170.66 z m 256,0 H 682.67 v 170.66 h 170.66 z m -256,512 H 426.67 v 170.66 h 170.66 z m 0,-256 H 426.67 v 170.66 h 170.66 z m 256,256 H 682.67 v 170.66 h 170.66 z m 0,-256 H 682.67 v 170.66 h 170.66 z"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
--- a/demo/images/docked_editor.svg
+++ b/demo/images/docked_editor.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0,0,1024,1024">
+	<desc>chrome_reader_mode icon - Licensed under Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) - Created with Iconfu.com - Derivative work of Material icons (Copyright Google Inc.)</desc>
+	<g fill="#03b8e5" fill-rule="nonzero" style="mix-blend-mode: normal">
+		<path d="M981.33,256v554.67c0,46.93 -38.4,85.33 -85.33,85.33h-768c-46.93,0 -85.33,-38.4 -85.33,-85.33v-554.67c0,-46.93 38.4,-85.33 85.33,-85.33h768c46.93,0 85.33,38.4 85.33,85.33zM896,256h-384v554.67h384zM554.67,512h298.66v64h-298.66zM554.67,405.33h298.66v64h-298.66zM554.67,618.67h298.66v64h-298.66z"/>
+	</g>
+</svg>
--- a/demo/status_dialog.py
+++ b/demo/status_dialog.py
@@ -0,0 +1,38 @@
+import os
+import sys
+
+from PyQt5 import uic
+from PyQtAds import QtAds
+
+UI_FILE = os.path.join(os.path.dirname(__file__), 'StatusDialog.ui')
+StatusDialogUI, StatusDialogBase = uic.loadUiType(UI_FILE)
+
+class CStatusDialog(StatusDialogUI, StatusDialogBase):
+    
+    def __init__(self, dock_manager: QtAds.CDockManager, parent=None):
+        super().__init__(parent)
+
+        self.setupUi(self)
+        
+        self.dock_manager = dock_manager
+        self.dock_widgets = self.dock_manager.dockWidgetsMap()
+        
+        for key, widget in self.dock_widgets.items():
+            self.dockWidgetsComboBox.addItem(key, widget)
+            
+    def on_dockWidgetsComboBox_currentIndexChanged(self, index: int):
+        if not isinstance(index, int):
+            return
+        if index < 0:
+            return
+        
+        dock_widget = self.dockWidgetsComboBox.currentData()
+        self.isClosedCheckBox.setChecked(dock_widget.isClosed())
+        self.isFloatingCheckBox.setChecked(dock_widget.isFloating())
+        self.tabbedCheckBox.setChecked(dock_widget.isTabbed())
+        self.isCurrentTabCheckBox.setChecked(dock_widget.isCurrentTab())
+        self.closableCheckBox.setChecked(dock_widget.features() & QtAds.CDockWidget.DockWidgetClosable)
+        self.movableCheckBox.setChecked(dock_widget.features() & QtAds.CDockWidget.DockWidgetMovable)
+        self.floatableCheckBox.setChecked(dock_widget.features() & QtAds.CDockWidget.DockWidgetFloatable)
+        self.deleteOnCloseCheckBox.setChecked(dock_widget.features() & QtAds.CDockWidget.DockWidgetDeleteOnClose)
+        self.customCloseHandlingCheckBox.setChecked(dock_widget.features() & QtAds.CDockWidget.CustomCloseHandling)
--- a/doc/ezEngine_editor.png
+++ b/doc/ezEngine_editor.png
--- a/doc/user-guide.md
+++ b/doc/user-guide.md
@@ -23,6 +23,8 @@
  - [`FloatingContainerHasWidgetTitle`](#floatingcontainerhaswidgettitle)
  - [`FloatingContainerHasWidgetIcon`](#floatingcontainerhaswidgeticon)
  - [`HideSingleCentralWidgetTitleBar`](#hidesinglecentralwidgettitlebar)
+- [Styling](#styling)
+  - [Disabling the Internal Style Sheet](#disabling-the-internal-style-sheet)

 ## Configuration Flags

@@ -297,3 +299,19 @@ still has a titlebar to drag it out of the main window.

 ![HideSingleCentralWidgetTitleBar false](cfg_flag_HideSingleCentralWidgetTitleBar_false.png)

+## 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
+icons are styleable this way.
+
+### Disabling the Internal Style Sheet
+
+The dock manager uses an internal stylesheet to style its components. That
+means, the style that you see in the demo application comes from the
+internal stylesheets that you will find in `src/stylesheets` folder. If you want
+to disable this internal stylesheet because your application uses its own,
+just call the function for settings the stylesheet with an empty string.
+
+```c++
+DockManager->setStyleSheet("");
+```
--- a/example/CMakeLists.txt
+++ b/example/CMakeLists.txt
@@ -1,46 +0,0 @@
-cmake_minimum_required(VERSION 3.3)
-set (CMAKE_CXX_STANDARD 14)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-project(ads_example VERSION "1.0") 
-set(REQUIRED_QT_VERSION 5.5.0)
-find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED)
-find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED)
-find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED)
-set(ads_example_LIBS ${ads_example_LIBS} ${Qt5Core_LIBRARIES})
-set(ads_example_INCLUDE ${ads_example_INCLUDE} ${Qt5Core_INCLUDE_DIRS})
-set(ads_example_COMPILE_DEFINE ${ads_example_COMPILE_DEFINE} ${Qt5Core_COMPILE_DEFINITIONS} )
-set(ads_example_LIBS ${ads_example_LIBS} ${Qt5Gui_LIBRARIES})
-set(ads_example_INCLUDE ${ads_example_INCLUDE} ${Qt5Gui_INCLUDE_DIRS})
-set(ads_example_COMPILE_DEFINE ${ads_example_COMPILE_DEFINE} ${Qt5Gui_COMPILE_DEFINITIONS})
-set(ads_example_LIBS ${ads_example_LIBS} ${Qt5Widgets_LIBRARIES})
-set(ads_example_INCLUDE ${ads_example_INCLUDE} ${Qt5Widgets_INCLUDE_DIRS})
-set(ads_example_COMPILE_DEFINE ${ads_example_COMPILE_DEFINE} ${Qt5Widgets_COMPILE_DEFINITIONS})
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-set(ads_example_SRCS
-    main.cpp
-    MainWindow.cpp
-    MainWindow.ui
-)
-add_executable(Example1 WIN32 ${ads_example_SRCS})
-if(BUILD_STATIC)
-    set(ads_example_DEFINE ${ads_example_DEFINE} ADS_STATIC)
-endif()
-add_dependencies(Example1 qtadvanceddocking)
-target_include_directories(Example1 PUBLIC 
-    $<BUILD_INTERFACE:${ads_example_INCLUDE}>
-    $<INSTALL_INTERFACE:include>
-    )
-target_include_directories(Example1 PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../src"  ${ads_example_INCLUDE})
-target_link_libraries(Example1 PRIVATE qtadvanceddocking ${ads_example_LIBS})
-target_compile_definitions(Example1 PRIVATE ${ads_example_DEFINE})
-set_target_properties(Example1 PROPERTIES 
-    VERSION "1.0"
-    SOVERSION 1
-    EXPORT_NAME "Qt Advanced Docking System Example"
-    ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib"
-    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib"
-    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/bin"
-)
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.5)
+project(QtADSExamples LANGUAGES CXX VERSION ${VERSION_SHORT})
+add_subdirectory(simple)
+add_subdirectory(sidebar)
+add_subdirectory(deleteonclose)
--- a/examples/deleteonclose/CMakeLists.txt
+++ b/examples/deleteonclose/CMakeLists.txt
@@ -0,0 +1,21 @@
+cmake_minimum_required(VERSION 3.5)
+project(ads_example_deleteonclose VERSION ${VERSION_SHORT}) 
+find_package(Qt5 5.5 COMPONENTS Core Gui Widgets REQUIRED)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+add_executable(DeleteOnCloseTest WIN32 
+    main.cpp
+)
+target_include_directories(DeleteOnCloseTest PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../../src")
+target_link_libraries(DeleteOnCloseTest PRIVATE qtadvanceddocking)
+target_link_libraries(DeleteOnCloseTest PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets)
+set_target_properties(DeleteOnCloseTest PROPERTIES 
+    AUTOMOC ON
+    CXX_STANDARD 14
+    CXX_STANDARD_REQUIRED ON
+    CXX_EXTENSIONS OFF
+    VERSION ${VERSION_SHORT}
+    EXPORT_NAME "Qt Advanced Docking System Delete on Close Example"
+    ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib"
+    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib"
+    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/bin"
+)
--- a/examples/deleteonclose/deleteonclose.pro
+++ b/examples/deleteonclose/deleteonclose.pro
@@ -0,0 +1,39 @@
+ADS_OUT_ROOT = $${OUT_PWD}/../..
+
+QT += core gui widgets
+
+TARGET = DeleteOnCloseTest
+DESTDIR = $${ADS_OUT_ROOT}/lib
+TEMPLATE = app
+CONFIG += c++14
+CONFIG += debug_and_release
+adsBuildStatic {
+    DEFINES += ADS_STATIC
+}
+
+DEFINES += QT_DEPRECATED_WARNINGS
+
+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
+}
+
+INCLUDEPATH += ../../src
+DEPENDPATH += ../../src    
+
--- a/examples/deleteonclose/main.cpp
+++ b/examples/deleteonclose/main.cpp
@@ -0,0 +1,41 @@
+#include <QMainWindow>
+#include <QAction>
+#include <QTextEdit>
+#include <QApplication>
+#include <QMenuBar>
+#include "DockManager.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication a(argc, argv);
+    QMainWindow w;
+
+    auto dockManager = new ads::CDockManager(&w);
+
+    QAction *action = new QAction("New Delete On Close", &w);
+    w.menuBar()->addAction(action);
+
+    int i = 0;
+    QObject::connect(action, &QAction::triggered, [&]() {
+        auto dw = new ads::CDockWidget(QStringLiteral("test doc %1").arg(i++), &w);
+        auto editor = new QTextEdit(QStringLiteral("lorem ipsum..."), dw);
+        dw->setWidget(editor);
+        dw->setFeature(ads::CDockWidget::DockWidgetDeleteOnClose, true);
+        auto area = dockManager->addDockWidgetTab(ads::CenterDockWidgetArea, dw);
+        qDebug() << "doc dock widget created!" << dw << area;
+    });
+
+    action = new QAction("New", &w);
+    w.menuBar()->addAction(action);
+    QObject::connect(action, &QAction::triggered, [&]() {
+        auto dw = new ads::CDockWidget(QStringLiteral("test %1").arg(i++), &w);
+        auto editor = new QTextEdit(QStringLiteral("lorem ipsum..."), dw);
+        dw->setWidget(editor);
+        auto area = dockManager->addDockWidgetTab(ads::CenterDockWidgetArea, dw);
+        qDebug() << "dock widget created!" << dw << area;
+    });
+
+    w.show();
+
+    return a.exec();
+}
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -0,0 +1,6 @@
+TEMPLATE = subdirs
+
+SUBDIRS = \
+	simple \
+	sidebar \
+	deleteonclose
--- a/examples/sidebar/CMakeLists.txt
+++ b/examples/sidebar/CMakeLists.txt
@@ -0,0 +1,25 @@
+cmake_minimum_required(VERSION 3.5)
+project(ads_example_sidebar VERSION ${VERSION_SHORT}) 
+find_package(Qt5 5.5 COMPONENTS Core Gui Widgets REQUIRED)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+add_executable(SidebarExample WIN32 
+    main.cpp
+    MainWindow.cpp
+    MainWindow.ui
+)
+target_include_directories(SidebarExample PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../../src")
+target_link_libraries(SidebarExample PRIVATE qtadvanceddocking)
+target_link_libraries(SidebarExample PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets)
+set_target_properties(SidebarExample PROPERTIES 
+    AUTOMOC ON
+    AUTORCC ON
+    AUTOUIC ON
+    CXX_STANDARD 14
+    CXX_STANDARD_REQUIRED ON
+    CXX_EXTENSIONS OFF
+    VERSION ${VERSION_SHORT}
+    EXPORT_NAME "Qt Advanced Docking System Sidebar Example"
+    ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib"
+    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib"
+    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/bin"
+)
--- a/examples/sidebar/MainWindow.cpp
+++ b/examples/sidebar/MainWindow.cpp
@@ -0,0 +1,53 @@
+#include "MainWindow.h"
+
+#include "ui_MainWindow.h"
+
+#include <QLabel>
+#include <QVBoxLayout>
+#include <QPlainTextEdit>
+
+MainWindow::MainWindow(QWidget *parent) :
+    QMainWindow(parent),
+    ui(new Ui::MainWindow)
+{
+    ui->setupUi(this);
+
+    // Create the dock manager. Because the parent parameter is a QMainWindow
+    // the dock manager registers itself as the central widget.
+	QVBoxLayout* Layout = new QVBoxLayout(ui->dockContainer);
+	Layout->setContentsMargins(QMargins(0, 0, 0, 0));
+	m_DockManager = new ads::CDockManager(ui->dockContainer);
+	Layout->addWidget(m_DockManager);
+
+	// Create example content label - this can be any application specific
+	// widget
+	QLabel* l = new 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
+	ads::CDockWidget* DockWidget = new ads::CDockWidget("Label 1");
+	DockWidget->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
+	ui->menuView->addAction(DockWidget->toggleViewAction());
+
+
+	// Add the dock widget to the top dock widget area
+	m_DockManager->addDockWidget(ads::TopDockWidgetArea, DockWidget);
+
+	// Create an example editor
+	QPlainTextEdit* te = new QPlainTextEdit();
+	te->setPlaceholderText("Please enter your text here into this QPlainTextEdit...");
+	DockWidget = new ads::CDockWidget("Editor 1");
+	ui->menuView->addAction(DockWidget->toggleViewAction());
+	m_DockManager->addDockWidget(ads::BottomDockWidgetArea, DockWidget);
+}
+
+MainWindow::~MainWindow()
+{
+    delete ui;
+}
--- a/examples/sidebar/MainWindow.h
+++ b/examples/sidebar/MainWindow.h
@@ -0,0 +1,30 @@
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+#include "DockManager.h"
+
+QT_BEGIN_NAMESPACE
+namespace Ui {
+class MainWindow;
+}
+QT_END_NAMESPACE
+
+/**
+ * This example shows, how to place a dock widget container and a static
+ * sidebar into a QMainWindow
+ */
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    explicit MainWindow(QWidget *parent = 0);
+    ~MainWindow();
+
+private:
+    Ui::MainWindow *ui;
+    ads::CDockManager* m_DockManager;
+};
+
+#endif // MAINWINDOW_H
--- a/examples/sidebar/MainWindow.ui
+++ b/examples/sidebar/MainWindow.ui
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>650</width>
+    <height>376</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>MainWindow</string>
+  </property>
+  <widget class="QWidget" name="centralWidget">
+   <layout class="QHBoxLayout" name="horizontalLayout">
+    <item>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="QComboBox" name="comboBox"/>
+      </item>
+      <item>
+       <widget class="QPushButton" name="pushButton">
+        <property name="text">
+         <string>PushButton</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLineEdit" name="lineEdit">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPlainTextEdit" name="plainTextEdit">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
+    <item>
+     <widget class="QWidget" name="dockContainer" native="true">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="menuBar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>650</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="menuView">
+    <property name="title">
+     <string>View</string>
+    </property>
+   </widget>
+   <addaction name="menuView"/>
+  </widget>
+  <widget class="QStatusBar" name="statusBar"/>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <resources/>
+ <connections/>
+</ui>
--- a/examples/sidebar/main.cpp
+++ b/examples/sidebar/main.cpp
@@ -1,5 +1,5 @@
-#include "MainWindow.h"
 #include <QApplication>
+#include "../../examples/simple/MainWindow.h"

 int main(int argc, char *argv[])
 {
--- a/examples/sidebar/sidebar.pro
+++ b/examples/sidebar/sidebar.pro
@@ -0,0 +1,47 @@
+ADS_OUT_ROOT = $${OUT_PWD}/../..
+
+QT += core gui widgets
+
+TARGET = SidebarExample
+DESTDIR = $${ADS_OUT_ROOT}/lib
+TEMPLATE = app
+CONFIG += c++14
+CONFIG += debug_and_release
+adsBuildStatic {
+    DEFINES += ADS_STATIC
+}
+
+DEFINES += QT_DEPRECATED_WARNINGS
+
+SOURCES += \
+        main.cpp \
+        MainWindow.cpp
+
+HEADERS += \
+        MainWindow.h
+
+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
+}
+
+INCLUDEPATH += ../../src
+DEPENDPATH += ../../src    
+
--- a/examples/sidebar/sidebar.py
+++ b/examples/sidebar/sidebar.py
@@ -0,0 +1,60 @@
+import os
+import sys
+
+from PyQt5 import uic
+from PyQt5.QtCore import Qt, QMargins
+from PyQt5.QtWidgets import QApplication, QLabel, QVBoxLayout, QPlainTextEdit
+
+from PyQtAds import QtAds
+
+UI_FILE = os.path.join(os.path.dirname(__file__), 'MainWindow.ui')
+MainWindowUI, MainWindowBase = uic.loadUiType(UI_FILE)
+
+
+class MainWindow(MainWindowUI, MainWindowBase):
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+
+        self.setupUi(self)
+ 
+        # Create the dock manager. Because the parent parameter is a QMainWindow
+        # the dock manager registers itself as the central widget.
+        layout = QVBoxLayout(self.dockContainer);
+        layout.setContentsMargins(QMargins(0, 0, 0, 0))
+        self.dock_manager = QtAds.CDockManager(self.dockContainer)
+        layout.addWidget(self.dock_manager)
+        
+        # Create example content label - this can be any application specific
+        # widget
+        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_widget = QtAds.CDockWidget("Label 1")
+        dock_widget.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_manager.addDockWidget(QtAds.TopDockWidgetArea, dock_widget)
+        
+        # Create an example editor
+        te = QPlainTextEdit()
+        te.setPlaceholderText("Please enter your text here into this QPlainTextEdit...")
+        dock_widget = QtAds.CDockWidget("Editor 1")
+        self.menuView.addAction(dock_widget.toggleViewAction())
+        self.dock_manager.addDockWidget(QtAds.BottomDockWidgetArea, dock_widget)
+
+
+if __name__ == '__main__':
+    app = QApplication(sys.argv)
+    
+    w = MainWindow()
+    w.show()
+    app.exec_()
--- a/examples/simple/CMakeLists.txt
+++ b/examples/simple/CMakeLists.txt
@@ -0,0 +1,25 @@
+cmake_minimum_required(VERSION 3.5)
+project(ads_example_simple VERSION ${VERSION_SHORT}) 
+find_package(Qt5 5.5 COMPONENTS Core Gui Widgets REQUIRED)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+add_executable(SimpleExample WIN32 
+    main.cpp
+    MainWindow.cpp
+    MainWindow.ui
+)
+target_include_directories(SimpleExample PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../../src")
+target_link_libraries(SimpleExample PRIVATE qtadvanceddocking)
+target_link_libraries(SimpleExample PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets)
+set_target_properties(SimpleExample PROPERTIES 
+    AUTOMOC ON
+    AUTORCC ON
+    AUTOUIC ON
+    CXX_STANDARD 14
+    CXX_STANDARD_REQUIRED ON
+    CXX_EXTENSIONS OFF
+    VERSION ${VERSION_SHORT}
+    EXPORT_NAME "Qt Advanced Docking System Simple Example"
+    ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib"
+    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib"
+    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/bin"
+)
--- a/examples/simple/MainWindow.cpp
+++ b/examples/simple/MainWindow.cpp
@@ -1,4 +1,5 @@
-#include "MainWindow.h"
+#include "../../examples/simple/MainWindow.h"
+
 #include "ui_MainWindow.h"

 #include <QLabel>
--- a/examples/simple/MainWindow.h
+++ b/examples/simple/MainWindow.h
@@ -4,9 +4,11 @@
 #include <QMainWindow>
 #include "DockManager.h"

+QT_BEGIN_NAMESPACE
 namespace Ui {
 class MainWindow;
 }
+QT_END_NAMESPACE

 class MainWindow : public QMainWindow
 {
--- a/examples/simple/MainWindow.ui
+++ b/examples/simple/MainWindow.ui
--- a/examples/simple/main.cpp
+++ b/examples/simple/main.cpp
@@ -0,0 +1,11 @@
+#include <QApplication>
+#include "../../examples/simple/MainWindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication a(argc, argv);
+    MainWindow w;
+    w.show();
+
+    return a.exec();
+}
--- a/examples/simple/simple.pro
+++ b/examples/simple/simple.pro
@@ -1,8 +1,8 @@
-ADS_OUT_ROOT = $${OUT_PWD}/..
+ADS_OUT_ROOT = $${OUT_PWD}/../..

 QT += core gui widgets

-TARGET = Example1
+TARGET = SimpleExample
 DESTDIR = $${ADS_OUT_ROOT}/lib
 TEMPLATE = app
 CONFIG += c++14
@@ -42,6 +42,6 @@ else{
    LIBS += -lqtadvanceddocking
 }

-INCLUDEPATH += ../src
-DEPENDPATH += ../src    
+INCLUDEPATH += ../../src
+DEPENDPATH += ../../src    

--- a/examples/simple/simple.py
+++ b/examples/simple/simple.py
@@ -1,5 +1,3 @@
-import datetime
-import logging
 import os
 import sys

--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,7 @@
 import os
 import sys
 import shlex
+import shutil
 import subprocess
 import glob

@@ -141,7 +142,23 @@ class build_ext(sipdistutils.build_ext):

    def _find_sip(self):
        """override _find_sip to allow for manually speficied sip path."""
-        return self.sip_bin or super()._find_sip()
+        
+        # 1. Manually specified sip_bin
+        if self.sip_bin:
+            return self.sip_bin
+
+        # 2. Path determined from sipconfig.Configuration()
+        #    This may not exist, depending on conda build configuration.
+        sip_bin = super()._find_sip()
+        if os.path.exists(sip_bin):
+            return sip_bin
+
+        # 3. Finally, fall back to sip binary found in path
+        sip_bin = shutil.which('sip')
+        if sip_bin:
+            return sip_bin
+
+        raise SystemExit('Could not find PyQt SIP binary.')

    def _sip_compile(self, sip_bin, source, sbf):
        cmd = [sip_bin]
@@ -194,6 +211,8 @@ class build_ext(sipdistutils.build_ext):
        return super().swig_sources(sources, extension)

    def build_extension(self, ext):
+        # /usr/bin/rcc -name ads ../../Qt-Advanced-Docking-System/src/ads.qrc -o release/qrc_ads.cpp
+        
        cppsources = [source for source in ext.sources if source.endswith(".cpp")]

        dir_util.mkpath(self.build_temp, dry_run=self.dry_run)
@@ -231,6 +250,17 @@ class build_ext(sipdistutils.build_ext):
        # Add the temp build directory to include path, for compiler to find
        # the created .moc files
        ext.include_dirs += [self._sip_output_dir()]
+        
+        # Run rcc on all resource files
+        resources = [source for source in ext.sources if source.endswith(".qrc")]
+        for source in resources:
+            ext.sources.remove(source)
+            out_file = os.path.join(self.build_temp, "qrc_" + os.path.basename(source).replace(".qrc", ".cpp"))
+            if newer(header, out_file) or self.force:
+                spawn.spawn(["rcc", "-name", os.path.splitext(os.path.basename(source))[0], source, "-o", out_file], dry_run=self.dry_run)
+
+            if os.path.getsize(out_file) > 0:
+                ext.sources.append(out_file)

        sipdistutils.build_ext.build_extension(self, ext)

@@ -262,9 +292,10 @@ class BuildPyCommand(build_py):
 setup_requires = ["PyQt5"] if REQUIRE_PYQT else []
 cpp_sources = glob.glob(os.path.join('src', '*.cpp'))
 sip_sources = [os.path.join('sip', MODULE_NAME + '.sip')]
+resources = [os.path.join('src', MODULE_NAME + '.qrc')]
 if sys.platform == 'linux':
    cpp_sources += glob.glob(os.path.join('src', 'linux', '*.cpp'))
-ext_modules = [Extension('PyQtAds.QtAds.ads', cpp_sources + sip_sources)]
+ext_modules = [Extension('PyQtAds.QtAds.ads', cpp_sources + sip_sources + resources)]

 install_requires = ["PyQt5"]
 if sys.platform == 'win32':
--- a/sip/DockComponentsFactory.sip
+++ b/sip/DockComponentsFactory.sip
@@ -16,7 +16,7 @@ public:
 	virtual CDockAreaTabBar* createDockAreaTabBar(CDockAreaWidget* DockArea /Transfer/ ) const;
 	virtual CDockAreaTitleBar* createDockAreaTitleBar(CDockAreaWidget* DockArea /Transfer/ ) const;
 	static const CDockComponentsFactory* factory();
-	static void setFactory(CDockComponentsFactory* Factory);
+	static void setFactory(CDockComponentsFactory* Factory /KeepReference/);
 	static void resetDefaultFactory();
    
 };
--- a/sip/DockManager.sip
+++ b/sip/DockManager.sip
@@ -165,12 +165,12 @@ public:
 		DockAreaDynamicTabsMenuButtonVisibility,
 		FloatingContainerHasWidgetTitle,
 		FloatingContainerHasWidgetIcon,
+		HideSingleCentralWidgetTitleBar,
        DefaultDockAreaButtons,
 		DefaultBaseConfig,
        DefaultOpaqueConfig,
 		DefaultNonOpaqueConfig,
 		NonOpaqueWithWindowFrame,
-		HideSingleCentralWidgetTitleBar,
 	};
    typedef QFlags<ads::CDockManager::eConfigFlag> ConfigFlags;

--- a/sip/DockWidgetTab.sip
+++ b/sip/DockWidgetTab.sip
@@ -33,7 +33,7 @@ public:
 	bool isTitleElided() const;
 	bool isClosable() const;
 	virtual bool event(QEvent *e);
-
+	void setElideMode(Qt::TextElideMode mode);

 public slots:
 	virtual void setVisible(bool visible);
--- a/sip/ads_globals.sip
+++ b/sip/ads_globals.sip
@@ -10,7 +10,7 @@ namespace ads

    enum eStateFileVersion
    {
-        InitialVerison,
+        InitialVersion,
        Version1,
        CurrentVersion
    };
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -0,0 +1,106 @@
+cmake_minimum_required(VERSION 3.5)
+project(QtAdvancedDockingSystem LANGUAGES CXX VERSION ${VERSION_SHORT})
+find_package(Qt5 5.5 COMPONENTS Core Gui Widgets REQUIRED)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+if(BUILD_STATIC)
+    set(CMAKE_STATIC_LIBRARY_SUFFIX "_static${CMAKE_STATIC_LIBRARY_SUFFIX}")
+endif()
+set(ads_SRCS
+    ads_globals.cpp
+    DockAreaTabBar.cpp
+    DockAreaTitleBar.cpp
+    DockAreaWidget.cpp
+    DockContainerWidget.cpp
+    DockManager.cpp
+    DockOverlay.cpp
+    DockSplitter.cpp
+    DockWidget.cpp
+    DockWidgetTab.cpp
+    DockingStateReader.cpp
+    ElidingLabel.cpp
+    FloatingDockContainer.cpp
+    FloatingDragPreview.cpp
+    IconProvider.cpp
+    DockComponentsFactory.cpp
+    ads.qrc
+)
+set(ads_INSTALL_INCLUDE 
+    ads_globals.h
+    DockAreaTabBar.h
+    DockAreaTitleBar.h
+    DockAreaTitleBar_p.h
+    DockAreaWidget.h
+    DockContainerWidget.h
+    DockManager.h
+    DockOverlay.h
+    DockSplitter.h
+    DockWidget.h
+    DockWidgetTab.h
+    DockingStateReader.h
+    ElidingLabel.h
+    FloatingDockContainer.h
+    FloatingDragPreview.h
+    IconProvider.h
+    DockComponentsFactory.h
+)
+if (UNIX)
+    set(ads_SRCS linux/FloatingWidgetTitleBar.cpp ${ads_SRCS})
+    set(ads_INSTALL_INCLUDE linux/FloatingWidgetTitleBar.h ${ads_INSTALL_INCLUDE})
+endif()
+if(BUILD_STATIC)
+    add_library(qtadvanceddocking STATIC ${ads_SRCS})
+    target_compile_definitions(qtadvanceddocking PUBLIC ADS_STATIC)
+else()
+    add_library(qtadvanceddocking SHARED ${ads_SRCS})
+    target_compile_definitions(qtadvanceddocking PRIVATE ADS_SHARED_EXPORT)
+endif()
+target_link_libraries(qtadvanceddocking PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets)
+set_target_properties(qtadvanceddocking PROPERTIES 
+    AUTOMOC ON
+    AUTORCC ON
+    CXX_STANDARD 14
+    CXX_STANDARD_REQUIRED ON
+    CXX_EXTENSIONS OFF
+    VERSION ${VERSION_SHORT}
+    EXPORT_NAME "qtadvanceddocking"
+    ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib"
+    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib"
+    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/bin"
+)
+include(CMakePackageConfigHelpers)
+write_basic_package_version_file(
+    "qtadvanceddockingConfigVersion.cmake"
+    VERSION ${VERSION_SHORT}
+    COMPATIBILITY SameMajorVersion
+)
+install(FILES ${ads_INSTALL_INCLUDE}
+    DESTINATION include 
+    COMPONENT headers
+)
+install(FILES 
+    "${CMAKE_SOURCE_DIR}/LICENSE"
+    "${CMAKE_SOURCE_DIR}/gnu-lgpl-v2.1.md"
+    DESTINATION license 
+    COMPONENT license
+)
+install(TARGETS qtadvanceddocking
+    EXPORT adsTargets
+    RUNTIME DESTINATION bin
+    LIBRARY DESTINATION lib
+    ARCHIVE DESTINATION lib
+    INCLUDES DESTINATION include
+)
+
+install(EXPORT adsTargets
+    FILE adsTargets.cmake
+    NAMESPACE ads::
+    DESTINATION lib/cmake/qtadvanceddocking
+)
+install(FILES qtadvanceddockingConfig.cmake "${CMAKE_CURRENT_BINARY_DIR}/qtadvanceddockingConfigVersion.cmake"
+    DESTINATION lib/cmake/qtadvanceddocking
+)
+
+target_include_directories(qtadvanceddocking PUBLIC
+    $<INSTALL_INTERFACE:include>
+)
+
--- a/src/DockAreaTabBar.cpp
+++ b/src/DockAreaTabBar.cpp
@@ -27,7 +27,7 @@
 //============================================================================
 //                                   INCLUDES
 //============================================================================
-#include <FloatingDragPreview.h>
+#include "FloatingDragPreview.h"
 #include "DockAreaTabBar.h"

 #include <QMouseEvent>
@@ -205,10 +205,14 @@ void CDockAreaTabBar::insertTab(int Index, CDockWidgetTab* Tab)
 	connect(Tab, SIGNAL(elidedChanged(bool)), this, SIGNAL(elidedChanged(bool)));
 	Tab->installEventFilter(this);
 	emit tabInserted(Index);
-	if (Index <= d->CurrentIndex || d->CurrentIndex == -1)
+    if (Index <= d->CurrentIndex)
 	{
 		setCurrentIndex(d->CurrentIndex + 1);
-	}
+    }
+    else if (d->CurrentIndex == -1)
+    {
+    	setCurrentIndex(Index);
+    }

 	updateGeometry();
 }
--- a/src/DockAreaTitleBar.cpp
+++ b/src/DockAreaTitleBar.cpp
@@ -39,6 +39,7 @@
 #include <QDebug>
 #include <QPointer>

+#include "DockAreaTitleBar_p.h"
 #include "ads_globals.h"
 #include "FloatingDockContainer.h"
 #include "FloatingDragPreview.h"
@@ -55,8 +56,6 @@

 namespace ads
 {
-using tTitleBarButton = QToolButton;
-

 /**
 * Private data class of CDockAreaTitleBar class (pimpl)
@@ -130,86 +129,6 @@ struct DockAreaTitleBarPrivate
 	IFloatingWidget* makeAreaFloating(const QPoint& Offset, eDragState DragState);
 };// struct DockAreaTitleBarPrivate

-
-/**
- * Title bar button of a dock area that customizes tTitleBarButton appearance/behaviour
- * according to various config flags such as:
- * CDockManager::DockAreaHas_xxx_Button - if set to 'false' keeps the button always invisible
- * CDockManager::DockAreaHideDisabledButtons - if set to 'true' hides button when it is disabled
- */
-class CTitleBarButton : public tTitleBarButton
-{
-	Q_OBJECT
-	bool Visible = true;
-	bool HideWhenDisabled = false;
-public:
-	using Super = tTitleBarButton;
-	CTitleBarButton(bool visible = true, QWidget* parent = nullptr)
-		: tTitleBarButton(parent),
-		  Visible(visible),
-		  HideWhenDisabled(DockAreaTitleBarPrivate::testConfigFlag(CDockManager::DockAreaHideDisabledButtons))
-	{}
-	
-
-	/**
-	 * Adjust this visibility change request with our internal settings:
-	 */
-	virtual void setVisible(bool visible) override
-	{
-		// 'visible' can stay 'true' if and only if this button is configured to generaly visible:
-		visible = visible && this->Visible;
-
-		// 'visible' can stay 'true' unless: this button is configured to be invisible when it is disabled and it is currently disabled:
-		if(visible && HideWhenDisabled)
-		{
-			visible = isEnabled();
-		}
-
-		Super::setVisible(visible);
-	}
-	
-protected:
-	/**
-	 * Handle EnabledChanged signal to set button invisible if the configured
-	 */
-	bool event(QEvent *ev) override
-	{
-		if(QEvent::EnabledChange == ev->type() && HideWhenDisabled)
-		{
-			// force setVisible() call 
-			// Calling setVisible() directly here doesn't work well when button is expected to be shown first time
-			QMetaObject::invokeMethod(this, "setVisible", Qt::QueuedConnection, Q_ARG(bool, isEnabled()));
-		}
-
-		return Super::event(ev);
-	}
-};
-
-
-/**
- * This spacer widget is here because of the following problem.
- * The dock area title bar handles mouse dragging and moving the floating widget.
- * The  problem is, that if the title bar becomes invisible, i.e. if the dock
- * area contains only one single dock widget and the dock area is moved
- * into a floating widget, then mouse events are not handled anymore and dragging
- * of the floating widget stops.
- */
-class CSpacerWidget : public QWidget
-{
-	Q_OBJECT
-public:
-	using Super = QWidget;
-	CSpacerWidget(QWidget* Parent = 0)
-	    : Super(Parent)
-	{
-	    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-	    setStyleSheet("border: none; background: none;");
-	}
-	virtual QSize sizeHint() const override {return QSize(0, 0);}
-	virtual QSize minimumSizeHint() const override {return QSize(0, 0);}
-};
-
-
 //============================================================================
 DockAreaTitleBarPrivate::DockAreaTitleBarPrivate(CDockAreaTitleBar* _public) :
 	_this(_public)
@@ -589,7 +508,7 @@ void CDockAreaTitleBar::mouseMoveEvent(QMouseEvent* ev)
        return;
    }

-	// If this is the last dock area in a dock container it does not make
+	// If this is the last dock area in a floating dock container it does not make
 	// sense to move it to a new floating widget and leave this one
 	// empty
 	if (d->DockArea->dockContainer()->isFloating()
@@ -612,7 +531,7 @@ void CDockAreaTitleBar::mouseMoveEvent(QMouseEvent* ev)
 	int DragDistance = (d->DragStartMousePos - ev->pos()).manhattanLength();
 	if (DragDistance >= CDockManager::startDragDistance())
 	{
-        ADS_PRINT("CTabsScrollArea::startFloating");
+        ADS_PRINT("CDockAreaTitlBar::startFloating");
 		d->startFloating(d->DragStartMousePos);
 		auto Overlay = d->DockArea->dockManager()->containerOverlay();
 		Overlay->setAllowedAreas(OuterDockAreas);
@@ -674,10 +593,50 @@ int CDockAreaTitleBar::indexOf(QWidget *widget) const
 	return d->Layout->indexOf(widget);
 }

+//============================================================================
+CTitleBarButton::CTitleBarButton(bool visible /*= true*/, QWidget* parent /*= nullptr*/) : tTitleBarButton(parent),
+Visible(visible),
+HideWhenDisabled(DockAreaTitleBarPrivate::testConfigFlag(CDockManager::DockAreaHideDisabledButtons))
+{
+
+}
+
+//============================================================================
+void CTitleBarButton::setVisible(bool visible)
+{
+	// 'visible' can stay 'true' if and only if this button is configured to generaly visible:
+	visible = visible && this->Visible;
+
+	// 'visible' can stay 'true' unless: this button is configured to be invisible when it is disabled and it is currently disabled:
+	if (visible && HideWhenDisabled)
+	{
+		visible = isEnabled();
+	}
+
+	Super::setVisible(visible);
+}
+
+//============================================================================
+bool CTitleBarButton::event(QEvent *ev)
+{
+	if (QEvent::EnabledChange == ev->type() && HideWhenDisabled)
+	{
+		// force setVisible() call 
+		// Calling setVisible() directly here doesn't work well when button is expected to be shown first time
+		QMetaObject::invokeMethod(this, "setVisible", Qt::QueuedConnection, Q_ARG(bool, isEnabled()));
+	}
+
+	return Super::event(ev);
+}
+
+//============================================================================
+CSpacerWidget::CSpacerWidget(QWidget* Parent /*= 0*/) : Super(Parent)
+{
+	setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+	setStyleSheet("border: none; background: none;");
+}

 } // namespace ads

-#include "DockAreaTitleBar.moc"
-
 //---------------------------------------------------------------------------
 // EOF DockAreaTitleBar.cpp
--- a/src/DockAreaTitleBar.h
+++ b/src/DockAreaTitleBar.h
@@ -34,7 +34,7 @@

 #include "ads_globals.h"

-class QAbstractButton;
+QT_FORWARD_DECLARE_CLASS(QAbstractButton)

 namespace ads
 {
@@ -86,7 +86,7 @@ protected:
 	/**
 	 * Show context menu
 	 */
-	virtual void contextMenuEvent(QContextMenuEvent *event);
+	virtual void contextMenuEvent(QContextMenuEvent *event) override;

 public slots:
 	/**
@@ -155,6 +155,7 @@ signals:
 	 */
 	void tabBarClicked(int index);
 }; // class name
+
 }
 // namespace ads
 //-----------------------------------------------------------------------------
--- a/src/DockAreaTitleBar_p.h
+++ b/src/DockAreaTitleBar_p.h
@@ -0,0 +1,94 @@
+#ifndef DockAreaTitleBar_pH
+#define DockAreaTitleBar_pH
+/*******************************************************************************
+** Qt Advanced Docking System
+** Copyright (C) 2017 Uwe Kindler
+**
+** This library is free software; you can redistribute it and/or
+** modify it under the terms of the GNU Lesser General Public
+** License as published by the Free Software Foundation; either
+** version 2.1 of the License, or (at your option) any later version.
+**
+** This library is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+** Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser General Public
+** License along with this library; If not, see <http://www.gnu.org/licenses/>.
+******************************************************************************/
+
+
+//============================================================================
+/// \file   DockAreaTitleBar_p.h
+/// \author Uwe Kindler
+/// \date   12.10.2018
+/// \brief  Declaration of classes CTitleBarButton and CSpacerWidget
+//============================================================================
+
+
+//============================================================================
+//                                   INCLUDES
+//============================================================================
+#include <QFrame>
+#include <QToolButton>
+
+#include "ads_globals.h"
+
+namespace ads
+{
+using tTitleBarButton = QToolButton;
+
+/**
+* Title bar button of a dock area that customizes tTitleBarButton appearance/behaviour
+* according to various config flags such as:
+* CDockManager::DockAreaHas_xxx_Button - if set to 'false' keeps the button always invisible
+* CDockManager::DockAreaHideDisabledButtons - if set to 'true' hides button when it is disabled
+*/
+class CTitleBarButton : public tTitleBarButton
+{
+	Q_OBJECT
+		
+private:
+	bool Visible = true;
+	bool HideWhenDisabled = false;
+
+public:
+	using Super = tTitleBarButton;
+	CTitleBarButton(bool visible = true, QWidget* parent = nullptr);
+
+	/**
+	* Adjust this visibility change request with our internal settings:
+	*/
+	virtual void setVisible(bool visible) override;
+
+protected:
+	/**
+	* Handle EnabledChanged signal to set button invisible if the configured
+	*/
+	bool event(QEvent *ev) override;
+};
+
+
+/**
+* This spacer widget is here because of the following problem.
+* The dock area title bar handles mouse dragging and moving the floating widget.
+* The  problem is, that if the title bar becomes invisible, i.e. if the dock
+* area contains only one single dock widget and the dock area is moved
+* into a floating widget, then mouse events are not handled anymore and dragging
+* of the floating widget stops.
+*/
+class CSpacerWidget : public QWidget
+{
+	Q_OBJECT
+public:
+	using Super = QWidget;
+	CSpacerWidget(QWidget* Parent = 0);
+	virtual QSize sizeHint() const override {return QSize(0, 0);}
+	virtual QSize minimumSizeHint() const override {return QSize(0, 0);}
+};
+
+}
+ // namespace ads
+//-----------------------------------------------------------------------------
+#endif // DockAreaTitleBar_pH
--- a/src/DockAreaWidget.cpp
+++ b/src/DockAreaWidget.cpp
@@ -429,6 +429,12 @@ void CDockAreaWidget::insertDockWidget(int index, CDockWidget* DockWidget,
 		setCurrentIndex(index);
 	}
 	DockWidget->setDockArea(this);
+	// If this dock area is hidden, then we need to make it visible again
+	// by calling DockWidget->toggleViewInternal(true);
+	if (!this->isVisible() && d->ContentsLayout->count() > 1 && !dockManager()->isRestoringState())
+	{
+		DockWidget->toggleViewInternal(true);
+	}
 	d->updateTitleBarButtonStates();
 }

@@ -448,7 +454,7 @@ void CDockAreaWidget::removeDockWidget(CDockWidget* DockWidget)
 	{
 		setCurrentDockWidget(NextOpenDockWidget);
 	}
-	else if (d->ContentsLayout->isEmpty() && DockContainer->dockAreaCount() > 1)
+	else if (d->ContentsLayout->isEmpty() && DockContainer->dockAreaCount() >= 1)
 	{
        ADS_PRINT("Dock Area empty");
 		DockContainer->removeDockArea(this);
--- a/src/DockAreaWidget.h
+++ b/src/DockAreaWidget.h
@@ -35,8 +35,8 @@
 #include "ads_globals.h"
 #include "DockWidget.h"

-class QXmlStreamWriter;
-class QAbstractButton;
+QT_FORWARD_DECLARE_CLASS(QXmlStreamWriter)
+QT_FORWARD_DECLARE_CLASS(QAbstractButton)

 namespace ads
 {
--- a/src/DockComponentsFactory.cpp
+++ b/src/DockComponentsFactory.cpp
@@ -8,7 +8,7 @@
 //============================================================================
 //                                   INCLUDES
 //============================================================================
-#include <DockComponentsFactory.h>
+#include "DockComponentsFactory.h"

 #include <memory>

--- a/src/DockContainerWidget.cpp
+++ b/src/DockContainerWidget.cpp
@@ -415,9 +415,10 @@ void DockContainerWidgetPrivate::dropIntoContainer(CFloatingDockContainer* Float
 	}
 	else if (FloatingSplitter->orientation() == InsertParam.orientation())
 	{
+        int InsertIndex = InsertParam.append() ? Splitter->count() : 0;
 		while (FloatingSplitter->count())
 		{
-			insertWidgetIntoSplitter(Splitter, FloatingSplitter->widget(0), InsertParam.append());
+            Splitter->insertWidget(InsertIndex++, FloatingSplitter->widget(0));
 		}
 	}
 	else
@@ -575,6 +576,11 @@ void DockContainerWidgetPrivate::moveIntoCenterOfSection(QWidget* Widget, CDockA
 	if (DroppedDockWidget)
 	{
 		CDockAreaWidget* OldDockArea = DroppedDockWidget->dockAreaWidget();
+		if (OldDockArea == TargetArea)
+		{
+			return;
+		}
+
 		if (OldDockArea)
 		{
 			OldDockArea->removeDockWidget(DroppedDockWidget);
@@ -1034,6 +1040,10 @@ void DockContainerWidgetPrivate::addDockArea(CDockAreaWidget* NewDockArea, DockW
 	if (Splitter->orientation() == InsertParam.orientation())
 	{
 		insertWidgetIntoSplitter(Splitter, NewDockArea, InsertParam.append());
+		if (Splitter->isHidden())
+		{
+			Splitter->show();
+		}
 	}
 	else
 	{
--- a/src/DockContainerWidget.h
+++ b/src/DockContainerWidget.h
@@ -35,7 +35,7 @@
 #include "ads_globals.h"
 #include "DockWidget.h"

-class QXmlStreamWriter;
+QT_FORWARD_DECLARE_CLASS(QXmlStreamWriter)


 namespace ads
--- a/src/DockManager.h
+++ b/src/DockManager.h
@@ -36,8 +36,8 @@
 #include "FloatingDockContainer.h"


-class QSettings;
-class QMenu;
+QT_FORWARD_DECLARE_CLASS(QSettings)
+QT_FORWARD_DECLARE_CLASS(QMenu)

 namespace ads
 {
--- a/src/DockOverlay.h
+++ b/src/DockOverlay.h
@@ -26,10 +26,11 @@
 #include <QHash>
 #include <QRect>
 #include <QFrame>
-class QGridLayout;

 #include "ads_globals.h"

+QT_FORWARD_DECLARE_CLASS(QGridLayout)
+
 namespace ads
 {
 struct DockOverlayPrivate;
--- a/src/DockWidget.cpp
+++ b/src/DockWidget.cpp
@@ -293,6 +293,7 @@ QWidget* CDockWidget::takeWidget()
 		w = d->ScrollArea->takeWidget();
 		delete d->ScrollArea;
 		d->ScrollArea = nullptr;
+		d->Widget = nullptr;
 	}
 	else if (d->Widget)
 	{
--- a/src/DockWidget.h
+++ b/src/DockWidget.h
@@ -34,8 +34,8 @@

 #include "ads_globals.h"

-class QToolBar;
-class QXmlStreamWriter;
+QT_FORWARD_DECLARE_CLASS(QToolBar)
+QT_FORWARD_DECLARE_CLASS(QXmlStreamWriter)

 namespace ads
 {
--- a/src/DockWidgetTab.cpp
+++ b/src/DockWidgetTab.cpp
@@ -28,7 +28,7 @@
 //============================================================================
 //                                   INCLUDES
 //============================================================================
-#include <FloatingDragPreview.h>
+#include "FloatingDragPreview.h"
 #include "ElidingLabel.h"
 #include "DockWidgetTab.h"

@@ -570,7 +570,7 @@ void CDockWidgetTab::mouseDoubleClickEvent(QMouseEvent *event)
 void CDockWidgetTab::setVisible(bool visible)
 {
 	// Just here for debugging to insert debug output
-	Super::setVisible(visible);
+    Super::setVisible(visible);
 }


--- a/src/FloatingDockContainer.cpp
+++ b/src/FloatingDockContainer.cpp
@@ -46,6 +46,12 @@
 #include "DockWidget.h"
 #include "DockOverlay.h"

+#ifdef Q_OS_WIN
+#include <windows.h>
+#ifdef _MSC_VER
+#pragma comment(lib, "User32.lib")
+#endif
+#endif
 #ifdef Q_OS_LINUX
 #include "linux/FloatingWidgetTitleBar.h"
 #include <xcb/xcb.h>
@@ -53,6 +59,304 @@

 namespace ads
 {
+#ifdef Q_OS_WIN
+#if 0 // set to 1 if you need this function for debugging
+/**
+ * Just for debuging to convert windows message identifiers to strings
+ */
+static const char* windowsMessageString(int MessageId)
+{
+	switch (MessageId)
+	{
+    case 0: return "WM_NULL";
+    case 1: return "WM_CREATE";
+    case 2: return "WM_DESTROY";
+    case 3: return "WM_MOVE";
+    case 5: return "WM_SIZE";
+    case 6: return "WM_ACTIVATE";
+    case 7: return "WM_SETFOCUS";
+    case 8: return "WM_KILLFOCUS";
+    case 10: return "WM_ENABLE";
+    case 11: return "WM_SETREDRAW";
+    case 12: return "WM_SETTEXT";
+    case 13: return "WM_GETTEXT";
+    case 14: return "WM_GETTEXTLENGTH";
+    case 15: return "WM_PAINT";
+    case 16: return "WM_CLOSE";
+    case 17: return "WM_QUERYENDSESSION";
+    case 18: return "WM_QUIT";
+    case 19: return "WM_QUERYOPEN";
+    case 20: return "WM_ERASEBKGND";
+    case 21: return "WM_SYSCOLORCHANGE";
+    case 22: return "WM_ENDSESSION";
+    case 24: return "WM_SHOWWINDOW";
+    case 25: return "WM_CTLCOLOR";
+    case 26: return "WM_WININICHANGE";
+    case 27: return "WM_DEVMODECHANGE";
+    case 28: return "WM_ACTIVATEAPP";
+    case 29: return "WM_FONTCHANGE";
+    case 30: return "WM_TIMECHANGE";
+    case 31: return "WM_CANCELMODE";
+    case 32: return "WM_SETCURSOR";
+    case 33: return "WM_MOUSEACTIVATE";
+    case 34: return "WM_CHILDACTIVATE";
+    case 35: return "WM_QUEUESYNC";
+    case 36: return "WM_GETMINMAXINFO";
+    case 38: return "WM_PAINTICON";
+    case 39: return "WM_ICONERASEBKGND";
+    case 40: return "WM_NEXTDLGCTL";
+    case 42: return "WM_SPOOLERSTATUS";
+    case 43: return "WM_DRAWITEM";
+    case 44: return "WM_MEASUREITEM";
+    case 45: return "WM_DELETEITEM";
+    case 46: return "WM_VKEYTOITEM";
+    case 47: return "WM_CHARTOITEM";
+    case 48: return "WM_SETFONT";
+    case 49: return "WM_GETFONT";
+    case 50: return "WM_SETHOTKEY";
+    case 51: return "WM_GETHOTKEY";
+    case 55: return "WM_QUERYDRAGICON";
+    case 57: return "WM_COMPAREITEM";
+    case 61: return "WM_GETOBJECT";
+    case 65: return "WM_COMPACTING";
+    case 68: return "WM_COMMNOTIFY";
+    case 70: return "WM_WINDOWPOSCHANGING";
+    case 71: return "WM_WINDOWPOSCHANGED";
+    case 72: return "WM_POWER";
+    case 73: return "WM_COPYGLOBALDATA";
+    case 74: return "WM_COPYDATA";
+    case 75: return "WM_CANCELJOURNAL";
+    case 78: return "WM_NOTIFY";
+    case 80: return "WM_INPUTLANGCHANGEREQUEST";
+    case 81: return "WM_INPUTLANGCHANGE";
+    case 82: return "WM_TCARD";
+    case 83: return "WM_HELP";
+    case 84: return "WM_USERCHANGED";
+    case 85: return "WM_NOTIFYFORMAT";
+    case 123: return "WM_CONTEXTMENU";
+    case 124: return "WM_STYLECHANGING";
+    case 125: return "WM_STYLECHANGED";
+    case 126: return "WM_DISPLAYCHANGE";
+    case 127: return "WM_GETICON";
+    case 128: return "WM_SETICON";
+    case 129: return "WM_NCCREATE";
+    case 130: return "WM_NCDESTROY";
+    case 131: return "WM_NCCALCSIZE";
+    case 132: return "WM_NCHITTEST";
+    case 133: return "WM_NCPAINT";
+    case 134: return "WM_NCACTIVATE";
+    case 135: return "WM_GETDLGCODE";
+    case 136: return "WM_SYNCPAINT";
+    case 160: return "WM_NCMOUSEMOVE";
+    case 161: return "WM_NCLBUTTONDOWN";
+    case 162: return "WM_NCLBUTTONUP";
+    case 163: return "WM_NCLBUTTONDBLCLK";
+    case 164: return "WM_NCRBUTTONDOWN";
+    case 165: return "WM_NCRBUTTONUP";
+    case 166: return "WM_NCRBUTTONDBLCLK";
+    case 167: return "WM_NCMBUTTONDOWN";
+    case 168: return "WM_NCMBUTTONUP";
+    case 169: return "WM_NCMBUTTONDBLCLK";
+    case 171: return "WM_NCXBUTTONDOWN";
+    case 172: return "WM_NCXBUTTONUP";
+    case 173: return "WM_NCXBUTTONDBLCLK";
+    case 176: return "EM_GETSEL";
+    case 177: return "EM_SETSEL";
+    case 178: return "EM_GETRECT";
+    case 179: return "EM_SETRECT";
+    case 180: return "EM_SETRECTNP";
+    case 181: return "EM_SCROLL";
+    case 182: return "EM_LINESCROLL";
+    case 183: return "EM_SCROLLCARET";
+    case 185: return "EM_GETMODIFY";
+    case 187: return "EM_SETMODIFY";
+    case 188: return "EM_GETLINECOUNT";
+    case 189: return "EM_LINEINDEX";
+    case 190: return "EM_SETHANDLE";
+    case 191: return "EM_GETHANDLE";
+    case 192: return "EM_GETTHUMB";
+    case 193: return "EM_LINELENGTH";
+    case 194: return "EM_REPLACESEL";
+    case 195: return "EM_SETFONT";
+    case 196: return "EM_GETLINE";
+    case 197: return "EM_LIMITTEXT / EM_SETLIMITTEXT";
+    case 198: return "EM_CANUNDO";
+    case 199: return "EM_UNDO";
+    case 200: return "EM_FMTLINES";
+    case 201: return "EM_LINEFROMCHAR";
+    case 202: return "EM_SETWORDBREAK";
+    case 203: return "EM_SETTABSTOPS";
+    case 204: return "EM_SETPASSWORDCHAR";
+    case 205: return "EM_EMPTYUNDOBUFFER";
+    case 206: return "EM_GETFIRSTVISIBLELINE";
+    case 207: return "EM_SETREADONLY";
+    case 209: return "EM_SETWORDBREAKPROC / EM_GETWORDBREAKPROC";
+    case 210: return "EM_GETPASSWORDCHAR";
+    case 211: return "EM_SETMARGINS";
+    case 212: return "EM_GETMARGINS";
+    case 213: return "EM_GETLIMITTEXT";
+    case 214: return "EM_POSFROMCHAR";
+    case 215: return "EM_CHARFROMPOS";
+    case 216: return "EM_SETIMESTATUS";
+    case 217: return "EM_GETIMESTATUS";
+    case 224: return "SBM_SETPOS";
+    case 225: return "SBM_GETPOS";
+    case 226: return "SBM_SETRANGE";
+    case 227: return "SBM_GETRANGE";
+    case 228: return "SBM_ENABLE_ARROWS";
+    case 230: return "SBM_SETRANGEREDRAW";
+    case 233: return "SBM_SETSCROLLINFO";
+    case 234: return "SBM_GETSCROLLINFO";
+    case 235: return "SBM_GETSCROLLBARINFO";
+    case 240: return "BM_GETCHECK";
+    case 241: return "BM_SETCHECK";
+    case 242: return "BM_GETSTATE";
+    case 243: return "BM_SETSTATE";
+    case 244: return "BM_SETSTYLE";
+    case 245: return "BM_CLICK";
+    case 246: return "BM_GETIMAGE";
+    case 247: return "BM_SETIMAGE";
+    case 248: return "BM_SETDONTCLICK";
+    case 255: return "WM_INPUT";
+    case 256: return "WM_KEYDOWN";
+    case 257: return "WM_KEYUP";
+    case 258: return "WM_CHAR";
+    case 259: return "WM_DEADCHAR";
+    case 260: return "WM_SYSKEYDOWN";
+    case 261: return "WM_SYSKEYUP";
+    case 262: return "WM_SYSCHAR";
+    case 263: return "WM_SYSDEADCHAR";
+    case 265: return "WM_UNICHAR / WM_WNT_CONVERTREQUESTEX";
+    case 266: return "WM_CONVERTREQUEST";
+    case 267: return "WM_CONVERTRESULT";
+    case 268: return "WM_INTERIM";
+    case 269: return "WM_IME_STARTCOMPOSITION";
+    case 270: return "WM_IME_ENDCOMPOSITION";
+    case 272: return "WM_INITDIALOG";
+    case 273: return "WM_COMMAND";
+    case 274: return "WM_SYSCOMMAND";
+    case 275: return "WM_TIMER";
+    case 276: return "WM_HSCROLL";
+    case 277: return "WM_VSCROLL";
+    case 278: return "WM_INITMENU";
+    case 279: return "WM_INITMENUPOPUP";
+    case 280: return "WM_SYSTIMER";
+    case 287: return "WM_MENUSELECT";
+    case 288: return "WM_MENUCHAR";
+    case 289: return "WM_ENTERIDLE";
+    case 290: return "WM_MENURBUTTONUP";
+    case 291: return "WM_MENUDRAG";
+    case 292: return "WM_MENUGETOBJECT";
+    case 293: return "WM_UNINITMENUPOPUP";
+    case 294: return "WM_MENUCOMMAND";
+    case 295: return "WM_CHANGEUISTATE";
+    case 296: return "WM_UPDATEUISTATE";
+    case 297: return "WM_QUERYUISTATE";
+    case 306: return "WM_CTLCOLORMSGBOX";
+    case 307: return "WM_CTLCOLOREDIT";
+    case 308: return "WM_CTLCOLORLISTBOX";
+    case 309: return "WM_CTLCOLORBTN";
+    case 310: return "WM_CTLCOLORDLG";
+    case 311: return "WM_CTLCOLORSCROLLBAR";
+    case 312: return "WM_CTLCOLORSTATIC";
+    case 512: return "WM_MOUSEMOVE";
+    case 513: return "WM_LBUTTONDOWN";
+    case 514: return "WM_LBUTTONUP";
+    case 515: return "WM_LBUTTONDBLCLK";
+    case 516: return "WM_RBUTTONDOWN";
+    case 517: return "WM_RBUTTONUP";
+    case 518: return "WM_RBUTTONDBLCLK";
+    case 519: return "WM_MBUTTONDOWN";
+    case 520: return "WM_MBUTTONUP";
+    case 521: return "WM_MBUTTONDBLCLK";
+    case 522: return "WM_MOUSEWHEEL";
+    case 523: return "WM_XBUTTONDOWN";
+    case 524: return "WM_XBUTTONUP";
+    case 525: return "WM_XBUTTONDBLCLK";
+    case 528: return "WM_PARENTNOTIFY";
+    case 529: return "WM_ENTERMENULOOP";
+    case 530: return "WM_EXITMENULOOP";
+    case 531: return "WM_NEXTMENU";
+    case 532: return "WM_SIZING";
+    case 533: return "WM_CAPTURECHANGED";
+    case 534: return "WM_MOVING";
+    case 536: return "WM_POWERBROADCAST";
+    case 537: return "WM_DEVICECHANGE";
+    case 544: return "WM_MDICREATE";
+    case 545: return "WM_MDIDESTROY";
+    case 546: return "WM_MDIACTIVATE";
+    case 547: return "WM_MDIRESTORE";
+    case 548: return "WM_MDINEXT";
+    case 549: return "WM_MDIMAXIMIZE";
+    case 550: return "WM_MDITILE";
+    case 551: return "WM_MDICASCADE";
+    case 552: return "WM_MDIICONARRANGE";
+    case 553: return "WM_MDIGETACTIVE";
+    case 560: return "WM_MDISETMENU";
+    case 561: return "WM_ENTERSIZEMOVE";
+    case 562: return "WM_EXITSIZEMOVE";
+    case 563: return "WM_DROPFILES";
+    case 564: return "WM_MDIREFRESHMENU";
+    case 640: return "WM_IME_REPORT";
+    case 641: return "WM_IME_SETCONTEXT";
+    case 642: return "WM_IME_NOTIFY";
+    case 643: return "WM_IME_CONTROL";
+    case 644: return "WM_IME_COMPOSITIONFULL";
+    case 645: return "WM_IME_SELECT";
+    case 646: return "WM_IME_CHAR";
+    case 648: return "WM_IME_REQUEST";
+    case 656: return "WM_IME_KEYDOWN";
+    case 657: return "WM_IME_KEYUP";
+    case 672: return "WM_NCMOUSEHOVER";
+    case 673: return "WM_MOUSEHOVER";
+    case 674: return "WM_NCMOUSELEAVE";
+    case 675: return "WM_MOUSELEAVE";
+    case 768: return "WM_CUT";
+    case 769: return "WM_COPY";
+    case 770: return "WM_PASTE";
+    case 771: return "WM_CLEAR";
+    case 772: return "WM_UNDO";
+    case 773: return "WM_RENDERFORMAT";
+    case 774: return "WM_RENDERALLFORMATS";
+    case 775: return "WM_DESTROYCLIPBOARD";
+    case 776: return "WM_DRAWCLIPBOARD";
+    case 777: return "WM_PAINTCLIPBOARD";
+    case 778: return "WM_VSCROLLCLIPBOARD";
+    case 779: return "WM_SIZECLIPBOARD";
+    case 780: return "WM_ASKCBFORMATNAME";
+    case 781: return "WM_CHANGECBCHAIN";
+    case 782: return "WM_HSCROLLCLIPBOARD";
+    case 783: return "WM_QUERYNEWPALETTE";
+    case 784: return "WM_PALETTEISCHANGING";
+    case 785: return "WM_PALETTECHANGED";
+    case 786: return "WM_HOTKEY";
+    case 791: return "WM_PRINT";
+    case 792: return "WM_PRINTCLIENT";
+    case 793: return "WM_APPCOMMAND";
+    case 856: return "WM_HANDHELDFIRST";
+    case 863: return "WM_HANDHELDLAST";
+    case 864: return "WM_AFXFIRST";
+    case 895: return "WM_AFXLAST";
+    case 896: return "WM_PENWINFIRST";
+    case 897: return "WM_RCRESULT";
+    case 898: return "WM_HOOKRCRESULT";
+    case 899: return "WM_GLOBALRCCHANGE / WM_PENMISCINFO";
+    case 900: return "WM_SKB";
+    case 901: return "WM_HEDITCTL / WM_PENCTL";
+    case 902: return "WM_PENMISC";
+    case 903: return "WM_CTLINIT";
+    case 904: return "WM_PENEVENT";
+    case 911: return "WM_PENWINLAST";
+    default:
+    	return "unknown WM_ message";
+	}
+
+	return "unknown WM_ message";
+}
+#endif
+#endif
+
+
 static unsigned int zOrderCounter = 0;
 /**
 * Private data class of CFloatingDockContainer class (pimpl)
@@ -68,6 +372,7 @@ struct FloatingDockContainerPrivate
 	CDockContainerWidget *DropContainer = nullptr;
 	CDockAreaWidget *SingleDockArea = nullptr;
 	QPoint DragStartPos;
+	bool Hiding = false;
 #ifdef Q_OS_LINUX
    QWidget* MouseEventHandler = nullptr;
    CFloatingWidgetTitleBar* TitleBar = nullptr;
@@ -378,36 +683,65 @@ void CFloatingDockContainer::changeEvent(QEvent *event)
 	}
 }

-//============================================================================
-void CFloatingDockContainer::moveEvent(QMoveEvent *event)
-{
-	QWidget::moveEvent(event);
-	switch (d->DraggingState)
-	{
-	case DraggingMousePressed:
+
 #ifdef Q_OS_WIN
-		qApp->installEventFilter(this);
-#endif
-		d->setState(DraggingFloatingWidget);
-		d->updateDropOverlays(QCursor::pos());
+//============================================================================
+bool CFloatingDockContainer::nativeEvent(const QByteArray &eventType, void *message, long *result)
+{
+	QWidget::nativeEvent(eventType, message, result);
+	MSG *msg = static_cast<MSG*>(message);
+	switch (msg->message)
+	{
+		case WM_MOVING:
+		{
+			if (d->isState(DraggingFloatingWidget))
+			{
+				d->updateDropOverlays(QCursor::pos());
+			}
+		}
 		break;

-	case DraggingFloatingWidget:
-		d->updateDropOverlays(QCursor::pos());
-#ifdef Q_OS_MACOS
-		// In OSX when hiding the DockAreaOverlay the application would set
-		// the main window as the active window for some reason. This fixes
-		// that by resetting the active window to the floating widget after
-		// updating the overlays.
-		QApplication::setActiveWindow(this);
-#endif
-		break;
-	default:
-		break;
+		case WM_NCLBUTTONDOWN:
+			 if (msg->wParam == HTCAPTION && d->isState(DraggingInactive))
+			 {
+				ADS_PRINT("CFloatingDockContainer::nativeEvent WM_NCLBUTTONDOWN" << e->type());
+				d->DragStartPos = pos();
+				d->setState(DraggingMousePressed);
+			 }
+			 break;
+
+		case WM_NCLBUTTONDBLCLK:
+			 d->setState(DraggingInactive);
+			 break;
+
+		case WM_ENTERSIZEMOVE:
+			 if (d->isState(DraggingMousePressed))
+			 {
+				ADS_PRINT("CFloatingDockContainer::nativeEvent WM_ENTERSIZEMOVE" << e->type());
+				d->setState(DraggingFloatingWidget);
+				d->updateDropOverlays(QCursor::pos());
+			 }
+			 break;
+
+		case WM_EXITSIZEMOVE:
+			 if (d->isState(DraggingFloatingWidget))
+			 {
+				ADS_PRINT("CFloatingDockContainer::nativeEvent WM_EXITSIZEMOVE" << e->type());
+				if (GetAsyncKeyState(VK_ESCAPE) & 0x8000)
+				{
+					d->handleEscapeKey();
+				}
+				else
+				{
+					d->titleMouseReleaseEvent();
+				}
+			 }
+			 break;
 	}
-
-
+	return false;
 }
+#endif
+

 //============================================================================
 void CFloatingDockContainer::closeEvent(QCloseEvent *event)
@@ -455,6 +789,7 @@ void CFloatingDockContainer::hideEvent(QHideEvent *event)
        return;
    }

+    d->Hiding = true;
 	for (auto DockArea : d->DockContainer->openedDockAreas())
 	{
 		for (auto DockWidget : DockArea->openedDockWidgets())
@@ -462,6 +797,7 @@ void CFloatingDockContainer::hideEvent(QHideEvent *event)
 			DockWidget->toggleView(false);
 		}
 	}
+	d->Hiding = false;
 }

 //============================================================================
@@ -471,117 +807,6 @@ void CFloatingDockContainer::showEvent(QShowEvent *event)
 }


-//============================================================================
-bool CFloatingDockContainer::event(QEvent *e)
-{
-	switch (d->DraggingState)
-	{
-	case DraggingInactive:
-	{
-		// Normally we would check here, if the left mouse button is pressed.
-		// But from QT version 5.12.2 on the mouse events from
-		// QEvent::NonClientAreaMouseButtonPress return the wrong mouse button
-		// The event always returns Qt::RightButton even if the left button
-		// is clicked.
-		// It is really great to work around the whole NonClientMouseArea
-		// bugs
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 2))
-		if (e->type() == QEvent::NonClientAreaMouseButtonPress /*&& QGuiApplication::mouseButtons().testFlag(Qt::LeftButton)*/)
-#else
-		if (e->type() == QEvent::NonClientAreaMouseButtonPress && QGuiApplication::mouseButtons().testFlag(Qt::LeftButton))
-#endif
-		{
-			ADS_PRINT("FloatingWidget::event Event::NonClientAreaMouseButtonPress" << e->type());
-			d->DragStartPos = pos();
-			d->setState(DraggingMousePressed);
-		}
-	}
-	break;
-
-	case DraggingMousePressed:
-		switch (e->type())
-		{
-		case QEvent::NonClientAreaMouseButtonDblClick:
-			ADS_PRINT("FloatingWidget::event QEvent::NonClientAreaMouseButtonDblClick");
-			d->setState(DraggingInactive);
-			break;
-
-		case QEvent::Resize:
-			// If the first event after the mouse press is a resize event, then
-			// the user resizes the window instead of dragging it around.
-			// But there is one exception. If the window is maximized,
-			// then dragging the window via title bar will cause the widget to
-			// leave the maximized state. This in turn will trigger a resize event.
-			// To know, if the resize event was triggered by user via moving a
-			// corner of the window frame or if it was caused by a windows state
-			// change, we check, if we are not in maximized state.
-			if (!isMaximized())
-			{
-				d->setState(DraggingInactive);
-			}
-			break;
-
-		default:
-			break;
-		}
-		break;
-
-	case DraggingFloatingWidget:
-		if (e->type() == QEvent::NonClientAreaMouseButtonRelease)
-		{
-			ADS_PRINT("FloatingWidget::event QEvent::NonClientAreaMouseButtonRelease");
-			d->titleMouseReleaseEvent();
-		}
-		break;
-
-	default:
-		break;
-	}
-
-#if (ADS_DEBUG_LEVEL > 0)
-	qDebug() << QTime::currentTime() << "CFloatingDockContainer::event " << e->type();
-#endif
-	return QWidget::event(e);
-}
-
-
-//============================================================================
-bool CFloatingDockContainer::eventFilter(QObject *watched, QEvent *e)
-{
-	Q_UNUSED(watched);
-	// I have not found a way to detect non client area key press events to
-	// handle escape key presses. On Windows, if the escape key is pressed while
-	// dragging around a widget, the widget position is reset to its start position
-	// which in turn generates a QEvent::NonClientAreaMouseButtonRelease event
-	// if the mouse is outside of the widget after the move to its initial position
-	// or a QEvent::MouseButtonRelease event, if the mouse is inside of teh widget
-	// after the position has been reset.
-	// So we can install an event filter on the application to get these events
-	// here to properly cancel dragging and hide the overlays.
-	// If we are in DraggingFloatingWidget state, it means the widget
-	// has been dragged already but if the position is the same like
-	// the start position, then this is an indication that the escape
-	// key has been pressed.
-	if (e->type() == QEvent::MouseButtonRelease || e->type() == QEvent::NonClientAreaMouseButtonRelease)
-	{
-		ADS_PRINT("CFloatingDockContainer::eventFilter QEvent::MouseButtonRelease or"
-			"QEvent::NonClientAreaMouseButtonRelease" << "d->DragggingState " << d->DraggingState);
-		qApp->removeEventFilter(this);
-		if (d->DragStartPos == pos())
-		{
-			d->handleEscapeKey();
-			return true;
-		}
-		return false;
-	}
-
-#if (ADS_DEBUG_LEVEL > 0)
-	qDebug() << QTime::currentTime() << "CFloatingDockContainer::eventFilter " << e->type();
-#endif
-	return false;
-}
-
-
 //============================================================================
 void CFloatingDockContainer::startFloating(const QPoint &DragStartMousePos,
    const QSize &Size, eDragState DragState, QWidget *MouseEventHandler)
@@ -614,6 +839,27 @@ void CFloatingDockContainer::moveFloating()
 	const QPoint moveToPos = QCursor::pos() - d->DragStartMousePosition
 	    - QPoint(BorderSize, 0);
 	move(moveToPos);
+
+	switch (d->DraggingState)
+	{
+	case DraggingMousePressed:
+		d->setState(DraggingFloatingWidget);
+		d->updateDropOverlays(QCursor::pos());
+		break;
+
+	case DraggingFloatingWidget:
+		d->updateDropOverlays(QCursor::pos());
+#ifdef Q_OS_MACOS
+		// In OSX when hiding the DockAreaOverlay the application would set
+		// the main window as the active window for some reason. This fixes
+		// that by resetting the active window to the floating widget after
+		// updating the overlays.
+		QApplication::setActiveWindow(this);
+#endif
+		break;
+	default:
+		break;
+	}
 }

 //============================================================================
@@ -652,11 +898,22 @@ void CFloatingDockContainer::onDockAreasAddedOrRemoved()
 //============================================================================
 void CFloatingDockContainer::updateWindowTitle()
 {
+	// If this floating container will be hidden, then updating the window
+	// tile is not required anymore
+	if (d->Hiding)
+	{
+		return;
+	}
+
+
 	auto TopLevelDockArea = d->DockContainer->topLevelDockArea();
 	if (TopLevelDockArea)
 	{
 		CDockWidget* CurrentWidget = TopLevelDockArea->currentDockWidget();
-		d->reflectCurrentWidget(CurrentWidget);
+		if (CurrentWidget)
+		{
+			d->reflectCurrentWidget(CurrentWidget);
+		}
 	}
 	else
 	{
--- a/src/FloatingDockContainer.h
+++ b/src/FloatingDockContainer.h
@@ -177,12 +177,17 @@ protected:

 protected: // reimplements QWidget
 	virtual void changeEvent(QEvent *event) override;
-	virtual void moveEvent(QMoveEvent *event) override;
-	virtual bool event(QEvent *e) override;
 	virtual void closeEvent(QCloseEvent *event) override;
 	virtual void hideEvent(QHideEvent *event) override;
 	virtual void showEvent(QShowEvent *event) override;
-	virtual bool eventFilter(QObject *watched, QEvent *event) override;
+
+#ifdef Q_OS_WIN
+	/**
+	 * Native event filter for handling WM_MOVING messages on Windows
+	 */
+	virtual bool nativeEvent(const QByteArray &eventType, void *message, long *result) override;
+#endif
+

 public:
 	using Super = QWidget;
--- a/src/FloatingDragPreview.cpp
+++ b/src/FloatingDragPreview.cpp
@@ -33,7 +33,6 @@ struct FloatingDragPreviewPrivate
 	CFloatingDragPreview *_this;
 	QWidget* Content;
 	CDockAreaWidget* ContentSourceArea = nullptr;
-	CDockContainerWidget* ContenSourceContainer = nullptr;
 	QPoint DragStartMousePosition;
 	CDockManager* DockManager;
 	CDockContainerWidget *DropContainer = nullptr;
@@ -123,10 +122,8 @@ void FloatingDragPreviewPrivate::updateDropOverlays(const QPoint &GlobalPos)
 	int VisibleDockAreas = TopContainer->visibleDockAreaCount();
 	ContainerOverlay->setAllowedAreas(
 	    VisibleDockAreas > 1 ? OuterDockAreas : AllDockAreas);
-	DockWidgetArea ContainerArea = ContainerOverlay->showOverlay(TopContainer);
-	ContainerOverlay->enableDropPreview(ContainerArea != InvalidDockWidgetArea);
 	auto DockArea = TopContainer->dockAreaAt(GlobalPos);
-	if (DockArea && DockArea->isVisible() && VisibleDockAreas > 0 && DockArea != ContentSourceArea)
+	if (DockArea && DockArea->isVisible() && VisibleDockAreas >= 0 && DockArea != ContentSourceArea)
 	{
 		DockAreaOverlay->enableDropPreview(true);
 		DockAreaOverlay->setAllowedAreas(
@@ -137,8 +134,7 @@ void FloatingDragPreviewPrivate::updateDropOverlays(const QPoint &GlobalPos)
 		// the mouse is in the title bar. If the ContainerArea is valid
 		// then we ignore the dock area of the dockAreaOverlay() and disable
 		// the drop preview
-		if ((Area == CenterDockWidgetArea)
-		    && (ContainerArea != InvalidDockWidgetArea))
+		if ((Area == CenterDockWidgetArea) && (ContainerDropArea != InvalidDockWidgetArea))
 		{
 			DockAreaOverlay->enableDropPreview(false);
 			ContainerOverlay->enableDropPreview(true);
@@ -147,6 +143,7 @@ void FloatingDragPreviewPrivate::updateDropOverlays(const QPoint &GlobalPos)
 		{
 			ContainerOverlay->enableDropPreview(InvalidDockWidgetArea == Area);
 		}
+		ContainerOverlay->showOverlay(TopContainer);
 	}
 	else
 	{
@@ -158,6 +155,11 @@ void FloatingDragPreviewPrivate::updateDropOverlays(const QPoint &GlobalPos)
 		{
 			ContainerOverlay->hideOverlay();
 		}
+		else
+		{
+			ContainerOverlay->showOverlay(TopContainer);
+		}
+

 		if (DockArea == ContentSourceArea && InvalidDockWidgetArea == ContainerDropArea)
 		{
@@ -266,7 +268,6 @@ CFloatingDragPreview::CFloatingDragPreview(CDockWidget* Content)
 	if (Content->dockAreaWidget()->openDockWidgetsCount() == 1)
 	{
 		d->ContentSourceArea = Content->dockAreaWidget();
-		d->ContenSourceContainer = Content->dockContainer();
 	}
 	setWindowTitle(Content->windowTitle());
 }
@@ -278,7 +279,6 @@ CFloatingDragPreview::CFloatingDragPreview(CDockAreaWidget* Content)
 {
 	d->DockManager = Content->dockManager();
 	d->ContentSourceArea = Content;
-	d->ContenSourceContainer = Content->dockContainer();
 	setWindowTitle(Content->currentDockWidget()->windowTitle());
 }

@@ -297,6 +297,7 @@ void CFloatingDragPreview::moveFloating()
 	const QPoint moveToPos = QCursor::pos() - d->DragStartMousePosition
 	    - QPoint(BorderSize, 0);
 	move(moveToPos);
+	d->updateDropOverlays(QCursor::pos());
 }


@@ -314,14 +315,6 @@ void CFloatingDragPreview::startFloating(const QPoint &DragStartMousePos,
 }


-//============================================================================
-void CFloatingDragPreview::moveEvent(QMoveEvent *event)
-{
-	QWidget::moveEvent(event);
-	d->updateDropOverlays(QCursor::pos());
-}
-
-
 //============================================================================
 void CFloatingDragPreview::finishDragging()
 {
--- a/src/FloatingDragPreview.h
+++ b/src/FloatingDragPreview.h
@@ -39,11 +39,6 @@ private slots:
 	void onApplicationStateChanged(Qt::ApplicationState state);

 protected:
-	/**
-	 * Updates the drop overlays
-	 */
-	virtual void moveEvent(QMoveEvent *event) override;
-
 	/**
 	 * Cares about painting the
 	 */
--- a/src/ads_globals.h
+++ b/src/ads_globals.h
@@ -37,7 +37,7 @@
 #include <QDebug>
 #include <QStyle>

-class QAbstractButton;
+QT_FORWARD_DECLARE_CLASS(QAbstractButton)

 #ifndef ADS_STATIC
 #ifdef ADS_SHARED_EXPORT
@@ -60,7 +60,7 @@ class QAbstractButton;
 // dumps to qDebug and std::cout after layout changes
 #define ADS_DEBUG_LEVEL 0

-class QSplitter;
+QT_FORWARD_DECLARE_CLASS(QSplitter)

 namespace ads
 {
--- a/src/qtadvanceddockingConfig.cmake
+++ b/src/qtadvanceddockingConfig.cmake
@@ -0,0 +1,2 @@
+include(CMakeFindDependencyMacro)
+include("${CMAKE_CURRENT_LIST_DIR}/adsTargets.cmake")
--- a/src/src.pro
+++ b/src/src.pro
@@ -41,6 +41,7 @@ HEADERS += \
    FloatingDragPreview.h \
    DockOverlay.h \
    DockSplitter.h \
+    DockAreaTitleBar_p.h \
    DockAreaTitleBar.h \
    ElidingLabel.h \
    IconProvider.h \
@@ -72,7 +73,7 @@ SOURCES += linux/FloatingWidgetTitleBar.cpp
 }

 isEmpty(PREFIX){
-	PREFIX=..\installed
+	PREFIX=../installed
 	warning("Install Prefix not set")
 }
 headers.path=$$PREFIX/include
Author	SHA1	Message	Date
Uwe Kindler	ccf8ea9d1e	Try to fix appveyour build problem	2020-05-27 15:26:36 +02:00
Uwe Kindler	dfb8543aee	Properly handle Escape key in native Window event handling function if event WM_EXITSIZEMOVE occurs	2020-05-27 13:28:29 +02:00
Uwe Kindler	277e06627b	Removed eclipe project file, Added VisualStudio.gitignore to .gitignore	2020-05-27 12:42:59 +02:00
Uwe Kindler	ea9b39a9dd	Merge branch 'master' of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System	2020-05-26 06:41:58 +02:00
Uwe Kindler	1848ffa35a	Properly reset widget pointer to nullptr in takeWidget()	2020-05-26 06:41:40 +02:00
Luca	c53be0e97d	Modernised CMake build files and CI configs (#185 ) * Modernised CMake build files and CI configs Fixed include formats * Fixed build errors and warnings * Fixes to allow CMake find_package	2020-05-24 09:14:33 +02:00
Uwe Kindler	6a393955cd	Removed debug output	2020-05-22 21:18:59 +02:00
Uwe Kindler	6b5f364864	Fixed issue #179 - appearance of drop indicators then Windows option "Show window contents while dragging" is FloatingDragPreview.cpp: moved code from moveEvent into moveFloating function to remove indirection and to simplify code Moved code from moveEvent() function into moveFloating() to remove indirection and to simplify code Implemented Windows drag handling with native WM_ nonclient area messages	2020-05-22 19:43:50 +02:00
Uwe Kindler	36bcbded54	Fixed showing of dock area when inserting a dock widget into a hidden dock area fixed setting of DockAreaTabBar index to prevent showing of tab 0 when inserting a dock widget into an area with no current index tab	2020-05-19 20:26:57 +02:00
Uwe Kindler	eee9ebb41d	Fixed an issue that caused wrong inserten order of dock widget when dropping a floating widget to the left or top container drop area	2020-05-17 12:21:52 +02:00
Patrick Stewart	cdb8926673	Add missing override (#176 )	2020-05-15 19:48:19 +02:00
githubuser0xFFFF	b3307d81ca	Update user-guide.md Fixed typo	2020-05-15 12:41:58 +02:00
Uwe Kindler	40374178c9	Added Style documentation section to user-guide.md	2020-05-15 12:40:49 +02:00
Uwe Kindler	516465aefb	Fixed issue #173 - tab changes position when redocking it to the same position	2020-05-15 12:25:22 +02:00
Uwe Kindler	0d406ece7c	Fixed MSVC compiler warning because of using class instead of struct in a friend declaration	2020-05-14 07:31:03 +02:00
Uwe Kindler	7c03b1b936	Fixed gcc compiler warning caused by supefluous extra semi-colon by all QT_FORWARD_DECLARE_CLASS statements	2020-05-14 07:27:48 +02:00
Uwe Kindler	427b5a0be0	Added nullptr check to fix potential issue #171 - nullptr access closing a CFloatingDockContainer	2020-05-14 07:20:30 +02:00
Uwe Kindler	3011c0c030	Merge branch 'master' of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System	2020-05-14 06:46:47 +02:00
Uwe Kindler	b8b6db632c	Added a new showcase application to README.md - ezEditor	2020-05-14 06:46:31 +02:00
Patrick Stewart	04ca4ae674	Support for Qt built with the -qtnamespace configure option (#170 )	2020-05-13 23:26:05 +02:00
Uwe Kindler	14f5426299	Merge branch 'jankrassnigg-master'	2020-05-13 16:58:48 +02:00
Uwe Kindler	d418d92ef4	Added missing DockAreaTitleBar_p.h to src.pro	2020-05-13 16:57:36 +02:00
Jan Krassnigg	726d73b2c2	Missing cmake change	2020-05-13 16:47:43 +02:00
Jan Krassnigg	115e67edc4	Moved private classes into dedicated header	2020-05-13 16:40:43 +02:00
n-elie	4a8b5dd7ab	Update PyQt bindings (#168 ) * Fix include header in sidebar example * Update SIP files and Python examples Co-authored-by: K Lauer <klauer@users.noreply.github.com> Co-authored-by: K Lauer <klauer@users.noreply.github.com>	2020-05-13 16:05:00 +02:00
Jan Krassnigg	a9965bf6dc	Moved CTitleBarButton and CSpacerWidget declaration into DockAreaTitleBar.h This gets rid of the need to MOC DockAreaTitleBar.h and DockAreaTitleBar.cpp and it means that DockAreaTitleBar.cpp does not need to #include "DockAreaTitleBar.moc" anymore, which is a file that is generated by the build system and therefore may be named differently when using a custom build system.	2020-05-13 08:04:50 +02:00
Uwe Kindler	aa7976dac6	Fixed issue #164 - Single DockArea cannot be split	2020-05-11 09:03:28 +02:00
Uwe Kindler	b7e7c0ccc3	Added new test action for adding docked editor widget to test fix for issue #148	2020-05-07 16:14:59 +02:00
Uwe Kindler	cb18bc0d91	Fixed visibility issue when adding dock widget after all other dock widgets have ben closed in the GUI - fix for GitHub issue #148	2020-05-07 16:13:59 +02:00
Uwe Kindler	07464ce05c	Added new SidebarExample	2020-05-07 14:39:02 +02:00
Uwe Kindler	62ce9dca5d	Fixed small bug in FloatingDragPreview that caused flashing of hidden overlay when dragging the last visible dock widget in non opaque docking mode	2020-05-07 14:20:31 +02:00