1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "QDockWidget: Always show dock widgets with the main window"

Browse Source 
This reverts commit 4c60a11d8f935abb762a83b0ab99cefa6db3060c.

Reason for revert: Breaks QMainWindow::restoreState(). Dock widget is shown, even if restored into hidden state.

Change-Id: I9808de4e0fd48871c3b234ae9bbaf6c64c8e832d
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 0ea37300d111beea3bb353f036d6c747f63c88dd)
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
This commit is contained in:
Axel Spoerl 2023-12-22 11:24:15 +00:00 committed by Volker Hilsheimer
parent fef7baaf11
commit b01235ca3f
3 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/widgets/widgets/qmainwindow.cpp
View File

@ -1290,13 +1290,6 @@ bool QMainWindow::event(QEvent *event)
return true; return true;
#endif // QT_CONFIG(statustip) #endif // QT_CONFIG(statustip)
#if QT_CONFIG(dockwidget)
case QEvent::Show:
Q_ASSERT(d->layout);
d->layout->showDockWidgets();
break;
#endif // QT_CONFIG(dockwidget)
case QEvent::StyleChange: case QEvent::StyleChange:
#if QT_CONFIG(dockwidget) #if QT_CONFIG(dockwidget)
Q_ASSERT(d->layout); Q_ASSERT(d->layout);

11
src/widgets/widgets/qmainwindowlayout.cpp
View File

@ -1630,17 +1630,6 @@ inline static Qt::DockWidgetArea toDockWidgetArea(int pos)
return QDockWidgetPrivate::toDockWidgetArea(static_cast<QInternal::DockPosition>(pos)); return QDockWidgetPrivate::toDockWidgetArea(static_cast<QInternal::DockPosition>(pos));
} }
void QMainWindowLayout::showDockWidgets() const
{
const auto dockWidgets = parent()->findChildren<QDockWidget *>(Qt::FindDirectChildrenOnly);
for (auto *dockWidget : dockWidgets)
dockWidget->show();
const auto groupWindows = parent()->findChildren<QDockWidgetGroupWindow *>(Qt::FindDirectChildrenOnly);
for (auto *groupWindow : groupWindows)
groupWindow->show();
}
// Checks if QDockWidgetGroupWindow or QDockWidget can be plugged the area indicated by path. // Checks if QDockWidgetGroupWindow or QDockWidget can be plugged the area indicated by path.
// Returns false if called with invalid widget type or if compiled without dockwidget support. // Returns false if called with invalid widget type or if compiled without dockwidget support.
static bool isAreaAllowed(QWidget *widget, const QList<int> &path) static bool isAreaAllowed(QWidget *widget, const QList<int> &path)

1
src/widgets/widgets/qmainwindowlayout_p.h
View File

@ -508,7 +508,6 @@ public:
Qt::Orientation orientation); Qt::Orientation orientation);
Qt::DockWidgetArea dockWidgetArea(QWidget* widget) const; Qt::DockWidgetArea dockWidgetArea(QWidget* widget) const;
bool restoreDockWidget(QDockWidget *dockwidget); bool restoreDockWidget(QDockWidget *dockwidget);
void showDockWidgets() const;
#if QT_CONFIG(tabbar) #if QT_CONFIG(tabbar)
void tabifyDockWidget(QDockWidget *first, QDockWidget *second); void tabifyDockWidget(QDockWidget *first, QDockWidget *second);
void raise(QDockWidget *widget); void raise(QDockWidget *widget);