From a972a4141f62ee27157b1ee3cbd432724d829c69 Mon Sep 17 00:00:00 2001
From: Alexey Edelev <alexey.edelev@qt.io>
Date: Tue, 4 May 2021 17:42:30 +0200
Subject: Map window coordinates to the same coordinate system as the
 QPointerEvent point

If the window has parent windows its geometry should be mapped to the
global coordinates before check if it contains the point coordinates.

Fixes: QTBUG-91716
Change-Id: I300547361dbe895b67caeee0d47f416426444552
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit c740a9d30571079fa22fd26cb8e72df6ca28c7b2)
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
---
 .../qquicktaphandler/tst_qquicktaphandler.cpp      | 55 ++++++++++++++++++++--
 1 file changed, 52 insertions(+), 3 deletions(-)

(limited to 'tests/auto/quick/pointerhandlers/qquicktaphandler/tst_qquicktaphandler.cpp')

diff --git a/tests/auto/quick/pointerhandlers/qquicktaphandler/tst_qquicktaphandler.cpp b/tests/auto/quick/pointerhandlers/qquicktaphandler/tst_qquicktaphandler.cpp
index 419afed3ac..52cef6248f 100644
--- a/tests/auto/quick/pointerhandlers/qquicktaphandler/tst_qquicktaphandler.cpp
+++ b/tests/auto/quick/pointerhandlers/qquicktaphandler/tst_qquicktaphandler.cpp
@@ -71,15 +71,25 @@ private slots:
     void buttonsMultiTouch();
     void componentUserBehavioralOverride();
     void rightLongPressIgnoreWheel();
+    void nonTopLevelParentWindow();
 
 private:
-    void createView(QScopedPointer<QQuickView> &window, const char *fileName);
+    void createView(QScopedPointer<QQuickView> &window, const char *fileName,
+                    QWindow *parent = nullptr);
     QTouchDevice *touchDevice;
+    void mouseEvent(QEvent::Type type, Qt::MouseButton button, const QPoint &point,
+                    QWindow *targetWindow, QWindow *mapToWindow);
 };
 
-void tst_TapHandler::createView(QScopedPointer<QQuickView> &window, const char *fileName)
+void tst_TapHandler::createView(QScopedPointer<QQuickView> &window, const char *fileName,
+                                QWindow *parent)
 {
-    window.reset(new QQuickView);
+    window.reset(new QQuickView(parent));
+    if (parent) {
+        parent->show();
+        QVERIFY(QTest::qWaitForWindowActive(parent));
+    }
+
     window->setSource(testFileUrl(fileName));
     QTRY_COMPARE(window->status(), QQuickView::Ready);
     QQuickViewTestUtil::centerOnScreen(window.data());
@@ -90,6 +100,20 @@ void tst_TapHandler::createView(QScopedPointer<QQuickView> &window, const char *
     QVERIFY(window->rootObject() != nullptr);
 }
 
+void tst_TapHandler::mouseEvent(QEvent::Type type, Qt::MouseButton button, const QPoint &point,
+                                QWindow *targetWindow, QWindow *mapToWindow)
+{
+    QVERIFY(targetWindow);
+    QVERIFY(mapToWindow);
+    auto buttons = button;
+    if (type == QEvent::MouseButtonRelease) {
+        buttons = Qt::NoButton;
+    }
+    QMouseEvent me(type, point, mapToWindow->mapToGlobal(point), button, buttons,
+                   Qt::KeyboardModifiers());
+    QVERIFY(qApp->notify(targetWindow, &me));
+}
+
 void tst_TapHandler::initTestCase()
 {
     // This test assumes that we don't get synthesized mouse events from QGuiApplication
@@ -745,6 +769,31 @@ void tst_TapHandler::rightLongPressIgnoreWheel()
     QCOMPARE(tappedSpy.count(), 0);
 }
 
+void tst_TapHandler::nonTopLevelParentWindow() // QTBUG-91716
+{
+    QScopedPointer<QQuickWindow> parentWindowPtr(new QQuickWindow);
+    auto parentWindow = parentWindowPtr.get();
+    parentWindow->setGeometry(400, 400, 250, 250);
+
+    QScopedPointer<QQuickView> windowPtr;
+    createView(windowPtr, "simpleTapHandler.qml", parentWindow);
+    auto window = windowPtr.get();
+    window->setGeometry(10, 10, 100, 100);
+
+    QQuickItem *root = window->rootObject();
+
+    auto p1 = QPoint(20, 20);
+    mouseEvent(QEvent::MouseButtonPress, Qt::LeftButton, p1, window, parentWindow);
+    mouseEvent(QEvent::MouseButtonRelease, Qt::LeftButton, p1, window, parentWindow);
+
+    QCOMPARE(root->property("tapCount").toInt(), 1);
+
+    QTest::touchEvent(window, touchDevice).press(0, p1, parentWindow).commit();
+    QTest::touchEvent(window, touchDevice).release(0, p1, parentWindow).commit();
+
+    QCOMPARE(root->property("tapCount").toInt(), 2);
+}
+
 QTEST_MAIN(tst_TapHandler)
 
 #include "tst_qquicktaphandler.moc"
-- 
cgit v1.2.3