1
=== modified file 'qml/Dash/DashNavigationList.qml'
2
--- qml/Dash/DashNavigationList.qml	2016-03-29 03:47:39 +0000
3
+++ qml/Dash/DashNavigationList.qml	2016-06-29 12:23:18 +0000
4
@@ -53,61 +53,64 @@
5
53
            Repeater {
53
            Repeater {
6
54
                model: navigation && navigation.loaded ? navigation : null
54
                model: navigation && navigation.loaded ? navigation : null
7
55
                clip: true
55
                clip: true
11
56
                // FIXME Move to ListItem (and remove import) once 1556971 is fixed
56
                delegate: Loader {
12
57
                delegate: ListItems.Empty {
57
                    asynchronous: true
10
58
                    objectName: root.objectName + "child" + index
13
59
                    height: root.itemHeight
58
                    height: root.itemHeight
14
60
                    width: column.width
59
                    width: column.width
26
61
                    anchors {
60
                    // FIXME Move to ListItem (and remove import) once 1556971 is fixed
27
62
                        left: column.left
61
                    sourceComponent: ListItems.Empty {
28
63
                        right: column.right
62
                        objectName: root.objectName + "child" + index
18
64
                        leftMargin: units.gu(2)
19
65
                        rightMargin: units.gu(2)
20
66
                    }
21
67
22
68
                    onClicked: root.enterNavigation(navigationId, allLabel != "" ? allLabel : label, hasChildren)
23
69
24
70
                    Icon {
25
71
                        id: leftIcon
29
72
                        anchors {
63
                        anchors {
30
73
                            verticalCenter: parent.verticalCenter
31
74
                            left: parent.left
64
                            left: parent.left
46
75
                        }
65
                            right: parent.right
47
76
                        height: units.gu(2)
66
                            leftMargin: units.gu(2)
34
77
                        width: height
35
78
                        name: "tick"
36
79
                        color: "#3EB34F"
37
80
                        visible: isActive
38
81
                    }
39
82
40
83
                    Label {
41
84
                        anchors {
42
85
                            verticalCenter: parent.verticalCenter
43
86
                            left: leftIcon.right
44
87
                            leftMargin: units.gu(1)
45
88
                            right: rightIcon.left
48
89
                            rightMargin: units.gu(2)
67
                            rightMargin: units.gu(2)
49
90
                        }
68
                        }
70
91
                        text: label
69
71
92
                        color: isActive ? "#333333" : "#888888"
70
                        onClicked: root.enterNavigation(navigationId, allLabel != "" ? allLabel : label, hasChildren)
72
93
                        wrapMode: Text.Wrap
71
73
94
                        maximumLineCount: 2
72
                        Icon {
74
95
                        elide: Text.ElideMiddle
73
                            id: leftIcon
75
96
                    }
74
                            anchors {
76
97
75
                                verticalCenter: parent.verticalCenter
77
98
                    Icon {
76
                                left: parent.left
78
99
                        id: rightIcon
77
                            }
79
100
                        anchors {
78
                            height: units.gu(2)
80
101
                            verticalCenter: parent.verticalCenter
79
                            width: height
81
102
                            right: parent.right
80
                            name: "tick"
82
103
                        }
81
                            color: "#3EB34F"
83
104
                        height: units.gu(2)
82
                            visible: isActive
84
105
                        width: height
83
                        }
85
106
                        name: "go-next"
84
86
107
                        visible: hasChildren
85
                        Label {
87
108
                    }
86
                            anchors {
88
109
87
                                verticalCenter: parent.verticalCenter
89
110
                    divider.visible: index != navigation.count - 1
88
                                left: leftIcon.right
90
89
                                leftMargin: units.gu(1)
91
90
                                right: rightIcon.left
92
91
                                rightMargin: units.gu(2)
93
92
                            }
94
93
                            text: label
95
94
                            color: isActive ? "#333333" : "#888888"
96
95
                            wrapMode: Text.Wrap
97
96
                            maximumLineCount: 2
98
97
                            elide: Text.ElideMiddle
99
98
                        }
100
99
101
100
                        Icon {
102
101
                            id: rightIcon
103
102
                            anchors {
104
103
                                verticalCenter: parent.verticalCenter
105
104
                                right: parent.right
106
105
                            }
107
106
                            height: units.gu(2)
108
107
                            width: height
109
108
                            name: "go-next"
110
109
                            visible: hasChildren
111
110
                        }
112
111
113
112
                        divider.visible: index != navigation.count - 1
114
113
                    }
115
111
                }
114
                }
116
112
            }
115
            }
117
113
        }
116
        }
Status:	Merged
Approved by:	Josh Arenson on 2016-06-30
Approved revision:	2496
Merged at revision:	2560
Proposed branch:	lp:~aacid/unity8/asyncLoaderForNavigationListViewDelegate
Merge into:	lp:unity8
Diff against target:	117 lines (+52/-49) 1 file modified qml/Dash/DashNavigationList.qml (+52/-49)
To merge this branch:	bzr merge lp:~aacid/unity8/asyncLoaderForNavigationListViewDelegate
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Approve on 2016-06-30
Josh Arenson		2016-06-28	Approve on 2016-06-29
Review via email: mp+298507@code.launchpad.net