Merge lp:~mzanetti/unity8/keep-appImage-aspect-ratio into lp:~unity-team/unity8/new-scopes

[Michael Zanetti]

 * Are there any related MPs required for this MP to build/function as expected? Please list.

https://code.launchpad.net/~mzanetti/unity-mir/expose-appimage-sourceSize/+merge/207626

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

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?

Yeah, I did.. But no, no design review. Seems quite obvious that this is wanted by design. In any case, we want it for MWC and afterwards this code will be dropped again in favor of the right edge rework.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:730
http://jenkins.qa.ubuntu.com/job/unity8-ci/2374/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3390
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3044
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1244
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/895
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/899
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/899/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/895
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2986
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3392
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3392/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3046
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3046/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5441
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4176

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

review: Needs Fixing (continuous-integration)

=== modified file 'qml/Dash/Apps/RunningApplicationTile.qml'
--- qml/Dash/Apps/RunningApplicationTile.qml	2014-02-18 18:09:43 +0000
+++ qml/Dash/Apps/RunningApplicationTile.qml	2014-02-21 17:26:50 +0000
@@ -63,11 +63,9 @@
             horizontalCenter: parent.horizontalCenter
         }
 
-        // FIXME: width and height should be defined according to the
-        // application window's aspect ratio.
-        width: (application.stage === ApplicationInfo.MainStage && __sideStageEnabled) ?
-            units.gu(22) : units.gu(11)
         height: (__sideStageEnabled) ? units.gu(22) : units.gu(19)
+        width: applicationImage.width
+
         radius: "medium"
         image: applicationImage
     }
@@ -75,8 +73,8 @@
     ApplicationImage {
         id: applicationImage
         source: ApplicationManager.findApplication((application) ? application.appId : "")
-        width: shapedApplicationImage.width
         height: shapedApplicationImage.height
+        width: Math.min(height, height * sourceSize.width / sourceSize.height)
     }
 
     UbuntuShape {