86fa95c · unity8 · git.iko.soy

git.iko.soy/unity8

Merge mzanetti's test cases.

commit86fa95c8a7a26ce49ad29a1f66adcaf7350955af authorYing-Chun Liu <paul.liu@canonical.com> dateFri 21 Mar 2014, 20:30 (13 years ago) parentb21bc6b 82fd6e4

2 files changed+8−2

compare with xenial

unifiedsplit

qml/Components/LazyImage.qml+2−2 tests/qmltests/Components/tst_LazyImage.qml+6

qml/Components/LazyImage.qml+2−2

@@ -99,10 +99,10 @@ Item {

9999 horizontalAlignment: Image.AlignHCenter

100100 verticalAlignment: Image.AlignVCenter

101101 sourceSize.width: root.scaleTo == "width" ? root.width

102− : root.scaleTo == "fit" && root.width < root.height ? root.width

102+ : root.scaleTo == "fit" && root.width <= root.height ? root.width

103103 : 0

104104 sourceSize.height: root.scaleTo == "height" ? root.height

105− : root.scaleTo == "fit" && root.height < root.width ? root.height

105+ : root.scaleTo == "fit" && root.height <= root.width ? root.height

106106 : 0

107107 }

108108 }

tests/qmltests/Components/tst_LazyImage.qml+6

@@ -168,6 +168,12 @@ Rectangle {

168168 compare(data.image.initialHeight, data.initialHeight);

169169 compare(data.image.initialWidth, data.initialWidth);

170170

171+ // check the sourceSize

172+ var sourceHeight = (data.image.scaleTo === "height" || (data.image.scaleTo === "fit" && data.height <= data.width)) ? data.height : 0

173+ var sourceWidth = (data.image.scaleTo === "width" || (data.image.scaleTo === "fit" && data.width <= data.height)) ? data.width : 0

174+ compare(data.image.sourceSize.height, sourceHeight);

175+ compare(data.image.sourceSize.width, sourceWidth);

176+

171177 // check the shape dimensions

172178 var shape = findChild(data.image, "shape");

173179 compare(shape.width, data.imageWidth);