git.iko.soy/unity8
on xenial help sign in
Make menus items close the menu on clicking on them
d339861Albert Astals Cid
qml/ApplicationMenus/MenuBar.qml+1
compare with xenial
unifiedsplit
@@ -100,6 +100,7 @@ Item {
100 function show() {
100 function show() {
101 if (!__popup) {
101 if (!__popup) {
102 __popup = menuComponent.createObject(root, { objectName: visualItem.objectName + "-menu" });
102 __popup = menuComponent.createObject(root, { objectName: visualItem.objectName + "-menu" });
103+ __popup.childActivated.connect(dismiss);
103 // force the current item to be the newly popped up menu
104 // force the current item to be the newly popped up menu
104 } else {
105 } else {
105 __popup.show();
106 __popup.show();
qml/ApplicationMenus/MenuPopup.qml+19−5
@@ -26,6 +26,8 @@ UbuntuShape {
26 objectName: "menu"
26 objectName: "menu"
27 backgroundColor: theme.palette.normal.overlay
27 backgroundColor: theme.palette.normal.overlay
28
28
29+ signal childActivated()
30+
29 property alias unityMenuModel: repeater.model
31 property alias unityMenuModel: repeater.model
30
32
31 function show() {
33 function show() {
@@ -263,16 +265,22 @@ UbuntuShape {
263 return mapToItem(container, 0, y).y;
265 return mapToItem(container, 0, y).y;
264 })
266 })
265 });
267 });
268+ popup.retreat.connect(function() {
269+ popup.destroy();
270+ popup = null;
271+ menuItem.forceActiveFocus();
272+ });
273+ popup.childActivated.connect(function() {
274+ popup.destroy();
275+ popup = null;
276+ root.childActivated();
277+ });
266 } else if (popup) {
278 } else if (popup) {
267 popup.visible = true;
279 popup.visible = true;
268 }
280 }
269− popup.retreat.connect(function() {
270− popup.destroy();
271− popup = null;
272− menuItem.forceActiveFocus();
273− })
274 } else {
281 } else {
275 root.unityMenuModel.activate(__ownIndex);
282 root.unityMenuModel.activate(__ownIndex);
283+ root.childActivated();
276 }
284 }
277 }
285 }
278
286
@@ -377,6 +385,7 @@ UbuntuShape {
377
385
378 property var unityMenuModel: null
386 property var unityMenuModel: null
379 signal retreat()
387 signal retreat()
388+ signal childActivated()
380
389
381 Binding {
390 Binding {
382 target: item
391 target: item
@@ -392,6 +401,11 @@ UbuntuShape {
392
401
393 Keys.onLeftPressed: retreat()
402 Keys.onLeftPressed: retreat()
394
403
404+ Connections {
405+ target: item
406+ onChildActivated: childActivated();
407+ }
408+
395 Component.onCompleted: item.select(0);
409 Component.onCompleted: item.select(0);
396 onVisibleChanged: if (visible) { item.select(0); }
410 onVisibleChanged: if (visible) { item.select(0); }
397 }
411 }
tests/qmltests/ApplicationMenus/tst_MenuBar.qml+35
@@ -179,5 +179,40 @@ Item {
179 keyPress(data.tag, Qt.AltModifier, 100);
179 keyPress(data.tag, Qt.AltModifier, 100);
180 tryCompare(priv, "currentItem", menuItem);
180 tryCompare(priv, "currentItem", menuItem);
181 }
181 }
182+
183+ function test_menuActivateClosesMenu() {
184+ menuBackend.modelData = appMenuData.generateTestData(3,3,0,0,"menu");
185+ var priv = findInvisibleChild(menuBar, "d");
186+
187+ var menuItem = findChild(menuBar, "menuBar-item0");
188+ menuItem.show();
189+ compare(priv.currentItem, menuItem, "CurrentItem should be set to item 0");
190+ compare(priv.currentItem.popupVisible, true, "Popup should be visible");
191+
192+ var actionItem = findChild(menuBar, "menuBar-item0-menu-item0-actionItem");
193+ mouseClick(actionItem);
194+ compare(priv.currentItem, null, "CurrentItem should be null");
195+ }
196+
197+ function test_subMenuActivateClosesMenu() {
198+ menuBackend.modelData = appMenuData.generateTestData(3,4,1,0,"menu");
199+ var priv = findInvisibleChild(menuBar, "d");
200+
201+ var menuItem = findChild(menuBar, "menuBar-item0");
202+ menuItem.show();
203+ compare(priv.currentItem, menuItem, "CurrentItem should be set to item 0");
204+ compare(priv.currentItem.popupVisible, true, "Popup should be visible");
205+
206+ var actionItem = findChild(menuBar, "menuBar-item0-menu-item0-actionItem");
207+ mouseClick(actionItem);
208+
209+ actionItem = findChild(menuBar, "menuBar-item0-menu-item0-menu-item0-actionItem");
210+ mouseClick(actionItem);
211+
212+ actionItem = findChild(menuBar, "menuBar-item0-menu-item0-menu-item0-menu-item0-actionItem");
213+ mouseClick(actionItem);
214+
215+ compare(priv.currentItem, null, "CurrentItem should be null");
216+ }
182 }
217 }
183}
218}