aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Hänel <florian.haenel@basyskom.com>2013-06-05 19:23:32 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-12 14:35:04 +0100
commitd765ad8e3dabe44f276db9084b1d16164c4535e7 (patch)
tree80cb8d688ad512cfbb7b75d288a083b1ced3585c
parentfa27ed3024e473be80ea70e5b2dc2f905cab2111 (diff)
Fix wrong calculation of viewPort for transitions
Viewport is calculated wrong for horizontal layout in a second instance Task-number: QTBUG-29944 Task-Number: QTBUG-31546 Change-Id: I136ae4484278d14f796613505e3f38c65ec51ebe Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com> Reviewed-by: Florian Hänel <florian.haenel@basyskom.com>
-rw-r--r--src/quick/items/qquickitemview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
index e5b2ee822c..d6cedbb78d 100644
--- a/src/quick/items/qquickitemview.cpp
+++ b/src/quick/items/qquickitemview.cpp
@@ -1836,7 +1836,7 @@ void QQuickItemViewPrivate::layout()
prepareVisibleItemTransitions();
- QRectF viewBounds(0, position(), q->width(), q->height());
+ QRectF viewBounds(q->contentX(), q->contentY(), q->width(), q->height());
for (QList<FxViewItem*>::Iterator it = releasePendingTransition.begin();
it != releasePendingTransition.end(); ) {
FxViewItem *item = *it;