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

da6cbd4Andrea Cimitan11 years ago

qml/Components/ZoomableImage.qml+1−1

compare with xenial

unifiedsplit

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

65 anchors.fill: parent

66 fillMode: Image.PreserveAspectFit

68− readonly property int sourceSizeMultiplier: 3

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

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

71 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 {

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

74 waitForRendering(zoomableImage);

75 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);

77 }

80 }

79 function get_filename(a) {

82 function get_filename(a) {

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

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

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

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

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

140

143

141− signalSpy.signalName = "onScaleChanged";

142− signalSpy.target = image;

143− signalSpy.clear();

144−

145 zoomableImage.source = data.source;

144 zoomableImage.source = data.source;

146 zoomableImage.zoomable = data.zoomable;

145 zoomableImage.zoomable = data.zoomable;

147 waitForRendering(zoomableImage);

146 waitForRendering(zoomableImage);

148

147

148+ signalSpy.signalName = "onScaleChanged";

149+ signalSpy.target = image;

150+ signalSpy.clear();

151+

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

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

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

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

151 waitForRendering(image);

154 waitForRendering(image);