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

panel: provide a consistent way to refer to panel items from lg

Browse Source 
Rename a few Panel fields and add a _statusArea object pointing to the
status area PanelButton objects. You can now address each item
consistently from lg:

    Main.panel._activities
    Main.panel._appMenu
    Main.panel._dateMenu
    Main.panel._statusArea.a11y
    Main.panel._statusArea.volume ...
    Main.panel._userMenu

https://bugzilla.gnome.org/show_bug.cgi?id=646915
This commit is contained in:
Dan Winship 2011-04-06 09:26:15 -04:00
parent 07a0960265
commit 9d5906dae3
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
js/ui/panel.js
View File

@ -817,6 +817,8 @@ Panel.prototype = {
reactive: true }); reactive: true });
this.actor._delegate = this; this.actor._delegate = this;
this._statusArea = {};
Main.overview.connect('shown', Lang.bind(this, function () { Main.overview.connect('shown', Lang.bind(this, function () {
this.actor.add_style_class_name('in-overview'); this.actor.add_style_class_name('in-overview');
})); }));
@ -913,6 +915,7 @@ Panel.prototype = {
style_class: 'panel-button', style_class: 'panel-button',
reactive: true, reactive: true,
can_focus: true }); can_focus: true });
this._activities = this.button;
this.button.set_child(label); this.button.set_child(label);
this.button._delegate = this.button; this.button._delegate = this.button;
this.button._xdndTimeOut = 0; this.button._xdndTimeOut = 0;
@ -941,10 +944,10 @@ Panel.prototype = {
this._hotCorner = null; this._hotCorner = null;
let appMenuButton = new AppMenuButton(); this._appMenu = new AppMenuButton();
this._leftBox.add(appMenuButton.actor); this._leftBox.add(this._appMenu.actor);
this._menus.addMenu(appMenuButton.menu); this._menus.addMenu(this._appMenu.menu);
/* center */ /* center */
this._dateMenu = new DateMenu.DateMenuButton(); this._dateMenu = new DateMenu.DateMenuButton();
@ -963,12 +966,12 @@ Panel.prototype = {
this._rightBox.add(this._trayBox); this._rightBox.add(this._trayBox);
this._rightBox.add(this._statusBox); this._rightBox.add(this._statusBox);
this._statusmenu = new StatusMenu.StatusMenuButton(); this._userMenu = new StatusMenu.StatusMenuButton();
this._statusmenu.actor.name = 'panelStatus'; this._userMenu.actor.name = 'panelStatus';
this._rightBox.add(this._statusmenu.actor); this._rightBox.add(this._userMenu.actor);
// Synchronize the buttons pseudo classes with its corner // Synchronize the buttons pseudo classes with its corner
this._statusmenu.actor.connect('style-changed', Lang.bind(this, this._userMenu.actor.connect('style-changed', Lang.bind(this,
function(actor) { function(actor) {
let rtl = actor.get_direction() == St.TextDirection.RTL; let rtl = actor.get_direction() == St.TextDirection.RTL;
let corner = rtl ? this._leftCorner : this._rightCorner; let corner = rtl ? this._leftCorner : this._rightCorner;
@ -1051,11 +1054,13 @@ Panel.prototype = {
let indicator = new constructor(); let indicator = new constructor();
this._statusBox.add(indicator.actor); this._statusBox.add(indicator.actor);
this._menus.addMenu(indicator.menu); this._menus.addMenu(indicator.menu);
this._statusArea[role] = indicator;
} }
// PopupMenuManager depends on menus being added in order for // PopupMenuManager depends on menus being added in order for
// keyboard navigation // keyboard navigation
this._menus.addMenu(this._statusmenu.menu); this._menus.addMenu(this._userMenu.menu);
}, },
startupAnimation: function() { startupAnimation: function() {