From dbaccf95532eec3a2b68a0cf5b4ba824ee084706 Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Fri, 17 Feb 2012 12:38:53 +1000 Subject: Take QDeclarativeTransition::enabled() into account Don't run transitions if enabled() is false Change-Id: I1df5479f8415b12837df8d54aa3902e072c73037 Reviewed-by: Martin Jones --- src/quick/items/qquicklistview.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/quick/items/qquicklistview.cpp') diff --git a/src/quick/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp index 03be177e2c..906b9b3781 100644 --- a/src/quick/items/qquicklistview.cpp +++ b/src/quick/items/qquicklistview.cpp @@ -629,7 +629,7 @@ bool QQuickListViewPrivate::addVisibleItems(qreal fillFrom, qreal fillTo, bool d #endif if (!(item = static_cast(createItem(modelIndex, doBuffer)))) break; - if (!(usePopulateTransition && populateTransition)) // pos will be set by layoutVisibleItems() + if (!canTransition(FxViewItemTransitionManager::PopulateTransition, true)) // pos will be set by layoutVisibleItems() item->setPosition(pos); item->item->setVisible(!doBuffer); pos += item->size() + spacing; @@ -649,7 +649,7 @@ bool QQuickListViewPrivate::addVisibleItems(qreal fillFrom, qreal fillTo, bool d break; --visibleIndex; visiblePos -= item->size() + spacing; - if (!(usePopulateTransition && populateTransition)) // pos will be set by layoutVisibleItems() + if (!canTransition(FxViewItemTransitionManager::PopulateTransition, true)) // pos will be set by layoutVisibleItems() item->setPosition(visiblePos); item->item->setVisible(!doBuffer); visibleItems.prepend(item); @@ -2755,7 +2755,7 @@ bool QQuickListViewPrivate::applyInsertionChange(const QDeclarativeChangeSet::In if (change.isMove()) { // we know this is a move target, since move displaced items that are // shuffled into view due to a move would be added in refill() - if (moveTransition && newItem) + if (canTransition(FxViewItemTransitionManager::MoveTransition, true) && newItem) movingIntoView->append(MovedItem(item, change.moveKey(item->index))); } else { addedItems->append(item); -- cgit v1.2.3