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

Return the actual modal window in QGuiApplicationPrivate::isWindowBlocked

Browse Source 
The method erroneously returns the common ancestor of the |window| in
question and a modal window in case of window-modality of the modal
window. What should be returned is the modal window because it is the
one that blocks the |window|.

Fixes: QTBUG-106627
Change-Id: Ib4da6c1e9757629bbedbd8a16407cd6b5b0d5d27
Pick-to: 6.4
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Mikolaj Boc 2022-09-21 15:19:44 +02:00 committed by Mikołaj Boc
parent c2df659c8d
commit 56eb4badb5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/kernel/qguiapplication.cpp
View File

@ -899,7 +899,7 @@ bool QGuiApplicationPrivate::isWindowBlocked(QWindow *window, QWindow **blocking
auto *current = window; auto *current = window;
do { do {
if (current->isAncestorOf(modalWindow, QWindow::IncludeTransients)) { if (current->isAncestorOf(modalWindow, QWindow::IncludeTransients)) {
*blockingWindow = current; *blockingWindow = modalWindow;
return true; return true;
} }
current = current->parent(QWindow::IncludeTransients); current = current->parent(QWindow::IncludeTransients);