AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Detect popup window correctly in modal window blocked handling.

Browse Source 
Task-number: QTBUG-32433

Change-Id: Ida8f6237a383311bc2e231de90fd54b90ebd1508
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
This commit is contained in:
Friedemann Kleint 2013-07-16 16:03:13 +02:00 committed by The Qt Project
parent 4315f270e6
commit 8493f5d6a3
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -210,6 +210,11 @@ static inline void clearFontUnlocked()
QGuiApplicationPrivate::app_font = 0;
}
static inline bool isPopupWindow(const QWindow *w)
{
return (w->flags() & Qt::WindowType_Mask) == Qt::Popup;
}
/*!
\class QGuiApplication
\brief The QGuiApplication class manages the GUI application's control
@ -493,7 +498,7 @@ static void updateBlockedStatusRecursion(QWindow *window, bool shouldBeBlocked)
void QGuiApplicationPrivate::updateBlockedStatus(QWindow *window)
{
bool shouldBeBlocked = false;
if ((window->type() & Qt::Popup) != Qt::Popup && !self->modalWindowList.isEmpty())
if (!isPopupWindow(window) && !self->modalWindowList.isEmpty())
shouldBeBlocked = self->isWindowBlocked(window);
updateBlockedStatusRecursion(window, shouldBeBlocked);
}
@ -503,7 +508,7 @@ void QGuiApplicationPrivate::showModalWindow(QWindow *modal)
self->modalWindowList.prepend(modal);
// Send leave for currently entered window if it should be blocked
if (currentMouseWindow && (currentMouseWindow->type() & Qt::Popup) != Qt::Popup) {
if (currentMouseWindow && !isPopupWindow(currentMouseWindow)) {
bool shouldBeBlocked = self->isWindowBlocked(currentMouseWindow);
if (shouldBeBlocked) {
// Remove the new window from modalWindowList temporarily so leave can go through

1
tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
View File

@ -422,6 +422,7 @@ void tst_QGuiApplication::modalWindow()
QScopedPointer<BlockableWindow> window2(new BlockableWindow);
window2->setTitle(QStringLiteral("window2"));
window2->setFlags(window2->flags() & Qt::Tool); // QTBUG-32433, don't be fooled by unusual window flags.
window2->resize(windowSize, windowSize);
window2->setFramePosition(QPoint(x, y));
x += spacing + windowSize;