diff options
| author | Michael Brasser <mbrasser@ford.com> | 2018-08-22 13:21:14 -0500 |
|---|---|---|
| committer | Michael Brasser <michael.brasser@live.com> | 2018-08-23 17:14:33 +0000 |
| commit | 6e2fc84646987135c96755fbe1c2af20fc722e3d (patch) | |
| tree | cd7af170589621180b0cbb59e345a4a68b8ed871 /src/quick/items/qquickflickable.cpp | |
| parent | ee0713e3988b0acf3a1ec6cad1c7722dbec76ea7 (diff) | |
Prevent ListView from jumping horizontally with flick(0,<number>)
The internal flick functions were not written to handle empty flicks
in invalid directions. Guard our calls accordingly.
Change-Id: I34801a7e548160ce4895dd8a2f6c0b17172cd02e
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quick/items/qquickflickable.cpp')
| -rw-r--r-- | src/quick/items/qquickflickable.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp index 8ae5ea64a7..85045be411 100644 --- a/src/quick/items/qquickflickable.cpp +++ b/src/quick/items/qquickflickable.cpp @@ -1847,8 +1847,8 @@ void QQuickFlickable::flick(qreal xVelocity, qreal yVelocity) d->vData.velocity = yVelocity; d->hData.vTime = d->vData.vTime = d->timeline.time(); - bool flickedX = d->flickX(xVelocity); - bool flickedY = d->flickY(yVelocity); + const bool flickedX = xflick() && !qFuzzyIsNull(xVelocity) && d->flickX(xVelocity); + const bool flickedY = yflick() && !qFuzzyIsNull(yVelocity) && d->flickY(yVelocity); if (flickedX) d->hMoved = true; |