diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-06-30 11:14:22 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-07-07 16:56:27 +0000 |
| commit | 145d8462e3daa96b49a921fd4a34cf4dc84071d4 (patch) | |
| tree | 6741d9cf6fe8a2062efbf05a6decdff7d7189ab1 /src/plugins/platforms/windows/qwindowsmousehandler.cpp | |
| parent | 5dc739ba9b09326bf113bb7f4ce9aa45fe671c6b (diff) | |
Windows QPA: Accept foreign windows when checking for wheel receivers
After change 14efcaa3921687129d4dca9b7d5794668a329cd6, foreign
windows no longer have a corresponding QWindowsWindow. This should
not block wheel events when checking for blocking modal windows.
Amends change 14efcaa3921687129d4dca9b7d5794668a329cd6.
Task-number: QTBUG-54430
Change-Id: I1ac87445844946bafc214024e27da08c4f884d79
Reviewed-by: Tim Blechmann <tim@klingt.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsmousehandler.cpp')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsmousehandler.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/windows/qwindowsmousehandler.cpp b/src/plugins/platforms/windows/qwindowsmousehandler.cpp index 78fff65d84..b92387d397 100644 --- a/src/plugins/platforms/windows/qwindowsmousehandler.cpp +++ b/src/plugins/platforms/windows/qwindowsmousehandler.cpp @@ -393,6 +393,8 @@ static bool isValidWheelReceiver(QWindow *candidate) { if (candidate) { const QWindow *toplevel = QWindowsWindow::topLevelOf(candidate); + if (toplevel->type() == Qt::ForeignWindow) + return true; if (const QWindowsWindow *ww = QWindowsWindow::windowsWindowOf(toplevel)) return !ww->testFlag(QWindowsWindow::BlockedByModal); } |