Fix wrong local positions in mouse events when no tlw was given

Calling handleMouseEvent() with w == 0 implies that the local position
is bogus and instead it should be calculated from the global position
once the target window is known.

Change-Id: If173d0570f6dcc8b7bc5d6f21fa1f69d06d9d702
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>

1 files changed, 8 insertions, 3 deletions

diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index aa13def646..7bf5a7589f 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -1134,12 +1134,17 @@ void QGuiApplicationPrivate::processMouseEvent(QWindowSystemInterfacePrivate::Mo
     QWindow *window = e->window.data();
     modifier_buttons = e->modifiers;
 
-    if (!window)
-        window = QGuiApplication::topLevelAt(e->globalPos.toPoint());
-
     QPointF localPoint = e->localPos;
     QPointF globalPoint = e->globalPos;
 
+    if (!window) {
+        window = QGuiApplication::topLevelAt(globalPoint.toPoint());
+        if (window) {
+            QPointF delta = globalPoint - globalPoint.toPoint();
+            localPoint = window->mapFromGlobal(globalPoint.toPoint()) + delta;
+        }
+    }
+
     Qt::MouseButton button = Qt::NoButton;
     bool doubleClick = false;