1
=== modified file 'src/imports/Components/Themes/Ambiance/1.3/ScrollingActionBarStyle.qml'
2
--- src/imports/Components/Themes/Ambiance/1.3/ScrollingActionBarStyle.qml	2016-08-29 19:43:27 +0000
3
+++ src/imports/Components/Themes/Ambiance/1.3/ScrollingActionBarStyle.qml	2016-10-03 14:08:38 +0000
4
@@ -47,14 +47,12 @@
5
47
     */
47
     */
6
48
    // FIXME: This ListItem { AbstractButton { } } construction can be avoided
48
    // FIXME: This ListItem { AbstractButton { } } construction can be avoided
7
49
    //  when StyledItem supports cursor keys navigation, see bug #1573616.
49
    //  when StyledItem supports cursor keys navigation, see bug #1573616.
8
50
    // FIXME: For the first and last item in the list, it is possible to move
9
51
    //  the focus inside the ListItem to the AbstractButton, see bug #1590005.
10
52
    // FIXME: Focus can go on disabled item. See bug #1611327.
11
53
    defaultDelegate: ListItem {
50
    defaultDelegate: ListItem {
12
54
        width: units.gu(4)
51
        width: units.gu(4)
13
55
        height: actionBarStyle.height
52
        height: actionBarStyle.height
14
56
        enabled: modelData.enabled
53
        enabled: modelData.enabled
15
57
        objectName: modelData.objectName + "_button"
54
        objectName: modelData.objectName + "_button"
16
55
        onClicked: button.trigger()
17
58
        AbstractButton {
56
        AbstractButton {
18
59
            id: button
57
            id: button
19
60
            anchors.fill: parent
58
            anchors.fill: parent
20
@@ -93,7 +91,7 @@
21
93
            return visibleActionList;
91
            return visibleActionList;
22
94
        }
92
        }
23
95
93
25
96
        ListView {
94
        UbuntuListView {
26
97
            id: actionsListView
95
            id: actionsListView
27
98
            objectName: "actions_listview"
96
            objectName: "actions_listview"
28
99
            anchors {
97
            anchors {
29
@@ -114,6 +112,13 @@
30
114
            delegate: styledItem.delegate
112
            delegate: styledItem.delegate
31
115
            model: listViewContainer.visibleActions
113
            model: listViewContainer.visibleActions
32
116
114
33
115
            highlight: Rectangle {
34
116
                color: theme.palette.focused.background
35
117
                visible: actionsListView.activeFocus
36
118
                width: actionsListView.currentItem.width
37
119
                height: actionsListView.currentItem.height
38
120
            }
39
121
40
117
            // This gives the correct behavior when scrollButtons.width is
122
            // This gives the correct behavior when scrollButtons.width is
41
118
            //  larger/smaller/equal compared to the width of the delegate.
123
            //  larger/smaller/equal compared to the width of the delegate.
42
119
            onCurrentIndexChanged: positionViewAtIndex(currentIndex, ListView.Contain)
124
            onCurrentIndexChanged: positionViewAtIndex(currentIndex, ListView.Contain)
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-10-04
Zsombor Egri		2016-10-03	Approve on 2016-10-04
Review via email: mp+307410@code.launchpad.net