aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items
diff options
context:
space:
mode:
authorMichael Brasser <mbrasser@ford.com>2017-08-31 16:53:21 -0500
committerMichael Brasser <michael.brasser@live.com>2017-09-08 21:13:40 +0000
commit0b73daa4f6858aa8d52e6b958d8f0b3209858b80 (patch)
tree6af4c483d93d32a56a5eae201de925c26fbe71fe /src/quick/items
parentc1fed764a2495373a9e4563bc3ac0d578b2f9409 (diff)
Fix issue with programmatic flicking at bounds
Ensure that the same flick consistently produces the same results, by making sure we don't use old timestamps from previous flicks. Task-number: QTBUG-62939 Change-Id: Ie738076abba66d38ff505292925e9441c38a3c95 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/quick/items')
-rw-r--r--src/quick/items/qquickflickable.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp
index 3bd647fed6..c92d370a48 100644
--- a/src/quick/items/qquickflickable.cpp
+++ b/src/quick/items/qquickflickable.cpp
@@ -1773,6 +1773,7 @@ void QQuickFlickable::flick(qreal xVelocity, qreal yVelocity)
d->vData.reset();
d->hData.velocity = xVelocity;
d->vData.velocity = yVelocity;
+ d->hData.vTime = d->vData.vTime = d->timeline.time();
bool flickedX = d->flickX(xVelocity);
bool flickedY = d->flickY(yVelocity);