diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2012-10-30 10:21:36 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-30 12:53:46 +0100 |
commit | a48508cd766b056d3cb5b6502cf269a8293bb5a5 (patch) | |
tree | 1e9d0fcd89c7a0f07cfe00379f10d3ede4852596 /src/widgets | |
parent | 50ec06da2c8a1c680d48b84f8c1267fe78a86b6a (diff) |
Send leave to most recently entered window when modal dialog is shown.
If a modal dialog was shown as a response to button click, the button
retained its hover highlight, because it didn't get leave event.
Fixed by tracking the most recently entered window and sending a leave
to it when modal dialog is shown that blocks it.
Also modified tst_QGuiApplication::modalWindow() autotest to check
for enters and leaves.
Task-number: QTBUG-27644
Change-Id: I387647e18a762a39d523e3df31221b9583a39f9d
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/kernel/qwidgetwindow.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp index b3d46d5c28..b49441beba 100644 --- a/src/widgets/kernel/qwidgetwindow.cpp +++ b/src/widgets/kernel/qwidgetwindow.cpp @@ -234,6 +234,7 @@ void QWidgetWindow::handleEnterLeaveEvent(QEvent *event) while (enterParent->parent()) enterParent = enterParent->parent(); if (thisParent == enterParent) { + QGuiApplicationPrivate::currentMouseWindow = enterWindow; enter = enterWindow->widget(); QWindowSystemInterfacePrivate::removeWindowSystemEvent(systemEvent); } |