aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickitemview.cpp
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2014-01-02 21:35:50 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-13 08:49:24 +0100
commitb244fc002d4fb97abb8647ed07f6e927cf3de789 (patch)
treebcba8674f9b21f9900af44aed8127aa90f340346 /src/quick/items/qquickitemview.cpp
parent8a3e4758350dd3868353d7a1b0ba9a4b31f7ac3d (diff)
Item views: avoid fixing up the position while moving/flicking
Task-number: QTBUG-35920 Change-Id: Id6a68400eed69d880dd1c218ec4a1beda8a8fbb9 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'src/quick/items/qquickitemview.cpp')
-rw-r--r--src/quick/items/qquickitemview.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
index 020d48613b..e51a562490 100644
--- a/src/quick/items/qquickitemview.cpp
+++ b/src/quick/items/qquickitemview.cpp
@@ -686,7 +686,8 @@ void QQuickItemView::setPreferredHighlightBegin(qreal start)
d->haveHighlightRange = d->highlightRange != NoHighlightRange && d->highlightRangeStart <= d->highlightRangeEnd;
if (isComponentComplete()) {
d->updateViewport();
- d->fixupPosition();
+ if (!isMoving() && !isFlicking())
+ d->fixupPosition();
}
emit preferredHighlightBeginChanged();
}
@@ -700,7 +701,8 @@ void QQuickItemView::resetPreferredHighlightBegin()
d->highlightRangeStart = 0;
if (isComponentComplete()) {
d->updateViewport();
- d->fixupPosition();
+ if (!isMoving() && !isFlicking())
+ d->fixupPosition();
}
emit preferredHighlightBeginChanged();
}
@@ -721,7 +723,8 @@ void QQuickItemView::setPreferredHighlightEnd(qreal end)
d->haveHighlightRange = d->highlightRange != NoHighlightRange && d->highlightRangeStart <= d->highlightRangeEnd;
if (isComponentComplete()) {
d->updateViewport();
- d->fixupPosition();
+ if (!isMoving() && !isFlicking())
+ d->fixupPosition();
}
emit preferredHighlightEndChanged();
}
@@ -735,7 +738,8 @@ void QQuickItemView::resetPreferredHighlightEnd()
d->highlightRangeEnd = 0;
if (isComponentComplete()) {
d->updateViewport();
- d->fixupPosition();
+ if (!isMoving() && !isFlicking())
+ d->fixupPosition();
}
emit preferredHighlightEndChanged();
}