Deliver wheel events when window is null

The generic input plugins do not set the window parameter. So,
use the same technique we use with mouse event handling to determine
the window to deliver the event to.

Done-with: Johannes Zellner

Change-Id: I950c0ad2f330dccfdcc41b8d01f62cd39902bc9c
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>

diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 846b7d0..3cd8d5f 100644 (file)
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -1255,26 +1255,26 @@ void QGuiApplicationPrivate::processMouseEvent(QWindowSystemInterfacePrivate::Mo
 
 void QGuiApplicationPrivate::processWheelEvent(QWindowSystemInterfacePrivate::WheelEvent *e)
 {
-    if (!e->window)
-        return;
-
+    QWindow *window = e->window.data();
     QPointF globalPoint = e->globalPos;
+
+    if (!window) {
+        window = QGuiApplication::topLevelAt(globalPoint.toPoint());
+        if (!window)
+            return;
+    }
+
     QGuiApplicationPrivate::lastCursorPosition = globalPoint;
     modifier_buttons = e->modifiers;
 
-    QWindow *window = e->window.data();
-
-    if (window) {
-        if (window->d_func()->blockedByModalWindow) {
-            // a modal window is blocking this window, don't allow wheel events through
-            return;
-        }
+    if (window->d_func()->blockedByModalWindow) {
+        // a modal window is blocking this window, don't allow wheel events through
+        return;
+    }
 
-         QWheelEvent ev(e->localPos, e->globalPos, e->pixelDelta, e->angleDelta, e->qt4Delta, e->qt4Orientation, buttons, e->modifiers);
-         ev.setTimestamp(e->timestamp);
-         QGuiApplication::sendSpontaneousEvent(window, &ev);
-         return;
-     }
+     QWheelEvent ev(e->localPos, e->globalPos, e->pixelDelta, e->angleDelta, e->qt4Delta, e->qt4Orientation, buttons, e->modifiers);
+     ev.setTimestamp(e->timestamp);
+     QGuiApplication::sendSpontaneousEvent(window, &ev);
 }
 
 // Remember, Qt convention is:  keyboard state is state *before*