Merge lp:~cimi/unity8/no-fullres-not-zoomable-images into lp:unity8

[Andrea Cimitan]

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

 * Are there any related MPs required for this MP to build/function as expected? Please list.
n
 * Did you perform an exploratory manual test run of your code change and any related functionality?
y
 * Did you make sure that your branch does not contain spurious tags?
y
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
n/a
 * If you changed the UI, has there been a design review?
n/a

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2138
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/187/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/187/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2138
http://jenkins.qa.ubuntu.com/job/unity8-ci/7144/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6170
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/559/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1849
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/552
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1744
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1744
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/551
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/550
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4760
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6181
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6181/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26986
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/290/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/557
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/557/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26987

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7144/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

 * Did CI run pass?
Kind of yes

 * Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2138
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/243/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/243/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'qml/Components/ZoomableImage.qml'
--- qml/Components/ZoomableImage.qml	2015-07-15 15:07:19 +0000
+++ qml/Components/ZoomableImage.qml	2016-01-22 23:43:05 +0000
@@ -65,7 +65,7 @@
                     anchors.fill: parent
                     fillMode: Image.PreserveAspectFit
 
-                    readonly property int sourceSizeMultiplier: 3
+                    readonly property int sourceSizeMultiplier: root.zoomable ? 3 : 1
 
                     sourceSize.width: root.width * sourceSizeMultiplier <= root.height * sourceSizeMultiplier ? root.width * sourceSizeMultiplier : 0
                     sourceSize.height: root.height * sourceSizeMultiplier <= root.width * sourceSizeMultiplier ? root.height * sourceSizeMultiplier : 0

=== modified file 'tests/qmltests/Components/tst_ZoomableImage.qml'
--- tests/qmltests/Components/tst_ZoomableImage.qml	2015-11-06 12:21:43 +0000
+++ tests/qmltests/Components/tst_ZoomableImage.qml	2016-01-22 23:43:05 +0000
@@ -73,7 +73,10 @@
             tryCompareFunction(function() { return get_filename(imageRenderer.source.toString()) === get_filename(widgetData1["source"]); }, true);
             waitForRendering(zoomableImage);
             tryCompare(zoomableImage, "imageStatus", Image.Ready);
-            compare (signalSpy.count, 1);
+            compare(signalSpy.count, 1);
+            compare(imageRenderer.sourceSize.width, root.width);
+            zoomableImage.zoomable = true;
+            compare(imageRenderer.sourceSize.width, root.width*3);
         }
 
         function get_filename(a) {
@@ -138,14 +141,14 @@
             var imageRenderer = findChild(zoomableImage, "imageRenderer");
             var flickable = findChild(zoomableImage, "flickable");
 
+            zoomableImage.source = data.source;
+            zoomableImage.zoomable = data.zoomable;
+            waitForRendering(zoomableImage);
+
             signalSpy.signalName = "onScaleChanged";
             signalSpy.target = image;
             signalSpy.clear();
 
-            zoomableImage.source = data.source;
-            zoomableImage.zoomable = data.zoomable;
-            waitForRendering(zoomableImage);
-
             tryCompare(zoomableImage, "imageStatus", Image.Ready);
             tryCompareFunction(function() { return get_filename(imageRenderer.source.toString()) === get_filename(data.source); }, true);
             waitForRendering(image);