panel: Defer adding the user status menu to the manager

PopupMenuManager relies on menus being added in the order of the
menu buttons they are attached to, so defer adding the user status
menu until the status icon menus have been added to make the manager
happy.
This commit is contained in:
Florian Müllner 2011-02-22 17:40:32 +01:00
parent 1496c85bb6
commit 867c9a19ae

View File

@ -874,7 +874,6 @@ Panel.prototype = {
this._statusmenu = new StatusMenu.StatusMenuButton(); this._statusmenu = new StatusMenu.StatusMenuButton();
this._statusmenu.actor.name = 'panelStatus'; this._statusmenu.actor.name = 'panelStatus';
this._menus.addMenu(this._statusmenu.menu);
this._rightBox.add(this._statusmenu.actor); this._rightBox.add(this._statusmenu.actor);
// Synchronize the buttons pseudo classes with its corner // Synchronize the buttons pseudo classes with its corner
@ -951,6 +950,10 @@ Panel.prototype = {
this._statusBox.add(indicator.actor); this._statusBox.add(indicator.actor);
this._menus.addMenu(indicator.menu); this._menus.addMenu(indicator.menu);
} }
// PopupMenuManager depends on menus being added in order for
// keyboard navigation
this._menus.addMenu(this._statusmenu.menu);
}, },
startupAnimation: function() { startupAnimation: function() {