Merge lp:~zsombi/ubuntu-ui-toolkit/thindivider-fix into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Thin divider adjustments.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1219
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/913/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/745
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/745
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/745/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/745

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

review: Approve (continuous-integration)

[Cris Dywan (kalikiana)]

This shouldn't be a public property. Please move it into a QtObject { id: internal }

review: Needs Fixing

[Zsombor Egri (zsombi)]

> This shouldn't be a public property. Please move it into a QtObject { id:
> internal }

It could be placed in an internal QtObject, but that would decrease the performance of the list item is used in. That's why I had chosen a private property, and also not to make the design with two rectangles but a 4step gradient.

[lp:~zsombi/ubuntu-ui-toolkit/thindivider-fix]

1220. By Zsombor Egri on 2014-08-27

comments reasoning the change added

[Cris Dywan (kalikiana)]

Makes sense. Thanks for clarification and adding the code comments!

review: Approve

=== modified file 'components.api'
--- components.api	2014-08-20 13:03:13 +0000
+++ components.api	2014-08-27 09:30:36 +0000
@@ -193,6 +193,7 @@
     property string subText
 ThinDivider 0.1 1.0
 Rectangle
+    property bool __lightBackground
 ValueSelector 0.1 1.0
 Empty
     property variant icon

=== modified file 'modules/Ubuntu/Components/ListItems/ThinDivider.qml'
--- modules/Ubuntu/Components/ListItems/ThinDivider.qml	2014-05-20 07:03:31 +0000
+++ modules/Ubuntu/Components/ListItems/ThinDivider.qml	2014-08-27 09:30:36 +0000
@@ -15,6 +15,7 @@
  */
 
 import QtQuick 2.0
+import Ubuntu.Components 1.0
 
 /*!
     \qmltype ThinDivider
@@ -48,10 +49,19 @@
     anchors {
         left: (parent) ? parent.left : null
         right: (parent) ? parent.right : null
+        leftMargin: units.gu(2)
+        rightMargin: units.gu(2)
     }
     height: (visible) ? units.dp(2) : 0
+    // a private property to catch theme background color change
+    // use private property instead of embedding it into a QtObject to avoid further
+    // performance decrease
+    property bool __lightBackground: ColorUtils.luminance(Theme.palette.normal.background) > 0.85
+    // use a gradient of 4 steps instead of instantiating two Rectangles for performance reasons
     gradient: Gradient {
-        GradientStop { position: 0.0; color: "#26000000" }
-        GradientStop { position: 1.0; color: "#14F3F3E7" }
+        GradientStop { position: 0.0; color: __lightBackground ? "#26000000" : "#26FFFFFF" }
+        GradientStop { position: 0.49; color: __lightBackground ? "#26000000" : "#26FFFFFF" }
+        GradientStop { position: 0.5; color: __lightBackground ? "#14FFFFFF" : "#14000000" }
+        GradientStop { position: 1.0; color: __lightBackground ? "#14FFFFFF" : "#14000000" }
     }
 }