Merge lp:~tpeeters/ubuntu-ui-toolkit/fix-black-icon into lp:~bzoltan/ubuntu-ui-toolkit/landing_18.09

[Tim Peeters]

Fix black icons in gallery-app header.

Fix black icons in gallery-app header.

[Lars Karlitski (larsu)]

This looks good to me. I removed the update() function because it wasn't needed for the unitythemeiconprovider anymore, but forgot to test with other icon providers.

Thanks!

review: Approve

=== modified file 'modules/Ubuntu/Components/Icon10.qml'
--- modules/Ubuntu/Components/Icon10.qml	2014-09-05 04:42:38 +0000
+++ modules/Ubuntu/Components/Icon10.qml	2014-09-19 13:31:22 +0000
@@ -34,16 +34,42 @@
     Image {
         id: image
         objectName: "image"
-        anchors { top: parent.top; bottom: parent.bottom }
-        fillMode: Image.PreserveAspectFit;
-        sourceSize.height: height
-        source: {
-            if (icon.name)
-                return "image://theme/%1".arg(icon.name);
-            else if (icon.hasOwnProperty("source"))
-                return icon.source;
-            else
-                return "";
+        anchors.fill: parent
+
+        /* Necessary so that icons are not loaded before a size is set. */
+        source: ""
+        sourceSize {
+            width: 0
+            height: 0
+        }
+
+        Component.onCompleted: update()
+        onWidthChanged: update()
+        onHeightChanged: update()
+        Connections {
+            target: icon
+            ignoreUnknownSignals: true
+            onNameChanged: image.update()
+            onSourceChanged: 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 || (icon.hasOwnProperty("source") && icon.source))) {
+                sourceSize.width = width;
+                sourceSize.height = height;
+                if (icon.hasOwnProperty("source")) {
+                    source = icon.source;
+                } else {
+                    source = "image://theme/%1".arg(icon.name);
+                }
+            } else {
+                source = "";
+                sourceSize.width = 0;
+                sourceSize.height = 0;
+            }
         }
 
         cache: true

=== added file 'tests/unit_x11/tst_components/[e-mail]'
Binary files tests/unit_x11/tst_components/[e-mail]	1970-01-01 00:00:00 +0000 and tests/unit_x11/tst_components/[e-mail]	2014-09-19 13:31:22 +0000 differ
=== modified file 'tests/unit_x11/tst_components/tst_icon.qml'
--- tests/unit_x11/tst_components/tst_icon.qml	2014-09-02 09:39:09 +0000
+++ tests/unit_x11/tst_components/tst_icon.qml	2014-09-19 13:31:22 +0000
@@ -50,6 +50,14 @@
             width: units.gu(10)
             height: width
         }
+        Icon {
+            // Regression test for bug #1371509
+            // Will print "QML QQuickImage: Failed to get image from provider" when broken.
+            id: icon3
+            width: units.gu(10)
+            height: width
+            source: Qt.resolvedUrl("tst_icon-select.png")
+        }
     }
 
     UbuntuTestCase {
@@ -82,7 +90,7 @@
 
             var image = findChild(icon2, "image");
             compare(image.source,
-                    "image://theme/search",
+                    "file:///usr/share/icons/suru/actions/scalable/search.svg",
                     "Source of the image should equal icon2.source.");
         }
     }