Merge lp:~tpeeters/ubuntu-ui-toolkit/iconFix into lp:ubuntu-ui-toolkit/staging

[Tim Peeters]

Fix icon loading problems

Fix two icon loading issues:
- Add libqt5svg5 as a BUILD dependency (needed for running unit tests with icons)
- Fix warning caused by having a sourceSize.width or height 0 when icon is rendered.

[Zsombor Egri (zsombi)]

Thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1178
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/683/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2718
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2164
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/515
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/515
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/515/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/515
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2823
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3961
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3961/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10676
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1797
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2423
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2423/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/683/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2014-07-28 15:09:00 +0000
+++ debian/control	2014-07-30 12:12:03 +0000
@@ -26,6 +26,7 @@
                qtdeclarative5-doc-html,
                qtwebkit5-doc-html,
                qtsvg5-doc-html,
+               libqt5svg5,
                qtscript5-doc-html,
                qtmultimedia5-doc-html,
                unity-action-doc,

=== modified file 'modules/Ubuntu/Components/Icon.qml'
--- modules/Ubuntu/Components/Icon.qml	2014-07-03 13:30:32 +0000
+++ modules/Ubuntu/Components/Icon.qml	2014-07-30 12:12:03 +0000
@@ -84,17 +84,37 @@
 
     Image {
         id: image
+        anchors.fill: parent
 
         /* Necessary so that icons are not loaded before a size is set. */
-        property bool ready: false
-        Component.onCompleted: ready = true
-
-        anchors.fill: parent
-        source: ready && width > 0 && height > 0 && icon.name ? "image://theme/%1".arg(icon.name) : ""
+        source: ""
         sourceSize {
-            width: width
-            height: height
-        }
+            width: 0
+            height: 0
+        }
+
+        Component.onCompleted: update()
+        onWidthChanged: update()
+        onHeightChanged: update()
+        Connections {
+            target: icon
+            onNameChanged: image.update()
+        }
+
+        function update() {
+            // only set sourceSize.width, sourceSize.height and source when
+            // icon dimensions are valid, see bug #1349769.
+            if (width > 0 && height > 0 && icon.name) {
+                sourceSize.width = width;
+                sourceSize.height = height;
+                source = "image://theme/%1".arg(icon.name);
+            } else {
+                source = "";
+                sourceSize.width = 0;
+                sourceSize.height = 0;
+            }
+        }
+
         cache: true
         visible: !colorizedImage.active
     }

=== added file 'tests/unit_x11/tst_components/tst_icon.qml'
--- tests/unit_x11/tst_components/tst_icon.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/tst_icon.qml	2014-07-30 12:12:03 +0000
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import QtTest 1.0
+import Ubuntu.Components 1.1
+
+Item {
+    width: units.gu(50)
+    height: units.gu(50)
+
+    Row {
+        anchors.centerIn: parent
+        height: units.gu(10)
+        width: childrenRect.width
+
+        Icon {
+            // Fails to load the icon when suru-icon-theme or libqt5svg5 are
+            // not installed. This causes a warning and rejection
+            // by jenkins continuous integration.
+            name: "add"
+            height: parent.height
+            width: height
+        }
+        Icon {
+            // Fails when the icon is becoming invisible when non-atomic updates
+            // cause sourceSize.width or sourceSize.height to be 0 before other
+            // properties are updated.
+            id: icon
+            width: visible ? units.gu(10) : 0
+            height: width
+            name: "search"
+        }
+    }
+
+    TestCase {
+        name: "Icon"
+        when: windowShown
+
+        function test_updateIconSize_bug1349769() {
+            icon.visible = false;
+            // causes "QML Image: Failed to get image from provider: image://theme/search"
+            // warning when sourceSize.width or sourceSize.height becomes 0 while
+            // while still trying to render the icon. Tests will pass with the warning, but
+            // the MR is rejected by jenkins continuous integration.
+        }
+    }
+}