Merge lp:~saviq/unity8/simple-theming into lp:unity8

[Michał Sawicz]

Support the simplified theming from ubuntu-ui-toolkit.

The cause for this are:

https://code.launchpad.net/~fboucault/ubuntu-ui-toolkit/button_no_background_when_transparent/+merge/171690
https://code.launchpad.net/~fboucault/ubuntu-ui-toolkit/simple_theming/+merge/171645

[Michael Zanetti (mzanetti)]

29 Button {
30 - ItemStyle.class: "transparent-button"
31 + color: "transparent"

Actually I'm curios why this is a button at all. To me it doesn't seem we should load 2 UbuntuShapes just to not display them. Woudln't a MouseArea do the same job here, but with less resources ?

review: Needs Information

[Michał Sawicz (saviq)]

Indeed, there should be an AbstractButton that would simply be the MouseArea (and later keyboard handling).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:55
http://jenkins.qa.ubuntu.com/job/unity8-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/429
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/229
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/431
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/431/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/391

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

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

review: Approve

[lp:~saviq/unity8/simple-theming]

56. By Michał Sawicz on 2013-06-28

Bring back UbuntuShapeForItem.qml

57. By Michał Sawicz on 2013-06-28

Drop newline

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:56
http://jenkins.qa.ubuntu.com/job/unity8-ci/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/463
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/255
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/13/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/465
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/465/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/423

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:57
http://jenkins.qa.ubuntu.com/job/unity8-ci/15/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/467
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/258
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/15/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/469
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/469/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/427

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

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

Tested after applying this: https://code.launchpad.net/~fboucault/ubuntu-ui-toolkit/button_no_background_when_transparent/+merge/171690

Works as expected.

I still disagree that we're using buttons at all here but that's just my opinion. The proposed solution works and looks as expected.

review: Approve

=== modified file 'Components/FilterGrid.qml'
--- Components/FilterGrid.qml	2013-06-05 22:03:08 +0000
+++ Components/FilterGrid.qml	2013-06-28 12:59:28 +0000
@@ -108,7 +108,7 @@
 
                 anchors.fill: parent
                 radius: "small"
-                borderSource: ItemStyle.style.borderPressed
+                borderSource: "radius_pressed.sci"
                 opacity: button.pressed ? 1.0 : 0.0
                 Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }
             }

=== modified file 'Components/PageHeader.qml'
--- Components/PageHeader.qml	2013-06-05 22:03:08 +0000
+++ Components/PageHeader.qml	2013-06-28 12:59:28 +0000
@@ -149,7 +149,7 @@
 
                     primaryItem: Button {
                         enabled: searchField.text != ""
-                        ItemStyle.class: "transparent-button"
+                        color: "transparent"
                         onClicked: {
                             if (searchField.text != "") {
                                 searchHistory.addQuery(searchField.text)
@@ -272,7 +272,7 @@
                         // FIXME: this should go into the first item below, but enable: false
                         // prevents mouse events propagation
                         Button {
-                            ItemStyle.class: "transparent-button"
+                            color: "transparent"
                             anchors {
                                 top: parent.top
                                 right: parent.right

=== modified file 'Components/Tile.qml'
--- Components/Tile.qml	2013-06-05 22:03:08 +0000
+++ Components/Tile.qml	2013-06-28 12:59:28 +0000
@@ -51,7 +51,7 @@
 
         anchors.fill: icon
         radius: "medium"
-        borderSource: ItemStyle.style.borderPressed
+        borderSource: "radius_pressed.sci"
         opacity: root.pressed ? 1.0 : 0.0
         Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }
     }

=== modified file 'Components/UbuntuShapeForItem.qml'
--- Components/UbuntuShapeForItem.qml	2013-06-05 22:03:08 +0000
+++ Components/UbuntuShapeForItem.qml	2013-06-28 12:59:28 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1 as Theming
+import Ubuntu.Components 0.1
 
 /* FIXME: This component is duplicating the UbuntuShape from the SDK, but shapes more
  * general (Item-based) components. This ability should be incorporated into the SDK's
@@ -24,66 +24,22 @@
  */
 
 Item {
-    id: shape
-
-    Theming.ItemStyle.class: "UbuntuShape-radius-" + radius
-
-    property string radius: "small"
-    property url maskSource: Theming.ComponentUtils.style(shape, "maskSource", "")
-    property url borderSource: Theming.ComponentUtils.style(shape, "borderIdle", "")
-    property Item image
-
-    implicitWidth: units.gu(8)
-    implicitHeight: units.gu(8)
-
-    onWidthChanged: __updateImageDimensions()
-    onHeightChanged: __updateImageDimensions()
-    onImageChanged: __updateImageDimensions()
-
-    function __updateImageDimensions() {
-        if (!image) return;
-        image.width = shape.width;
-        image.height = shape.height;
-        image.visible = false;
-    }
-
-    ShaderEffect {
-        anchors.fill: parent
-        visible: shape.image
-
-        property ShaderEffectSource mask: ShaderEffectSource {
-            sourceItem: BorderImage {
-                width: shape.width
-                height: shape.height
-                source: shape.maskSource
-                visible: false
-            }
-        }
-
-        property ShaderEffectSource image: ShaderEffectSource {
-            sourceItem: shape.image
-        }
-
-        fragmentShader:
-            "
-            varying highp vec2 qt_TexCoord0;
-            uniform lowp float qt_Opacity;
-            uniform sampler2D mask;
-            uniform sampler2D image;
-
-            void main(void)
-            {
-                lowp vec4 maskColor = texture2D(mask, qt_TexCoord0.st);
-                lowp vec4 imageColor = texture2D(image, qt_TexCoord0.st);
-                gl_FragColor = imageColor * maskColor.a * qt_Opacity;
-            }
-            "
-    }
-
-    BorderImage {
-        id: border
-
-        anchors.fill: parent
-        source: shape.borderSource
+    id: root
+
+    property alias radius: shape.radius
+    property alias image: source.sourceItem
+
+    ShaderEffectSource {
+        id: source
+        width: 1
+        height: 1
+        hideSource: true
+    }
+
+    Shape {
+        id: shape
+        image: source
+
+        anchors.fill: parent
     }
 }

=== modified file 'Dash/Apps/RunningApplicationTile.qml'
--- Dash/Apps/RunningApplicationTile.qml	2013-06-05 22:03:08 +0000
+++ Dash/Apps/RunningApplicationTile.qml	2013-06-28 12:59:28 +0000
@@ -87,7 +87,7 @@
 
         anchors.fill: shapedApplicationImage
         radius: "medium"
-        borderSource: ItemStyle.style.borderPressed
+        borderSource: "radius_pressed.sci"
         opacity: root.pressed ? 1.0 : 0.0
         Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }
     }

=== modified file 'Dash/Music/AlbumTile.qml'
--- Dash/Music/AlbumTile.qml	2013-06-05 22:03:08 +0000
+++ Dash/Music/AlbumTile.qml	2013-06-28 12:59:28 +0000
@@ -45,7 +45,7 @@
 
         anchors.fill: icon
         radius: "medium"
-        borderSource: ItemStyle.style.borderPressed
+        borderSource: "radius_pressed.sci"
         opacity: root.pressed ? 1.0 : 0.0
         Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }
     }

=== modified file 'Hud/SearchBar.qml'
--- Hud/SearchBar.qml	2013-06-05 22:03:08 +0000
+++ Hud/SearchBar.qml	2013-06-28 12:59:28 +0000
@@ -55,13 +55,6 @@
             }
         }
 
-        // Don't let the style play with our opacity
-        Binding {
-            target: searchBar.ItemStyle.style
-            property: "opacity"
-            value: 1
-        }
-
         Item {
             id: primary
             height: searchBar.height

=== modified file 'Hud/ToolBarIcon.qml'
--- Hud/ToolBarIcon.qml	2013-06-05 22:03:08 +0000
+++ Hud/ToolBarIcon.qml	2013-06-28 12:59:28 +0000
@@ -18,7 +18,7 @@
 import Ubuntu.Components 0.1
 
 Button {
-    ItemStyle.class: "transparent-button"
+    color: "transparent"
 
     property alias source: image.source