brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PopupMenuManager: only navigate visible menus

Browse Source 
When doing keyboard navigation, ignore menus whose sourceActor is
hidden.
This is needed to hide status icons, as otherwise the menu would
appear despite having no icon.

https://bugzilla.gnome.org/show_bug.cgi?id=638306
This commit is contained in:
Giovanni Campagna 2010-12-30 15:22:54 +01:00
parent 493844d005
commit 4de15b2b57
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/ui/popupMenu.js
View File

@ -1194,6 +1194,18 @@ PopupMenuManager.prototype = {
return -1; return -1;
}, },
_nextMenu: function(pos, direction) {
for (let i = 1; i < this._menus.length; i++) {
let candidate = mod(pos + i * direction, this._menus.length);
let menu = this._menus[candidate].menu;
if (!menu.sourceActor || menu.sourceActor.visible)
return menu;
}
// no menu is found? this should not happen
// anyway stay on current menu
return this._menus[pos];
},
_onEventCapture: function(actor, event) { _onEventCapture: function(actor, event) {
if (!this.grabbed) if (!this.grabbed)
return false; return false;
@ -1232,7 +1244,7 @@ PopupMenuManager.prototype = {
if (symbol == Clutter.Left || symbol == Clutter.Right) { if (symbol == Clutter.Left || symbol == Clutter.Right) {
let direction = symbol == Clutter.Right ? 1 : -1; let direction = symbol == Clutter.Right ? 1 : -1;
let pos = this._findMenu(this._activeMenu); let pos = this._findMenu(this._activeMenu);
let next = this._menus[mod(pos + direction, this._menus.length)].menu; let next = this._nextMenu(pos, direction);
if (next != this._activeMenu) { if (next != this._activeMenu) {
this._changeMenu(next); this._changeMenu(next);
next.activateFirst(); next.activateFirst();