Fix jump and property changes on first move when dragging a Flickable.

Fixes a regression whereby on the first mouse move the contentItem was
moved the total distance from the touch point to where the drag
distance was exceeded. For large drag thresholds this causes a
noticeable jump.

Task-number: QTBUG-30032

(cherry picked from qtquick1 3a80424aeae19e838be03aa12a5243911ec3f020)

Change-Id: I92c119d27dc2e22203484f9ada5978697d171957
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>

3 files changed, 12 insertions, 6 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index 3edc62dd43..f05bc60ee2 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -788,9 +788,9 @@ void QDeclarativeFlickablePrivate::handleMouseMoveEvent(QGraphicsSceneMouseEvent
 
     if (q->yflick()) {
         int dy = int(event->pos().y() - pressPos.y());
-        if (vData.dragStartOffset == 0)
-            vData.dragStartOffset = dy;
         if (qAbs(dy) > QApplication::startDragDistance() || QDeclarativeItemPrivate::elapsed(pressTime) > 200) {
+            if (!vMoved)
+                vData.dragStartOffset = dy;
             qreal newY = dy + vData.pressPos - vData.dragStartOffset;
             const qreal minY = vData.dragMinBound;
             const qreal maxY = vData.dragMaxBound;
@@ -817,9 +817,9 @@ void QDeclarativeFlickablePrivate::handleMouseMoveEvent(QGraphicsSceneMouseEvent
 
     if (q->xflick()) {
         int dx = int(event->pos().x() - pressPos.x());
-        if (hData.dragStartOffset == 0)
-            hData.dragStartOffset = dx;
         if (qAbs(dx) > QApplication::startDragDistance() || QDeclarativeItemPrivate::elapsed(pressTime) > 200) {
+            if (!hMoved)
+                hData.dragStartOffset = dx;
             qreal newX = dx + hData.pressPos - hData.dragStartOffset;
             const qreal minX = hData.dragMinBound;
             const qreal maxX = hData.dragMaxBound;
diff --git a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
index 01ab415e6f..549d282807 100644
--- a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
+++ b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
@@ -625,6 +625,9 @@ void tst_qdeclarativeflickable::nestedStopAtBounds()
     axis += invert ? threshold : -threshold;
     moveEvent.setScenePos(position);
     QApplication::sendEvent(view.scene(), &moveEvent);
+    axis += invert ? threshold : -threshold;
+    moveEvent.setScenePos(position);
+    QApplication::sendEvent(view.scene(), &moveEvent);
     QVERIFY(outer->contentX() != 50 || outer->contentY() != 50);
     QVERIFY((inner->contentX() == 0 || inner->contentX() == 100)
             && (inner->contentY() == 0 || inner->contentY() == 100));
@@ -643,6 +646,9 @@ void tst_qdeclarativeflickable::nestedStopAtBounds()
     axis += invert ? -threshold : threshold;
     moveEvent.setScenePos(position);
     QApplication::sendEvent(view.scene(), &moveEvent);
+    axis += invert ? -threshold : threshold;
+    moveEvent.setScenePos(position);
+    QApplication::sendEvent(view.scene(), &moveEvent);
     QVERIFY(outer->contentX() == 50 && outer->contentY() == 50);
     QVERIFY((inner->contentX() != 0 && inner->contentX() != 100)
             || (inner->contentY() != 0 && inner->contentY() != 100));
diff --git a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
index 9b4123f48c..41dcc81cd9 100644
--- a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
+++ b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
@@ -602,8 +602,8 @@ void tst_QDeclarativeMouseArea::preventStealing()
     QVERIFY(!mouseArea->pressed());
 
     // Flickable content should have moved.
-    QCOMPARE(flickable->contentX(), 20.);
-    QCOMPARE(flickable->contentY(), 20.);
+    QCOMPARE(flickable->contentX(), 10.);
+    QCOMPARE(flickable->contentY(), 10.);
 
     QTest::mouseRelease(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(50, 50)));