aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquicklistview.cpp
diff options
context:
space:
mode:
authorJan Arve Saether <jan-arve.saether@digia.com>2014-05-02 15:46:12 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-05-14 21:27:54 +0200
commit1246a5673fe352f10dc3236c248b1ca36d89bd04 (patch)
tree99f7c0cf2eb4f92ce46d00e141d3b382020db72b /src/quick/items/qquicklistview.cpp
parent528b720d8f25c851b5e73b4159c20d70a47aefc0 (diff)
Don't adjust the position of transitioning list items.
Adjusting the position of list items only makes sense for items that belongs to the layout. Task-number: QTBUG-38229 Change-Id: I7a05f7a3591620cce3cd9ab84cfecbe325e5e93c Reviewed-by: Bea Lam <bea.lam@jollamobile.com>
Diffstat (limited to 'src/quick/items/qquicklistview.cpp')
-rw-r--r--src/quick/items/qquicklistview.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp
index 8f9dbb567f..e29e9d3bb6 100644
--- a/src/quick/items/qquicklistview.cpp
+++ b/src/quick/items/qquicklistview.cpp
@@ -1378,6 +1378,8 @@ void QQuickListViewPrivate::itemGeometryChanged(QQuickItem *item, const QRectF &
// position all subsequent items
if (visibleItems.count() && item == visibleItems.first()->item) {
FxListItemSG *listItem = static_cast<FxListItemSG*>(visibleItems.first());
+ if (listItem->transitionScheduledOrRunning())
+ return;
if (orient == QQuickListView::Vertical) {
const qreal oldItemEndPosition = verticalLayoutDirection == QQuickItemView::BottomToTop ? -oldGeometry.y() : oldGeometry.y() + oldGeometry.height();
qreal diff = newGeometry.height() - oldGeometry.height();