Merge branch 'master' of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System

Author: githubuser0xFFFF

.github/workflows/linux-builds.yml

@@ -28,7 +28,7 @@ jobs:
     - uses: actions/checkout@v2
     - name: Cache Qt
       id: cache-qt-6-4
-      uses: actions/cache@v1  # not v2!
+      uses: actions/cache@v3
       with:
         path: ../Qt/6.4.2
         key: ${{ runner.os }}-QtCache-Qt6-4

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 if (POLICY CMP0091)
   cmake_policy(SET CMP0091 NEW)

README.md

@@ -161,6 +161,7 @@ know it from Visual Studio.
   - [Auto-Hide Functionality](#auto-hide-functionality)
 - [Python Bindings](#python-bindings)
   - [PySide6](#pyside6)
+  - [PyQt6](#pyqt6)
   - [PyQt5](#pyqt5)
 - [Tested Compatible Environments](#tested-compatible-environments)
   - [Supported Qt Versions](#supported-qt-versions)
@@ -189,7 +190,7 @@ know it from Visual Studio.
   - [RDE – Robox Development Environment](#rde--robox-development-environment)
   - [ResInsight](#resinsight)
   - [ADTF 3](#adtf-3)
-  - [DREAM.3D NX](#dream3d-nx)
+  - [DREAM3D-NX](#dream3d-nx)
   - [LabPlot](#labplot)
 - [Alternative Docking System Implementations](#alternative-docking-system-implementations)
   - [KDDockWidgets](#kddockwidgets)
@@ -308,7 +309,7 @@ More about the auto hide configuration options in the [online documentation...](
 ![Python Logo](doc/python_logo.png)
 
 Thanks to the contribution of several users, the Advanced Docking System comes
-with a complete Python integration. Python bindings are available for **PyQt5** and
+with a complete Python integration. Python bindings are available for **PyQt5**, **PyQt6**, and
 **PySide6**.
 
 ### PySide6
@@ -328,6 +329,24 @@ The PySide6 bindings were contributed by:
 
 Please file PySide6-QtAds-specific issues on its [pyside6_qtads](https://github.com/mborgerson/pyside6_qtads) fork for tracking. For more information about the PySide6 bindings read [this](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/issues/298) issue.
 
+### PyQt6
+
+A PyQt6 ADS package is available via PyPi and can be installed on Windows,
+macOS, and Linux with:
+
+```bash
+pip install PyQt6Ads
+```
+
+Sample code is available [here](https://github.com/pyapp-kit/PyQt6Ads/tree/main/examples).
+
+The PyQt6 bindings were contributed by:
+
+- [tlambert03](https://github.com/tlambert03)
+
+Please file PyQt6Ads-specific issues at [pyapp-kit/PyQt6Ads](https://github.com/pyapp-kit/PyQt6Ads).
+
+
 ### PyQt5
 
 A package is available via [conda-forge](https://github.com/conda-forge/pyqtads-feedstock).
@@ -582,7 +601,7 @@ highlights are:
 - Simple Drag & Drop user interface.
 - Load data from file.
 - Connect to live streaming of data.
-- Save the visualization layout and configurations to re-use them later.
+- Save the visualization layout and configurations to reuse them later.
 - Fast OpenGL visualization.
 - Can handle thousands of timeseries and millions of data points.
 - Transform your data using a simple editor: derivative, moving average, integral, etc…
@@ -667,15 +686,17 @@ says about the switch to Qt Advanced Docking:
 
 ![ADTF](doc/showcase_adtf.png)
 
-### [DREAM.3D NX](https://github.com/BlueQuartzSoftware/DREAM3D)
+### [DREAM3D-NX](https://www.dream3d.io)
 
-DREAM.3D *(Digital Representation Environment for Analysis of Materials in 3D)* is an open source, cross-platform and modular, software suite that allows users to prepare, reconstruct, quantify, instantiate, and mesh, multidimensional, multimodal microstructural data, as well as many other applications.
+DREAM3D-NX *(Digital Representation Environment for Analysis of Materials in 3D)* is a cross-platform and modular, software suite that allows users to prepare, reconstruct, quantify, instantiate, and mesh, multidimensional, multimodal microstructural data, as well as many other applications.
 
-[BlueQuartz Software](http://www.bluequartz.net/) is currently completely rewriting the DREAM.3D application. For the upcoming version **[DREAM3D NX](http://www.dream3d.io/)** they improved the UI by using the Advanced Docking System. An [early version](http://www.dream3d.io/) of **DREAM3D NX** with ADS is already available to any user who would like to take the brand new version out for a spin.
+[BlueQuartz Software](http://www.bluequartz.net/) has completely rewritten the old DREAM.3D version 6.5 application
+taking advantage of the Advanced Docking System to present a highly customizable user interface
+for DREAM3D-NX Version 7.
 
 ![DREAM.3D NX](doc/showcase_dream3d_nx.png)
 
-[read more...](http://dream3d.bluequartz.net/)
+[read more...](http://www.dream3d.io/)
 
 ### [LabPlot](https://labplot.kde.org/)
 

demo/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
 project(ads_demo VERSION ${VERSION_SHORT}) 
 
 find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)

doc/showcase_dream3d_nx.png

@@ -853,7 +853,7 @@ When an entire area is closed, the default behavior is to hide the dock widgets
 
 It is possible to globally lock features of all dock widgets to "freeze" the
 current workspace layout. That means, you can now lock your workspace
-to avoid accidentally dragging a docked view. When locking was't possible,
+to avoid accidentally dragging a docked view. When locking wasn't possible,
 users had to manually dock it back to the desired place after each accidental
 undock.
 

doc/user-guide.md

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
 project(QtADSExamples LANGUAGES CXX VERSION ${VERSION_SHORT})
 add_subdirectory(simple)
 add_subdirectory(hideshow)

examples/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
 project(ads_example_autohide VERSION ${VERSION_SHORT}) 
 find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
 find_package(Qt${QT_VERSION_MAJOR} 5.5 COMPONENTS Core Gui Widgets REQUIRED)

examples/autohide/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
 project(ads_example_autohide_dragndrop VERSION ${VERSION_SHORT})
 find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
 find_package(Qt${QT_VERSION_MAJOR} 5.5 COMPONENTS Core Gui Widgets REQUIRED)

examples/autohidedragndrop/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
 project(ads_example_centralwidget VERSION ${VERSION_SHORT}) 
 find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
 find_package(Qt${QT_VERSION_MAJOR} 5.5 COMPONENTS Core Gui Widgets REQUIRED)

examples/centralwidget/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
 project(ads_example_centralwidget VERSION ${VERSION_SHORT}) 
 find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
 find_package(Qt${QT_VERSION_MAJOR} 5.5 COMPONENTS Core Gui Widgets REQUIRED)

examples/configflags/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
 project(ads_example_deleteonclose VERSION ${VERSION_SHORT}) 
 find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
 find_package(Qt${QT_VERSION_MAJOR} 5.5 COMPONENTS Core Gui Widgets REQUIRED)

examples/deleteonclose/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
 project(ads_example_dockindock VERSION ${VERSION_SHORT}) 
 find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
 find_package(Qt${QT_VERSION_MAJOR} 5.5 COMPONENTS Core Gui Widgets REQUIRED)

examples/dockindock/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
 project(ads_example_centralwidget VERSION ${VERSION_SHORT}) 
 find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
 find_package(Qt${QT_VERSION_MAJOR} 5.5 COMPONENTS Core Gui Widgets REQUIRED)

examples/emptydockarea/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
 project(ads_example_hideshow VERSION ${VERSION_SHORT}) 
 find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
 find_package(Qt${QT_VERSION_MAJOR} 5.5 COMPONENTS Core Gui Widgets REQUIRED)

examples/hideshow/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
 project(ads_example_sidebar VERSION ${VERSION_SHORT}) 
 find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
 find_package(Qt${QT_VERSION_MAJOR} 5.5 COMPONENTS Core Gui Widgets REQUIRED)

examples/sidebar/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
 project(ads_example_simple VERSION ${VERSION_SHORT}) 
 find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
 find_package(Qt${QT_VERSION_MAJOR} 5.5 COMPONENTS Core Gui Widgets REQUIRED)

examples/simple/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
 project(QtAdvancedDockingSystem LANGUAGES CXX VERSION ${VERSION_SHORT})
 include(GNUInstallDirs)
 if (${QT_VERSION_MAJOR})
@@ -85,6 +85,11 @@ add_library(ads::${library_name} ALIAS ${library_name})
 target_link_libraries(${library_name} PUBLIC Qt${QT_VERSION_MAJOR}::Core 
                                                Qt${QT_VERSION_MAJOR}::Gui 
                                                Qt${QT_VERSION_MAJOR}::Widgets)
+
+if(QT_VERSION_MAJOR STREQUAL "6")
+    target_link_libraries(${library_name} PRIVATE Qt6::GuiPrivate) #needed for <qpa/qplatformnativeinterface.h>
+endif()
+
 if (UNIX AND NOT APPLE)
   if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
       find_package(X11 REQUIRED)

src/CMakeLists.txt

@@ -334,27 +334,13 @@ void CDockAreaTabBar::onTabCloseRequested()
 void CDockAreaTabBar::onCloseOtherTabsRequested()
 {
 	auto Sender = qobject_cast<CDockWidgetTab*>(sender());
-	for (int i = 0; i < count(); ++i)
-	{
-		auto Tab = tab(i);
-		if (Tab->isClosable() && !Tab->isHidden() && Tab != Sender)
-		{
-			// If the dock widget is deleted with the closeTab() call, its tab
-			// it will no longer be in the layout, and thus the index needs to
-			// be updated to not skip any tabs
-			int Offset = Tab->dockWidget()->features().testFlag(
-				CDockWidget::DockWidgetDeleteOnClose) ? 1 : 0;
-			closeTab(i);
-
-			// If the dock widget blocks closing, i.e. if the flag
-			// CustomCloseHandling is set, and the dock widget is still open,
-			// then we do not need to correct the index
-			if (Tab->dockWidget()->isClosed())
-			{
-				i -= Offset;
-			}
-		}
-	}
+
+    for (int i = count() - 1; i >= 0; --i) {
+        auto Tab = tab(i);
+        if (Tab->isClosable() && !Tab->isHidden() && Tab != Sender) {
+            closeTab(i);
+        }
+    }
 }
 
 

src/DockAreaTabBar.cpp

@@ -270,7 +270,7 @@ struct DockAreaWidgetPrivate
 	DockAreaWidgetPrivate(CDockAreaWidget* _public);
 
 	/**
-	 * Convencience function to ease components factory access
+	 * Convenience function to ease components factory access
 	 */
 	QSharedPointer<ads::CDockComponentsFactory> componentsFactory() const
 	{
@@ -379,10 +379,10 @@ void DockAreaWidgetPrivate::updateTitleBarButtonStates()
 
 	if (_this->isAutoHide())
 	{
-		if (CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideHasCloseButton))
-        {
+		if (CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideHasCloseButton))
+        {
 			TitleBar->button(TitleBarButtonClose)->setEnabled(
-				_this->features().testFlag(CDockWidget::DockWidgetClosable));
+				_this->features().testFlag(CDockWidget::DockWidgetClosable));
         }
 	}
 	else
@@ -872,10 +872,22 @@ void CDockAreaWidget::updateTitleBarVisibility()
     bool IsAutoHide = isAutoHide();
     if (!CDockManager::testConfigFlag(CDockManager::AlwaysShowTabs))
     {
-		bool Hidden = Container->hasTopLevelDockWidget() && (Container->isFloating()
-			|| CDockManager::testConfigFlag(CDockManager::HideSingleCentralWidgetTitleBar));
-		Hidden |= (d->Flags.testFlag(HideSingleWidgetTitleBar) && openDockWidgetsCount() == 1);
-		Hidden &= !IsAutoHide; // Titlebar must always be visible when auto hidden so it can be dragged
+        bool Hidden = false;
+        if (!IsAutoHide)  // Titlebar must always be visible when auto hidden so it can be dragged
+        {
+            if (Container->isFloating() || CDockManager::testConfigFlag(CDockManager::HideSingleCentralWidgetTitleBar))
+            {
+                // Always show title bar if it contains title bar actions
+                if (CDockWidget* TopLevelWidget = Container->topLevelDockWidget())
+                    Hidden |= TopLevelWidget->titleBarActions().empty();
+            }
+            if (!Hidden && d->Flags.testFlag(HideSingleWidgetTitleBar))
+            {
+                // Always show title bar if it contains title bar actions
+                auto DockWidgets = openedDockWidgets();
+                Hidden |= (DockWidgets.size() == 1) && DockWidgets.front()->titleBarActions().empty();
+            }
+        }
 		d->TitleBar->setVisible(!Hidden);
     }
 

src/DockAreaWidget.cpp

@@ -67,7 +67,7 @@ class ADS_EXPORT CDockComponentsFactory
 
 	/**
 	 * This returns the default dock components factory instance.
-	 * If no components factory is assigned to a specifc dock manager, this
+	 * If no components factory is assigned to a specific dock manager, this
 	 * global factory instance will be used.
 	 */
     static QSharedPointer<ads::CDockComponentsFactory> factory();

src/DockComponentsFactory.h

@@ -423,6 +423,13 @@ CDockWidget* CDockFocusController::focusedDockWidget() const
 }
 
 
+//==========================================================================
+CDockAreaWidget* CDockFocusController::focusedDockArea() const
+{
+    return d->FocusedArea.data();
+}
+
+
 //==========================================================================
 void CDockFocusController::setDockWidgetTabPressed(bool Value)
 {

src/DockFocusController.cpp

@@ -69,6 +69,12 @@ private Q_SLOTS:
 	 */
 	CDockWidget* focusedDockWidget() const;
 
+    /**
+     * Returns the dock area that contains the focusedDockWidget() or nullptr if
+     * the focused dock widget is not in this area.
+     */
+    CDockAreaWidget* focusedDockArea() const;
+
 	/**
 	 * Request focus highlighting for the given dock widget assigned to the tab
 	 * given in Tab parameter

src/DockFocusController.h

@@ -530,14 +530,27 @@ CDockManager::CDockManager(QWidget *parent) :
 	window()->installEventFilter(this);
 
 #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
-    connect(qApp, &QApplication::focusWindowChanged, [](QWindow* focusWindow)
+    connect(qApp, &QApplication::focusWindowChanged, [this](QWindow* focusWindow)
     {
-        // bring modal dialogs to foreground to ensure that they are in front of any
-        // floating dock widget
-        if (focusWindow && focusWindow->isModal())
+        if (!focusWindow)
         {
-            focusWindow->raise();
+            return;
         }
+
+        // bring the main application window that hosts the dock manager and all floating
+        // widgets in front of any other application
+        this->raise();
+        for (auto FloatingWidget : d->FloatingWidgets)
+        {
+            if (FloatingWidget)
+            {
+                FloatingWidget->raise();
+            }
+        }
+
+        // ensure that the dragged floating window is in front of the main application window
+        // and any other floating widget - this will also ensure that modal dialogs come to foreground
+        focusWindow->raise();
     });
 #endif
 }
@@ -555,7 +568,7 @@ CDockManager::~CDockManager()
 	{
 		if (!area || area->dockManager() != this) continue;
 
-		// QPointer delete safety - just in case some dock wigdet in destruction
+		// QPointer delete safety - just in case some dock widget in destruction
 		// deletes another related/twin or child dock widget.
 		std::vector<QPointer<QWidget>> deleteWidgets;
 		for ( auto widget : area->dockWidgets() )
@@ -1523,6 +1536,16 @@ QVariant CDockManager::configParam(eConfigParam Param, QVariant Default)
 }
 
 
+//===========================================================================
+void CDockManager::raise()
+{
+    if (parentWidget())
+    {
+        parentWidget()->raise();
+    }
+}
+
+
 } // namespace ads
 
 //---------------------------------------------------------------------------

src/DockManager.cpp

@@ -770,6 +770,12 @@ public Q_SLOTS:
      */
     void hideManagerAndFloatingWidgets();
 
+    /**
+     * Calls raise() for the widget that hosts this dock manager.
+     * This will bring the widget in front of any other application that is running
+     */
+    void raise();
+
 Q_SIGNALS:
 	/**
 	 * This signal is emitted if the list of perspectives changed.

src/DockManager.h

@@ -841,9 +841,9 @@ void CDockWidget::saveState(QXmlStreamWriter& s) const
 void CDockWidget::flagAsUnassigned()
 {
 	d->Closed = true;
-	setParent(d->DockManager);
 	setVisible(false);
 	setDockArea(nullptr);
+	setParent(d->DockManager);
 	tabWidget()->setParent(this);
 }