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

Revert the other half of "St: don't attempt to give focus to non reactive actors"

Browse Source 
This reverts commit 26d3b1929e.

https://bugzilla.gnome.org/show_bug.cgi?id=667439
This commit is contained in:
Jasper St. Pierre 2012-08-19 21:40:09 -04:00
parent 785ab8192b
commit 8a86540090
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/ui/networkAgent.js
View File

@ -168,6 +168,7 @@ const NetworkSecretDialog = new Lang.Class({
} }
this._okButton.button.reactive = valid; this._okButton.button.reactive = valid;
this._okButton.button.can_focus = valid;
}, },
_onOk: function() { _onOk: function() {

8
js/ui/popupMenu.js
View File

@ -134,6 +134,7 @@ const PopupBaseMenuItem = new Lang.Class({
this.sensitive = sensitive; this.sensitive = sensitive;
this.actor.reactive = sensitive; this.actor.reactive = sensitive;
this.actor.can_focus = sensitive;
this.emit('sensitive-changed', sensitive); this.emit('sensitive-changed', sensitive);
}, },
@ -717,7 +718,8 @@ const Switch = new Lang.Class({
_init: function(state) { _init: function(state) {
this.actor = new St.Bin({ style_class: 'toggle-switch', this.actor = new St.Bin({ style_class: 'toggle-switch',
accessible_role: Atk.Role.CHECK_BOX}); accessible_role: Atk.Role.CHECK_BOX,
can_focus: true });
// Translators: this MUST be either "toggle-switch-us" // Translators: this MUST be either "toggle-switch-us"
// (for toggle switches containing the English words // (for toggle switches containing the English words
// "ON" and "OFF") or "toggle-switch-intl" (for toggle // "ON" and "OFF") or "toggle-switch-intl" (for toggle
@ -1876,7 +1878,7 @@ const RemoteMenu = new Lang.Class({
})); }));
} }
item.actor.reactive = action.enabled; item.actor.reactive = item.actor.can_focus = action.enabled;
destroyId = item.connect('destroy', Lang.bind(this, function() { destroyId = item.connect('destroy', Lang.bind(this, function() {
item.disconnect(destroyId); item.disconnect(destroyId);
@ -2008,7 +2010,7 @@ const RemoteMenu = new Lang.Class({
if (action.items.length) { if (action.items.length) {
for (let i = 0; i < action.items.length; i++) { for (let i = 0; i < action.items.length; i++) {
let item = action.items[i]; let item = action.items[i];
item.actor.reactive = action.enabled; item.actor.reactive = item.actor.can_focus = action.enabled;
} }
} }
} }