From 68bc850b88ade9b6c3f8ea653caef1f6c17c61a8 Mon Sep 17 00:00:00 2001 From: Cynthia Pang Date: Tue, 10 Oct 2023 14:32:21 +0800 Subject: [PATCH] Minimize button flag cannot be global flag - should be configurable for each dock widget. --- demo/MainWindow.cpp | 3 --- examples/autohide/mainwindow.cpp | 9 ++++----- sip/ads_globals.sip | 1 + src/DockAreaTitleBar.cpp | 7 +------ src/DockAreaWidget.cpp | 2 +- src/DockManager.h | 2 -- src/DockWidget.h | 3 ++- 7 files changed, 9 insertions(+), 18 deletions(-) diff --git a/demo/MainWindow.cpp b/demo/MainWindow.cpp index f1d384b..2ebf052 100644 --- a/demo/MainWindow.cpp +++ b/demo/MainWindow.cpp @@ -724,9 +724,6 @@ CMainWindow::CMainWindow(QWidget *parent) : // uncomment the following line if you don't want close button on DockArea's title bar //CDockManager::setConfigFlag(CDockManager::DockAreaHasCloseButton, false); - // uncomment the following line if you don't want Auto Hide docks to be closeable - //CDockManager::setAutoHideConfigFlag(CDockManager::AutoHideDockAreaCloseable, false); - // uncomment the following line if you don't want undock button on DockArea's title bar //CDockManager::setConfigFlag(CDockManager::DockAreaHasUndockButton, false); diff --git a/examples/autohide/mainwindow.cpp b/examples/autohide/mainwindow.cpp index 6e49b1a..96d3997 100644 --- a/examples/autohide/mainwindow.cpp +++ b/examples/autohide/mainwindow.cpp @@ -14,8 +14,6 @@ #include "AutoHideDockContainer.h" #include "DockAreaWidget.h" -#include "DockAreaTitleBar.h" -#include "IconProvider.h" using namespace ads; @@ -25,13 +23,11 @@ CMainWindow::CMainWindow(QWidget *parent) , ui(new Ui::CMainWindow) { ui->setupUi(this); - CDockManager::iconProvider().registerCustomIcon(DockAreaMinimizeIcon, QIcon()); // TODO: CP: Icon. - CDockManager::setConfigFlag(CDockManager::OpaqueSplitterResize, true); CDockManager::setConfigFlag(CDockManager::XmlCompressionEnabled, false); CDockManager::setConfigFlag(CDockManager::FocusHighlighting, true); CDockManager::setAutoHideConfigFlags(CDockManager::DefaultAutoHideConfig); - CDockManager::setAutoHideConfigFlag(CDockManager::AutoHideDockAreaCloseable, false); + CDockManager::setAutoHideConfigFlag(CDockManager::AutoHideCloseButtonCollapsesDock, false); CDockManager::setAutoHideConfigFlag(CDockManager::AutoHideDockHasMinimizeButton, true); DockManager = new CDockManager(this); @@ -49,6 +45,7 @@ CMainWindow::CMainWindow(QWidget *parent) table->setColumnCount(3); table->setRowCount(10); CDockWidget* TableDockWidget = new CDockWidget("Table 1"); + TableDockWidget->setFeature(CDockWidget::AutoHideDockWidgetClosable, false); TableDockWidget->setWidget(table); TableDockWidget->setMinimumSizeHintMode(CDockWidget::MinimumSizeHintFromDockWidget); TableDockWidget->setMinimumSize(200,150); @@ -60,6 +57,7 @@ CMainWindow::CMainWindow(QWidget *parent) table->setColumnCount(5); table->setRowCount(1020); TableDockWidget = new CDockWidget("Table 2"); + TableDockWidget->setFeature(CDockWidget::AutoHideDockWidgetClosable, false); TableDockWidget->setWidget(table); TableDockWidget->setMinimumSizeHintMode(CDockWidget::MinimumSizeHintFromDockWidget); TableDockWidget->resize(250, 150); @@ -71,6 +69,7 @@ CMainWindow::CMainWindow(QWidget *parent) propertiesTable->setColumnCount(3); propertiesTable->setRowCount(10); CDockWidget* PropertiesDockWidget = new CDockWidget("Properties"); + PropertiesDockWidget->setFeature(CDockWidget::AutoHideDockWidgetClosable, true); PropertiesDockWidget->setWidget(propertiesTable); PropertiesDockWidget->setMinimumSizeHintMode(CDockWidget::MinimumSizeHintFromDockWidget); PropertiesDockWidget->resize(250, 150); diff --git a/sip/ads_globals.sip b/sip/ads_globals.sip index bbe6491..c8e77f9 100644 --- a/sip/ads_globals.sip +++ b/sip/ads_globals.sip @@ -91,6 +91,7 @@ namespace ads DockAreaMenuIcon, DockAreaUndockIcon, DockAreaCloseIcon, + DockAreaMinimizeIcon, IconCount, }; diff --git a/src/DockAreaTitleBar.cpp b/src/DockAreaTitleBar.cpp index 08ff491..071bd94 100644 --- a/src/DockAreaTitleBar.cpp +++ b/src/DockAreaTitleBar.cpp @@ -223,7 +223,7 @@ void DockAreaTitleBarPrivate::createButtons() MinimizeButton = new CTitleBarButton(testAutoHideConfigFlag(CDockManager::AutoHideDockHasMinimizeButton)); MinimizeButton->setObjectName("autoHideDockAreaMinimizeButton"); MinimizeButton->setAutoRaise(true); - internal::setButtonIcon(MinimizeButton, QStyle::SP_TitleBarNormalButton, ads::DockAreaMinimizeIcon); + internal::setButtonIcon(MinimizeButton, QStyle::SP_TitleBarMinButton, ads::DockAreaMinimizeIcon); internal::setToolTip(MinimizeButton, _this->titleBarButtonToolTip(TitleBarButtonMinimize)); MinimizeButton->setSizePolicy(ButtonSizePolicy); MinimizeButton->setIconSize(QSize(16, 16)); @@ -433,11 +433,6 @@ void CDockAreaTitleBar::onCloseButtonClicked() { d->DockArea->autoHideDockContainer()->collapseView(true); } - //else if (!CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideDockAreaCloseable) && - // d->DockArea->autoHideDockContainer()) - //{ - // return; - //} else if (d->testConfigFlag(CDockManager::DockAreaCloseButtonClosesTab)) { d->TabBar->closeTab(d->TabBar->currentIndex()); diff --git a/src/DockAreaWidget.cpp b/src/DockAreaWidget.cpp index 510b082..9200953 100644 --- a/src/DockAreaWidget.cpp +++ b/src/DockAreaWidget.cpp @@ -371,7 +371,7 @@ void DockAreaWidgetPrivate::updateTitleBarButtonStates() } TitleBar->button(TitleBarButtonClose)->setEnabled( - (_this->isAutoHide() ? CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideDockAreaCloseable) : true) + (_this->isAutoHide() ? _this->features().testFlag(CDockWidget::AutoHideDockWidgetClosable) : true) && _this->features().testFlag(CDockWidget::DockWidgetClosable)); TitleBar->button(TitleBarButtonUndock)->setEnabled( _this->features().testFlag(CDockWidget::DockWidgetFloatable)); diff --git a/src/DockManager.h b/src/DockManager.h index 134d74d..124fe35 100644 --- a/src/DockManager.h +++ b/src/DockManager.h @@ -250,13 +250,11 @@ public: AutoHideSideBarsIconOnly = 0x10,///< show only icons in auto hide side tab - if a tab has no icon, then the text will be shown AutoHideShowOnMouseOver = 0x20, ///< show the auto hide window on mouse over tab and hide it if mouse leaves auto hide container AutoHideCloseButtonCollapsesDock = 0x40, ///< Close button of an auto hide container collapses the dock instead of hiding it completely - AutoHideDockAreaCloseable = 0x080,///< if this flag is set, the auto hide dock area can be closed. AutoHideDockHasMinimizeButton = 0x100,///< if the flag is set each auto hide dock area has a minimize button. DefaultAutoHideConfig = AutoHideFeatureEnabled | DockAreaHasAutoHideButton | AutoHideCloseButtonCollapsesDock - | AutoHideDockAreaCloseable }; Q_DECLARE_FLAGS(AutoHideFlags, eAutoHideFlag) diff --git a/src/DockWidget.h b/src/DockWidget.h index b27130e..4b82acc 100644 --- a/src/DockWidget.h +++ b/src/DockWidget.h @@ -162,7 +162,8 @@ public: NoTab = 0x080, ///< dock widget tab will never be shown if this flag is set DeleteContentOnClose = 0x100, ///< deletes only the contained widget on close, keeping the dock widget intact and in place. Attempts to rebuild the contents widget on show if there is a widget factory set. DockWidgetPinnable = 0x200, ///< dock widget can be pinned and added to an auto hide dock container - DefaultDockWidgetFeatures = DockWidgetClosable | DockWidgetMovable | DockWidgetFloatable | DockWidgetFocusable | DockWidgetPinnable, + AutoHideDockWidgetClosable = 0x400,///< dock widget in an auto hide dock container is closable + DefaultDockWidgetFeatures = DockWidgetClosable | DockWidgetMovable | DockWidgetFloatable | DockWidgetFocusable | DockWidgetPinnable | AutoHideDockWidgetClosable, AllDockWidgetFeatures = DefaultDockWidgetFeatures | DockWidgetDeleteOnClose | CustomCloseHandling, DockWidgetAlwaysCloseAndDelete = DockWidgetForceCloseWithArea | DockWidgetDeleteOnClose, NoDockWidgetFeatures = 0x000