Merge lp:~fboucault/unity8/notifications_icon_respect_ratio into lp:unity8

[Florian Boucault]

Notifications: shaped icon was stretching the icon instead of respecting its aspect ratio and filling the whole shape.

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

no

 * 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?

Yes, fixed a bug.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1756
http://jenkins.qa.ubuntu.com/job/unity8-ci/5668/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2607
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/833
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/833
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/833
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2257
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2605
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2605/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20142

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

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

yes

 * Did CI run pass? If not, please explain why.

unrelated AP failure.

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

yes

review: Approve

[Michael Zanetti (mzanetti)]

Actually not top-approving until Mirco has given it a quick look. It looks good to me, but he might know about corner cases or something.

[Mirco Müller (macslow)]

This patch breaks the fix for LP #1378417 (as of unity8 revision 1439).

review: Needs Fixing

[Mirco Müller (macslow)]

Most - if not all - of our symbolic icons (e.g. battery-status etc) are non-square, thus we need to keep Image.PreserveAspectFit

[lp:~fboucault/unity8/notifications_icon_respect_ratio]

1757. By Florian Boucault on 2015-05-08

When not shaped, do not fill and crop.

[Florian Boucault (fboucault)]

Thanks Mirco! Is that better now?

[Mirco Müller (macslow)]

Yup now it's fine. Approved.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1757
http://jenkins.qa.ubuntu.com/job/unity8-ci/5693/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2691
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/858/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/858
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/859
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2327
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2689
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2689/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20321

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1757
http://jenkins.qa.ubuntu.com/job/unity8-ci/5700/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2701
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/866
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/865
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/866
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2333
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2699
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2699/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20351

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

review: Needs Fixing (continuous-integration)

[Mirco Müller (macslow)]

Jenkins-failures are unrelated to this branch.

=== modified file 'qml/Notifications/ShapedIcon.qml'
--- qml/Notifications/ShapedIcon.qml	2014-11-07 15:32:48 +0000
+++ qml/Notifications/ShapedIcon.qml	2015-05-08 14:09:40 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.3
+import Ubuntu.Components 1.2
 
 Item {
     property string fileSource
@@ -25,7 +25,8 @@
         objectName: "shapedIcon"
         anchors.fill: parent
         visible: shaped
-        image: realImage
+        source: realImage
+        sourceFillMode: UbuntuShape.PreserveAspectCrop
     }
 
     Image {