Synchronize PathView gesture grabbing with other items.

PathView didn't attempt to grab the gesture at the same event as other
items. This prevented PathView from rightfully claiming the gesture
before lower items in the stack. Use the same threshold test for
PathView as used elsewhere.

Task-number: QTBUG-37859
Change-Id: Ic57cb805ac979e41c3e35d86b2e7db781e61d69d
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>

1 files changed, 59 insertions, 4 deletions

diff --git a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
index 1960775ad3..0575d8626f 100644
--- a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
+++ b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
@@ -143,8 +143,9 @@ private slots:
     void indexAt_itemAt();
     void indexAt_itemAt_data();
     void cacheItemCount();
-    void incorrectSteal();
     void changePathDuringRefill();
+    void nestedinFlickable();
+    void flickableDelegate();
 };
 
 class TestObject : public QObject
@@ -2165,11 +2166,11 @@ void tst_QQuickPathView::changePathDuringRefill()
     testCurrentIndexChange(pathView, QStringList() << "delegateA" << "delegateB" << "delegateC");
 }
 
-void tst_QQuickPathView::incorrectSteal()
+void tst_QQuickPathView::nestedinFlickable()
 {
     QScopedPointer<QQuickView> window(createView());
     QQuickViewTestUtil::moveMouseAway(window.data());
-    window->setSource(testFileUrl("incorrectSteal.qml"));
+    window->setSource(testFileUrl("nestedInFlickable.qml"));
     window->show();
     window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window.data()));
@@ -2215,12 +2216,66 @@ void tst_QQuickPathView::incorrectSteal()
     QTRY_COMPARE(moveEndedSpy.count(), 1);
     QCOMPARE(moveStartedSpy.count(), 1);
     // Flickable should not handle this
-    QEXPECT_FAIL("", "QTBUG-37859", Abort);
     QCOMPARE(fflickingSpy.count(), 0);
     QCOMPARE(fflickStartedSpy.count(), 0);
     QCOMPARE(fflickEndedSpy.count(), 0);
 }
 
+void tst_QQuickPathView::flickableDelegate()
+{
+    QScopedPointer<QQuickView> window(createView());
+    QQuickViewTestUtil::moveMouseAway(window.data());
+    window->setSource(testFileUrl("flickableDelegate.qml"));
+    window->show();
+    window->requestActivate();
+    QVERIFY(QTest::qWaitForWindowActive(window.data()));
+    QCOMPARE(window.data(), qGuiApp->focusWindow());
+
+    QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
+    QVERIFY(pathview != 0);
+
+    QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(pathview->currentItem());
+    QVERIFY(flickable != 0);
+
+    QSignalSpy movingSpy(pathview, SIGNAL(movingChanged()));
+    QSignalSpy moveStartedSpy(pathview, SIGNAL(movementStarted()));
+    QSignalSpy moveEndedSpy(pathview, SIGNAL(movementEnded()));
+
+    QSignalSpy fflickingSpy(flickable, SIGNAL(flickingChanged()));
+    QSignalSpy fflickStartedSpy(flickable, SIGNAL(flickStarted()));
+    QSignalSpy fflickEndedSpy(flickable, SIGNAL(flickEnded()));
+
+    int waitInterval = 5;
+
+    QTest::mousePress(window.data(), Qt::LeftButton, 0, QPoint(23,100));
+
+    QTest::mouseMove(window.data(), QPoint(25,100), waitInterval);
+    QTest::mouseMove(window.data(), QPoint(26,100), waitInterval);
+    QTest::mouseMove(window.data(), QPoint(28,100), waitInterval);
+    QTest::mouseMove(window.data(), QPoint(31,100), waitInterval);
+    QTest::mouseMove(window.data(), QPoint(39,100), waitInterval);
+
+    // first move beyond threshold does not trigger drag
+    QVERIFY(!flickable->isMoving());
+    QVERIFY(!flickable->isDragging());
+    QCOMPARE(movingSpy.count(), 0);
+    QCOMPARE(moveStartedSpy.count(), 0);
+    QCOMPARE(moveEndedSpy.count(), 0);
+    QCOMPARE(fflickingSpy.count(), 0);
+    QCOMPARE(fflickStartedSpy.count(), 0);
+    QCOMPARE(fflickEndedSpy.count(), 0);
+
+    // no further moves after the initial move beyond threshold
+    QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(53,100));
+    QTRY_COMPARE(fflickingSpy.count(), 2);
+    QTRY_COMPARE(fflickStartedSpy.count(), 1);
+    QCOMPARE(fflickEndedSpy.count(), 1);
+    // PathView should not handle this
+    QTRY_COMPARE(movingSpy.count(), 0);
+    QTRY_COMPARE(moveEndedSpy.count(), 0);
+    QCOMPARE(moveStartedSpy.count(), 0);
+}
+
 QTEST_MAIN(tst_QQuickPathView)
 
 #include "tst_qquickpathview.moc"