Merge lp:~zsombi/ubuntu-ui-toolkit/listitem-divider-rollback into lp:ubuntu-ui-toolkit/rtm

[Zsombor Egri]

Rolling back ListItem dividers from 2GU left&right margins to no margins.

Rolling back ListItem dividers from 2GU left&right margins to no margins.

[Tim Peeters (tpeeters)]

This is the same as the combination of https://code.launchpad.net/~zsombi/ubuntu-ui-toolkit/header-divider/+merge/242663 and https://code.launchpad.net/~zsombi/ubuntu-ui-toolkit/thindivider-margins/+merge/239320 which I reviewed before and that already landed in staging.

Approving for rtm.

review: Approve

=== modified file 'modules/Ubuntu/Components/ListItems/Empty.qml'
--- modules/Ubuntu/Components/ListItems/Empty.qml	2014-10-02 13:03:22 +0000
+++ modules/Ubuntu/Components/ListItems/Empty.qml	2015-01-07 07:47:57 +0000
@@ -307,11 +307,7 @@
 
     ThinDivider {
         id: bottomDividerLine
-        anchors {
-            bottom: parent.bottom
-            leftMargin: units.gu(2)
-            rightMargin: units.gu(2)
-        }
+        anchors.bottom: parent.bottom
         visible: showDivider && !priv.removed
     }
 

=== modified file 'modules/Ubuntu/Components/ListItems/Header.qml'
--- modules/Ubuntu/Components/ListItems/Header.qml	2014-09-09 16:03:39 +0000
+++ modules/Ubuntu/Components/ListItems/Header.qml	2015-01-07 07:47:57 +0000
@@ -74,8 +74,6 @@
             left: parent.left
             right: parent.right
             bottom: parent.bottom
-            leftMargin: units.gu(2)
-            rightMargin: units.gu(2)
         }
     }
 }

=== modified file 'modules/Ubuntu/Components/ListItems/ThinDivider.qml'
--- modules/Ubuntu/Components/ListItems/ThinDivider.qml	2014-09-09 04:59:23 +0000
+++ modules/Ubuntu/Components/ListItems/ThinDivider.qml	2015-01-07 07:47:57 +0000
@@ -57,9 +57,9 @@
     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: __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" }
+        GradientStop { position: 0.0; color: __lightBackground ? Qt.rgba(0, 0, 0, 0.1) : Qt.rgba(0, 0, 0, 0.4) }
+        GradientStop { position: 0.49; color: __lightBackground ? Qt.rgba(0, 0, 0, 0.1) : Qt.rgba(0, 0, 0, 0.4) }
+        GradientStop { position: 0.5; color: __lightBackground ? Qt.rgba(1, 1, 1, 0.4) : Qt.rgba(1, 1, 1, 0.1) }
+        GradientStop { position: 1.0; color: __lightBackground ? Qt.rgba(1, 1, 1, 0.4) : Qt.rgba(1, 1, 1, 0.1) }
     }
 }

=== added directory 'tests/resources/listitems'
=== added file 'tests/resources/listitems/Dividers.qml'
--- tests/resources/listitems/Dividers.qml	1970-01-01 00:00:00 +0000
+++ tests/resources/listitems/Dividers.qml	2015-01-07 07:47:57 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2014 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 Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1
+import Ubuntu.Components.Popups 0.1
+
+MainView {
+    width: units.gu(50)
+    height: units.gu(100)
+
+    Component.onCompleted: Theme.name = "Ubuntu.Components.Themes.SuruDark"
+
+    Column {
+        width: parent.width
+        Repeater {
+            model: 5
+            Subtitled {
+                text: "Caption text"
+                subText: "Subtitle"
+            }
+        }
+        ThinDivider {}
+        Repeater {
+            model: 5
+            Subtitled {
+                text: "Caption text"
+                subText: "Subtitle"
+            }
+        }
+    }
+}