Merge lp:~unity-team/unity8/croppedImageMinimumSourceSize into lp:unity8

[Michał Sawicz]

Save texture memory by limiting sourceSize

* Are there any related MPs required for this MP to build/function as expected?
https://code.launchpad.net/~aacid/ubuntu-ui-toolkit/scaling_image_provider_respect_one_requested_size_zero/+merge/235098

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

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

 * 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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1201
http://jenkins.qa.ubuntu.com/job/unity8-ci/4073/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3978
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1074
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1167
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1167
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3825
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5228
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5228/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12023

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1203
http://jenkins.qa.ubuntu.com/job/unity8-ci/4077/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3983
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1078
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1171
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1171
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3831
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5233
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5233/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12033

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

review: Approve (continuous-integration)

[Andrea Cimitan (cimi)]

Instead of using resized and resizing, shall we use a string property (or int) representing "none" "resizing" "resized" states?

review: Needs Information

[Albert Astals Cid (aacid)]

> Instead of using resized and resizing, shall we use a string property (or int)
> representing "none" "resizing" "resized" states?

I think this way is easier, the "resizing" is an internal state, the outer world only cares for none and resized, thus that boolean is the one they should be using directly.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1204
http://jenkins.qa.ubuntu.com/job/unity8-ci/4155/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4170
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1156
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1249
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1249
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3992
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5422
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5422/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12265

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1205
http://jenkins.qa.ubuntu.com/job/unity8-ci/4164/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4197
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1165
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1258
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1258
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4011
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5449
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5449/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12291

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1206
http://jenkins.qa.ubuntu.com/job/unity8-ci/4228/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4432
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1229
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1322
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1322
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4208
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5684
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5684/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12631

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

review: Abstain (is my code)

[lp:~unity-team/unity8/croppedImageMinimumSourceSize]

1207. By Albert Astals Cid on 2014-09-17

properties at the begnning

1208. By Albert Astals Cid on 2014-09-17

Merge

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1207
http://jenkins.qa.ubuntu.com/job/unity8-ci/4331/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4894/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1332
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1425/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1425/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6146/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1208
http://jenkins.qa.ubuntu.com/job/unity8-ci/4334/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4898/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1335
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1428
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1428
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4651/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6150
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6150/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13317

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

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity8/croppedImageMinimumSourceSize]

1209. By Albert Astals Cid on 2014-09-18

Do not rename

1210. By Albert Astals Cid on 2014-09-22

merge

1211. By Albert Astals Cid on 2014-09-22

This seems to come from a broken merge

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1210
http://jenkins.qa.ubuntu.com/job/unity8-ci/4364/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5047/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1365
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1458
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1458
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4798/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6299
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6299/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13536

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1211
http://jenkins.qa.ubuntu.com/job/unity8-ci/4367/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5056/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1368
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1461
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1461
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4803/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6308
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6308/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13543

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

review: Needs Fixing (continuous-integration)

[Mirco Müller (macslow)]

Code looks good, but I still need to run it on the device for testing/measuring. Depencency-problems currently keep me from installing the .debs from output.zip.

This qml-test fails:
- qmltestrunner::Card::test_paddings

review: Needs Fixing

[Albert Astals Cid (aacid)]

> Code looks good, but I still need to run it on the device for
> testing/measuring. Depencency-problems currently keep me from installing the
> .debs from output.zip.
>
> This qml-test fails:
> - qmltestrunner::Card::test_paddings

Are you running with the pre-requisite?

[lp:~unity-team/unity8/croppedImageMinimumSourceSize]

1212. By Albert Astals Cid on 2014-09-23

Merge

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1212
http://jenkins.qa.ubuntu.com/job/unity8-ci/4376/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5083/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1377
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1470
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1470
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4830/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6335
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6335/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13588

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

review: Needs Fixing (continuous-integration)

[lp:~unity-team/unity8/croppedImageMinimumSourceSize]

1213. By Albert Astals Cid on 2014-09-23

Merge

[Mirco Müller (macslow)]

Still trying to get lp:ubuntu-ui-toolkit/staging compiled (into a .deb) so I can properly test.

[Mirco Müller (macslow)]

Ok, finally got the prerequisite lp:ubuntu-ui-toolkit/staging working and was able to properly test this locally. All fine and qmltests pass too. Now all we need is to wait for Jenkins to get its act together and I'm fine with top-approving.

review: Approve

[Andrea Cimitan (cimi)]

on my side, used this many times, works fine indeed...

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1213
http://jenkins.qa.ubuntu.com/job/unity8-ci/4381/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5090/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1382
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1475
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1475
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4838/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6342
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6342/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13594

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

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/Dash/CardCreator.js'
--- plugins/Dash/CardCreator.js	2014-09-23 13:39:16 +0000
+++ plugins/Dash/CardCreator.js	2014-09-23 13:39:16 +0000
@@ -82,13 +82,13 @@
                                             height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height }); \n\
                                         } \n\
                                     } \n\
-                                    image: Image { \n\
+                                    image: CroppedImageMinimumSourceSize { \n\
                                         objectName: "artImage"; \n\
                                         property bool doLoadSource: !NetworkingStatus.limitedBandwith; \n\
                                         source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; } \n\
                                         cache: true; \n\
                                         asynchronous: root.asynchronous; \n\
-                                        fillMode: Image.PreserveAspectCrop; \n\
+                                        visible: false; \n\
                                         width: %2; \n\
                                         height: %3; \n\
                                     } \n\
@@ -191,17 +191,14 @@
 
 // %1 is used as anchors of mascotImage
 // %2 is used as visible of mascotImage
-var kMascotImageCode = 'Image { \n\
+var kMascotImageCode = 'CroppedImageMinimumSourceSize { \n\
                             id: mascotImage; \n\
                             objectName: "mascotImage"; \n\
                             anchors { %1 } \n\
-                            readonly property int maxSize: Math.max(width, height) * 4; \n\
                             property bool doLoadSource: !NetworkingStatus.limitedBandwith; \n\
                             source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; } \n\
                             width: units.gu(6); \n\
                             height: units.gu(5.625); \n\
-                            sourceSize { width: maxSize; height: maxSize } \n\
-                            fillMode: Image.PreserveAspectCrop; \n\
                             horizontalAlignment: Image.AlignHCenter; \n\
                             verticalAlignment: Image.AlignVCenter; \n\
                             visible: %2; \n\
@@ -438,7 +435,7 @@
             mascotShapeCode = kMascotShapeLoaderCode.arg(mascotAnchors);
         }
 
-        var mascotImageVisible = useMascotShape ? 'false' : 'showHeader';
+        var mascotImageVisible = useMascotShape ? 'false' : 'showHeader && resized';
         mascotCode = kMascotImageCode.arg(mascotAnchors).arg(mascotImageVisible);
     }
 

=== added file 'plugins/Dash/CroppedImageMinimumSourceSize.qml'
--- plugins/Dash/CroppedImageMinimumSourceSize.qml	1970-01-01 00:00:00 +0000
+++ plugins/Dash/CroppedImageMinimumSourceSize.qml	2014-09-23 13:39:16 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+
+Image {
+    property bool resized: false
+    property bool resizing: false
+    fillMode: Image.PreserveAspectCrop
+    visible: resized
+    onSourceSizeChanged: {
+        if (!resized && !resizing) {
+            resizing = true;
+            var ar = width / height;
+            var ssar = sourceSize.width / sourceSize.height;
+            if (ar > ssar) {
+                sourceSize = Qt.size(width, 0);
+            } else {
+                sourceSize = Qt.size(0, height);
+            }
+            resizing = false;
+            resized = true;
+        }
+    }
+}

=== modified file 'plugins/Dash/qmldir'
--- plugins/Dash/qmldir	2014-07-22 10:03:37 +0000
+++ plugins/Dash/qmldir	2014-09-23 13:39:16 +0000
@@ -3,4 +3,5 @@
 typeinfo Dash.qmltypes
 singleton CardCreatorCache 0.1 CardCreatorCache.qml
 ScopeStyle 0.1 ScopeStyle.qml
-CardAttributes 0.1 CardAttributes.qml
\ No newline at end of file
+CardAttributes 0.1 CardAttributes.qml
+CroppedImageMinimumSourceSize 0.1 CroppedImageMinimumSourceSize.qml

=== modified file 'tests/plugins/Dash/cardcreator/1.res'
--- tests/plugins/Dash/cardcreator/1.res	2014-09-23 13:39:16 +0000
+++ tests/plugins/Dash/cardcreator/1.res	2014-09-23 13:39:16 +0000
@@ -44,13 +44,13 @@
                                             height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height });
                                         } 
                                     } 
-                                    image: Image { 
+                                    image: CroppedImageMinimumSourceSize {
                                         objectName: "artImage"; 
                                         property bool doLoadSource: !NetworkingStatus.limitedBandwith;
                                         source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; }
                                         cache: true; 
                                         asynchronous: root.asynchronous; 
-                                        fillMode: Image.PreserveAspectCrop;
+                                        visible: false; 
                                         width: root.width; 
                                         height: width / artShape.aspect; 
                                     } 

=== modified file 'tests/plugins/Dash/cardcreator/2.res'
--- tests/plugins/Dash/cardcreator/2.res	2014-09-23 13:39:16 +0000
+++ tests/plugins/Dash/cardcreator/2.res	2014-09-23 13:39:16 +0000
@@ -62,20 +62,17 @@
                         anchors.margins: margins;
                         anchors.rightMargin: 0;
                         data: [
-Image { 
+CroppedImageMinimumSourceSize {
                             id: mascotImage; 
                             objectName: "mascotImage"; 
                             anchors { verticalCenter: parent.verticalCenter; } 
-                            readonly property int maxSize: Math.max(width, height) * 4; 
                             property bool doLoadSource: !NetworkingStatus.limitedBandwith;
                             source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; }
                             width: units.gu(6); 
                             height: units.gu(5.625); 
-                            sourceSize { width: maxSize; height: maxSize } 
-                            fillMode: Image.PreserveAspectCrop; 
                             horizontalAlignment: Image.AlignHCenter; 
                             verticalAlignment: Image.AlignVCenter; 
-                            visible: showHeader; 
+                            visible: showHeader && resized;
                         }
 ,Item { 
                             id: headerTitleContainer; 

=== modified file 'tests/plugins/Dash/cardcreator/3.res'
--- tests/plugins/Dash/cardcreator/3.res	2014-09-23 13:39:16 +0000
+++ tests/plugins/Dash/cardcreator/3.res	2014-09-23 13:39:16 +0000
@@ -44,13 +44,13 @@
                                             height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height });
                                         }
                                     } 
-                                    image: Image { 
+                                    image: CroppedImageMinimumSourceSize {
                                         objectName: "artImage"; 
                                         property bool doLoadSource: !NetworkingStatus.limitedBandwith;
                                         source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; }
                                         cache: true;
                                         asynchronous: root.asynchronous; 
-                                        fillMode: Image.PreserveAspectCrop;
+                                        visible: false; 
                                         width: root.width; 
                                         height: width / artShape.aspect; 
                                     } 

=== modified file 'tests/plugins/Dash/cardcreator/4.res'
--- tests/plugins/Dash/cardcreator/4.res	2014-09-23 13:39:16 +0000
+++ tests/plugins/Dash/cardcreator/4.res	2014-09-23 13:39:16 +0000
@@ -41,17 +41,14 @@
                         anchors { verticalCenter: parent.verticalCenter; }
                     }
 
-,Image { 
+,CroppedImageMinimumSourceSize {
                     id: mascotImage; 
                     objectName: "mascotImage"; 
                     anchors { verticalCenter: parent.verticalCenter; }
-                    readonly property int maxSize: Math.max(width, height) * 4; 
                     property bool doLoadSource: !NetworkingStatus.limitedBandwith;
                     source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; }
                     width: units.gu(6);
                     height: units.gu(5.625); 
-                    sourceSize { width: maxSize; height: maxSize } 
-                    fillMode: Image.PreserveAspectCrop; 
                     horizontalAlignment: Image.AlignHCenter; 
                     verticalAlignment: Image.AlignVCenter; 
                     visible: false; 

=== modified file 'tests/plugins/Dash/cardcreator/5.res'
--- tests/plugins/Dash/cardcreator/5.res	2014-09-23 13:39:16 +0000
+++ tests/plugins/Dash/cardcreator/5.res	2014-09-23 13:39:16 +0000
@@ -44,13 +44,13 @@
                                             height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height });
                                         }
                                     } 
-                                    image: Image { 
+                                    image: CroppedImageMinimumSourceSize {
                                         objectName: "artImage"; 
                                         property bool doLoadSource: !NetworkingStatus.limitedBandwith;
                                         source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; }
                                         cache: true;
                                         asynchronous: root.asynchronous; 
-                                        fillMode: Image.PreserveAspectCrop;
+                                        visible: false; 
                                         width: root.width; 
                                         height: width / artShape.aspect; 
                                     } 

=== modified file 'tests/plugins/Dash/cardcreator/7.res'
--- tests/plugins/Dash/cardcreator/7.res	2014-09-23 13:39:16 +0000
+++ tests/plugins/Dash/cardcreator/7.res	2014-09-23 13:39:16 +0000
@@ -62,20 +62,17 @@
                         anchors.margins: margins;
                         anchors.rightMargin: 0;
                         data: [ 
-Image { 
+CroppedImageMinimumSourceSize {
                             id: mascotImage; 
                             objectName: "mascotImage"; 
                             anchors { verticalCenter: parent.verticalCenter; } 
-                            readonly property int maxSize: Math.max(width, height) * 4; 
                             property bool doLoadSource: !NetworkingStatus.limitedBandwith;
                             source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; }
                             width: units.gu(6);
                             height: units.gu(5.625); 
-                            sourceSize { width: maxSize; height: maxSize } 
-                            fillMode: Image.PreserveAspectCrop; 
                             horizontalAlignment: Image.AlignHCenter; 
                             verticalAlignment: Image.AlignVCenter; 
-                            visible: showHeader; 
+                            visible: showHeader && resized;
                         }
 
 ,Item {