1
=== modified file 'qml/Panel/PanelBar.qml'
2
--- qml/Panel/PanelBar.qml	2016-09-30 14:27:30 +0000
3
+++ qml/Panel/PanelBar.qml	2017-01-16 11:01:31 +0000
4
@@ -49,6 +49,7 @@
5
49
            row.resetCurrentItem();
49
            row.resetCurrentItem();
6
50
        }
50
        }
7
51
        row.setCurrentItemIndex(index);
51
        row.setCurrentItemIndex(index);
8
52
        d.alignIndicators();
9
52
    }
53
    }
10
53
54
11
54
    function addScrollOffset(scrollAmmout) {
55
    function addScrollOffset(scrollAmmout) {
12
55
56
13
=== modified file 'qml/Panel/PanelMenu.qml'
14
--- qml/Panel/PanelMenu.qml	2016-12-22 14:55:39 +0000
15
+++ qml/Panel/PanelMenu.qml	2017-01-16 11:01:31 +0000
16
@@ -140,6 +140,19 @@
17
140
        visible: !root.fullyClosed
140
        visible: !root.fullyClosed
18
141
    }
141
    }
19
142
142
20
143
    Keys.onPressed: {
21
144
        if (event.key === Qt.Key_Left) {
22
145
            bar.setCurrentItemIndex(bar.currentItemIndex - 1);
23
146
            event.accepted = true;
24
147
        } else if (event.key === Qt.Key_Right) {
25
148
            bar.setCurrentItemIndex(bar.currentItemIndex + 1);
26
149
            event.accepted = true;
27
150
        } else if (event.key === Qt.Key_Escape) {
28
151
            root.hide();
29
152
            event.accepted = true;
30
153
        }
31
154
    }
32
155
33
143
    PanelBar {
156
    PanelBar {
34
144
        id: bar
157
        id: bar
35
145
        objectName: "indicatorsBar"
158
        objectName: "indicatorsBar"
36
@@ -368,6 +381,7 @@
37
368
        State {
381
        State {
38
369
            name: "commit"
382
            name: "commit"
39
370
            extend: "locked"
383
            extend: "locked"
40
384
            PropertyChanges { target: root; focus: true }
41
371
            PropertyChanges { target: bar; interactive: true }
385
            PropertyChanges { target: bar; interactive: true }
42
372
            PropertyChanges {
386
            PropertyChanges {
43
373
                target: d;
387
                target: d;
44
374
388
45
=== modified file 'tests/qmltests/Panel/tst_Panel.qml'
46
--- tests/qmltests/Panel/tst_Panel.qml	2017-01-10 13:50:27 +0000
47
+++ tests/qmltests/Panel/tst_Panel.qml	2017-01-16 11:01:31 +0000
48
@@ -799,5 +799,39 @@
49
799
            tryCompare(appTitle, "visible", false, undefined, "App title should still be visible on mouse hover when panel decorations are visible");
799
            tryCompare(appTitle, "visible", false, undefined, "App title should still be visible on mouse hover when panel decorations are visible");
50
800
            tryCompare(appMenuBar, "visible", true, undefined, "App menu bar should be visible on mouse hover when panel decorations not visible");
800
            tryCompare(appMenuBar, "visible", true, undefined, "App menu bar should be visible on mouse hover when panel decorations not visible");
51
801
        }
801
        }
52
802
53
803
        function test_keyboardNavigation_data() {
54
804
            return [
55
805
                {tag: "tab to start", doTab: false},
56
806
                {tag: "no tab to start", doTab: true}
57
807
            ]
58
808
        }
59
809
60
810
        function test_keyboardNavigation(data) {
61
811
            var indicatorsBar = findChild(panel.indicators, "indicatorsBar");
62
812
63
813
            pullDownIndicatorsMenu();
64
814
65
815
            indicatorsBar.setCurrentItemIndex(0);
66
816
67
817
            if (data.doTab) {
68
818
                keyClick(Qt.Key_Tab);
69
819
            }
70
820
71
821
            keyClick(Qt.Key_Right);
72
822
            tryCompare(indicatorsBar, "currentItemIndex", 1);
73
823
74
824
            keyClick(Qt.Key_Right);
75
825
            tryCompare(indicatorsBar, "currentItemIndex", 2);
76
826
77
827
            keyClick(Qt.Key_Left);
78
828
            tryCompare(indicatorsBar, "currentItemIndex", 1);
79
829
80
830
            keyClick(Qt.Key_Left);
81
831
            tryCompare(indicatorsBar, "currentItemIndex", 0);
82
832
83
833
            keyClick(Qt.Key_Escape);
84
834
            tryCompare(panel.indicators, "fullyClosed", true);
85
835
        }
86
802
    }
836
    }
87
803
}
837
}
Status:	Merged
Approved by:	Michael Zanetti on 2017-01-18
Approved revision:	2754
Merged at revision:	2781
Proposed branch:	lp:~aacid/unity8/indicator_keyboard_navigation
Merge into:	lp:unity8
Diff against target:	87 lines (+49/-0) 3 files modified qml/Panel/PanelBar.qml (+1/-0) qml/Panel/PanelMenu.qml (+14/-0) tests/qmltests/Panel/tst_Panel.qml (+34/-0)
To merge this branch:	bzr merge lp:~aacid/unity8/indicator_keyboard_navigation
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration	2017-01-04	Approve on 2017-01-18
Michael Zanetti (community)		2017-01-04	Approve on 2017-01-04
Review via email: mp+314088@code.launchpad.net