diff --git a/examples/autohide/mainwindow.cpp b/examples/autohide/mainwindow.cpp index 3424257..6e49b1a 100644 --- a/examples/autohide/mainwindow.cpp +++ b/examples/autohide/mainwindow.cpp @@ -15,6 +15,7 @@ #include "AutoHideDockContainer.h" #include "DockAreaWidget.h" #include "DockAreaTitleBar.h" +#include "IconProvider.h" using namespace ads; @@ -24,11 +25,15 @@ 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::AutoHideDockHasMinimizeButton, true); + DockManager = new CDockManager(this); // Set central widget diff --git a/src/DockAreaTitleBar.cpp b/src/DockAreaTitleBar.cpp index 2e342da..08ff491 100644 --- a/src/DockAreaTitleBar.cpp +++ b/src/DockAreaTitleBar.cpp @@ -71,6 +71,7 @@ struct DockAreaTitleBarPrivate QPointer TabsMenuButton; QPointer AutoHideButton; QPointer UndockButton; + QPointer MinimizeButton; QPointer CloseButton; QBoxLayout* Layout; CDockAreaWidget* DockArea; @@ -218,6 +219,17 @@ void DockAreaTitleBarPrivate::createButtons() Layout->addWidget(AutoHideButton, 0); _this->connect(AutoHideButton, SIGNAL(clicked()), SLOT(onAutoHideButtonClicked())); + // Minimize button + MinimizeButton = new CTitleBarButton(testAutoHideConfigFlag(CDockManager::AutoHideDockHasMinimizeButton)); + MinimizeButton->setObjectName("autoHideDockAreaMinimizeButton"); + MinimizeButton->setAutoRaise(true); + internal::setButtonIcon(MinimizeButton, QStyle::SP_TitleBarNormalButton, ads::DockAreaMinimizeIcon); + internal::setToolTip(MinimizeButton, _this->titleBarButtonToolTip(TitleBarButtonMinimize)); + MinimizeButton->setSizePolicy(ButtonSizePolicy); + MinimizeButton->setIconSize(QSize(16, 16)); + Layout->addWidget(MinimizeButton, 0); + _this->connect(MinimizeButton, SIGNAL(clicked()), SLOT(onMinimizeButtonClicked())); + // Close button CloseButton = new CTitleBarButton(testConfigFlag(CDockManager::DockAreaHasCloseButton)); CloseButton->setObjectName("dockAreaCloseButton"); @@ -228,6 +240,7 @@ void DockAreaTitleBarPrivate::createButtons() CloseButton->setIconSize(QSize(16, 16)); Layout->addWidget(CloseButton, 0); _this->connect(CloseButton, SIGNAL(clicked()), SLOT(onCloseButtonClicked())); + } @@ -527,6 +540,14 @@ void CDockAreaTitleBar::onAutoHideButtonClicked() } } +//============================================================================ +void CDockAreaTitleBar::onMinimizeButtonClicked() +{ + if (d->DockArea->autoHideDockContainer()) + { + d->DockArea->autoHideDockContainer()->collapseView(true); + } +} //============================================================================ void CDockAreaTitleBar::onAutoHideDockAreaActionClicked() @@ -551,6 +572,7 @@ CTitleBarButton* CDockAreaTitleBar::button(TitleBarButton which) const case TitleBarButtonTabsMenu: return d->TabsMenuButton; case TitleBarButtonUndock: return d->UndockButton; case TitleBarButtonClose: return d->CloseButton; + case TitleBarButtonMinimize: return d->MinimizeButton; case TitleBarButtonAutoHide: return d->AutoHideButton; default: return nullptr; @@ -740,6 +762,12 @@ void CDockAreaTitleBar::contextMenuEvent(QContextMenuEvent* ev) } Menu.addSeparator(); } + if (isAutoHide && CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideDockHasMinimizeButton)) + { + Action = Menu.addAction(tr("Minimize"), this, SLOT(onMinimizeButtonClicked())); + Action->setEnabled(true); + } + Action = Menu.addAction(isAutoHide ? tr("Close") : tr("Close Group"), this, SLOT(onCloseButtonClicked())); Action->setEnabled(d->DockArea->features().testFlag(CDockWidget::DockWidgetClosable)); if (!isAutoHide && !isTopLevelArea) @@ -800,6 +828,10 @@ QString CDockAreaTitleBar::titleBarButtonToolTip(TitleBarButton Button) const } break; + case TitleBarButtonMinimize: + return tr("Minimize"); + break; + default: break; } diff --git a/src/DockAreaTitleBar.h b/src/DockAreaTitleBar.h index 46ac231..45cb534 100644 --- a/src/DockAreaTitleBar.h +++ b/src/DockAreaTitleBar.h @@ -101,6 +101,7 @@ private Q_SLOTS: void onTabsMenuActionTriggered(QAction* Action); void onCurrentTabChanged(int Index); void onAutoHideButtonClicked(); + void onMinimizeButtonClicked(); void onAutoHideDockAreaActionClicked(); void onAutoHideToActionClicked(); diff --git a/src/DockAreaWidget.cpp b/src/DockAreaWidget.cpp index c8e984d..510b082 100644 --- a/src/DockAreaWidget.cpp +++ b/src/DockAreaWidget.cpp @@ -394,6 +394,7 @@ void DockAreaWidgetPrivate::updateTitleBarButtonVisibility(bool IsTopLevel) if (IsTopLevel) { TitleBar->button(TitleBarButtonClose)->setVisible(!container->isFloating()); + TitleBar->button(TitleBarButtonMinimize)->setVisible(!container->isFloating()); TitleBar->button(TitleBarButtonAutoHide)->setVisible(!container->isFloating()); // Undock and tabs should never show when auto hidden TitleBar->button(TitleBarButtonUndock)->setVisible(!container->isFloating() && !_this->isAutoHide()); @@ -402,6 +403,7 @@ void DockAreaWidgetPrivate::updateTitleBarButtonVisibility(bool IsTopLevel) else { TitleBar->button(TitleBarButtonClose)->setVisible(true); + TitleBar->button(TitleBarButtonMinimize)->setVisible(_this->isAutoHide() && CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideDockHasMinimizeButton)); TitleBar->button(TitleBarButtonAutoHide)->setVisible(true); TitleBar->button(TitleBarButtonUndock)->setVisible(!_this->isAutoHide()); TitleBar->button(TitleBarButtonTabsMenu)->setVisible(!_this->isAutoHide()); @@ -888,6 +890,8 @@ void CDockAreaWidget::updateTitleBarButtonsToolTips() { internal::setToolTip(titleBarButton(TitleBarButtonClose), titleBar()->titleBarButtonToolTip(TitleBarButtonClose)); + internal::setToolTip(titleBarButton(TitleBarButtonMinimize), + titleBar()->titleBarButtonToolTip(TitleBarButtonMinimize)); internal::setToolTip(titleBarButton(TitleBarButtonAutoHide), titleBar()->titleBarButtonToolTip(TitleBarButtonAutoHide)); } diff --git a/src/DockContainerWidget.cpp b/src/DockContainerWidget.cpp index b7f8b2f..b0073a4 100644 --- a/src/DockContainerWidget.cpp +++ b/src/DockContainerWidget.cpp @@ -911,6 +911,7 @@ void DockContainerWidgetPrivate::addDockAreasToList(const QListtitleBarButton(TitleBarButtonClose)->setVisible(true); + DockArea->titleBarButton(TitleBarButtonMinimize)->setVisible(true); DockArea->titleBarButton(TitleBarButtonAutoHide)->setVisible(true); } diff --git a/src/DockManager.h b/src/DockManager.h index b365bbd..134d74d 100644 --- a/src/DockManager.h +++ b/src/DockManager.h @@ -190,14 +190,14 @@ public: TabCloseButtonIsToolButton = 0x0040,//! If enabled the tab close buttons will be QToolButtons instead of QPushButtons - disabled by default AllTabsHaveCloseButton = 0x0080, //!< if this flag is set, then all tabs that are closable show a close button RetainTabSizeWhenCloseButtonHidden = 0x0100, //!< if this flag is set, the space for the close button is reserved even if the close button is not visible - DragPreviewIsDynamic = 0x0400,///< If opaque undocking is disabled, this flag defines the behavior of the drag preview window, if this flag is enabled, the preview will be adjusted dynamically to the drop area + DragPreviewIsDynamic = 0x0400,///< If opaque undocking is disabled, this flag defines the behavior of the drag preview window, if this flag is enabled, the preview will be adjusted dynamically to the drop area DragPreviewShowsContentPixmap = 0x0800,///< If opaque undocking is disabled, the created drag preview window shows a copy of the content of the dock widget / dock are that is dragged DragPreviewHasWindowFrame = 0x1000,///< If opaque undocking is disabled, then this flag configures if the drag preview is frameless or looks like a real window AlwaysShowTabs = 0x2000,///< If this option is enabled, the tab of a dock widget is always displayed - even if it is the only visible dock widget in a floating widget. - DockAreaHasUndockButton = 0x4000, //!< If the flag is set each dock area has an undock button + DockAreaHasUndockButton = 0x4000, //!< If the flag is set each dock area has an undock button DockAreaHasTabsMenuButton = 0x8000, //!< If the flag is set each dock area has a tabs menu button DockAreaHideDisabledButtons = 0x10000, //!< If the flag is set disabled dock area buttons will not appear on the toolbar at all (enabling them will bring them back) - DockAreaDynamicTabsMenuButtonVisibility = 0x20000, //!< If the flag is set, the tabs menu button will be shown only when it is required - that means, if the tabs are elided. If the tabs are not elided, it is hidden + DockAreaDynamicTabsMenuButtonVisibility = 0x20000, //!< If the flag is set, the tabs menu button will be shown only when it is required - that means, if the tabs are elided. If the tabs are not elided, it is hidden FloatingContainerHasWidgetTitle = 0x40000, //!< If set, the Floating Widget window title reflects the title of the current dock widget otherwise it displays the title set with `CDockManager::setFloatingContainersTitle` or application name as window title FloatingContainerHasWidgetIcon = 0x80000, //!< If set, the Floating Widget icon reflects the icon of the current dock widget otherwise it displays application icon HideSingleCentralWidgetTitleBar = 0x100000, //!< If there is only one single visible dock widget in the main dock container (the dock manager) and if this flag is set, then the titlebar of this dock widget will be hidden @@ -251,6 +251,7 @@ public: 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 diff --git a/src/ads_globals.h b/src/ads_globals.h index d2460f5..7a15dc7 100644 --- a/src/ads_globals.h +++ b/src/ads_globals.h @@ -107,7 +107,8 @@ enum TitleBarButton TitleBarButtonTabsMenu, TitleBarButtonUndock, TitleBarButtonClose, - TitleBarButtonAutoHide + TitleBarButtonAutoHide, + TitleBarButtonMinimize }; /** @@ -126,13 +127,14 @@ enum eDragState */ enum eIcon { - TabCloseIcon, //!< TabCloseIcon - AutoHideIcon, //!< AutoHideIcon - DockAreaMenuIcon, //!< DockAreaMenuIcon - DockAreaUndockIcon,//!< DockAreaUndockIcon - DockAreaCloseIcon, //!< DockAreaCloseIcon + TabCloseIcon, //!< TabCloseIcon + AutoHideIcon, //!< AutoHideIcon + DockAreaMenuIcon, //!< DockAreaMenuIcon + DockAreaUndockIcon, //!< DockAreaUndockIcon + DockAreaCloseIcon, //!< DockAreaCloseIcon + DockAreaMinimizeIcon, //!< DockAreaMinimizeIcon - IconCount, //!< just a delimiter for range checks + IconCount, //!< just a delimiter for range checks }; /**