diff options
| author | Liang Qi <liang.qi@qt.io> | 2022-08-26 19:59:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2022-08-30 22:27:07 +0200 |
| commit | c3c4d4dda942cab92a8fdcd47a5973f5ecf59d40 (patch) | |
| tree | 09eb6d5c7bcd0fe3a6da599cfde20f9fd42cac25 /src/widgets/widgets | |
| parent | 337a853cb581806b79ac58ed2e9b8f7b97abc034 (diff) | |
widgets: avoid setting X11BypassWindowManagerHint in QToolBar
when restoring state
With X11BypassWindowManagerHint, the floating tool bar was created
without control from window manager, which causes it stays on top
at all virtual desktops.
Pick-to: 6.4 6.3 6.2 5.15
Fixes: QTBUG-105591
Change-Id: I1868f4e75e1b84f9e81c05d2e927a183a0c635ee
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/widgets/widgets')
| -rw-r--r-- | src/widgets/widgets/qtoolbararealayout.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/widgets/qtoolbararealayout.cpp b/src/widgets/widgets/qtoolbararealayout.cpp index adddfbc529..6334874a4c 100644 --- a/src/widgets/widgets/qtoolbararealayout.cpp +++ b/src/widgets/widgets/qtoolbararealayout.cpp @@ -1335,7 +1335,7 @@ bool QToolBarAreaLayout::restoreState(QDataStream &stream, const QList<QToolBar* item.widgetItem = new QWidgetItemV2(toolBar); toolBar->setOrientation(floating ? ((shown & 2) ? Qt::Vertical : Qt::Horizontal) : dock.o); toolBar->setVisible(shown & 1); - toolBar->d_func()->setWindowState(floating, true, rect); + toolBar->d_func()->setWindowState(floating, false, rect); item.preferredSize = item.size; line.toolBarItems.append(item); |