mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2025-04-01 02:42:39 +08:00
Code

Show disabled close button for auto hide dock area.

Browse Source
This commit is contained in:
Cynthia Pang 2023-10-09 16:13:00 +08:00
parent 2178b52621
commit 3247054969
5 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
demo/MainWindow.cpp
View File

@ -724,6 +724,9 @@ CMainWindow::CMainWindow(QWidget *parent) :
// uncomment the following line if you don't want close button on DockArea's title bar // uncomment the following line if you don't want close button on DockArea's title bar
//CDockManager::setConfigFlag(CDockManager::DockAreaHasCloseButton, false); //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 // uncomment the following line if you don't want undock button on DockArea's title bar
//CDockManager::setConfigFlag(CDockManager::DockAreaHasUndockButton, false); //CDockManager::setConfigFlag(CDockManager::DockAreaHasUndockButton, false);

1
examples/autohide/mainwindow.cpp
View File

@ -28,6 +28,7 @@ CMainWindow::CMainWindow(QWidget *parent)
CDockManager::setConfigFlag(CDockManager::XmlCompressionEnabled, false); CDockManager::setConfigFlag(CDockManager::XmlCompressionEnabled, false);
CDockManager::setConfigFlag(CDockManager::FocusHighlighting, true); CDockManager::setConfigFlag(CDockManager::FocusHighlighting, true);
CDockManager::setAutoHideConfigFlags(CDockManager::DefaultAutoHideConfig); CDockManager::setAutoHideConfigFlags(CDockManager::DefaultAutoHideConfig);
CDockManager::setAutoHideConfigFlag(CDockManager::AutoHideDockAreaCloseable, false);
DockManager = new CDockManager(this); DockManager = new CDockManager(this);
// Set central widget // Set central widget

5
src/DockAreaTitleBar.cpp
View File

@ -420,6 +420,11 @@ void CDockAreaTitleBar::onCloseButtonClicked()
{ {
d->DockArea->autoHideDockContainer()->collapseView(true); d->DockArea->autoHideDockContainer()->collapseView(true);
} }
//else if (!CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideDockAreaCloseable) &&
// d->DockArea->autoHideDockContainer())
//{
// return;
//}
else if (d->testConfigFlag(CDockManager::DockAreaCloseButtonClosesTab)) else if (d->testConfigFlag(CDockManager::DockAreaCloseButtonClosesTab))
{ {
d->TabBar->closeTab(d->TabBar->currentIndex()); d->TabBar->closeTab(d->TabBar->currentIndex());

3
src/DockAreaWidget.cpp
View File

@ -371,7 +371,8 @@ void DockAreaWidgetPrivate::updateTitleBarButtonStates()
} }
TitleBar->button(TitleBarButtonClose)->setEnabled( TitleBar->button(TitleBarButtonClose)->setEnabled(
_this->features().testFlag(CDockWidget::DockWidgetClosable)); (_this->isAutoHide() ? CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideDockAreaCloseable) : true)
&& _this->features().testFlag(CDockWidget::DockWidgetClosable));
TitleBar->button(TitleBarButtonUndock)->setEnabled( TitleBar->button(TitleBarButtonUndock)->setEnabled(
_this->features().testFlag(CDockWidget::DockWidgetFloatable)); _this->features().testFlag(CDockWidget::DockWidgetFloatable));
TitleBar->button(TitleBarButtonAutoHide)->setEnabled( TitleBar->button(TitleBarButtonAutoHide)->setEnabled(

2
src/DockManager.h
View File

@ -250,10 +250,12 @@ public:
AutoHideSideBarsIconOnly = 0x10,///< show only icons in auto hide side tab - if a tab has no icon, then the text will be shown 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 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 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.
DefaultAutoHideConfig = AutoHideFeatureEnabled DefaultAutoHideConfig = AutoHideFeatureEnabled
| DockAreaHasAutoHideButton | DockAreaHasAutoHideButton
| AutoHideCloseButtonCollapsesDock | AutoHideCloseButtonCollapsesDock
| AutoHideDockAreaCloseable
}; };
Q_DECLARE_FLAGS(AutoHideFlags, eAutoHideFlag) Q_DECLARE_FLAGS(AutoHideFlags, eAutoHideFlag)