Merge lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-ternary-op-color-fix into lp:ubuntu-ui-toolkit

[Loïc Molinari]

Added workaround for QML buggy support for color props in ternary ops.

Added workaround for QML buggy support for color props in ternary ops.

[Florian Boucault (fboucault)]

For code clarity and avoiding repetition, I would create a function:

function colorFromColor(color) {
    return Qt.rgba(color.r, color.g, color.b, color.a);
}

[Florian Boucault (fboucault)]

It'd be best to report the bug to Qt and put the link to that bug report along with our workaround before we merge.

[Florian Boucault (fboucault)]

> For code clarity and avoiding repetition, I would create a function:
>
> function colorFromColor(color) {
> return Qt.rgba(color.r, color.g, color.b, color.a);
> }

oh, and yeah colorFromColor is a terrible name!

[Florian Boucault (fboucault)]

> It'd be best to report the bug to Qt and put the link to that bug report along
> with our workaround before we merge.

Bug report in Qt just reported describing the issue: https://bugreports.qt-project.org/browse/QTBUG-32238

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:583
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/272/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/728
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/129
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/129
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/129/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/730
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/730/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/653

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/272/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

Yup, this helps.

review: Approve

[lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-ternary-op-color-fix]

584. By Loïc Molinari on 2013-07-04

Added link to bug report and func for color hack.

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml	2013-07-02 00:15:07 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml	2013-07-04 21:56:26 +0000
@@ -63,10 +63,17 @@
     UbuntuShape {
         id: background
         anchors.fill: parent
-        color: isGradient ? gradientProxy.topColor : button.color
-        gradientColor: isGradient ? gradientProxy.bottomColor : button.color
         borderSource: "radius_idle.sci"
         visible: color.a != 0.0
+
+        // Color properties in a JS ternary operator don't work as expected in
+        // QML because it overwrites alpha values with 1. A workaround is to use
+        // Qt.rgba(). For more information, see
+        // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1197802 and
+        // https://bugreports.qt-project.org/browse/QTBUG-32238.
+        function colorHack(color) { return Qt.rgba(color.r, color.g, color.b, color.a); }
+        color: isGradient ? colorHack(gradientProxy) : colorHack(button)
+        gradientColor: isGradient ? colorHack(gradientProxy) : colorHack(button.color)
     }
 
     UbuntuShape {