1
=== modified file 'modules/Ubuntu/Components/ListItems/Empty.qml'
2
--- modules/Ubuntu/Components/ListItems/Empty.qml	2014-10-02 13:03:22 +0000
3
+++ modules/Ubuntu/Components/ListItems/Empty.qml	2014-10-24 15:04:57 +0000
4
@@ -307,11 +307,7 @@
5
307
307
6
308
    ThinDivider {
308
    ThinDivider {
7
309
        id: bottomDividerLine
309
        id: bottomDividerLine
13
310
        anchors {
310
        anchors.bottom: parent.bottom
9
311
            bottom: parent.bottom
10
312
            leftMargin: units.gu(2)
11
313
            rightMargin: units.gu(2)
12
314
        }
14
315
        visible: showDivider && !priv.removed
311
        visible: showDivider && !priv.removed
15
316
    }
312
    }
16
317
313
17
318
314
18
=== modified file 'modules/Ubuntu/Components/ListItems/ThinDivider.qml'
19
--- modules/Ubuntu/Components/ListItems/ThinDivider.qml	2014-09-09 04:59:23 +0000
20
+++ modules/Ubuntu/Components/ListItems/ThinDivider.qml	2014-10-24 15:04:57 +0000
21
@@ -57,9 +57,9 @@
22
57
    property bool __lightBackground: ColorUtils.luminance(Theme.palette.normal.background) > 0.85
57
    property bool __lightBackground: ColorUtils.luminance(Theme.palette.normal.background) > 0.85
23
58
    // use a gradient of 4 steps instead of instantiating two Rectangles for performance reasons
58
    // use a gradient of 4 steps instead of instantiating two Rectangles for performance reasons
24
59
    gradient: Gradient {
59
    gradient: Gradient {
29
60
        GradientStop { position: 0.0; color: __lightBackground ? "#26000000" : "#26FFFFFF" }
60
        GradientStop { position: 0.0; color: __lightBackground ? Qt.rgba(0, 0, 0, 0.1) : Qt.rgba(0, 0, 0, 0.4) }
30
61
        GradientStop { position: 0.49; color: __lightBackground ? "#26000000" : "#26FFFFFF" }
61
        GradientStop { position: 0.49; color: __lightBackground ? Qt.rgba(0, 0, 0, 0.1) : Qt.rgba(0, 0, 0, 0.4) }
31
62
        GradientStop { position: 0.5; color: __lightBackground ? "#14FFFFFF" : "#14000000" }
62
        GradientStop { position: 0.5; color: __lightBackground ? Qt.rgba(1, 1, 1, 0.4) : Qt.rgba(1, 1, 1, 0.1) }
32
63
        GradientStop { position: 1.0; color: __lightBackground ? "#14FFFFFF" : "#14000000" }
63
        GradientStop { position: 1.0; color: __lightBackground ? Qt.rgba(1, 1, 1, 0.4) : Qt.rgba(1, 1, 1, 0.1) }
33
64
    }
64
    }
34
65
}
65
}
35
66
66
36
=== added directory 'tests/resources/listitems'
37
=== added file 'tests/resources/listitems/Dividers.qml'
38
--- tests/resources/listitems/Dividers.qml	1970-01-01 00:00:00 +0000
39
+++ tests/resources/listitems/Dividers.qml	2014-10-24 15:04:57 +0000
40
@@ -0,0 +1,46 @@
41
1
/*
42
2
 * Copyright 2014 Canonical Ltd.
43
3
 *
44
4
 * This program is free software; you can redistribute it and/or modify
45
5
 * it under the terms of the GNU Lesser General Public License as published by
46
6
 * the Free Software Foundation; version 3.
47
7
 *
48
8
 * This program is distributed in the hope that it will be useful,
49
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
50
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
51
11
 * GNU Lesser General Public License for more details.
52
12
 *
53
13
 * You should have received a copy of the GNU Lesser General Public License
54
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
55
15
 */
56
16
57
17
import QtQuick 2.0
58
18
import Ubuntu.Components 0.1
59
19
import Ubuntu.Components.ListItems 0.1
60
20
import Ubuntu.Components.Popups 0.1
61
21
62
22
MainView {
63
23
    width: units.gu(50)
64
24
    height: units.gu(100)
65
25
66
26
    Component.onCompleted: Theme.name = "Ubuntu.Components.Themes.SuruDark"
67
27
68
28
    Column {
69
29
        width: parent.width
70
30
        Repeater {
71
31
            model: 5
72
32
            Subtitled {
73
33
                text: "Caption text"
74
34
                subText: "Subtitle"
75
35
            }
76
36
        }
77
37
        ThinDivider {}
78
38
        Repeater {
79
39
            model: 5
80
40
            Subtitled {
81
41
                text: "Caption text"
82
42
                subText: "Subtitle"
83
43
            }
84
44
        }
85
45
    }
86
46
}
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2014-10-29
Tim Peeters		2014-10-22	Approve on 2014-10-24
Review via email: mp+239320@code.launchpad.net