PySide6-QtAds 4.2.1.1__tar.gz → 4.3.0__tar.gz

{pyside6_qtads-4.2.1.1/src/PySide6_QtAds.egg-info → pyside6_qtads-4.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySide6-QtAds
-Version: 4.2.1.1
+Version: 4.3.0
 Summary: PySide6 bindings to Qt Advanced Docking System
 Home-page: https://github.com/mborgerson/pyside6_qtads/
 License: LGPL v2.1
@@ -34,11 +34,11 @@ You may also build from source. Example build from source on Ubuntu 22.04:
 ```bash
 # Install Qt (for example, using aqtinstall)
 pip install aqtinstall
-aqt install-qt linux desktop 6.7.0 --outputdir qt
+aqt install-qt linux desktop 6.7.1 --outputdir qt
 
 # Build PySide6-QtAds
-LD_LIBRARY_PATH=$PWD/qt/6.7.0/gcc_64/lib \
-CMAKE_PREFIX_PATH=$PWD/qt/6.7.0/gcc_64/lib/cmake/ \
+LD_LIBRARY_PATH=$PWD/qt/6.7.1/gcc_64/lib \
+CMAKE_PREFIX_PATH=$PWD/qt/6.7.1/gcc_64/lib/cmake/ \
 PIP_EXTRA_INDEX_URL=https://download.qt.io/official_releases/QtForPython/ \
 pip install -v .
 ```

pyside6_qtads-4.3.0/Qt-Advanced-Docking-System/.clang-format

@@ -0,0 +1,146 @@
+---
+AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AlignConsecutiveMacros: None
+AlignConsecutiveAssignments: None
+AlignConsecutiveDeclarations: None
+AlignEscapedNewlines: Right
+AlignOperands: Align
+AlignTrailingComments: true
+
+AllowAllArgumentsOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseLabelsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: InlineOnly
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLambdasOnASingleLine: Inline
+AllowShortLoopsOnASingleLine: false
+
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: Yes
+
+BinPackArguments: true
+BinPackParameters: true
+
+BraceWrapping:
+  AfterCaseLabel: true
+  AfterClass: true
+  AfterControlStatement: Always
+  AfterEnum: true
+  AfterFunction: true
+  AfterNamespace: true
+  AfterStruct: true
+  AfterUnion: true
+  AfterExternBlock: true
+  BeforeCatch: true
+  BeforeElse: true
+  BeforeLambdaBody: false
+  IndentBraces: false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false
+
+BreakBeforeBinaryOperators: NonAssignment
+BreakBeforeBraces: Custom
+BreakBeforeTernaryOperators: false
+BreakConstructorInitializers: BeforeColon
+BreakInheritanceList: AfterColon
+BreakStringLiterals: true
+
+ColumnLimit: 82
+CommentPragmas: '^(!.*|@c)'
+
+CompactNamespaces: false
+
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+
+FixNamespaceComments: true
+
+IncludeBlocks: Regroup
+IncludeCategories:
+  - Regex: '^<windows(\.h)?>'  # windows headers
+    Priority: -1
+  - Regex: '^<labbcan[[:alnum:]._/]+'  # labbcan headers
+    Priority: 1
+  - Regex: '^<diag[[:alnum:]._/]+'  # usl headers
+    Priority: 1
+  - Regex: '^<usl[[:alnum:]._/]+'  # usl headers
+    Priority: 1
+  - Regex: '^<qt5compat[[:alnum:]._/]+'  # qtlabb headers
+    Priority: 2
+  - Regex: '^<qtcoreaddons[[:alnum:]._/]+'  # qtlabb headers
+    Priority: 2
+  - Regex: '^<qtlabb[[:alnum:]._/]+'  # qtlabb headers
+    Priority: 2
+  - Regex: '<Q[[:alnum:].]+>'  # Qt headers
+    Priority: 3
+  - Regex: '^<sila_cpp[[:alnum:]._/]+'  # sila_cpp headers
+    Priority: 4
+  - Regex: '<[[:alnum:]._/]+\.h>'  # other headers
+    Priority: 5
+  - Regex: '<[[:alnum:]._/]+>'  # system headers
+    Priority: 6
+  - Regex: '.*'
+    Priority: 7
+
+IncludeIsMainRegex: '(_p)?$'
+
+IndentCaseBlocks: false
+IndentCaseLabels: false
+IndentPPDirectives: AfterHash
+IndentWidth: 4
+IndentWrappedFunctionNames: false
+
+KeepEmptyLinesAtTheStartOfBlocks: false
+MaxEmptyLinesToKeep: 1
+
+NamespaceIndentation: None
+
+PenaltyBreakAssignment: 20
+PenaltyBreakBeforeFirstCallParameter: 15
+PenaltyBreakComment: 10
+PenaltyBreakFirstLessLess: 5
+# PenaltyBreakOpenParenthesis: 30
+PenaltyBreakString: 150
+PenaltyBreakTemplateDeclaration: 10
+PenaltyExcessCharacter: 100
+PenaltyIndentedWhitespace: 0
+PenaltyReturnTypeOnItsOwnLine: 150
+
+PointerAlignment: Left
+ReflowComments: true
+
+SortIncludes: CaseSensitive
+SortUsingDeclarations: true
+
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: false
+
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceBeforeSquareBrackets: false
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+
+SpacesBeforeTrailingComments: 2
+SpacesInAngles: Never
+SpacesInCStyleCastParentheses: false
+SpacesInConditionalStatement: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+
+Standard: c++17
+
+StatementMacros: [ 'Q_UNUSED', 'PIMPL_D', 'PIMPL_Q', 'OD_ENTRY', 'OD_ENTRY_PROCIMG' ]
+
+TabWidth: 4
+UseTab: Never

{pyside6_qtads-4.2.1.1 → pyside6_qtads-4.3.0}/Qt-Advanced-Docking-System/README.md

@@ -368,7 +368,7 @@ The application can be compiled for macOS. A user reported, that the library wor
 [![Build Status](https://travis-ci.org/githubuser0xFFFF/Qt-Advanced-Docking-System.svg?branch=master)](https://travis-ci.org/githubuser0xFFFF/Qt-Advanced-Docking-System)
 [![Build status](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/workflows/linux-builds/badge.svg)](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/actions?query=workflow%3Alinux-builds)
 
-Unfortunately, there is no such thing as a Linux operating system. Linux is a heterogeneous environment with a variety of different distributions. So it is not possible to support "Linux" like this is possible for Windows. It is only possible to support and test a small subset of Linux distributions. The library can be compiled for and has been developed and tested with the some Linux distributions. Depending on the used window manager or compositor, dock widgets
+Unfortunately, there is no such thing as a Linux operating system. Linux is a heterogeneous environment with a variety of different distributions. So it is not possible to support "Linux" like it is possible for Windows. It is only possible to support and test a small subset of Linux distributions. The library can be compiled for and has been developed and tested with some Linux distributions. Depending on the used window manager or compositor, dock widgets
 with native title bars are supported or not. If native title bars are not supported,
 the library switches to `QWidget` based title bars.
 

{pyside6_qtads-4.2.1.1 → pyside6_qtads-4.3.0}/Qt-Advanced-Docking-System/demo/MainWindow.cpp

@@ -592,19 +592,29 @@ void MainWindowPrivate::createActions()
 	ui.toolBar->addAction(ui.actionRestoreState);
 	ui.actionRestoreState->setIcon(svgIcon(":/adsdemo/images/restore.svg"));
 
-	SavePerspectiveAction = new QAction("Create Perspective", _this);
-	SavePerspectiveAction->setIcon(svgIcon(":/adsdemo/images/picture_in_picture.svg"));
-	_this->connect(SavePerspectiveAction, SIGNAL(triggered()), SLOT(savePerspective()));
+	ui.toolBar->addSeparator();
+
+	QAction* a = ui.toolBar->addAction("Lock Workspace");
+	a->setIcon(svgIcon(":/adsdemo/images/lock_outline.svg"));
+	a->setCheckable(true);
+	a->setChecked(false);
+	QObject::connect(a, &QAction::triggered, _this, &CMainWindow::lockWorkspace);
+
 	PerspectiveListAction = new QWidgetAction(_this);
 	PerspectiveComboBox = new QComboBox(_this);
 	PerspectiveComboBox->setSizeAdjustPolicy(QComboBox::AdjustToContents);
-	PerspectiveComboBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+	PerspectiveComboBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
 	PerspectiveListAction->setDefaultWidget(PerspectiveComboBox);
-	ui.toolBar->addSeparator();
 	ui.toolBar->addAction(PerspectiveListAction);
+
+	a = SavePerspectiveAction = ui.toolBar->addAction("Create Perspective");
+	a->setIcon(svgIcon(":/adsdemo/images/picture_in_picture.svg"));
+	QObject::connect(a, &QAction::triggered, _this, &CMainWindow::savePerspective);
 	ui.toolBar->addAction(SavePerspectiveAction);
 
-	QAction* a = ui.toolBar->addAction("Create Floating Editor");
+	ui.toolBar->addSeparator();
+
+	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"));
@@ -626,6 +636,7 @@ void MainWindowPrivate::createActions()
 	_this->connect(a, SIGNAL(triggered()), SLOT(createEditor()));
 	ui.menuTests->addAction(a);
 
+	ui.toolBar->addSeparator();
 	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"));
@@ -1030,3 +1041,17 @@ void CMainWindow::createImageViewer()
 	}
 }
 
+
+//============================================================================
+void CMainWindow::lockWorkspace(bool Value)
+{
+	if (Value)
+	{
+		d->DockManager->lockDockWidgetFeaturesGlobally();
+	}
+	else
+	{
+		d->DockManager->lockDockWidgetFeaturesGlobally(ads::CDockWidget::NoDockWidgetFeatures);
+	}
+}
+

{pyside6_qtads-4.2.1.1 → pyside6_qtads-4.3.0}/Qt-Advanced-Docking-System/demo/MainWindow.h

@@ -68,6 +68,7 @@ private slots:
 	void toggleDockWidgetWindowTitle();
 	void applyVsStyle();
 	void createImageViewer();
+	void lockWorkspace(bool Value);
 };
 
 #endif // MAINWINDOW_H

{pyside6_qtads-4.2.1.1 → pyside6_qtads-4.3.0}/Qt-Advanced-Docking-System/demo/demo.qrc

@@ -36,5 +36,8 @@
         <file>images/panorama.svg</file>
         <file>images/ads_icon2.svg</file>
         <file>images/font_download.svg</file>
+        <file>images/lock_outline.svg</file>
+        <file>images/lock.svg</file>
+        <file>images/lock_open.svg</file>
     </qresource>
 </RCC>

pyside6_qtads-4.3.0/Qt-Advanced-Docking-System/demo/images/lock.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>lock 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="M853.33,426.67v426.66c0,46.93 -38.4,85.34 -85.33,85.34h-512c-46.93,0 -85.33,-38.41 -85.33,-85.34v-426.66c0,-46.93 38.4,-85.34 85.33,-85.34h42.67v-85.33c0,-117.76 95.57,-213.33 213.33,-213.33c117.76,0 213.33,95.57 213.33,213.33v85.33h42.67c46.93,0 85.33,38.41 85.33,85.34zM644.27,256c0,-72.96 -59.31,-132.27 -132.27,-132.27c-72.96,0 -132.27,59.31 -132.27,132.27v85.33h264.54zM597.33,640c0,-46.93 -38.4,-85.33 -85.33,-85.33c-46.93,0 -85.33,38.4 -85.33,85.33c0,46.93 38.4,85.33 85.33,85.33c46.93,0 85.33,-38.4 85.33,-85.33z"/>
+	</g>
+</svg>

pyside6_qtads-4.3.0/Qt-Advanced-Docking-System/demo/images/lock_open.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>lock_open 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="M853.33,426.67v426.66c0,46.93 -38.4,85.34 -85.33,85.34h-512c-46.93,0 -85.33,-38.41 -85.33,-85.34v-426.66c0,-46.93 38.4,-85.34 85.33,-85.34h388.27v-85.33c0,-72.96 -59.31,-132.27 -132.27,-132.27c-72.96,0 -132.27,59.31 -132.27,132.27h-81.06c0,-117.76 95.57,-213.33 213.33,-213.33c117.76,0 213.33,95.57 213.33,213.33v85.33h42.67c46.93,0 85.33,38.41 85.33,85.34zM768,426.67h-512v426.66h512zM426.67,640c0,-46.93 38.4,-85.33 85.33,-85.33c46.93,0 85.33,38.4 85.33,85.33c0,46.93 -38.4,85.33 -85.33,85.33c-46.93,0 -85.33,-38.4 -85.33,-85.33z"/>
+	</g>
+</svg>

pyside6_qtads-4.3.0/Qt-Advanced-Docking-System/demo/images/lock_outline.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>lock_outline 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="M853.33,426.67v426.66c0,46.93 -38.4,85.34 -85.33,85.34h-512c-46.93,0 -85.33,-38.41 -85.33,-85.34v-426.66c0,-46.93 38.4,-85.34 85.33,-85.34h42.67v-85.33c0,-117.76 95.57,-213.33 213.33,-213.33c117.76,0 213.33,95.57 213.33,213.33v85.33h42.67c46.93,0 85.33,38.41 85.33,85.34zM768,426.67h-512v426.66h512zM379.73,341.33h264.54v-85.33c0,-72.96 -59.31,-132.27 -132.27,-132.27c-72.96,0 -132.27,59.31 -132.27,132.27zM426.67,640c0,-46.93 38.4,-85.33 85.33,-85.33c46.93,0 85.33,38.4 85.33,85.33c0,46.93 -38.4,85.33 -85.33,85.33c-46.93,0 -85.33,-38.4 -85.33,-85.33z"/>
+	</g>
+</svg>

{pyside6_qtads-4.2.1.1 → pyside6_qtads-4.3.0}/Qt-Advanced-Docking-System/doc/ads_qt_marketplace_description.md

@@ -12,10 +12,10 @@ styles as much as possible.
 
 ## Features
 
-### Docking everywhere - no central widget
+### Docking everywhere - with or without a central widget
 
-There is no central widget like in the Qt docking system. You can dock on every
-border of the main window or you can dock into each dock area - so you are
+The Advanced Docking System works with or without a central widget.
+You can dock on every border of the main window or you can dock into each dock area - so you are
 free to dock almost everywhere.
 
 ![Dropping widgets](https://raw.githubusercontent.com/githubuser0xFFFF/Qt-Advanced-Docking-System/master/doc/preview-dragndrop.png)

{pyside6_qtads-4.2.1.1 → pyside6_qtads-4.3.0}/Qt-Advanced-Docking-System/doc/user-guide.md

@@ -303,8 +303,9 @@ or to close it via the close button.
 
 ![HideSingleCentralWidgetTitleBar true](cfg_flag_HideSingleCentralWidgetTitleBar_true.png)
 
-The Advanced Docking System is meant for applications without a static central
-widget and normally does not know anything about a central static widget.
+Unless a central widget explicitly has been set with setCentralWidget, the
+Advanced Docking System is without a static central widget and it wouldn't know
+about a central static widget.
 Therefore this flag is disabled by default and a central single dock widget
 still has a titlebar to drag it out of the main window.
 

{pyside6_qtads-4.2.1.1/Qt-Advanced-Docking-System/examples/simple → pyside6_qtads-4.3.0/Qt-Advanced-Docking-System/examples/dockindock}/main.cpp

@@ -1,5 +1,5 @@
 #include <QApplication>
-#include "../../examples/simple/MainWindow.h"
+#include "mainframe.h"
 
 int main(int argc, char *argv[])
 {

{pyside6_qtads-4.2.1.1 → pyside6_qtads-4.3.0}/Qt-Advanced-Docking-System/src/AutoHideDockContainer.h

@@ -34,7 +34,7 @@
 #include <QSplitter>
 #include "AutoHideTab.h"
 
-class QXmlStreamWriter;
+QT_FORWARD_DECLARE_CLASS(QXmlStreamWriter)
 
 namespace ads
 {

{pyside6_qtads-4.2.1.1 → pyside6_qtads-4.3.0}/Qt-Advanced-Docking-System/src/AutoHideSideBar.h

@@ -33,7 +33,7 @@
 #include "ads_globals.h"
 #include "AutoHideTab.h"
 
-class QXmlStreamWriter;
+QT_FORWARD_DECLARE_CLASS(QXmlStreamWriter)
 
 namespace ads
 {

{pyside6_qtads-4.2.1.1 → pyside6_qtads-4.3.0}/Qt-Advanced-Docking-System/src/AutoHideTab.cpp

@@ -44,7 +44,6 @@
 
 namespace ads
 {
-static const char* const LocationProperty = "Location";
 
 /**
  * Private data class of CDockWidgetTab class (pimpl)
@@ -102,7 +101,7 @@ struct AutoHideTabPrivate
 		QMenu* Menu)
 	{
 		auto Action = Menu->addAction(Title);
-		Action->setProperty("Location", Location);
+		Action->setProperty(internal::LocationProperty, Location);
 		QObject::connect(Action, &QAction::triggered, _this, &CAutoHideTab::onAutoHideToActionClicked);
 		Action->setEnabled(Location != _this->sideBarLocation());
 		return Action;
@@ -174,7 +173,7 @@ void AutoHideTabPrivate::updateOrientation()
 bool AutoHideTabPrivate::startFloating(eDragState DraggingState)
 {
 	auto DockArea = DockWidget->dockAreaWidget();
-    ADS_PRINT("isFloating " << dockContainer->isFloating());
+    ADS_PRINT("isFloating " << dockContainer()->isFloating());
 
     ADS_PRINT("startFloating");
 	DragState = DraggingState;
@@ -419,7 +418,7 @@ void CAutoHideTab::unpinDockWidget()
 //===========================================================================
 void CAutoHideTab::onAutoHideToActionClicked()
 {
-	int Location = sender()->property(LocationProperty).toInt();
+	int Location = sender()->property(internal::LocationProperty).toInt();
 	d->DockWidget->setAutoHide(true, (SideBarLocation)Location);
 }
 

{pyside6_qtads-4.2.1.1 → pyside6_qtads-4.3.0}/Qt-Advanced-Docking-System/src/CMakeLists.txt

@@ -36,7 +36,7 @@ set(ads_SRCS
     AutoHideTab.cpp
     AutoHideDockContainer.cpp
     PushButton.cpp
-	ResizeHandle.cpp
+    ResizeHandle.cpp
     ads.qrc
 )
 set(ads_HEADERS
@@ -62,7 +62,7 @@ set(ads_HEADERS
     AutoHideTab.h
     AutoHideDockContainer.h
     PushButton.h
-	ResizeHandle.h
+    ResizeHandle.h
 )
 add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
 if (UNIX AND NOT APPLE)
@@ -120,7 +120,7 @@ write_basic_package_version_file(
     COMPATIBILITY SameMajorVersion
 )
 install(FILES ${ads_HEADERS}
-    DESTINATION include/${library_name}
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${library_name}
     COMPONENT headers
 )
 install(FILES
@@ -131,25 +131,25 @@ install(FILES
 )
 install(TARGETS ${library_name}
     EXPORT adsTargets
-    RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib
-    INCLUDES DESTINATION include/${library_name}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${library_name}
 )
 
 install(EXPORT adsTargets
     FILE adsTargets.cmake
     NAMESPACE ads::
-    DESTINATION lib/cmake/${library_name}
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${library_name}
 )
 install(FILES qtadvanceddockingConfig.cmake RENAME ${library_name}Config.cmake
-    DESTINATION lib/cmake/${library_name}
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${library_name}
 )
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${library_name}ConfigVersion.cmake"
-    DESTINATION lib/cmake/${library_name}
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${library_name}
 )
 
 target_include_directories(${library_name} PUBLIC
-    $<INSTALL_INTERFACE:include>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )

{pyside6_qtads-4.2.1.1 → pyside6_qtads-4.3.0}/Qt-Advanced-Docking-System/src/DockAreaTabBar.cpp

@@ -111,8 +111,9 @@ void DockAreaTabBarPrivate::updateTabs()
 			// Sometimes the synchronous calculation of the rectangular area fails
 			// Therefore we use QTimer::singleShot here to execute the call
 			// within the event loop - see #520
-			QTimer::singleShot(0, [&, TabWidget]{
-			    _this->ensureWidgetVisible(TabWidget);
+			QTimer::singleShot(0, TabWidget, [&, TabWidget]
+			{
+				_this->ensureWidgetVisible(TabWidget);
 			});
 		}
 		else

{pyside6_qtads-4.2.1.1 → pyside6_qtads-4.3.0}/Qt-Advanced-Docking-System/src/DockAreaTitleBar.cpp

@@ -60,7 +60,6 @@
 
 namespace ads
 {
-static const char* const LocationProperty = "Location";
 
 /**
  * Private data class of CDockAreaTitleBar class (pimpl)
@@ -159,7 +158,7 @@ struct DockAreaTitleBarPrivate
 		QMenu* Menu)
 	{
 		auto Action = Menu->addAction(Title);
-		Action->setProperty("Location", Location);
+		Action->setProperty(internal::LocationProperty, Location);
 		QObject::connect(Action, &QAction::triggered, _this, &CDockAreaTitleBar::onAutoHideToActionClicked);
 		return Action;
 	}
@@ -179,7 +178,8 @@ void DockAreaTitleBarPrivate::createButtons()
 	QSizePolicy ButtonSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
 
 	// Tabs menu button
-	TabsMenuButton = new CTitleBarButton(testConfigFlag(CDockManager::DockAreaHasTabsMenuButton));
+	TabsMenuButton = new CTitleBarButton(testConfigFlag(CDockManager::DockAreaHasTabsMenuButton),
+		false, TitleBarButtonTabsMenu);
 	TabsMenuButton->setObjectName("tabsMenuButton");
 	TabsMenuButton->setAutoRaise(true);
 	TabsMenuButton->setPopupMode(QToolButton::InstantPopup);
@@ -197,7 +197,8 @@ void DockAreaTitleBarPrivate::createButtons()
 		SLOT(onTabsMenuActionTriggered(QAction*)));
 
 	// Undock button
-	UndockButton = new CTitleBarButton(testConfigFlag(CDockManager::DockAreaHasUndockButton));
+	UndockButton = new CTitleBarButton(testConfigFlag(CDockManager::DockAreaHasUndockButton),
+		true, TitleBarButtonUndock);
 	UndockButton->setObjectName("detachGroupButton");
 	UndockButton->setAutoRaise(true);
 	internal::setToolTip(UndockButton, QObject::tr("Detach Group"));
@@ -208,7 +209,8 @@ void DockAreaTitleBarPrivate::createButtons()
 
 	// AutoHide Button
 	const auto autoHideEnabled = testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled);
-	AutoHideButton = new CTitleBarButton(testAutoHideConfigFlag(CDockManager::DockAreaHasAutoHideButton) && autoHideEnabled);
+	AutoHideButton = new CTitleBarButton(testAutoHideConfigFlag(CDockManager::DockAreaHasAutoHideButton) && autoHideEnabled,
+		true, TitleBarButtonAutoHide);
 	AutoHideButton->setObjectName("dockAreaAutoHideButton");
 	AutoHideButton->setAutoRaise(true);
 	internal::setToolTip(AutoHideButton, _this->titleBarButtonToolTip(TitleBarButtonAutoHide));
@@ -220,7 +222,8 @@ void DockAreaTitleBarPrivate::createButtons()
 	_this->connect(AutoHideButton, SIGNAL(clicked()),  SLOT(onAutoHideButtonClicked()));
 
 	// Minimize button
-	MinimizeButton = new CTitleBarButton(testAutoHideConfigFlag(CDockManager::AutoHideHasMinimizeButton));
+	MinimizeButton = new CTitleBarButton(testAutoHideConfigFlag(CDockManager::AutoHideHasMinimizeButton),
+		false, TitleBarButtonMinimize);
 	MinimizeButton->setObjectName("dockAreaMinimizeButton");
 	MinimizeButton->setAutoRaise(true);
 	MinimizeButton->setVisible(false);
@@ -231,7 +234,8 @@ void DockAreaTitleBarPrivate::createButtons()
 	_this->connect(MinimizeButton, SIGNAL(clicked()), SLOT(minimizeAutoHideContainer()));
 
 	// Close button
-	CloseButton = new CTitleBarButton(testConfigFlag(CDockManager::DockAreaHasCloseButton));
+	CloseButton = new CTitleBarButton(testConfigFlag(CDockManager::DockAreaHasCloseButton),
+		true, TitleBarButtonClose);
 	CloseButton->setObjectName("dockAreaCloseButton");
 	CloseButton->setAutoRaise(true);
 	internal::setButtonIcon(CloseButton, QStyle::SP_TitleBarCloseButton, ads::DockAreaCloseIcon);
@@ -510,7 +514,7 @@ void CDockAreaTitleBar::updateDockWidgetActionsButtons()
 	int InsertIndex = indexOf(d->TabsMenuButton);
 	for (auto Action : Actions)
 	{
-		auto Button = new CTitleBarButton(true, this);
+		auto Button = new CTitleBarButton(true, false, TitleBarButtonTabsMenu, this);
 		Button->setDefaultAction(Action);
 		Button->setAutoRaise(true);
 		Button->setPopupMode(QToolButton::InstantPopup);
@@ -564,7 +568,7 @@ void CDockAreaTitleBar::onAutoHideDockAreaActionClicked()
 //============================================================================
 void CDockAreaTitleBar::onAutoHideToActionClicked()
 {
-	int Location = sender()->property(LocationProperty).toInt();
+	int Location = sender()->property(internal::LocationProperty).toInt();
 	d->DockArea->toggleAutoHide((SideBarLocation)Location);
 }
 
@@ -856,10 +860,25 @@ void CDockAreaTitleBar::showAutoHideControls(bool Show)
 
 
 //============================================================================
-CTitleBarButton::CTitleBarButton(bool showInTitleBar, QWidget* parent)
+bool CDockAreaTitleBar::isAutoHide() const
+{
+	return d->DockArea && d->DockArea->isAutoHide();
+}
+
+
+//============================================================================
+CDockAreaWidget* CDockAreaTitleBar::dockAreaWidget() const
+{
+	return d->DockArea;
+}
+
+
+//============================================================================
+CTitleBarButton::CTitleBarButton(bool showInTitleBar, bool hideWhenDisabled, TitleBarButton ButtonId, QWidget* parent)
 	: tTitleBarButton(parent),
 	  ShowInTitleBar(showInTitleBar),
-	  HideWhenDisabled(CDockManager::testConfigFlag(CDockManager::DockAreaHideDisabledButtons))
+	  HideWhenDisabled(CDockManager::testConfigFlag(CDockManager::DockAreaHideDisabledButtons) && hideWhenDisabled),
+	  TitleBarButtonId(ButtonId)
 {
     setFocusPolicy(Qt::NoFocus);
 }
@@ -894,16 +913,47 @@ void CTitleBarButton::setShowInTitleBar(bool Show)
 //============================================================================
 bool CTitleBarButton::event(QEvent *ev)
 {
-	if (QEvent::EnabledChange == ev->type() && HideWhenDisabled)
+	if (QEvent::EnabledChange != ev->type() || !HideWhenDisabled || !ShowInTitleBar)
 	{
-		// 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);
 	}
 
+	bool Show = true;
+	if (isInAutoHideArea())
+	{
+		switch (TitleBarButtonId)
+        {
+		case TitleBarButtonClose: Show = CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideHasCloseButton); break;
+		case TitleBarButtonUndock: Show = false; break;
+		default:
+			break;
+        }
+	}
+
+	// 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, isEnabledTo(this->parentWidget()) & Show));
+
 	return Super::event(ev);
 }
 
+
+//============================================================================
+CDockAreaTitleBar* CTitleBarButton::titleBar() const
+{
+	return qobject_cast<CDockAreaTitleBar*>(parentWidget());
+}
+
+
+//============================================================================
+bool CTitleBarButton::isInAutoHideArea() const
+{
+	auto TitleBar = titleBar();
+    return TitleBar && TitleBar->isAutoHide();
+}
+
+
 //============================================================================
 CSpacerWidget::CSpacerWidget(QWidget* Parent /*= 0*/) : Super(Parent)
 {