1
=== modified file 'qml/Components/LazyImage.qml'
2
--- qml/Components/LazyImage.qml	2013-10-14 22:13:48 +0000
3
+++ qml/Components/LazyImage.qml	2014-03-26 14:31:57 +0000
4
@@ -99,10 +99,10 @@
5
99
            horizontalAlignment: Image.AlignHCenter
99
            horizontalAlignment: Image.AlignHCenter
6
100
            verticalAlignment: Image.AlignVCenter
100
            verticalAlignment: Image.AlignVCenter
7
101
            sourceSize.width: root.scaleTo == "width" ? root.width
101
            sourceSize.width: root.scaleTo == "width" ? root.width
9
102
                                : root.scaleTo == "fit" && root.width < root.height ? root.width
102
                                : root.scaleTo == "fit" && root.width <= root.height ? root.width
10
103
                                : 0
103
                                : 0
11
104
            sourceSize.height: root.scaleTo == "height" ? root.height
104
            sourceSize.height: root.scaleTo == "height" ? root.height
13
105
                                : root.scale == "fit" && root.height < root.width ? root.height
105
                                : root.scaleTo == "fit" && root.height <= root.width ? root.height
14
106
                                : 0
106
                                : 0
15
107
        }
107
        }
16
108
    }
108
    }
17
109
109
18
=== modified file 'tests/qmltests/Components/tst_LazyImage.qml'
19
--- tests/qmltests/Components/tst_LazyImage.qml	2014-02-28 15:15:31 +0000
20
+++ tests/qmltests/Components/tst_LazyImage.qml	2014-03-26 14:31:57 +0000
21
@@ -168,6 +168,12 @@
22
168
            compare(data.image.initialHeight, data.initialHeight);
168
            compare(data.image.initialHeight, data.initialHeight);
23
169
            compare(data.image.initialWidth, data.initialWidth);
169
            compare(data.image.initialWidth, data.initialWidth);
24
170
170
25
171
            // check the sourceSize
26
172
            var sourceHeight = (data.image.scaleTo === "height" || (data.image.scaleTo === "fit" && data.height <= data.width)) ? data.height : 0
27
173
            var sourceWidth = (data.image.scaleTo === "width" || (data.image.scaleTo === "fit" && data.width <= data.height)) ? data.width : 0
28
174
            compare(data.image.sourceSize.height, sourceHeight);
29
175
            compare(data.image.sourceSize.width, sourceWidth);
30
176
31
171
            // check the shape dimensions
177
            // check the shape dimensions
32
172
            var shape = findChild(data.image, "shape");
178
            var shape = findChild(data.image, "shape");
33
173
            compare(shape.width, data.imageWidth);
179
            compare(shape.width, data.imageWidth);
Status:	Merged
Approved by:	Albert Astals Cid on 2014-03-25
Approved revision:	776
Merged at revision:	788
Proposed branch:	lp:~paulliu/unity8/fix-lazyimage1
Merge into:	lp:unity8
Diff against target:	33 lines (+8/-2) 2 files modified qml/Components/LazyImage.qml (+2/-2) tests/qmltests/Components/tst_LazyImage.qml (+6/-0)
To merge this branch:	bzr merge lp:~paulliu/unity8/fix-lazyimage1
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2014-03-27
Albert Astals Cid (community)		2014-03-19	Approve on 2014-03-25
Review via email: mp+211728@code.launchpad.net