feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

FancyMainWindow: Keep collapse state when toggling dock area

Browse Source 
When using the hide/show side bar actions/buttons, keep collapsed docks
collapsed.

Change-Id: I2c455523f8cde2acf68280799dd8735631756120
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
Eike Ziller
2023-12-12 15:46:56 +01:00
parent 95fc28d37b
commit 0c9f5c99e7
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libs/utils/fancymainwindow.cpp
View File

@@ -48,6 +48,11 @@ struct FancyMainWindowPrivate
QAction m_menuSeparator1; QAction m_menuSeparator1;
QAction m_resetLayoutAction; QAction m_resetLayoutAction;
QHash<int, QList<QDockWidget *>> m_hiddenAreas; // Qt::DockWidgetArea -> dock widgets QHash<int, QList<QDockWidget *>> m_hiddenAreas; // Qt::DockWidgetArea -> dock widgets
// Usually dock widgets automatically uncollapse when e.g. other docks are hidden
// and they are the only one left. We need to block that when hiding a complete
// dock area to not change the collapse state
bool m_blockAutoUncollapse = false;
}; };
class DockWidget : public QDockWidget class DockWidget : public QDockWidget
@@ -303,7 +308,7 @@ DockWidget::DockWidget(QWidget *inner, FancyMainWindow *parent, bool immutable)
origCloseButton, &QAbstractButton::clicked); origCloseButton, &QAbstractButton::clicked);
connect(q, &FancyMainWindow::dockWidgetsChanged, this, [this] { connect(q, &FancyMainWindow::dockWidgetsChanged, this, [this] {
if (!supportsCollapse()) if (!q->isBlockingAutomaticUncollapse() && isVisible() && !supportsCollapse())
ensureWidgetShown(); ensureWidgetShown();
}); });
} }
@@ -679,6 +684,7 @@ void FancyMainWindow::showCentralWidget(bool on)
void FancyMainWindow::setDockAreaVisible(Qt::DockWidgetArea area, bool visible) void FancyMainWindow::setDockAreaVisible(Qt::DockWidgetArea area, bool visible)
{ {
d->m_blockAutoUncollapse = true;
if (visible) { if (visible) {
const QList<QDockWidget *> docks = d->m_hiddenAreas.value(area); const QList<QDockWidget *> docks = d->m_hiddenAreas.value(area);
for (QDockWidget *w : docks) for (QDockWidget *w : docks)
@@ -692,6 +698,7 @@ void FancyMainWindow::setDockAreaVisible(Qt::DockWidgetArea area, bool visible)
w->setVisible(false); w->setVisible(false);
} }
} }
d->m_blockAutoUncollapse = false;
} }
bool FancyMainWindow::isDockAreaVisible(Qt::DockWidgetArea area) const bool FancyMainWindow::isDockAreaVisible(Qt::DockWidgetArea area) const
@@ -708,6 +715,11 @@ bool FancyMainWindow::isDockAreaAvailable(Qt::DockWidgetArea area) const
return !docksInArea(area).isEmpty(); return !docksInArea(area).isEmpty();
} }
bool FancyMainWindow::isBlockingAutomaticUncollapse() const
{
return d->m_blockAutoUncollapse;
}
void FancyMainWindow::addDockActionsToMenu(QMenu *menu) void FancyMainWindow::addDockActionsToMenu(QMenu *menu)
{ {
QList<QAction *> actions; QList<QAction *> actions;

1
src/libs/utils/fancymainwindow.h
View File

@@ -49,6 +49,7 @@ public:
bool isDockAreaVisible(Qt::DockWidgetArea area) const; bool isDockAreaVisible(Qt::DockWidgetArea area) const;
bool isDockAreaAvailable(Qt::DockWidgetArea area) const; bool isDockAreaAvailable(Qt::DockWidgetArea area) const;
bool isBlockingAutomaticUncollapse() const;
signals: signals:
// Emitted by resetLayoutAction(). Connect to a slot // Emitted by resetLayoutAction(). Connect to a slot
// restoring the default layout. // restoring the default layout.