diff --git a/README.md b/README.md index 9ad198e..27e86b1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![ukraine](doc/ukraine.jpg) +![ukraine](doc/taiwan_ukraine.jpg) ![logo](doc/ads_logo.svg) @@ -8,13 +8,14 @@ [![Build status](https://ci.appveyor.com/api/projects/status/qcfb3cy932jw9mpy/branch/master?svg=true)](https://ci.appveyor.com/project/githubuser0xFFFF/qt-advanced-docking-system/branch/master) [![License: LGPL v2.1](https://img.shields.io/badge/License-LGPL%20v2.1-blue.svg)](gnu-lgpl-v2.1.md) -[What's new](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/releases/latest) -[Documentation](doc/user-guide.md) - Qt Advanced Docking System lets you create customizable layouts using a full featured window docking system similar to what is found in many popular integrated development environments (IDEs) such as Visual Studio. +- [What's new](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/releases/latest) +- [Documentation](doc/user-guide.md) +- Original Repository: https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System + [![Video Advanced Docking](doc/advanced-docking_video.png)](https://www.youtube.com/watch?v=7pdNfafg3Qc) ## New and Noteworthy @@ -25,6 +26,7 @@ adds the following features: - option to close tabs with the middle mouse button - `DeleteContentOnClose` flag for dynamic deletion and creation of dock widget content +- improved focus highlighting functionality The [release 3.7](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/releases/tag/3.7.2) adds the following features: @@ -151,7 +153,7 @@ If this flag is cleared, the widget resizing is deferred until the mouse button ### Opaque and non-opaque undocking -By default, opaque undocking is active. That means, as soon as you drag a dock widget or a dock area with a number of dock widgets it will be undocked and moved into a floating widget and then the floating widget will be dragged around. That means undocking will take place immediatelly. You can compare this with opaque splitter resizing. If the flag `OpaqueUndocking` is cleared, then non-opaque undocking is active. In this mode, undocking is more like a standard drag and drop operation. That means, the dragged dock widget or dock area is not undocked immediatelly. Instead, a drag preview widget is created and dragged around to indicate the future position of the dock widget or dock area. The actual dock operation is only executed when the mouse button is released. That makes it possible, to cancel an active drag operation with the escape key. +By default, opaque undocking is active. That means, as soon as you drag a dock widget or a dock area with a number of dock widgets it will be undocked and moved into a floating widget and then the floating widget will be dragged around. That means undocking will take place immediately. You can compare this with opaque splitter resizing. If the flag `OpaqueUndocking` is cleared, then non-opaque undocking is active. In this mode, undocking is more like a standard drag and drop operation. That means, the dragged dock widget or dock area is not undocked immediately. Instead, a drag preview widget is created and dragged around to indicate the future position of the dock widget or dock area. The actual dock operation is only executed when the mouse button is released. That makes it possible, to cancel an active drag operation with the escape key. The drag preview widget can be configured by a number of global dock manager flags: - `DragPreviewIsDynamic`: if this flag is enabled, the preview will be adjusted dynamically to the drop area @@ -414,7 +416,7 @@ D-Tect X is a X-ray inspection software for industrial radiography. It is a stat HiveWE is a Warcraft III world editor. It focusses on speed and ease of use, especially for large maps where the regular World Editor is often too slow and clunky. -It has a JASS editor with syntax hightlighting, tabs, code completion and more. +It has a JASS editor with syntax highlighting, tabs, code completion and more. The JASS editor uses the Qt Advanced Docking System for the management and layout of the open editor windows. diff --git a/demo/MainWindow.cpp b/demo/MainWindow.cpp index f0bf1fe..e0394c4 100644 --- a/demo/MainWindow.cpp +++ b/demo/MainWindow.cpp @@ -495,7 +495,10 @@ void MainWindowPrivate::createContent() #ifdef Q_OS_WIN #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) - if (!ads::CDockManager::testConfigFlag(ads::CDockManager::OpaqueUndocking)) + // ActiveX widget only works without OpaqueUndocking and without + // auto hide feature + if (!ads::CDockManager::testConfigFlag(ads::CDockManager::OpaqueUndocking) + && !ads::CDockManager::testAutoHideConfigFlag(ads::CDockManager::AutoHideFeatureEnabled)) { DockManager->addDockWidget(ads::CenterDockWidgetArea, createActiveXWidget(), RighDockArea); } @@ -647,7 +650,7 @@ CMainWindow::CMainWindow(QWidget *parent) : // uncomment the following line if you want a central widget in the main dock container (the dock manager) without a titlebar // If you enable this code, you can test it in the demo with the Calendar 0 // dock widget. - // CDockManager::setConfigFlag(CDockManager::HideSingleCentralWidgetTitleBar, true); + //CDockManager::setConfigFlag(CDockManager::HideSingleCentralWidgetTitleBar, true); // uncomment the following line to enable focus highlighting of the dock // widget that has the focus @@ -749,7 +752,7 @@ void CMainWindow::onViewToggled(bool Open) return; } - qDebug() << DockWidget->objectName() << " viewToggled(" << Open << ")"; + //qDebug() << DockWidget->objectName() << " viewToggled(" << Open << ")"; } diff --git a/doc/user-guide.md b/doc/user-guide.md index d08a6bd..4f7059b 100644 --- a/doc/user-guide.md +++ b/doc/user-guide.md @@ -48,7 +48,7 @@ ## Configuration Flags The Advanced Docking System has a number of global configuration options to -configure the design and the functionality of the docking system. Eachs +configure the design and the functionality of the docking system. Each configuration will be explained in detail in the following sections. ### Setting Configuration Flags @@ -68,9 +68,9 @@ d->DockManager = new CDockManager(this); If you set the configurations flags, you can set individual flags using the function `CDockManager::setConfigFlag` or you can set all flags using the function `CDockManager::setConfigFlags`. Instead of settings all -flags individualy, it is better to pick a predefined set of configuration +flags individually, it is better to pick a predefined set of configuration flags and then modify individual flags. The following predefined -configurations are avilable +configurations are available - `DefaultNonOpaqueConfig` - uses non opaque splitter resizing and non opaque docking - `DefaultOpaqueConfig` - uses opaque splitter resizing and opaque docking @@ -161,11 +161,11 @@ constant, that means, if enabled, the tabs need more space. ### `OpaqueUndocking` -If this flag is set, opaque undocking is active. That means, as soon as you drag a dock widget or a dock area with a number of dock widgets it will be undocked and moved into a floating widget and then the floating widget will be dragged around. That means undocking will take place immediatelly. You can compare this with opaque splitter resizing. +If this flag is set, opaque undocking is active. That means, as soon as you drag a dock widget or a dock area with a number of dock widgets it will be undocked and moved into a floating widget and then the floating widget will be dragged around. That means undocking will take place immediately. You can compare this with opaque splitter resizing. ![OpaqueUndocking true](opaque_undocking.gif) -If you would like to test opaque undocking, you should set the pedefined config +If you would like to test opaque undocking, you should set the predefined config flags `CDockManager::DefaultOpaqueConfig`. ```c++ @@ -325,7 +325,7 @@ still has a titlebar to drag it out of the main window. If this is enabled, the docking system is able to highlight the tab and the components of a dock area with a different style (i.e. a different color). -This option is disabled by default and needs to be enabled explicitely +This option is disabled by default and needs to be enabled explicitly because it adds some overhead. The dock manager needs to react on focus changes and dock widget dragging to highlight the right dock widget. You should enable it only, if you really need it for your application. @@ -345,7 +345,7 @@ be set to true and you can use this property to style the focused dock widget differently. The picture above uses the following styling: ```css -/* Color the tab with the nhighlight color */ +/* Color the tab with the highlight color */ ads--CDockWidgetTab[focused="true"] { background: palette(highlight); @@ -675,3 +675,4 @@ just call the function for settings the stylesheet with an empty string. ```c++ DockManager->setStyleSheet(""); ``` + diff --git a/examples/autohide/mainwindow.cpp b/examples/autohide/mainwindow.cpp index 4ae68be..56b6eaa 100644 --- a/examples/autohide/mainwindow.cpp +++ b/examples/autohide/mainwindow.cpp @@ -46,7 +46,7 @@ CMainWindow::CMainWindow(QWidget *parent) TableDockWidget->setWidget(table); TableDockWidget->setMinimumSizeHintMode(CDockWidget::MinimumSizeHintFromDockWidget); TableDockWidget->setMinimumSize(200,150); - const auto autoHideContainer = DockManager->addAutoHideDockWidget(SideBarLocation::Left, TableDockWidget, CDockWidget::Last); + const auto autoHideContainer = DockManager->addAutoHideDockWidget(SideBarLocation::Left, TableDockWidget); autoHideContainer->setSize(480); ui->menuView->addAction(TableDockWidget->toggleViewAction()); @@ -58,7 +58,7 @@ CMainWindow::CMainWindow(QWidget *parent) TableDockWidget->setMinimumSizeHintMode(CDockWidget::MinimumSizeHintFromDockWidget); TableDockWidget->resize(250, 150); TableDockWidget->setMinimumSize(200,150); - DockManager->addAutoHideDockWidget(SideBarLocation::Left, TableDockWidget, CDockWidget::Last); + DockManager->addAutoHideDockWidget(SideBarLocation::Left, TableDockWidget); ui->menuView->addAction(TableDockWidget->toggleViewAction()); QTableWidget* propertiesTable = new QTableWidget(); diff --git a/src/AutoHideDockContainer.cpp b/src/AutoHideDockContainer.cpp index 3c64940..ce28688 100644 --- a/src/AutoHideDockContainer.cpp +++ b/src/AutoHideDockContainer.cpp @@ -184,8 +184,6 @@ CAutoHideDockContainer::CAutoHideDockContainer(CDockManager* DockManager, SideBa d->DockArea = new CDockAreaWidget(DockManager, parent); d->DockArea->setObjectName("autoHideDockArea"); d->DockArea->setAutoHideDockContainer(this); - d->DockArea->updateAutoHideButtonCheckState(); - d->DockArea->updateTitleBarButtonToolTip(); setObjectName("autoHideDockContainer"); @@ -219,12 +217,17 @@ CAutoHideDockContainer::CAutoHideDockContainer(CDockWidget* DockWidget, SideBarL void CAutoHideDockContainer::updateSize() { auto dockContainerParent = parentContainer(); + if (!dockContainerParent) + { + return; + } + auto rect = dockContainerParent->contentRect(); switch (sideBarLocation()) { case SideBarLocation::Top: - resize(rect.width(), qMin(rect.height(), d->Size.height() - ResizeMargin)); + resize(rect.width(), qMin(rect.height() - ResizeMargin, d->Size.height())); move(rect.topLeft()); break; @@ -244,7 +247,7 @@ void CAutoHideDockContainer::updateSize() case SideBarLocation::Bottom: { - resize(rect.width(), qMin(rect.height(), d->Size.height() - ResizeMargin)); + resize(rect.width(), qMin(rect.height() - ResizeMargin, d->Size.height())); QPoint p = rect.bottomLeft(); p.ry() -= (height() - 1); move(p); @@ -256,6 +259,7 @@ void CAutoHideDockContainer::updateSize() //============================================================================ CAutoHideDockContainer::~CAutoHideDockContainer() { + qDebug() << "~CAutoHideDockContainer()" ADS_PRINT("~CAutoHideDockContainer"); // Remove event filter in case there are any queued messages diff --git a/src/AutoHideSideBar.cpp b/src/AutoHideSideBar.cpp index 9fd7709..17d25c8 100644 --- a/src/AutoHideSideBar.cpp +++ b/src/AutoHideSideBar.cpp @@ -143,6 +143,7 @@ CAutoHideDockContainer* CAutoHideSideBar::insertDockWidget(int Index, CDockWidge auto AutoHideContainer = new CAutoHideDockContainer(DockWidget, d->SideTabArea, d->ContainerWidget); DockWidget->dockManager()->dockFocusController()->clearDockWidgetFocus(DockWidget); auto Tab = AutoHideContainer->autoHideTab(); + DockWidget->setSideTabWidget(Tab); insertTab(Index, Tab); return AutoHideContainer; } diff --git a/src/AutoHideTab.cpp b/src/AutoHideTab.cpp index afe41cf..b045d88 100644 --- a/src/AutoHideTab.cpp +++ b/src/AutoHideTab.cpp @@ -85,19 +85,19 @@ void AutoHideTabPrivate::updateOrientation() switch (area) { case SideBarLocation::Left: - IconOnly = CDockManager::testConfigFlag(CDockManager::LeftSideBarIconOnly); + IconOnly = CDockManager::testAutoHideConfigFlag(CDockManager::LeftSideBarIconOnly); break; case SideBarLocation::Right: - IconOnly = CDockManager::testConfigFlag(CDockManager::RightSideBarIconOnly); + IconOnly = CDockManager::testAutoHideConfigFlag(CDockManager::RightSideBarIconOnly); break; case SideBarLocation::Top: - IconOnly = CDockManager::testConfigFlag(CDockManager::BottomSideBarIconOnly); + IconOnly = CDockManager::testAutoHideConfigFlag(CDockManager::BottomSideBarIconOnly); break; case SideBarLocation::Bottom: - IconOnly = CDockManager::testConfigFlag(CDockManager::TopSideBarIconOnly); + IconOnly = CDockManager::testAutoHideConfigFlag(CDockManager::TopSideBarIconOnly); break; } diff --git a/src/DockAreaTitleBar.cpp b/src/DockAreaTitleBar.cpp index 95eae21..94781b1 100644 --- a/src/DockAreaTitleBar.cpp +++ b/src/DockAreaTitleBar.cpp @@ -27,7 +27,6 @@ //============================================================================ // INCLUDES //============================================================================ -#include #include "DockAreaTitleBar.h" #include @@ -53,6 +52,7 @@ #include "DockComponentsFactory.h" #include "DockFocusController.h" #include "ElidingLabel.h" +#include "AutoHideDockContainer.h" #include @@ -124,9 +124,9 @@ struct DockAreaTitleBarPrivate * Returns true if the given config flag is set * Convenience function to ease config flag testing */ - static bool testConfigFlag(CDockManager::eAutoHideFlag Flag) + static bool testAutoHideConfigFlag(CDockManager::eAutoHideFlag Flag) { - return CDockManager::testConfigFlag(Flag); + return CDockManager::testAutoHideConfigFlag(Flag); } /** @@ -137,7 +137,6 @@ struct DockAreaTitleBarPrivate return this->DragState == dragState; } - /** * Starts floating */ @@ -191,14 +190,14 @@ void DockAreaTitleBarPrivate::createButtons() _this->connect(UndockButton, SIGNAL(clicked()), SLOT(onUndockButtonClicked())); // AutoHide Button - const auto autoHideEnabled = testConfigFlag(CDockManager::AutoHideFeatureEnabled); - AutoHideButton = new CTitleBarButton(testConfigFlag(CDockManager::DockAreaHasAutoHideButton) && autoHideEnabled); + const auto autoHideEnabled = testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled); + AutoHideButton = new CTitleBarButton(testAutoHideConfigFlag(CDockManager::DockAreaHasAutoHideButton) && autoHideEnabled); AutoHideButton->setObjectName("dockAreaAutoHideButton"); AutoHideButton->setAutoRaise(true); internal::setToolTip(AutoHideButton, QObject::tr("Toggle Auto Hide")); internal::setButtonIcon(AutoHideButton, QStyle::SP_DialogOkButton, ads::AutoHideIcon); AutoHideButton->setSizePolicy(ButtonSizePolicy); - AutoHideButton->setCheckable(testConfigFlag(CDockManager::AutoHideButtonCheckable)); + AutoHideButton->setCheckable(testAutoHideConfigFlag(CDockManager::AutoHideButtonCheckable)); AutoHideButton->setChecked(false); Layout->addWidget(AutoHideButton, 0); _this->connect(AutoHideButton, SIGNAL(clicked()), SLOT(onAutoHideButtonClicked())); @@ -493,10 +492,22 @@ void CDockAreaTitleBar::onCurrentTabChanged(int Index) //============================================================================ void CDockAreaTitleBar::onAutoHideButtonClicked() { - if (d->DockArea->features().testFlag(CDockWidget::DockWidgetPinnable)) + if (CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideButtonTogglesArea)) { - d->DockArea->toggleAutoHideArea(!d->DockArea->isAutoHide()); + d->DockArea->toggleAutoHide(); } + else + { + qDebug() << "d->DockArea->currentDockWidget()->toggleAutoHide()"; + d->DockArea->currentDockWidget()->toggleAutoHide(); + } +} + + +//============================================================================ +void CDockAreaTitleBar::onAutoHideDockAreaActionClicked() +{ + d->DockArea->toggleAutoHide(); } @@ -541,7 +552,6 @@ void CDockAreaTitleBar::mousePressEvent(QMouseEvent* ev) if (CDockManager::testConfigFlag(CDockManager::FocusHighlighting)) { - //d->TabBar->currentTab()->setFocus(Qt::OtherFocusReason); d->dockManager()->dockFocusController()->setDockWidgetTabFocused(d->TabBar->currentTab()); } return; @@ -655,13 +665,29 @@ void CDockAreaTitleBar::contextMenuEvent(QContextMenuEvent* ev) return; } + bool IsAutoHide = d->DockArea->isAutoHide(); + bool IsTopLevelArea = d->DockArea->isTopLevelArea(); + QAction* Action; QMenu Menu(this); - auto Action = Menu.addAction(tr("Detach Group"), this, SLOT(onUndockButtonClicked())); - Action->setEnabled(d->DockArea->features().testFlag(CDockWidget::DockWidgetFloatable)); - Menu.addSeparator(); - Action = Menu.addAction(tr("Close Group"), this, SLOT(onCloseButtonClicked())); + if (!IsTopLevelArea) + { + Action = Menu.addAction(IsAutoHide ? tr("Detach") : tr("Detach Group"), + this, SLOT(onUndockButtonClicked())); + Action->setEnabled(d->DockArea->features().testFlag(CDockWidget::DockWidgetFloatable)); + if (CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled)) + { + Action = Menu.addAction(IsAutoHide ? tr("Dock") : tr("Auto Hide Group"), this, SLOT(onAutoHideDockAreaActionClicked())); + Action->setEnabled(d->DockArea->features().testFlag(CDockWidget::DockWidgetPinnable)); + } + Menu.addSeparator(); + } + Action = Menu.addAction(IsAutoHide ? tr("Close") : tr("Close Group"), this, SLOT(onCloseButtonClicked())); Action->setEnabled(d->DockArea->features().testFlag(CDockWidget::DockWidgetClosable)); - Menu.addAction(tr("Close Other Groups"), d->DockArea, SLOT(closeOtherAreas())); + if (!IsAutoHide) + { + Action = Menu.addAction(tr("Close Other Groups"), d->DockArea, SLOT(closeOtherAreas())); + Action->setEnabled(!IsTopLevelArea); + } Menu.exec(ev->globalPos()); } diff --git a/src/DockAreaTitleBar.h b/src/DockAreaTitleBar.h index 5ccdc4a..b2c81e8 100644 --- a/src/DockAreaTitleBar.h +++ b/src/DockAreaTitleBar.h @@ -62,6 +62,7 @@ private Q_SLOTS: void onTabsMenuActionTriggered(QAction* Action); void onCurrentTabChanged(int Index); void onAutoHideButtonClicked(); + void onAutoHideDockAreaActionClicked(); protected: /** diff --git a/src/DockAreaWidget.cpp b/src/DockAreaWidget.cpp index c6d5523..06424c2 100644 --- a/src/DockAreaWidget.cpp +++ b/src/DockAreaWidget.cpp @@ -61,6 +61,15 @@ namespace ads static const char* const INDEX_PROPERTY = "index"; static const char* const ACTION_PROPERTY = "action"; +/** + * Check, if auto hide is enabled + */ +static bool isAutoHideFeatureEnabled() +{ + return CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled); +} + + /** * Internal dock area layout mimics stack layout but only inserts the current * widget into the internal QLayout object. @@ -455,6 +464,8 @@ bool CDockAreaWidget::isAutoHide() const void CDockAreaWidget::setAutoHideDockContainer(CAutoHideDockContainer* AutoHideDockContainer) { d->AutoHideDockContainer = AutoHideDockContainer; + updateAutoHideButtonCheckState(); + updateTitleBarButtonToolTip(); } @@ -503,6 +514,15 @@ void CDockAreaWidget::insertDockWidget(int index, CDockWidget* DockWidget, void CDockAreaWidget::removeDockWidget(CDockWidget* DockWidget) { ADS_PRINT("CDockAreaWidget::removeDockWidget"); + + // If this dock area is in a auto hide container, then we can delete + // the auto hide container now + if (isAutoHide()) + { + autoHideDockContainer()->cleanupAndDelete(); + return; + } + auto CurrentDockWidget = currentDockWidget(); auto NextOpenDockWidget = (DockWidget == CurrentDockWidget) ? nextOpenDockWidget(DockWidget) : nullptr; @@ -517,7 +537,7 @@ void CDockAreaWidget::removeDockWidget(CDockWidget* DockWidget) { setCurrentDockWidget(NextOpenDockWidget); } - else if (d->ContentsLayout->isEmpty() && DockContainer->dockAreaCount() >= 1 && !isAutoHide()) // Don't remove empty dock areas that are auto hidden, they'll be deleted by the auto hide dock + else if (d->ContentsLayout->isEmpty() && DockContainer->dockAreaCount() >= 1) // Don't remove empty dock areas that are auto hidden, they'll be deleted by the auto hide dock { ADS_PRINT("Dock Area empty"); DockContainer->removeDockArea(this); @@ -812,16 +832,24 @@ void CDockAreaWidget::updateTitleBarVisibility() return; } - if (d->TitleBar) + if (!d->TitleBar) + { + return; + } + + bool Hidden = Container->hasTopLevelDockWidget() && (Container->isFloating() + || CDockManager::testConfigFlag(CDockManager::HideSingleCentralWidgetTitleBar)); + Hidden |= (d->Flags.testFlag(HideSingleWidgetTitleBar) && openDockWidgetsCount() == 1); + bool IsAutoHide = isAutoHide(); + Hidden &= !IsAutoHide; // Titlebar must always be visible when auto hidden so it can be dragged + d->TitleBar->setVisible(!Hidden); + + if (isAutoHideFeatureEnabled()) { - bool Hidden = Container->hasTopLevelDockWidget() && (Container->isFloating() - || CDockManager::testConfigFlag(CDockManager::HideSingleCentralWidgetTitleBar)); - Hidden |= (d->Flags.testFlag(HideSingleWidgetTitleBar) && openDockWidgetsCount() == 1); - d->TitleBar->setVisible(isAutoHide() ? true : !Hidden); // Titlebar must always be visible when auto hidden so it can be dragged auto tabBar = d->TitleBar->tabBar(); - tabBar->setVisible(isAutoHide() ? false : !Hidden); // Never show tab bar when auto hidden - d->TitleBar->autoHideTitleLabel()->setVisible(isAutoHide()); // Always show when auto hidden, never otherwise - updateTitleBarButtonVisibility(Container->topLevelDockArea() == this); + tabBar->setVisible(!IsAutoHide); // Never show tab bar when auto hidden + d->TitleBar->autoHideTitleLabel()->setVisible(IsAutoHide); // Always show when auto hidden, never otherwise + updateTitleBarButtonVisibility(Container->topLevelDockArea() == this); } } @@ -950,9 +978,15 @@ bool CDockAreaWidget::restoreState(CDockingStateReader& s, CDockAreaWidget*& Cre } ADS_PRINT("Dock Widget found - parent " << DockWidget->parent()); + if (DockWidget->autoHideDockContainer()) + { + DockWidget->autoHideDockContainer()->cleanupAndDelete(); + } + // We hide the DockArea here to prevent the short display (the flashing) // of the dock areas during application startup DockArea->hide(); + qDebug() << "DockArea->addDockWidget " << DockWidget->windowTitle(); DockArea->addDockWidget(DockWidget); DockWidget->setToggleViewActionChecked(!Closed); DockWidget->setClosedState(Closed); @@ -1165,41 +1199,155 @@ void CDockAreaWidget::closeArea() } } -//============================================================================ -void CDockAreaWidget::toggleAutoHideArea(bool Enable) + +enum eBorderLocation { - if (!Enable) + BorderNone = 0, + BorderLeft = 0x01, + BorderRight = 0x02, + BorderTop = 0x04, + BorderBottom = 0x08, + BorderVertical = BorderLeft | BorderRight, + BorderHorizontal = BorderTop | BorderBottom, + BorderTopLeft = BorderTop | BorderLeft, + BorderTopRight = BorderTop | BorderRight, + BorderBottomLeft = BorderBottom | BorderLeft, + BorderBottomRight = BorderBottom | BorderRight, + BorderVerticalBottom = BorderVertical | BorderBottom, + BorderVerticalTop = BorderVertical | BorderTop, + BorderHorizontalLeft = BorderHorizontal | BorderLeft, + BorderHorizontalRight = BorderHorizontal | BorderRight, + BorderAll = BorderVertical | BorderHorizontal +}; + + +//============================================================================ +SideBarLocation CDockAreaWidget::calculateSideTabBarArea() const +{ + auto Container = dockContainer(); + auto ContentRect = Container->contentRect(); + + int borders = BorderNone; // contains all borders that are touched by the dock ware + auto DockAreaTopLeft = mapTo(Container, rect().topLeft()); + auto DockAreaRect = rect(); + DockAreaRect.moveTo(DockAreaTopLeft); + const qreal aspectRatio = DockAreaRect.width() / (qMax(1, DockAreaRect.height()) * 1.0); + const qreal sizeRatio = (qreal)ContentRect.width() / DockAreaRect.width(); + static const int MinBorderDistance = 16; + bool HorizontalOrientation = (aspectRatio > 1.0) && (sizeRatio < 3.0); + + // measure border distances - a distance less than 16 px means we touch the + // border + int BorderDistance[4]; + + int Distance = qAbs(ContentRect.topLeft().y() - DockAreaRect.topLeft().y()); + BorderDistance[SideBarLocation::Top] = (Distance < MinBorderDistance) ? 0 : Distance; + if (!BorderDistance[SideBarLocation::Top]) + { + borders |= BorderTop; + } + + Distance = qAbs(ContentRect.bottomRight().y() - DockAreaRect.bottomRight().y()); + BorderDistance[SideBarLocation::Bottom] = (Distance < MinBorderDistance) ? 0 : Distance; + if (!BorderDistance[SideBarLocation::Bottom]) + { + borders |= BorderBottom; + } + + Distance = qAbs(ContentRect.topLeft().x() - DockAreaRect.topLeft().x()); + BorderDistance[SideBarLocation::Left] = (Distance < MinBorderDistance) ? 0 : Distance; + if (!BorderDistance[SideBarLocation::Left]) + { + borders |= BorderLeft; + } + + Distance = qAbs(ContentRect.bottomRight().x() - DockAreaRect.bottomRight().x()); + BorderDistance[SideBarLocation::Right] = (Distance < MinBorderDistance) ? 0 : Distance; + if (!BorderDistance[SideBarLocation::Right]) + { + borders |= BorderRight; + } + + auto SideTab = SideBarLocation::Right; + switch (borders) + { + // 1. It's touching all borders + case BorderAll: SideTab = HorizontalOrientation ? SideBarLocation::Bottom : SideBarLocation::Right; break; + + // 2. It's touching 3 borders + case BorderVerticalBottom : SideTab = SideBarLocation::Bottom; break; + case BorderVerticalTop : SideTab = SideBarLocation::Top; break; + case BorderHorizontalLeft: SideTab = SideBarLocation::Left; break; + case BorderHorizontalRight: SideTab = SideBarLocation::Right; break; + + // 3. Its touching horizontal or vertical borders + case BorderVertical : SideTab = SideBarLocation::Bottom; break; + case BorderHorizontal: SideTab = SideBarLocation::Right; break; + + // 4. Its in a corner + case BorderTopLeft : SideTab = HorizontalOrientation ? SideBarLocation::Top : SideBarLocation::Left; break; + case BorderTopRight : SideTab = HorizontalOrientation ? SideBarLocation::Top : SideBarLocation::Right; break; + case BorderBottomLeft : SideTab = HorizontalOrientation ? SideBarLocation::Bottom : SideBarLocation::Left; break; + case BorderBottomRight : SideTab = HorizontalOrientation ? SideBarLocation::Bottom : SideBarLocation::Right; break; + + // 5 Ists touching only one border + case BorderLeft: SideTab = SideBarLocation::Left; break; + case BorderRight: SideTab = SideBarLocation::Right; break; + case BorderTop: SideTab = SideBarLocation::Top; break; + case BorderBottom: SideTab = SideBarLocation::Bottom; break; + } + + return SideTab; +} + + +//============================================================================ +void CDockAreaWidget::setAutoHide(bool Enable) +{ + if (!isAutoHideFeatureEnabled()) { - autoHideDockContainer()->moveContentsToParent(); return; } - const auto area = dockContainer()->calculateSideTabBarArea(this); - - if (dockManager()->testConfigFlag(CDockManager::AutoHideButtonTogglesArea)) + if (!Enable) { - for (const auto DockWidget : openedDockWidgets()) + if (isAutoHide()) { - if (Enable == isAutoHide()) - { - continue; - } - - dockContainer()->createAndSetupAutoHideContainer(area, DockWidget, DockWidget->autoHideInsertOrder()); + autoHideDockContainer()->moveContentsToParent(); } + return; } - else + + auto area = calculateSideTabBarArea(); + for (const auto DockWidget : openedDockWidgets()) { - const auto DockWidget = currentDockWidget(); if (Enable == isAutoHide()) { - return; + continue; } - dockContainer()->createAndSetupAutoHideContainer(area, DockWidget, DockWidget->autoHideInsertOrder()); + + if (!DockWidget->features().testFlag(CDockWidget::DockWidgetPinnable)) + { + continue; + } + + dockContainer()->createAndSetupAutoHideContainer(area, DockWidget); } } +//============================================================================ +void CDockAreaWidget::toggleAutoHide() +{ + if (!isAutoHideFeatureEnabled()) + { + return; + } + + setAutoHide(!isAutoHide()); +} + + //============================================================================ void CDockAreaWidget::closeOtherAreas() { @@ -1271,6 +1419,19 @@ void CDockAreaWidget::onDockWidgetFeaturesChanged() } +//============================================================================ +bool CDockAreaWidget::isTopLevelArea() const +{ + auto Container = dockContainer(); + if (!Container) + { + return false; + } + + return (Container->topLevelDockArea() == this); +} + + #ifdef Q_OS_WIN //============================================================================ bool CDockAreaWidget::event(QEvent *e) diff --git a/src/DockAreaWidget.h b/src/DockAreaWidget.h index 4059a83..b79107c 100644 --- a/src/DockAreaWidget.h +++ b/src/DockAreaWidget.h @@ -79,6 +79,22 @@ private Q_SLOTS: */ void reorderDockWidget(int fromIndex, int toIndex); + /* + * Update the auto hide button checked state based on if it's contained in an auto hide container or not + */ + void updateAutoHideButtonCheckState(); + + /* + * Update the title bar button tooltips + */ + void updateTitleBarButtonToolTip(); + + /** + * Calculate the auto hide side bar location depending on the dock area + * widget position in the container + */ + SideBarLocation calculateSideTabBarArea() const; + protected: #ifdef Q_OS_WIN @@ -152,21 +168,11 @@ protected: */ void markTitleBarMenuOutdated(); - /* - * Update the auto hide button checked state based on if it's contained in an auto hide container or not - */ - void updateAutoHideButtonCheckState(); - /* * Update the title bar button visibility based on if it's top level or not */ void updateTitleBarButtonVisibility(bool IsTopLevel) const; - /* - * Update the title bar button tooltips - */ - void updateTitleBarButtonToolTip(); - protected Q_SLOTS: void toggleView(bool Open); @@ -211,7 +217,7 @@ public: CAutoHideDockContainer* autoHideDockContainer() const; /** - * Returns true if the dock area exists in an auto hide dock container + * Returns true if the dock area is in an auto hide container */ bool isAutoHide() const; @@ -370,6 +376,12 @@ public: */ bool containsCentralWidget() const; + /** + * If this dock area is the one and only visible area in a container, then + * this function returns true + */ + bool isTopLevelArea() const; + public Q_SLOTS: /** @@ -385,9 +397,17 @@ public Q_SLOTS: void closeArea(); /** - * Toggles the Auto hides behaviour of the dock area and all dock widgets in this area + * Sets the dock area into auto hide mode or into normal mode. + * If the dock area is switched to auto hide mode, then all dock widgets + * that are pinable will be added to the sidebar */ - void toggleAutoHideArea(bool Enable); + void setAutoHide(bool Enable); + + /** + * Switches the dock area to auto hide mode or vice versa depending on its + * current state. + */ + void toggleAutoHide(); /** * This function closes all other areas except of this area diff --git a/src/DockContainerWidget.cpp b/src/DockContainerWidget.cpp index a7a0f2d..648c9e8 100644 --- a/src/DockContainerWidget.cpp +++ b/src/DockContainerWidget.cpp @@ -1045,7 +1045,7 @@ bool DockContainerWidgetPrivate::restoreSideBar(CDockingStateReader& s, Q_UNUSED(CreatedWidget) // Simply ignore side bar auto hide widgets from saved state if // auto hide support is disabled - if (!CDockManager::testConfigFlag(CDockManager::AutoHideFeatureEnabled)) + if (!CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled)) { return true; } @@ -1338,12 +1338,6 @@ CDockContainerWidget::~CDockContainerWidget() d->DockManager->removeDockContainer(this); } - auto AutoHideWidgets = d->AutoHideWidgets; - for (auto AutohideWidget : AutoHideWidgets) - { - delete AutohideWidget; - } - delete d; } @@ -1372,9 +1366,9 @@ CDockAreaWidget* CDockContainerWidget::addDockWidget(DockWidgetArea area, CDockW //============================================================================ CAutoHideDockContainer* CDockContainerWidget::createAndSetupAutoHideContainer( - SideBarLocation area, CDockWidget* DockWidget, CDockWidget::eAutoHideInsertOrder insertOrder) + SideBarLocation area, CDockWidget* DockWidget) { - if (!CDockManager::testConfigFlag(CDockManager::AutoHideFeatureEnabled)) + if (!CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled)) { Q_ASSERT_X(false, "CDockContainerWidget::createAndInitializeDockWidgetOverlayContainer", "Requested area does not exist in config"); @@ -1385,109 +1379,10 @@ CAutoHideDockContainer* CDockContainerWidget::createAndSetupAutoHideContainer( DockWidget->setDockManager(d->DockManager); // Auto hide Dock Container needs a valid dock manager } - return sideTabBar(area)->insertDockWidget(insertOrder == CDockWidget::First ? 0 : -1, DockWidget); + return sideTabBar(area)->insertDockWidget(-1, DockWidget); } -enum eBorderLocation -{ - BorderNone = 0, - BorderLeft = 0x01, - BorderRight = 0x02, - BorderTop = 0x04, - BorderBottom = 0x08, - BorderVertical = BorderLeft | BorderRight, - BorderHorizontal = BorderTop | BorderBottom, - BorderTopLeft = BorderTop | BorderLeft, - BorderTopRight = BorderTop | BorderRight, - BorderBottomLeft = BorderBottom | BorderLeft, - BorderBottomRight = BorderBottom | BorderRight, - BorderVerticalBottom = BorderVertical | BorderBottom, - BorderVerticalTop = BorderVertical | BorderTop, - BorderHorizontalLeft = BorderHorizontal | BorderLeft, - BorderHorizontalRight = BorderHorizontal | BorderRight, - BorderAll = BorderVertical | BorderHorizontal -}; - - -//============================================================================ -SideBarLocation CDockContainerWidget::calculateSideTabBarArea(CDockAreaWidget* DockAreaWidget) -{ - - auto ContentRect = this->contentRect(); - int borders = BorderNone; // contains all borders that are touched by the dock ware - auto DockAreaTopLeft = DockAreaWidget->mapTo(this, DockAreaWidget->rect().topLeft()); - auto DockAreaRect = DockAreaWidget->rect(); - DockAreaRect.moveTo(DockAreaTopLeft); - const qreal aspectRatio = DockAreaRect.width() / (qMax(1, DockAreaRect.height()) * 1.0); - const qreal sizeRatio = (qreal)ContentRect.width() / DockAreaRect.width(); - static const int MinBorderDistance = 16; - bool HorizontalOrientation = (aspectRatio > 1.0) && (sizeRatio < 3.0); - - // measure border distances - a distance less than 16 px means we touch the - // border - int BorderDistance[4]; - - int Distance = qAbs(ContentRect.topLeft().y() - DockAreaRect.topLeft().y()); - BorderDistance[SideBarLocation::Top] = (Distance < MinBorderDistance) ? 0 : Distance; - if (!BorderDistance[SideBarLocation::Top]) - { - borders |= BorderTop; - } - - Distance = qAbs(ContentRect.bottomRight().y() - DockAreaRect.bottomRight().y()); - BorderDistance[SideBarLocation::Bottom] = (Distance < MinBorderDistance) ? 0 : Distance; - if (!BorderDistance[SideBarLocation::Bottom]) - { - borders |= BorderBottom; - } - - Distance = qAbs(ContentRect.topLeft().x() - DockAreaRect.topLeft().x()); - BorderDistance[SideBarLocation::Left] = (Distance < MinBorderDistance) ? 0 : Distance; - if (!BorderDistance[SideBarLocation::Left]) - { - borders |= BorderLeft; - } - - Distance = qAbs(ContentRect.bottomRight().x() - DockAreaRect.bottomRight().x()); - BorderDistance[SideBarLocation::Right] = (Distance < MinBorderDistance) ? 0 : Distance; - if (!BorderDistance[SideBarLocation::Right]) - { - borders |= BorderRight; - } - - auto SideTab = SideBarLocation::Right; - switch (borders) - { - // 1. It's touching all borders - case BorderAll: SideTab = HorizontalOrientation ? SideBarLocation::Bottom : SideBarLocation::Right; break; - - // 2. It's touching 3 borders - case BorderVerticalBottom : SideTab = SideBarLocation::Bottom; break; - case BorderVerticalTop : SideTab = SideBarLocation::Top; break; - case BorderHorizontalLeft: SideTab = SideBarLocation::Left; break; - case BorderHorizontalRight: SideTab = SideBarLocation::Right; break; - - // 3. Its touching horizontal or vertical borders - case BorderVertical : SideTab = SideBarLocation::Bottom; break; - case BorderHorizontal: SideTab = SideBarLocation::Right; break; - - // 4. Its in a corner - case BorderTopLeft : SideTab = HorizontalOrientation ? SideBarLocation::Top : SideBarLocation::Left; break; - case BorderTopRight : SideTab = HorizontalOrientation ? SideBarLocation::Top : SideBarLocation::Right; break; - case BorderBottomLeft : SideTab = HorizontalOrientation ? SideBarLocation::Bottom : SideBarLocation::Left; break; - case BorderBottomRight : SideTab = HorizontalOrientation ? SideBarLocation::Bottom : SideBarLocation::Right; break; - - // 5 Ists touching only one border - case BorderLeft: SideTab = SideBarLocation::Left; break; - case BorderRight: SideTab = SideBarLocation::Right; break; - case BorderTop: SideTab = SideBarLocation::Top; break; - case BorderBottom: SideTab = SideBarLocation::Bottom; break; - } - - return SideTab; -} - //============================================================================ void CDockContainerWidget::removeDockWidget(CDockWidget* Dockwidget) { @@ -1529,17 +1424,6 @@ bool CDockContainerWidget::event(QEvent *e) } -//============================================================================ -void CDockContainerWidget::deleteAutoHideWidgets() -{ - const auto autoHideWidgets = d->AutoHideWidgets; - for (auto AutohideWidget : autoHideWidgets) - { - AutohideWidget->cleanupAndDelete(); - } - d->AutoHideWidgets.clear(); -} - //============================================================================ QList CDockContainerWidget::autoHideWidgets() const { @@ -1715,7 +1599,7 @@ void CDockContainerWidget::dropFloatingWidget(CFloatingDockContainer* FloatingWi auto autoHideWidgets = FloatingWidget->dockContainer()->autoHideWidgets(); for (const auto autohideWidget : autoHideWidgets) { - createAndSetupAutoHideContainer(autohideWidget->sideBarLocation(), autohideWidget->dockWidget(), autohideWidget->dockWidget()->autoHideInsertOrder()); + createAndSetupAutoHideContainer(autohideWidget->sideBarLocation(), autohideWidget->dockWidget()); } if (DockArea) @@ -1952,7 +1836,7 @@ void CDockContainerWidget::createRootSplitter() //============================================================================ void CDockContainerWidget::createSideTabBarWidgets() { - if (!CDockManager::testConfigFlag(CDockManager::AutoHideFeatureEnabled)) + if (!CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled)) { return; } diff --git a/src/DockContainerWidget.h b/src/DockContainerWidget.h index e8737e8..247c698 100644 --- a/src/DockContainerWidget.h +++ b/src/DockContainerWidget.h @@ -84,12 +84,6 @@ protected: */ virtual bool event(QEvent *e) override; - /* - * Delete function for resetting the auto hide widget list - * Used during restore - */ - void deleteAutoHideWidgets(); - /** * Access function for the internal root splitter */ @@ -100,8 +94,7 @@ protected: * Initializing inserts the tabs into the side tab widget and hides it * Returns nullptr if you try and insert into an area where the configuration is not enabled */ - CAutoHideDockContainer* createAndSetupAutoHideContainer( - SideBarLocation area, CDockWidget* DockWidget, CDockWidget::eAutoHideInsertOrder insertOrder); + CAutoHideDockContainer* createAndSetupAutoHideContainer(SideBarLocation area, CDockWidget* DockWidget); /** * Helper function for creation of the root splitter @@ -164,7 +157,8 @@ protected: CDockWidget* topLevelDockWidget() const; /** - * Returns the top level dock area. + * If the container has only one single visible dock area, then this + * functions returns this top level dock area */ CDockAreaWidget* topLevelDockArea() const; @@ -218,11 +212,6 @@ public: CDockAreaWidget* addDockWidget(DockWidgetArea area, CDockWidget* Dockwidget, CDockAreaWidget* DockAreaWidget = nullptr); - /** - * Get's the auto hide dock side tab bar area based on the dock area widget position - */ - SideBarLocation calculateSideTabBarArea(CDockAreaWidget* DockAreaWidget); - /** * Removes dockwidget */ diff --git a/src/DockManager.cpp b/src/DockManager.cpp index 5b4aefa..08b7a9c 100644 --- a/src/DockManager.cpp +++ b/src/DockManager.cpp @@ -437,7 +437,6 @@ bool DockManagerPrivate::restoreState(const QByteArray& State, int version) // Hide updates of floating widgets from use hideFloatingWidgets(); markDockWidgetsDirty(); - _this->deleteAutoHideWidgets(); if (!restoreStateFromXml(state, version)) { @@ -867,18 +866,17 @@ CDockAreaWidget* CDockManager::addDockWidgetToContainer(DockWidgetArea area, } //============================================================================ -CAutoHideDockContainer* CDockManager::addAutoHideDockWidget(SideBarLocation area, CDockWidget* Dockwidget, - CDockWidget::eAutoHideInsertOrder insertOrder) +CAutoHideDockContainer* CDockManager::addAutoHideDockWidget(SideBarLocation area, CDockWidget* Dockwidget) { - return addAutoHideDockWidgetToContainer(area, Dockwidget, this, insertOrder); + return addAutoHideDockWidgetToContainer(area, Dockwidget, this); } //============================================================================ CAutoHideDockContainer* CDockManager::addAutoHideDockWidgetToContainer(SideBarLocation area, CDockWidget* Dockwidget, - CDockContainerWidget* DockContainerWidget, CDockWidget::eAutoHideInsertOrder insertOrder) + CDockContainerWidget* DockContainerWidget) { d->DockWidgetsMap.insert(Dockwidget->objectName(), Dockwidget); - auto container = DockContainerWidget->createAndSetupAutoHideContainer(area, Dockwidget, insertOrder); + auto container = DockContainerWidget->createAndSetupAutoHideContainer(area, Dockwidget); container->collapseView(true); Q_EMIT dockWidgetAdded(Dockwidget); @@ -1183,7 +1181,7 @@ bool CDockManager::testConfigFlag(eConfigFlag Flag) //=========================================================================== -bool CDockManager::testConfigFlag(eAutoHideFlag Flag) +bool CDockManager::testAutoHideConfigFlag(eAutoHideFlag Flag) { return autoHideConfigFlags().testFlag(Flag); } diff --git a/src/DockManager.h b/src/DockManager.h index d9912be..4f5aaf7 100644 --- a/src/DockManager.h +++ b/src/DockManager.h @@ -236,12 +236,13 @@ public: { AutoHideFeatureEnabled = 0x01, //!< enables / disables auto hide feature DockAreaHasAutoHideButton = 0x02, //!< If the flag is set each dock area has a auto hide menu button - LeftSideBarIconOnly = 0x04, //!< If the flag is set left side bar will show only icon if a the dock widget has an icon assigned - RightSideBarIconOnly = 0x08, //!< If the flag is set right side bar will show only icon if a the dock widget has an icon assigned - BottomSideBarIconOnly = 0x10,//!< If the flag is set bottom side show only icon if a the dock widget has an icon assigned - TopSideBarIconOnly = 0x20, //!< If the flag is set top side bar show only icon if a the dock widget has an icon assigned - AutoHideButtonTogglesArea = 0x40, //!< If the flag is set, the auto hide button enables auto hiding for all dock widgets in an area, if disabled, only the current dock widget will be toggled - AutoHideButtonCheckable = 0x80, //!< If the flag is set, the auto hide button will be checked and unchecked depending on the auto hide state. Mainly for styling purposes. + AutoHideButtonTogglesArea = 0x04, //!< If the flag is set, the auto hide button enables auto hiding for all dock widgets in an area, if disabled, only the current dock widget will be toggled + AutoHideButtonCheckable = 0x08, //!< If the flag is set, the auto hide button will be checked and unchecked depending on the auto hide state. Mainly for styling purposes. + LeftSideBarIconOnly = 0x10, //!< If the flag is set left side bar will show only icon if a the dock widget has an icon assigned + RightSideBarIconOnly = 0x20, //!< If the flag is set right side bar will show only icon if a the dock widget has an icon assigned + BottomSideBarIconOnly = 0x40,//!< If the flag is set bottom side show only icon if a the dock widget has an icon assigned + TopSideBarIconOnly = 0x80, //!< If the flag is set top side bar show only icon if a the dock widget has an icon assigned + AutoHideSideBarsIconOnly = LeftSideBarIconOnly | RightSideBarIconOnly | BottomSideBarIconOnly | TopSideBarIconOnly, DefaultAutoHideConfig = AutoHideFeatureEnabled | DockAreaHasAutoHideButton ///< the default configuration for the auto hide feature @@ -307,7 +308,7 @@ public: /** * Returns true if the given overlay config flag is set */ - static bool testConfigFlag(eAutoHideFlag Flag); + static bool testAutoHideConfigFlag(eAutoHideFlag Flag); /** * Returns the global icon provider. @@ -346,8 +347,7 @@ public: * An overlay widget is used for auto hide functionality * \return Returns the CAutoHideDockContainer that contains the new DockWidget */ - CAutoHideDockContainer* addAutoHideDockWidget(SideBarLocation area, CDockWidget* Dockwidget, - CDockWidget::eAutoHideInsertOrder insertOrder = CDockWidget::Last); + CAutoHideDockContainer* addAutoHideDockWidget(SideBarLocation area, CDockWidget* Dockwidget); /** * Adds dock widget overlayed into the given container based on the CDockWidgetSideTab::SideTabBarArea. @@ -355,7 +355,7 @@ public: * \return Returns the CAutoHideDockContainer that contains the new DockWidget */ CAutoHideDockContainer* addAutoHideDockWidgetToContainer(SideBarLocation area, - CDockWidget* Dockwidget, CDockContainerWidget* DockContainerWidget, CDockWidget::eAutoHideInsertOrder = CDockWidget::Last); + CDockWidget* Dockwidget, CDockContainerWidget* DockContainerWidget); /** * This function will add the given Dockwidget to the given dock area as diff --git a/src/DockWidget.cpp b/src/DockWidget.cpp index be44c37..31f3cb9 100644 --- a/src/DockWidget.cpp +++ b/src/DockWidget.cpp @@ -94,7 +94,6 @@ struct DockWidgetPrivate QList TitleBarActions; CDockWidget::eMinimumSizeHintMode MinimumSizeHintMode = CDockWidget::MinimumSizeHintFromDockWidget; WidgetFactory* Factory = nullptr; - CDockWidget::eAutoHideInsertOrder AutoHideInsertOrder = CDockWidget::Last; QPointer SideTabWidget; /** @@ -1139,18 +1138,6 @@ bool CDockWidget::isCurrentTab() const } -//============================================================================ -void CDockWidget::setAutoHideInsertOrder(eAutoHideInsertOrder insertOrder) -{ - d->AutoHideInsertOrder = insertOrder; -} - -CDockWidget::eAutoHideInsertOrder CDockWidget::autoHideInsertOrder() const -{ - return d->AutoHideInsertOrder; -} - - //============================================================================ void CDockWidget::raise() { @@ -1169,6 +1156,45 @@ void CDockWidget::raise() } +//============================================================================ +void CDockWidget::setAutoHide(bool Enable) +{ + if (!CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled)) + { + return; + } + + // Do nothing if nothing changes + if (Enable == isAutoHide()) + { + return; + } + + auto DockArea = dockAreaWidget(); + if (!Enable) + { + DockArea->setAutoHide(false); + } + else + { + auto area = DockArea->calculateSideTabBarArea(); + dockContainer()->createAndSetupAutoHideContainer(area, this); + } +} + + +//============================================================================ +void CDockWidget::toggleAutoHide() +{ + if (!CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled)) + { + return; + } + + setAutoHide(!isAutoHide()); +} + + } // namespace ads //--------------------------------------------------------------------------- diff --git a/src/DockWidget.h b/src/DockWidget.h index 76f2dce..115c02c 100644 --- a/src/DockWidget.h +++ b/src/DockWidget.h @@ -231,17 +231,6 @@ public: ActionModeShow //!< ActionModeShow }; - /** - * This mode configures the order of pinning and unpinning auto hide widgets - * First will add it to the top of the SideTabBar, while Last will append it to the end - */ - enum eAutoHideInsertOrder - { - First, - Last - }; - - /** * This constructor creates a dock widget with the given title. @@ -537,28 +526,6 @@ public: */ bool isCurrentTab() const; - /* - * Set default dock proportion when auto hiding - * see *DefaultAutoHideDockProportion() - */ - void setDefaultAutoHideDockProportion(float Proportion); - - /* - * Set default dock proportion when auto hiding - * 0.25 is a quarter of the size, 0.5 is half the size, 1 is the entire size - */ - float DefaultAutoHideDockProportion() const; - - /* - * Set auto hide insertion mode - */ - void setAutoHideInsertOrder(eAutoHideInsertOrder insertOrder); - - /* - * Get auto hide insertion mode - */ - eAutoHideInsertOrder autoHideInsertOrder() const; - public: // reimplements QFrame ----------------------------------------------- /** * Emits titleChanged signal if title change event occurs @@ -625,6 +592,18 @@ public Q_SLOTS: */ void showNormal(); + /** + * Sets the dock widget into auto hide mode if this feature is enabled + * via CDockManager::setAutoHideFlags(CDockManager::AutoHideFeatureEnabled) + */ + void setAutoHide(bool Enable); + + /** + * Switches the dock widget to auto hide mode or vice versa depending on its + * current state. + */ + void toggleAutoHide(); + Q_SIGNALS: /** diff --git a/src/DockWidgetTab.cpp b/src/DockWidgetTab.cpp index e82ae77..aa904c7 100644 --- a/src/DockWidgetTab.cpp +++ b/src/DockWidgetTab.cpp @@ -343,10 +343,6 @@ CDockWidgetTab::CDockWidgetTab(CDockWidget* DockWidget, QWidget *parent) : d->DockWidget = DockWidget; d->createLayout(); setFocusPolicy(Qt::NoFocus); - /*if (CDockManager::testConfigFlag(CDockManager::FocusHighlighting)) - { - setFocusPolicy(Qt::ClickFocus); - }*/ } //============================================================================ @@ -519,6 +515,11 @@ void CDockWidgetTab::contextMenuEvent(QContextMenuEvent* ev) auto Action = Menu.addAction(tr("Detach"), this, SLOT(detachDockWidget())); Action->setEnabled(isDetachable); + if (CDockManager::testAutoHideConfigFlag(CDockManager::AutoHideFeatureEnabled)) + { + Action = Menu.addAction(tr("Auto Hide"), this, SLOT(autoHideDockWidget())); + Action->setEnabled(d->DockWidget->features().testFlag(CDockWidget::DockWidgetPinnable)); + } Menu.addSeparator(); Action = Menu.addAction(tr("Close"), this, SIGNAL(closeRequested())); Action->setEnabled(isClosable()); @@ -704,6 +705,13 @@ void CDockWidgetTab::detachDockWidget() } +//=========================================================================== +void CDockWidgetTab::autoHideDockWidget() +{ + d->DockWidget->setAutoHide(true); +} + + //============================================================================ bool CDockWidgetTab::event(QEvent *e) { diff --git a/src/DockWidgetTab.h b/src/DockWidgetTab.h index d186c46..df32ef0 100644 --- a/src/DockWidgetTab.h +++ b/src/DockWidgetTab.h @@ -63,6 +63,7 @@ private: private Q_SLOTS: void detachDockWidget(); + void autoHideDockWidget(); protected: virtual void mousePressEvent(QMouseEvent* ev) override;