diff options
| author | Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> | 2017-10-20 11:09:22 +0300 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-11-03 11:12:56 +0000 |
| commit | 0f043c594b559f2f936333c8cf9779283a480c7d (patch) | |
| tree | ddead588e4ef2783bf492ea2b32dd0c28f8bcda0 /src/quick/items/qquickflickable.cpp | |
| parent | 62b1bc426929c5f990f00bee7d3de8a0024ed7c5 (diff) | |
Fix providing correct velocity when using index based scrolling
Index based scrolling does not enable moving and flicking properties.
Task-number: QTBUG-34576
Change-Id: Ief06d37115ca389027670c97ce6c0457a74d4872
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/quick/items/qquickflickable.cpp')
| -rw-r--r-- | src/quick/items/qquickflickable.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp index 3462752370..e0f8b6de00 100644 --- a/src/quick/items/qquickflickable.cpp +++ b/src/quick/items/qquickflickable.cpp @@ -748,7 +748,8 @@ void QQuickFlickable::setContentX(qreal pos) d->hData.explicitValue = true; d->resetTimeline(d->hData); d->hData.vTime = d->timeline.time(); - movementEnding(true, false); + if (isMoving() || isFlicking()) + movementEnding(true, false); if (-pos != d->hData.move.value()) d->hData.move.setValue(-pos); } @@ -765,7 +766,8 @@ void QQuickFlickable::setContentY(qreal pos) d->vData.explicitValue = true; d->resetTimeline(d->vData); d->vData.vTime = d->timeline.time(); - movementEnding(false, true); + if (isMoving() || isFlicking()) + movementEnding(false, true); if (-pos != d->vData.move.value()) d->vData.move.setValue(-pos); } |