Merge remote-tracking branch 'upstream/master' into forceclose

Author: n-elie

.travis.yml

@@ -10,7 +10,7 @@ matrix:
     dist: trusty
     group: stable
     before_install:
-      - sudo apt-get install libqt5x11extras5-dev
+      - sudo apt-get -y install libqt5x11extras5-dev
     addons:
       apt:
         sources:
@@ -21,6 +21,7 @@ matrix:
         - qt55base
         - qt55tools
         - qt55x11extras
+        - libqt5x11extras5-dev
         - gcc-9
         - g++-9
     script:
@@ -39,7 +40,7 @@ matrix:
         - xvfb
     compiler: gcc
     before_install:
-      - sudo apt-get install libqt5x11extras5-dev
+      - sudo apt-get -y install libqt5x11extras5-dev
     addons:
       apt:
         sources:
@@ -50,6 +51,7 @@ matrix:
         - qt514base
         - qt514tools
         - qt514x11extras
+        - libqt5x11extras5-dev
         - gcc-9
         - g++-9
         - libc6-i386
@@ -71,9 +73,9 @@ matrix:
     services:
         - xvfb
     compiler: gcc
-    addons:
     before_install:
-      - sudo apt-get install libqt5x11extras5-dev    
+      - sudo apt-get -y install libqt5x11extras5-dev  
+    addons:  
       apt:
         sources:
         - ubuntu-toolchain-r-test
@@ -83,6 +85,7 @@ matrix:
         - qt514base
         - qt514tools
         - qt514x11extras
+        - libqt5x11extras5-dev
         - gcc-9
         - g++-9
         - libc6-i386
@@ -105,7 +108,7 @@ matrix:
         - xvfb
     compiler: gcc
     before_install:
-      - sudo apt-get install libqt5x11extras5-dev
+      - sudo apt-get -y install libqt5x11extras5-dev
     addons:
       apt:
         sources:
@@ -116,6 +119,7 @@ matrix:
         - qt514base
         - qt514tools
         - qt514x11extras
+        - libqt5x11extras5-dev
         - gcc-9
         - g++-9
         - libc6-i386
@@ -144,7 +148,7 @@ matrix:
         - xvfb
     compiler: gcc
     before_install:
-      - sudo apt-get install libqt5x11extras5-dev
+      - sudo apt-get -y install libqt5x11extras5-dev
     addons:
       apt:
         sources:
@@ -155,6 +159,7 @@ matrix:
         - qt514base
         - qt514tools
         - qt514x11extras
+        - libqt5x11extras5-dev
         - gcc-9
         - g++-9
         - libc6-i386

README.md

@@ -15,6 +15,20 @@ integrated development environments (IDEs) such as Visual Studio.
 
 ## New and Noteworthy
 
+The [release 3.6.0](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/releases/tag/3.6.0)
+adds some nice new features:
+
+- support for [central widget](doc/user-guide.md#central-widget) concept
+
+![Central Widget](doc/central_widget.gif)
+
+- support for [native floating widgets](doc/user-guide.md#floatingcontainerforcenativetitlebar-linux-only) on Linux
+
+![FloatingContainerForceNativeTitleBar true](doc/cfg_flag_FloatingContainerForceNativeTitleBar_true.png)
+
+Both features are contributions from ADS users. Read the [documentation](doc/user-guide.md)
+to learn more about both new features.
+
 The [release 3.5.0](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/releases/tag/3.5.0)
 adds the new [focus highlighting](doc/user-guide.md#focushighlighting) feature.
 This optional feature enables highlighting of the focused dock widget like you

demo/MainWindow.cpp

@@ -109,7 +109,7 @@ static void appendFeaturStringToWindowTitle(ads::CDockWidget* DockWidget)
 static QIcon svgIcon(const QString& File)
 {
 	// This is a workaround, because in item views SVG icons are not
-	// properly scaled an look blurry or pixelate
+	// properly scaled and look blurry or pixelate
 	QIcon SvgIcon(File);
 	SvgIcon.addPixmap(SvgIcon.pixmap(92));
 	return SvgIcon;
@@ -166,6 +166,7 @@ struct MainWindowPrivate
 	QComboBox* PerspectiveComboBox = nullptr;
 	ads::CDockManager* DockManager = nullptr;
 	ads::CDockWidget* WindowTitleTestDockWidget = nullptr;
+	ads::CDockWidget* LastDockedEditor = nullptr;
 
 	MainWindowPrivate(CMainWindow* _public) : _this(_public) {}
 
@@ -720,7 +721,17 @@ void CMainWindow::createEditor()
     }
     else
     {
-    	d->DockManager->addDockWidget(ads::TopDockWidgetArea, DockWidget);
+    	ads::CDockAreaWidget* EditorArea = d->LastDockedEditor ? d->LastDockedEditor->dockAreaWidget() : nullptr;
+    	if (EditorArea)
+    	{
+    		d->DockManager->setConfigFlag(ads::CDockManager::EqualSplitOnInsertion, true);
+    		d->DockManager->addDockWidget(ads::RightDockWidgetArea, DockWidget, EditorArea);
+    	}
+    	else
+    	{
+    		d->DockManager->addDockWidget(ads::TopDockWidgetArea, DockWidget);
+    	}
+    	d->LastDockedEditor = DockWidget;
     }
 }
 

demo/demo.py

@@ -65,7 +65,7 @@ def append_feature_string_to_window_title(dock_widget: QtAds.CDockWidget):
 def svg_icon(filename: str):
     '''Helper function to create an SVG icon'''
     # This is a workaround, because because in item views SVG icons are not
-    # properly scaled an look blurry or pixelate
+    # properly scaled and look blurry or pixelate
     icon = QIcon(filename)
     icon.addPixmap(icon.pixmap(92))
     return icon
@@ -104,6 +104,8 @@ def __init__(self, parent=None):
         self.perspective_list_action = None
         self.perspective_combo_box = None
         self.dock_manager = None
+        self.window_title_test_dock_widget = None
+        self.last_docked_editor = None
 
         self.setupUi(self)
         self.create_actions()
@@ -184,6 +186,7 @@ def create_content(self):
         # special_dock_area.setAllowedAreas(QtAds.LeftDockWidgetArea | QtAds.RightDockWidgetArea) # just for testing
 
         dock_widget = self.create_long_text_label_dock_widget()
+        self.window_title_test_dock_widget = dock_widget
         dock_widget.setFeature(QtAds.CDockWidget.DockWidgetFocusable, False)
         self.dock_manager.addDockWidget(QtAds.LeftDockWidgetArea, dock_widget)
         file_system_widget = self.create_file_system_tree_dock_widget()
@@ -203,8 +206,8 @@ def create_content(self):
         QtAds.CDockComponentsFactory.setFactory(CCustomComponentsFactory())
         top_dock_area = self.dock_manager.addDockWidget(QtAds.TopDockWidgetArea, file_system_widget)
         # Uncomment the next line if you would like to test the
-        # setHideSingleWidgetTitleBar() functionality
-        # top_dock_area.setHideSingleWidgetTitleBar(True)
+        # HideSingleWidgetTitleBar functionality
+        # top_dock_area.setDockAreaFlag(QtAds.CDockAreaWidget.HideSingleWidgetTitleBar, True)
         QtAds.CDockComponentsFactory.resetDefaultFactory()
 
         # We create a calendar widget and clear all flags to prevent the dock area
@@ -354,7 +357,6 @@ def on_view_visibility_changed(self, visible: bool):
     def create_editor(self):
         sender = self.sender()
         floating = sender.property("Floating")
-        print("Floating:", floating)
         dock_widget = self.create_editor_widget()
         dock_widget.setFeature(QtAds.CDockWidget.DockWidgetDeleteOnClose, True)
         dock_widget.closeRequested.connect(self.on_editor_close_requested)
@@ -363,7 +365,13 @@ def create_editor(self):
             floating_widget = self.dock_manager.addDockWidgetFloating(dock_widget)
             floating_widget.move(QPoint(20, 20))
         else:
-            self.dock_manager.addDockWidget(QtAds.TopDockWidgetArea, dock_widget)
+            editor_area = self.last_docked_editor.dockAreaWidget() if self.last_docked_editor is not None else None
+            if editor_area is not None:
+                self.dock_manager.setConfigFlag(QtAds.CDockManager.EqualSplitOnInsertion, True)
+                self.dock_manager.addDockWidget(QtAds.RightDockWidgetArea, dock_widget, editor_area)
+            else:
+                self.dock_manager.addDockWidget(QtAds.TopDockWidgetArea, dock_widget)
+            self.last_docked_editor = dock_widget
 
     def on_editor_close_requested(self):
         dock_widget = self.sender()
@@ -382,6 +390,16 @@ def show_status_dialog(self):
         dialog = CStatusDialog(self.dock_manager)
         dialog.exec_()
 
+
+    def toggle_dock_widget_window_title(self):
+        title = self.window_title_test_dock_widget.windowTitle()
+        i = title.find(" (Test) ")
+        if i == -1:
+            title += " (Test) "
+        else:
+            title = title[i]
+        self.window_title_test_dock_widget.setWindowTitle(title)
+
     def save_state(self):
         '''
         Saves the dock manager state and the main window geometry

doc/central_widget.gif

@@ -24,6 +24,10 @@
   - [`FloatingContainerHasWidgetIcon`](#floatingcontainerhaswidgeticon)
   - [`HideSingleCentralWidgetTitleBar`](#hidesinglecentralwidgettitlebar)
   - [`FocusHighlighting`](#focushighlighting)
+  - [`EqualSplitOnInsertion`](#equalsplitoninsertion)
+  - [`FloatingContainerForceNativeTitleBar` (Linux only)](#floatingcontainerforcenativetitlebar-linux-only)
+  - [`FloatingContainerForceQWidgetTitleBar` (Linux only)](#floatingcontainerforceqwidgettitlebar-linux-only)
+- [Central Widget](#central-widget)
 - [Styling](#styling)
   - [Disabling the Internal Style Sheet](#disabling-the-internal-style-sheet)
 
@@ -409,6 +413,93 @@ bool CMainWindow::eventFilter(QObject *watched, QEvent *event)
 }
 ```
 
+### `EqualSplitOnInsertion`
+
+This flag configures how the space is distributed if a new dock widget is
+inserted into an existing dock area. The flag is disabled by default. If 3 
+dock widgets are inserted with the following code
+
+```c++
+d->DockManager->addDockWidget(ads::RightDockWidgetArea, DockWidget, EditorArea);
+```
+
+then this is the result, if the flag is disabled:
+
+![EqualSplitOnInsertion false](cfg_flag_EqualSplitOnInsertion_false.png)
+
+If the flag is enabled, then the space is equally distributed to all widgets 
+in a  splitter:
+
+![EqualSplitOnInsertion true](cfg_flag_EqualSplitOnInsertion_true.png)
+
+
+### `FloatingContainerForceNativeTitleBar` (Linux only)
+
+Since release 3.6 the library supports native title bars and window decorations
+for floating widgets on Linux (thanks to a user contribution).
+Native title bars and window decorations are supported by most Linux window
+managers, such as Compiz or Xfwm. Some window managers like KWin do not properly
+support this feature. Native floating widgets look better because of the native
+styling and the support all window manager features like snapping to window
+borders or maximizing. The library tries to detect the window manager during
+runtime and activates native window decorations if possible:
+
+![FloatingContainerForceNativeTitleBar true](cfg_flag_FloatingContainerForceNativeTitleBar_true.png)
+
+If you would like to overwrite this autodetection, then you can  activate this
+flag to force native window titlebars. You can overwrite autodetection and this
+flag, if you set the environment variable `ADS_UseNativeTitle` to 0 or 1.
+
+### `FloatingContainerForceQWidgetTitleBar` (Linux only)
+
+If your window manager (i.e. KWin) does not properly support native floating
+windows, the docking library falls back to QWidget based floating widget
+title bars.
+
+![FloatingContainerForceNativeTitleBar false](cfg_flag_FloatingContainerForceNativeTitleBar_false.png)
+
+If you would like to overwrite autodetection, then you can activate this flag
+to force QWidget based title bars. You can overwrite autodetection and this
+flag, if you set the environment variable `ADS_UseNativeTitle` to 0 or 1.
+
+## Central Widget
+
+The Advanced Docking System has been developed to overcome the limitations of
+the native Qt docking system with its central widget concept. This was the
+reason that until version 3.6 of the library, there was no support for such
+thing like a central widget. Thanks to the contribution of a user the library
+now supports a central widget.
+
+In the Advanced Docking System a central widget is a docking widget that is
+neither closable nor movable or floatable. A central widget has no title bar
+and so it is not possible for the user to hide, close or drag the central
+widget. If there is a central widget, then also the distribution of the sizes
+for the dock widgets around the central widget is different:
+
+- **no central widget (default)** - on resizing the available space is
+distributed to all dock widgets - the size of all dock widgets
+shrinks or grows
+- **with central widget** - on resizing only the central widget is resized - the
+dock widgets around the central widget keep their size (see the animation below)
+
+![Central Widget](central_widget.gif)
+
+To set a central widget, you just need to pass your central dock widget
+to the dock manager `setCentralWidget` function:
+
+```c++
+auto* CentralDockArea = DockManager->setCentralWidget(CentralDockWidget);
+```
+
+See the `centralwidget` example to learn how it works.
+
+> ##### Note
+> The central widget needs to be the first dock widget that is added to the
+> dock manager. The function does not work and returns a `nullptr` if there
+> are already other dock widgets registered. So `setCentralWidget` should be
+> the first function that you call when adding dock widgets.
+
+
 ## 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