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

grabHelper: Clean up the code a bit

Browse Source 
I don't remember why I added needsGrab in the first place.
This commit is contained in:
Jasper St. Pierre 2012-09-03 20:23:51 -03:00
parent ffbc1fd190
commit be5df17a4a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/ui/grabHelper.js
View File

@ -10,11 +10,12 @@ const St = imports.gi.St;
const Main = imports.ui.main; const Main = imports.ui.main;
const Params = imports.misc.params; const Params = imports.misc.params;
function _navigateActor(actor, needsGrab) { function _navigateActor(actor) {
if (!actor) if (!actor)
return; return;
if (needsGrab && actor instanceof St.Widget) let needsGrab = true;
if (actor instanceof St.Widget)
needsGrab = !actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false); needsGrab = !actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
if (needsGrab) if (needsGrab)
actor.grab_key_focus(); actor.grab_key_focus();
@ -169,7 +170,8 @@ const GrabHelper = new Lang.Class({
if (params.grabFocus) if (params.grabFocus)
this._grabFocusCount++; this._grabFocusCount++;
_navigateActor(newFocus, hadFocus); if (hadFocus)
_navigateActor(newFocus);
return true; return true;
}, },
@ -254,7 +256,9 @@ const GrabHelper = new Lang.Class({
this._fullUngrab(wasModal); this._fullUngrab(wasModal);
let poppedGrab = poppedGrabs[0]; let poppedGrab = poppedGrabs[0];
_navigateActor(poppedGrab.savedFocus, hadFocus);
if (hadFocus)
_navigateActor(poppedGrab.savedFocus);
}, },
_fullUngrab: function(wasModal) { _fullUngrab: function(wasModal) {