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

QMainWindow: Fix unused separator widgets blocking mouse events

Browse Source 
We need to hide separator widgets that are unused, otherwise they block
mouse events from the underlying widgets.

Fixes: QTCREATORBUG-24600
Change-Id: I98c6d4860f683a861b89c4cad042bb734f590000
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 9943cf73717a497c7fec5989968311abd9f5d61b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Eike Ziller 2022-03-10 12:17:21 +01:00 committed by Qt Cherry-pick Bot
parent 817b4acbd9
commit d195265e9a
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2788,6 +2788,12 @@ QDockWidgetGroupWindow *QMainWindowLayout::createTabbedDockWindow()
void QMainWindowLayout::applyState(QMainWindowLayoutState &newState, bool animate)
{
// applying the state can lead to showing separator widgets, which would lead to a re-layout
// (even though the separator widgets are not really part of the layout)
// break the loop
if (isInApplyState)
return;
isInApplyState = true;
#if QT_CONFIG(dockwidget) && QT_CONFIG(tabwidget)
QSet<QTabBar*> used = newState.dockAreaLayout.usedTabBars();
const auto groups =
@ -2810,6 +2816,7 @@ void QMainWindowLayout::applyState(QMainWindowLayoutState &newState, bool animat
usedSeparatorWidgets = usedSeps;
for (QWidget *sepWidget : retiredSeps) {
unusedSeparatorWidgets.append(sepWidget);
sepWidget->hide();
}
}
@ -2818,6 +2825,7 @@ void QMainWindowLayout::applyState(QMainWindowLayoutState &newState, bool animat
#endif // QT_CONFIG(dockwidget) && QT_CONFIG(tabwidget)
newState.apply(dockOptions & QMainWindow::AnimatedDocks && animate);
isInApplyState = false;
}
void QMainWindowLayout::saveState(QDataStream &stream) const

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

@ -577,6 +577,7 @@ public:
QPointer<QDockWidgetGroupWindow> currentHoveredFloat; // set when dragging over a floating dock widget
void setCurrentHoveredFloat(QDockWidgetGroupWindow *w);
#endif
bool isInApplyState = false;
void hover(QLayoutItem *widgetItem, const QPoint &mousePos);
bool plug(QLayoutItem *widgetItem);