aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2011-11-22 09:28:40 +1000
committerQt by Nokia <qt-info@nokia.com>2011-11-22 03:32:42 +0100
commit8d8015f8d5912300d8c6a1f8bac298163cb566b1 (patch)
tree6f8c87886788caeab18ce2f67ef4913b943d32ba /src/declarative
parent88fefbc68ddcbe99e718a07c5f25e5d28c839439 (diff)
Move path with highlightMoveDuration: 0
Task-number: QTBUG-22786 Change-Id: I10043bfa5d8c622fc4e7a25bcb1f96ef43d23890 Reviewed-by: Bea Lam <bea.lam@nokia.com>
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/items/qquickpathview.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/items/qquickpathview.cpp b/src/declarative/items/qquickpathview.cpp
index c7eee841c4..f7e58eae6f 100644
--- a/src/declarative/items/qquickpathview.cpp
+++ b/src/declarative/items/qquickpathview.cpp
@@ -1720,7 +1720,9 @@ void QQuickPathViewPrivate::snapToCurrent()
const int duration = highlightMoveDuration;
- if (moveDirection == Positive || (moveDirection == Shortest && targetOffset - offset > modelCount/2)) {
+ if (!duration) {
+ tl.set(moveOffset, targetOffset);
+ } else if (moveDirection == Positive || (moveDirection == Shortest && targetOffset - offset > modelCount/2)) {
qreal distance = modelCount - targetOffset + offset;
if (targetOffset > moveOffset) {
tl.move(moveOffset, 0.0, QEasingCurve(QEasingCurve::InQuad), int(duration * offset / distance));