diff options
Diffstat (limited to 'recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch')
-rw-r--r-- | recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch b/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch new file mode 100644 index 00000000..84f8f661 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From 3919fe89e7adbc9f163eabce9269a924273c64ec Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Florian=20H=C3=A4nel?= <florian.haenel@basyskom.com> | ||
3 | Date: Wed, 5 Jun 2013 19:23:32 +0200 | ||
4 | Subject: [PATCH 2/2] Fix wrong calculation of viewPort for transitions | ||
5 | |||
6 | Viewport is calculated wrong for horizontal layout in a second instance | ||
7 | |||
8 | Task-number: QTBUG-29944 | ||
9 | Task-Number: QTBUG-31546 | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Looks like backport of https://codereview.qt-project.org/49226 but this | ||
14 | one was applied in previous patch, this change looks the same but is | ||
15 | in different part of qquickitemview.cpp and ISN'T applied yet in dev | ||
16 | branch. | ||
17 | |||
18 | Signed-off-by: Florian Haenel <florian.haenel@lge.com> | ||
19 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
20 | |||
21 | Change-Id: I136ae4484278d14f796613505e3f38c65ec51ebe | ||
22 | --- | ||
23 | src/quick/items/qquickitemview.cpp | 2 +- | ||
24 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
25 | |||
26 | diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp | ||
27 | index a6dabee..290f283 100644 | ||
28 | --- a/src/quick/items/qquickitemview.cpp | ||
29 | +++ b/src/quick/items/qquickitemview.cpp | ||
30 | @@ -1815,7 +1815,7 @@ void QQuickItemViewPrivate::layout() | ||
31 | |||
32 | prepareVisibleItemTransitions(); | ||
33 | |||
34 | - QRectF viewBounds(0, position(), q->width(), q->height()); | ||
35 | + QRectF viewBounds(q->contentX(), q->contentY(), q->width(), q->height()); | ||
36 | for (QList<FxViewItem*>::Iterator it = releasePendingTransition.begin(); | ||
37 | it != releasePendingTransition.end(); ) { | ||
38 | FxViewItem *item = *it; | ||
39 | -- | ||
40 | 1.8.3.2 | ||
41 | |||