From b588ae4e0e590ec08cd39a62f74e83fafda83e9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Tue, 14 May 2013 18:55:08 +0200 Subject: [PATCH] PopupMenuManager: Fix child menus Since commit c84dc6254d2d65c, popup menus are closed automatically when another menu opens (to catch the case where a menu is opened by keyboard shortcut, which wasn't handled before). However in the case of child menus, both child and parent are expected to be visible, so handle this case explicitly. https://bugzilla.gnome.org/show_bug.cgi?id=699678 --- js/ui/popupMenu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js index c3ac653f2..6f76a27f2 100644 --- a/js/ui/popupMenu.js +++ b/js/ui/popupMenu.js @@ -1875,7 +1875,7 @@ const PopupMenuManager = new Lang.Class({ _onMenuOpenState: function(menu, open) { if (open) { - if (this.activeMenu) + if (this.activeMenu && !this.activeMenu.isChildMenu(menu)) this.activeMenu.close(BoxPointer.PopupAnimation.FADE); this._grabHelper.grab({ actor: menu.actor, modal: true, focus: menu.sourceActor, onUngrab: Lang.bind(this, this._closeMenu, menu) });