QGesture: make sure we copy timestamp value for event clones

Otherwise, double-click recognition will fail.

Use QEvent::clone when possible, or set the timestamp explicitly when
not.

As a drive-by, remove some long-dead code in affected code lines.

Fixes: QTBUG-102010
Change-Id: I882bf6e8090bf6f182b7a0a3c62aa3a4c8db2e14
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
(cherry picked from commit fb09c82a2c7c44d41a0a36d8fe6d6d22e792668a)
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

1 files changed, 62 insertions, 0 deletions

diff --git a/tests/auto/widgets/util/qscroller/tst_qscroller.cpp b/tests/auto/widgets/util/qscroller/tst_qscroller.cpp
index 232b8084cd..c08797b236 100644
--- a/tests/auto/widgets/util/qscroller/tst_qscroller.cpp
+++ b/tests/auto/widgets/util/qscroller/tst_qscroller.cpp
@@ -127,6 +127,7 @@ private slots:
     void scroll();
     void overshoot();
     void multipleWindows();
+    void mouseEventTimestamp();
 
 private:
     QPointingDevice *m_touchScreen = QTest::createTouchDevice();
@@ -540,6 +541,67 @@ void tst_QScroller::multipleWindows()
 #endif
 }
 
+/*!
+    This test verifies that mouse events arrive at the target widget
+    with valid timestamp, even if there is a gesture filtering (and then
+    replaying a copy of) the event. QTBUG-102010
+
+    We cannot truly simulate the double click here, as simulated events don't
+    go through the exact same event machinery as real events, so double clicks
+    don't get generated by Qt here. But we can verify that the timestamps of
+    the eventually delivered events are maintained.
+*/
+void tst_QScroller::mouseEventTimestamp()
+{
+#if QT_CONFIG(gestures) && QT_CONFIG(scroller)
+    QScopedPointer<tst_QScrollerWidget> sw(new tst_QScrollerWidget());
+    sw->scrollArea = QRectF(0, 0, 1000, 1000);
+    QScroller::grabGesture(sw.data(), QScroller::LeftMouseButtonGesture);
+    sw->setGeometry(100, 100, 400, 300);
+    sw->show();
+    QApplication::setActiveWindow(sw.data());
+    if (!QTest::qWaitForWindowExposed(sw.data()) || !QTest::qWaitForWindowActive(sw.data()))
+        QSKIP("Failed to show and activate window");
+
+    QScroller *s1 = QScroller::scroller(sw.data());
+
+    struct EventFilter : QObject
+    {
+        QList<int> timestamps;
+    protected:
+        bool eventFilter(QObject *o, QEvent *e) override
+        {
+            if (e->isInputEvent())
+                timestamps << static_cast<QInputEvent *>(e)->timestamp();
+            return QObject::eventFilter(o, e);
+        }
+
+    } eventFilter;
+    sw->installEventFilter(&eventFilter);
+
+    const int interval = QGuiApplication::styleHints()->mouseDoubleClickInterval() / 10;
+    const QPoint point = sw->geometry().center();
+    // Simulate double by pressing twice within the double click interval.
+    // Presses are filtered and then delayed by the scroller/gesture machinery,
+    // so we first record all events, and then make sure that the relative timestamps
+    // are maintained also for the replayed or synthesized events.
+    QTest::mousePress(sw->windowHandle(), Qt::LeftButton, {}, point);
+    QCOMPARE(s1->state(), QScroller::Pressed);
+    QTest::mouseRelease(sw->windowHandle(), Qt::LeftButton, {}, point, interval);
+    QCOMPARE(s1->state(), QScroller::Inactive);
+    QTest::mousePress(sw->windowHandle(), Qt::LeftButton, {}, point, interval);
+    QCOMPARE(s1->state(), QScroller::Pressed);
+    // also filtered and delayed by the scroller
+    QTest::mouseRelease(sw->windowHandle(), Qt::LeftButton, {}, point, interval);
+    QCOMPARE(s1->state(), QScroller::Inactive);
+    int lastTimestamp = -1;
+    for (int timestamp : std::as_const(eventFilter.timestamps)) {
+        QVERIFY(timestamp >= lastTimestamp);
+        lastTimestamp = timestamp + interval;
+    }
+#endif
+}
+
 QTEST_MAIN(tst_QScroller)
 
 #include "tst_qscroller.moc"