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

grabHelper: Fix some keyboard focus issues with the message tray

Browse Source 
This will need to be revisited.
This commit is contained in:
Jasper St. Pierre 2012-08-16 13:40:51 -04:00
parent 79c25d1dc8
commit 11dc510ae4
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/ui/grabHelper.js
View File

@ -140,7 +140,7 @@ const GrabHelper = new Lang.Class({
let focus = global.stage.key_focus; let focus = global.stage.key_focus;
let hadFocus = focus && this._isWithinGrabbedActor(focus); let hadFocus = focus && this._isWithinGrabbedActor(focus);
let newFocus = hadFocus : focus ? params.actor; let newFocus = params.actor;
if (this.isActorGrabbed(params.actor)) if (this.isActorGrabbed(params.actor))
return; return;
@ -149,7 +149,6 @@ const GrabHelper = new Lang.Class({
this._fullGrab(hadFocus, params.modal, params.grabFocus); this._fullGrab(hadFocus, params.modal, params.grabFocus);
params.savedFocus = focus; params.savedFocus = focus;
params.newFocus = newFocus;
this._grabStack.push(params); this._grabStack.push(params);
if (params.modal) if (params.modal)
@ -219,12 +218,6 @@ const GrabHelper = new Lang.Class({
let focus = global.stage.key_focus; let focus = global.stage.key_focus;
let hadFocus = focus && this._isWithinGrabbedActor(focus); let hadFocus = focus && this._isWithinGrabbedActor(focus);
let newFocus = poppedGrab.savedFocus;
if (!newFocus)
newFocus = poppedGrab.newFocus;
_navigateActor(newFocus, hadFocus);
if (poppedGrab.onUngrab) if (poppedGrab.onUngrab)
poppedGrab.onUngrab(); poppedGrab.onUngrab();
@ -235,6 +228,7 @@ const GrabHelper = new Lang.Class({
if (modal) if (modal)
this._modalCount--; this._modalCount--;
_navigateActor(poppedGrab.savedFocus, hadFocus);
}, },
_fullUngrab: function() { _fullUngrab: function() {