da6cbd4 · unity8 · git.iko.soy

git.iko.soy/unity8

only request a bigger image if zoomable widget data property is true, otherwise just leave the screen size Fixes: #1536814

Approved by: Albert Astals Cid

commitda6cbd48741014dd01da8433aa3c8a4b03f377c0 authorAndrea Cimitan <andrea.cimitan@gmail.com> dateFri 12 Feb 2016, 00:11 (11 years ago) parent8b1e44c 1c14575

2 files changed+9−6

compare with xenial

unifiedsplit

qml/Components/ZoomableImage.qml+1−1 tests/qmltests/Components/tst_ZoomableImage.qml+8−5

qml/Components/ZoomableImage.qml+1−1

@@ -65,7 +65,7 @@ Item {

6565 anchors.fill: parent

6666 fillMode: Image.PreserveAspectFit

6767

68− readonly property int sourceSizeMultiplier: 3

68+ readonly property int sourceSizeMultiplier: root.zoomable ? 3 : 1

6969

7070 sourceSize.width: root.width * sourceSizeMultiplier <= root.height * sourceSizeMultiplier ? root.width * sourceSizeMultiplier : 0

7171 sourceSize.height: root.height * sourceSizeMultiplier <= root.width * sourceSizeMultiplier ? root.height * sourceSizeMultiplier : 0

tests/qmltests/Components/tst_ZoomableImage.qml+8−5

@@ -73,7 +73,10 @@ Rectangle {

7373 tryCompareFunction(function() { return get_filename(imageRenderer.source.toString()) === get_filename(widgetData1["source"]); }, true);

7474 waitForRendering(zoomableImage);

7575 tryCompare(zoomableImage, "imageStatus", Image.Ready);

76− compare (signalSpy.count, 1);

76+ compare(signalSpy.count, 1);

77+ compare(imageRenderer.sourceSize.width, root.width);

78+ zoomableImage.zoomable = true;

79+ compare(imageRenderer.sourceSize.width, root.width*3);

7780 }

7881

7982 function get_filename(a) {

@@ -138,14 +141,14 @@ Rectangle {

138141 var imageRenderer = findChild(zoomableImage, "imageRenderer");

139142 var flickable = findChild(zoomableImage, "flickable");

140143

141− signalSpy.signalName = "onScaleChanged";

142− signalSpy.target = image;

143− signalSpy.clear();

144−

145144 zoomableImage.source = data.source;

146145 zoomableImage.zoomable = data.zoomable;

147146 waitForRendering(zoomableImage);

148147

148+ signalSpy.signalName = "onScaleChanged";

149+ signalSpy.target = image;

150+ signalSpy.clear();

151+

149152 tryCompare(zoomableImage, "imageStatus", Image.Ready);

150153 tryCompareFunction(function() { return get_filename(imageRenderer.source.toString()) === get_filename(data.source); }, true);

151154 waitForRendering(image);