1
=== modified file 'qml/Panel/MenuContent.qml'
2
--- qml/Panel/MenuContent.qml	2016-10-04 11:44:43 +0000
3
+++ qml/Panel/MenuContent.qml	2017-03-15 14:33:59 +0000
4
@@ -44,9 +44,9 @@
5
44
        anchors.fill: parent
44
        anchors.fill: parent
6
45
        model: content.model
45
        model: content.model
7
46
46
9
47
        highlightFollowsCurrentItem: true
47
        highlightFollowsCurrentItem: false
10
48
        contentX: currentIndex * width
11
48
        interactive: false
49
        interactive: false
12
49
        highlightMoveDuration: 0
13
50
        orientation: ListView.Horizontal
50
        orientation: ListView.Horizontal
14
51
        // Load all the indicator menus (a big number)
51
        // Load all the indicator menus (a big number)
15
52
        cacheBuffer: 1073741823
52
        cacheBuffer: 1073741823
16
53
53
17
=== modified file 'qml/Panel/Panel.qml'
18
--- qml/Panel/Panel.qml	2017-03-15 14:33:59 +0000
19
+++ qml/Panel/Panel.qml	2017-03-15 14:33:59 +0000
20
@@ -272,6 +272,7 @@
21
272
                id: actionItem
272
                id: actionItem
22
273
                property int ownIndex: index
273
                property int ownIndex: index
23
274
                objectName: "appMenuItem"+index
274
                objectName: "appMenuItem"+index
24
275
                enabled: model.sensitive
25
275
276
26
276
                width: _title.width + units.gu(2)
277
                width: _title.width + units.gu(2)
27
277
                height: parent.height
278
                height: parent.height
28
278
279
29
=== modified file 'qml/Panel/PanelBar.qml'
30
--- qml/Panel/PanelBar.qml	2017-01-16 08:51:52 +0000
31
+++ qml/Panel/PanelBar.qml	2017-03-15 14:33:59 +0000
32
@@ -44,6 +44,22 @@
33
44
        row.selectItemAt(mapped.x);
44
        row.selectItemAt(mapped.x);
34
45
    }
45
    }
35
46
46
36
47
    function selectPreviousItem() {
37
48
        if (!expanded) {
38
49
            row.resetCurrentItem();
39
50
        }
40
51
        row.selectPreviousItem();
41
52
        d.alignIndicators();
42
53
    }
43
54
44
55
    function selectNextItem() {
45
56
        if (!expanded) {
46
57
            row.resetCurrentItem();
47
58
        }
48
59
        row.selectNextItem();
49
60
        d.alignIndicators();
50
61
    }
51
62
52
47
    function setCurrentItemIndex(index) {
63
    function setCurrentItemIndex(index) {
53
48
        if (!expanded) {
64
        if (!expanded) {
54
49
            row.resetCurrentItem();
65
            row.resetCurrentItem();
55
50
66
56
=== modified file 'qml/Panel/PanelItemRow.qml'
57
--- qml/Panel/PanelItemRow.qml	2017-01-24 17:34:19 +0000
58
+++ qml/Panel/PanelItemRow.qml	2017-03-15 14:33:59 +0000
59
@@ -96,31 +96,57 @@
60
96
        row.currentIndex = -1;
96
        row.currentIndex = -1;
61
97
    }
97
    }
62
98
98
63
99
    function selectPreviousItem() {
64
100
        var indexToSelect = currentItemIndex - 1;
65
101
        while (indexToSelect >= 0) {
66
102
            if (setCurrentItemIndex(indexToSelect))
67
103
                return;
68
104
            indexToSelect = indexToSelect - 1;
69
105
        }
70
106
    }
71
107
72
108
    function selectNextItem() {
73
109
        var indexToSelect = currentItemIndex + 1;
74
110
        while (indexToSelect < row.contentItem.children.length) {
75
111
            if (setCurrentItemIndex(indexToSelect))
76
112
                return;
77
113
            indexToSelect = indexToSelect + 1;
78
114
        }
79
115
    }
80
116
81
99
    function setCurrentItemIndex(index) {
117
    function setCurrentItemIndex(index) {
82
100
        for (var i = 0; i < row.contentItem.children.length; i++) {
118
        for (var i = 0; i < row.contentItem.children.length; i++) {
83
101
            var item = row.contentItem.children[i];
119
            var item = row.contentItem.children[i];
87
102
            if (item.hasOwnProperty("ownIndex") && item.ownIndex === index) {
120
            if (item.hasOwnProperty("ownIndex") && item.ownIndex === index && item.enabled) {
88
103
                if (currentItem !== item) row.currentIndex = index;
121
                if (currentItem !== item) {
89
104
                break;
122
                    row.currentIndex = index;
90
123
                }
91
124
                return true;
92
105
            }
125
            }
93
106
        }
126
        }
94
127
        return false;
95
107
    }
128
    }
96
108
129
97
109
    function selectItemAt(lateralPosition) {
130
    function selectItemAt(lateralPosition) {
98
110
        var item = indicatorAt(lateralPosition, 0);
131
        var item = indicatorAt(lateralPosition, 0);
100
111
        if (item && item.opacity > 0) {
132
        if (item && item.opacity > 0 && item.enabled) {
101
112
            row.currentIndex = item.ownIndex;
133
            row.currentIndex = item.ownIndex;
102
113
        } else {
134
        } else {
103
114
            // Select default item.
135
            // Select default item.
104
115
            var searchIndex = lateralPosition >= width ? row.count - 1 : 0;
136
            var searchIndex = lateralPosition >= width ? row.count - 1 : 0;
105
116
137
106
117
            for (var i = 0; i < row.contentItem.children.length; i++) {
138
            for (var i = 0; i < row.contentItem.children.length; i++) {
108
118
                if (row.contentItem.children[i].hasOwnProperty("ownIndex") && row.contentItem.children[i].ownIndex === searchIndex) {
139
                if (row.contentItem.children[i].hasOwnProperty("ownIndex") &&
109
140
                    row.contentItem.children[i].ownIndex === searchIndex &&
110
141
                    row.contentItem.children[i].enabled)
111
142
                {
112
119
                    item = row.contentItem.children[i];
143
                    item = row.contentItem.children[i];
113
120
                    break;
144
                    break;
114
121
                }
145
                }
115
122
            }
146
            }
117
123
            if (currentItem !== item) row.currentIndex = item ? item.ownIndex : -1;
147
            if (item && currentItem !== item) {
118
148
                row.currentIndex = item.ownIndex;
119
149
            }
120
124
        }
150
        }
121
125
    }
151
    }
122
126
152
123
127
153
124
=== modified file 'qml/Panel/PanelMenu.qml'
125
--- qml/Panel/PanelMenu.qml	2017-03-15 14:33:59 +0000
126
+++ qml/Panel/PanelMenu.qml	2017-03-15 14:33:59 +0000
127
@@ -143,10 +143,10 @@
128
143
143
129
144
    Keys.onPressed: {
144
    Keys.onPressed: {
130
145
        if (event.key === Qt.Key_Left) {
145
        if (event.key === Qt.Key_Left) {
132
146
            bar.setCurrentItemIndex(bar.currentItemIndex - 1);
146
            bar.selectPreviousItem();
133
147
            event.accepted = true;
147
            event.accepted = true;
134
148
        } else if (event.key === Qt.Key_Right) {
148
        } else if (event.key === Qt.Key_Right) {
136
149
            bar.setCurrentItemIndex(bar.currentItemIndex + 1);
149
            bar.selectNextItem();
137
150
            event.accepted = true;
150
            event.accepted = true;
138
151
        } else if (event.key === Qt.Key_Escape) {
151
        } else if (event.key === Qt.Key_Escape) {
139
152
            root.hide();
152
            root.hide();
140
153
153
141
=== modified file 'qml/Panel/PanelMenuPage.qml'
142
--- qml/Panel/PanelMenuPage.qml	2017-03-15 14:33:59 +0000
143
+++ qml/Panel/PanelMenuPage.qml	2017-03-15 14:33:59 +0000
144
@@ -63,7 +63,7 @@
145
63
            if (model) {
63
            if (model) {
146
64
                push(pageComponent, { "menuModel": model });
64
                push(pageComponent, { "menuModel": model });
147
65
            }
65
            }
149
66
        } else {
66
        } else if (root.currentPage) {
150
67
            root.currentPage.reset();
67
            root.currentPage.reset();
151
68
        }
68
        }
152
69
    }
69
    }
153
70
70
154
=== modified file 'tests/qmltests/ApplicationMenus/tst_MenuBar.qml'
155
--- tests/qmltests/ApplicationMenus/tst_MenuBar.qml	2017-03-15 14:33:59 +0000
156
+++ tests/qmltests/ApplicationMenus/tst_MenuBar.qml	2017-03-15 14:33:59 +0000
157
@@ -226,6 +226,30 @@
158
226
            keyRelease(data.tag, Qt.AltModifier, 100);
226
            keyRelease(data.tag, Qt.AltModifier, 100);
159
227
        }
227
        }
160
228
228
161
229
        function test_disabledTopLevel() {
162
230
            var modelData = appMenuData.generateTestData(3,3,0,0,"menu");
163
231
            modelData[1].rowData.sensitive = false;
164
232
            menuBackend.modelData = modelData;
165
233
166
234
            var priv = findInvisibleChild(menuBar, "d");
167
235
168
236
            var menuItem0 = findChild(menuBar, "menuBar-item0"); verify(menuItem0);
169
237
            var menuItem2 = findChild(menuBar, "menuBar-item2"); verify(menuItem2);
170
238
171
239
            menuItem0.show();
172
240
            compare(menuItem0.popupVisible, true, "Popup should be visible");
173
241
174
242
            keyClick(Qt.Key_Right);
175
243
            compare(priv.currentItem, menuItem2);
176
244
            compare(menuItem2.popupVisible, true);
177
245
            compare(menuItem0.popupVisible, false);
178
246
179
247
            keyClick(Qt.Key_Left);
180
248
            compare(priv.currentItem, menuItem0);
181
249
            compare(menuItem2.popupVisible, false);
182
250
            compare(menuItem0.popupVisible, true);
183
251
        }
184
252
185
229
        function test_menuActivateClosesMenu() {
253
        function test_menuActivateClosesMenu() {
186
230
            menuBackend.modelData = appMenuData.generateTestData(3,3,0,0,"menu");
254
            menuBackend.modelData = appMenuData.generateTestData(3,3,0,0,"menu");
187
231
            var priv = findInvisibleChild(menuBar, "d");
255
            var priv = findInvisibleChild(menuBar, "d");
188
232
256
189
=== modified file 'tests/qmltests/Panel/tst_Panel.qml'
190
--- tests/qmltests/Panel/tst_Panel.qml	2017-03-15 14:33:59 +0000
191
+++ tests/qmltests/Panel/tst_Panel.qml	2017-03-15 14:33:59 +0000
192
@@ -872,5 +872,29 @@
193
872
            keyClick(Qt.Key_Enter);
872
            keyClick(Qt.Key_Enter);
194
873
            compare(aboutToShowCalledSpy.count, 1);
873
            compare(aboutToShowCalledSpy.count, 1);
195
874
        }
874
        }
196
875
197
876
        function test_disabledTopLevel() {
198
877
            var modelData = appMenuData.generateTestData(3,3,0,0,"menu");
199
878
            modelData[1].rowData.sensitive = false;
200
879
            panel.applicationMenus.model.modelData = modelData;
201
880
202
881
            waitForRendering(panel);
203
882
204
883
            aboutToShowCalledSpy.target = panel.applicationMenus.model
205
884
            aboutToShowCalledSpy.clear();
206
885
207
886
            var indicatorsBar = findChild(panel.applicationMenus, "indicatorsBar");
208
887
209
888
            PanelState.title = "Fake Title"
210
889
            pullDownApplicationsMenu();
211
890
212
891
            tryCompare(indicatorsBar, "currentItemIndex", 0);
213
892
214
893
            keyClick(Qt.Key_Right);
215
894
            tryCompare(indicatorsBar, "currentItemIndex", 2);
216
895
217
896
            keyClick(Qt.Key_Left);
218
897
            tryCompare(indicatorsBar, "currentItemIndex", 0);
219
898
        }
220
875
    }
899
    }
221
876
}
900
}
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Approve on 2017-03-20
Lukáš Tinkl (community)		2017-03-08	Approve on 2017-03-15
Review via email: mp+319288@code.launchpad.net
1	=== modified file 'qml/Panel/MenuContent.qml'
2	--- qml/Panel/MenuContent.qml 2016-10-04 11:44:43 +0000
3	+++ qml/Panel/MenuContent.qml 2017-03-15 14:33:59 +0000
4	@@ -44,9 +44,9 @@
5	44	anchors.fill: parent	44	anchors.fill: parent
6	45	model: content.model	45	model: content.model
7	46		46
9	47	highlightFollowsCurrentItem: true	47	highlightFollowsCurrentItem: false
10			48	contentX: currentIndex * width
11	48	interactive: false	49	interactive: false
12	49	highlightMoveDuration: 0
13	50	orientation: ListView.Horizontal	50	orientation: ListView.Horizontal
14	51	// Load all the indicator menus (a big number)	51	// Load all the indicator menus (a big number)
15	52	cacheBuffer: 1073741823	52	cacheBuffer: 1073741823
16	53		53
17	=== modified file 'qml/Panel/Panel.qml'
18	--- qml/Panel/Panel.qml 2017-03-15 14:33:59 +0000
19	+++ qml/Panel/Panel.qml 2017-03-15 14:33:59 +0000
20	@@ -272,6 +272,7 @@
21	272	id: actionItem	272	id: actionItem
22	273	property int ownIndex: index	273	property int ownIndex: index
23	274	objectName: "appMenuItem"+index	274	objectName: "appMenuItem"+index
24			275	enabled: model.sensitive
25	275		276
26	276	width: _title.width + units.gu(2)	277	width: _title.width + units.gu(2)
27	277	height: parent.height	278	height: parent.height
28	278		279
29	=== modified file 'qml/Panel/PanelBar.qml'
30	--- qml/Panel/PanelBar.qml 2017-01-16 08:51:52 +0000
31	+++ qml/Panel/PanelBar.qml 2017-03-15 14:33:59 +0000
32	@@ -44,6 +44,22 @@
33	44	row.selectItemAt(mapped.x);	44	row.selectItemAt(mapped.x);
34	45	}	45	}
35	46		46
36			47	function selectPreviousItem() {
37			48	if (!expanded) {
38			49	row.resetCurrentItem();
39			50	}
40			51	row.selectPreviousItem();
41			52	d.alignIndicators();
42			53	}
43			54
44			55	function selectNextItem() {
45			56	if (!expanded) {
46			57	row.resetCurrentItem();
47			58	}
48			59	row.selectNextItem();
49			60	d.alignIndicators();
50			61	}
51			62
52	47	function setCurrentItemIndex(index) {	63	function setCurrentItemIndex(index) {
53	48	if (!expanded) {	64	if (!expanded) {
54	49	row.resetCurrentItem();	65	row.resetCurrentItem();
55	50		66
56	=== modified file 'qml/Panel/PanelItemRow.qml'
57	--- qml/Panel/PanelItemRow.qml 2017-01-24 17:34:19 +0000
58	+++ qml/Panel/PanelItemRow.qml 2017-03-15 14:33:59 +0000
59	@@ -96,31 +96,57 @@
60	96	row.currentIndex = -1;	96	row.currentIndex = -1;
61	97	}	97	}
62	98		98
63			99	function selectPreviousItem() {
64			100	var indexToSelect = currentItemIndex - 1;
65			101	while (indexToSelect >= 0) {
66			102	if (setCurrentItemIndex(indexToSelect))
67			103	return;
68			104	indexToSelect = indexToSelect - 1;
69			105	}
70			106	}
71			107
72			108	function selectNextItem() {
73			109	var indexToSelect = currentItemIndex + 1;
74			110	while (indexToSelect < row.contentItem.children.length) {
75			111	if (setCurrentItemIndex(indexToSelect))
76			112	return;
77			113	indexToSelect = indexToSelect + 1;
78			114	}
79			115	}
80			116
81	99	function setCurrentItemIndex(index) {	117	function setCurrentItemIndex(index) {
82	100	for (var i = 0; i < row.contentItem.children.length; i++) {	118	for (var i = 0; i < row.contentItem.children.length; i++) {
83	101	var item = row.contentItem.children[i];	119	var item = row.contentItem.children[i];
87	102	if (item.hasOwnProperty("ownIndex") && item.ownIndex === index) {	120	if (item.hasOwnProperty("ownIndex") && item.ownIndex === index && item.enabled) {
88	103	if (currentItem !== item) row.currentIndex = index;	121	if (currentItem !== item) {
89	104	break;	122	row.currentIndex = index;
90			123	}
91			124	return true;
92	105	}	125	}
93	106	}	126	}
94			127	return false;
95	107	}	128	}
96	108		129
97	109	function selectItemAt(lateralPosition) {	130	function selectItemAt(lateralPosition) {
98	110	var item = indicatorAt(lateralPosition, 0);	131	var item = indicatorAt(lateralPosition, 0);
100	111	if (item && item.opacity > 0) {	132	if (item && item.opacity > 0 && item.enabled) {
101	112	row.currentIndex = item.ownIndex;	133	row.currentIndex = item.ownIndex;
102	113	} else {	134	} else {
103	114	// Select default item.	135	// Select default item.
104	115	var searchIndex = lateralPosition >= width ? row.count - 1 : 0;	136	var searchIndex = lateralPosition >= width ? row.count - 1 : 0;
105	116		137
106	117	for (var i = 0; i < row.contentItem.children.length; i++) {	138	for (var i = 0; i < row.contentItem.children.length; i++) {
108	118	if (row.contentItem.children[i].hasOwnProperty("ownIndex") && row.contentItem.children[i].ownIndex === searchIndex) {	139	if (row.contentItem.children[i].hasOwnProperty("ownIndex") &&
109			140	row.contentItem.children[i].ownIndex === searchIndex &&
110			141	row.contentItem.children[i].enabled)
111			142	{
112	119	item = row.contentItem.children[i];	143	item = row.contentItem.children[i];
113	120	break;	144	break;
114	121	}	145	}
115	122	}	146	}
117	123	if (currentItem !== item) row.currentIndex = item ? item.ownIndex : -1;	147	if (item && currentItem !== item) {
118			148	row.currentIndex = item.ownIndex;
119			149	}
120	124	}	150	}
121	125	}	151	}
122	126		152
123	127		153
124	=== modified file 'qml/Panel/PanelMenu.qml'
125	--- qml/Panel/PanelMenu.qml 2017-03-15 14:33:59 +0000
126	+++ qml/Panel/PanelMenu.qml 2017-03-15 14:33:59 +0000
127	@@ -143,10 +143,10 @@
128	143		143
129	144	Keys.onPressed: {	144	Keys.onPressed: {
130	145	if (event.key === Qt.Key_Left) {	145	if (event.key === Qt.Key_Left) {
132	146	bar.setCurrentItemIndex(bar.currentItemIndex - 1);	146	bar.selectPreviousItem();
133	147	event.accepted = true;	147	event.accepted = true;
134	148	} else if (event.key === Qt.Key_Right) {	148	} else if (event.key === Qt.Key_Right) {
136	149	bar.setCurrentItemIndex(bar.currentItemIndex + 1);	149	bar.selectNextItem();
137	150	event.accepted = true;	150	event.accepted = true;
138	151	} else if (event.key === Qt.Key_Escape) {	151	} else if (event.key === Qt.Key_Escape) {
139	152	root.hide();	152	root.hide();
140	153		153
141	=== modified file 'qml/Panel/PanelMenuPage.qml'
142	--- qml/Panel/PanelMenuPage.qml 2017-03-15 14:33:59 +0000
143	+++ qml/Panel/PanelMenuPage.qml 2017-03-15 14:33:59 +0000
144	@@ -63,7 +63,7 @@
145	63	if (model) {	63	if (model) {
146	64	push(pageComponent, { "menuModel": model });	64	push(pageComponent, { "menuModel": model });
147	65	}	65	}
149	66	} else {	66	} else if (root.currentPage) {
150	67	root.currentPage.reset();	67	root.currentPage.reset();
151	68	}	68	}
152	69	}	69	}
153	70		70
154	=== modified file 'tests/qmltests/ApplicationMenus/tst_MenuBar.qml'
155	--- tests/qmltests/ApplicationMenus/tst_MenuBar.qml 2017-03-15 14:33:59 +0000
156	+++ tests/qmltests/ApplicationMenus/tst_MenuBar.qml 2017-03-15 14:33:59 +0000
157	@@ -226,6 +226,30 @@
158	226	keyRelease(data.tag, Qt.AltModifier, 100);	226	keyRelease(data.tag, Qt.AltModifier, 100);
159	227	}	227	}
160	228		228
161			229	function test_disabledTopLevel() {
162			230	var modelData = appMenuData.generateTestData(3,3,0,0,"menu");
163			231	modelData[1].rowData.sensitive = false;
164			232	menuBackend.modelData = modelData;
165			233
166			234	var priv = findInvisibleChild(menuBar, "d");
167			235
168			236	var menuItem0 = findChild(menuBar, "menuBar-item0"); verify(menuItem0);
169			237	var menuItem2 = findChild(menuBar, "menuBar-item2"); verify(menuItem2);
170			238
171			239	menuItem0.show();
172			240	compare(menuItem0.popupVisible, true, "Popup should be visible");
173			241
174			242	keyClick(Qt.Key_Right);
175			243	compare(priv.currentItem, menuItem2);
176			244	compare(menuItem2.popupVisible, true);
177			245	compare(menuItem0.popupVisible, false);
178			246
179			247	keyClick(Qt.Key_Left);
180			248	compare(priv.currentItem, menuItem0);
181			249	compare(menuItem2.popupVisible, false);
182			250	compare(menuItem0.popupVisible, true);
183			251	}
184			252
185	229	function test_menuActivateClosesMenu() {	253	function test_menuActivateClosesMenu() {
186	230	menuBackend.modelData = appMenuData.generateTestData(3,3,0,0,"menu");	254	menuBackend.modelData = appMenuData.generateTestData(3,3,0,0,"menu");
187	231	var priv = findInvisibleChild(menuBar, "d");	255	var priv = findInvisibleChild(menuBar, "d");
188	232		256
189	=== modified file 'tests/qmltests/Panel/tst_Panel.qml'
190	--- tests/qmltests/Panel/tst_Panel.qml 2017-03-15 14:33:59 +0000
191	+++ tests/qmltests/Panel/tst_Panel.qml 2017-03-15 14:33:59 +0000
192	@@ -872,5 +872,29 @@
193	872	keyClick(Qt.Key_Enter);	872	keyClick(Qt.Key_Enter);
194	873	compare(aboutToShowCalledSpy.count, 1);	873	compare(aboutToShowCalledSpy.count, 1);
195	874	}	874	}
196			875
197			876	function test_disabledTopLevel() {
198			877	var modelData = appMenuData.generateTestData(3,3,0,0,"menu");
199			878	modelData[1].rowData.sensitive = false;
200			879	panel.applicationMenus.model.modelData = modelData;
201			880
202			881	waitForRendering(panel);
203			882
204			883	aboutToShowCalledSpy.target = panel.applicationMenus.model
205			884	aboutToShowCalledSpy.clear();
206			885
207			886	var indicatorsBar = findChild(panel.applicationMenus, "indicatorsBar");
208			887
209			888	PanelState.title = "Fake Title"
210			889	pullDownApplicationsMenu();
211			890
212			891	tryCompare(indicatorsBar, "currentItemIndex", 0);
213			892
214			893	keyClick(Qt.Key_Right);
215			894	tryCompare(indicatorsBar, "currentItemIndex", 2);
216			895
217			896	keyClick(Qt.Key_Left);
218			897	tryCompare(indicatorsBar, "currentItemIndex", 0);
219			898	}
220	875	}	899	}
221	876	}	900	}