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

grabHelper: Fix ungrabbing properly

Browse Source 
Make sure to account for modalCount properly, rather than just
tracking modalCount for the last actor on the stack. Additionally,
traverse the popped actors in the reverse order so that onUngrabbed
callbacks are called at the proper place in time.
This commit is contained in:
Jasper St. Pierre 2012-08-19 21:12:46 -04:00
parent 3031036cb0
commit c3ae4542b2
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
js/ui/grabHelper.js
View File

@ -206,35 +206,34 @@ const GrabHelper = new Lang.Class({
if (grabStackIndex < 0) if (grabStackIndex < 0)
return; return;
let poppedGrab = this._grabStack[grabStackIndex];
let poppedGrabs = this._grabStack.slice(grabStackIndex); let poppedGrabs = this._grabStack.slice(grabStackIndex);
// "Pop" poppedGrab and everything after off by truncating the array. // "Pop" all newly ungrabbed actors off the grab stack
// by truncating the array.
this._grabStack.length = grabStackIndex; this._grabStack.length = grabStackIndex;
let { modal: modal, actor: actor } = poppedGrab; let wasModal = this._modalCount > 0;
for (let i = poppedGrabs.length - 1; i >= 0; i--) {
let poppedGrab = poppedGrabs[i];
if (params.actor && (params.actor != actor)) if (poppedGrab.onUngrab)
return; poppedGrab.onUngrab();
if (poppedGrab.modal)
this._modalCount--;
}
let focus = global.stage.key_focus; let focus = global.stage.key_focus;
let hadFocus = focus && this._isWithinGrabbedActor(focus); let hadFocus = focus && this._isWithinGrabbedActor(focus);
for (let i = 0; i < poppedGrabs.length; i++) {
if (poppedGrabs[i].onUngrab)
poppedGrabs[i].onUngrab();
}
// If we took away the last grab, ungrab ourselves. // If we took away the last grab, ungrab ourselves.
if (this._grabStack.length == 0) if (this._grabStack.length == 0)
this._fullUngrab(); this._fullUngrab(wasModal);
if (modal)
this._modalCount--;
let poppedGrab = poppedGrabs[0];
_navigateActor(poppedGrab.savedFocus, hadFocus); _navigateActor(poppedGrab.savedFocus, hadFocus);
}, },
_fullUngrab: function() { _fullUngrab: function(wasModal) {
global.stage.disconnect(this._capturedEventId); global.stage.disconnect(this._capturedEventId);
this._capturedEventId = 0; this._capturedEventId = 0;
global.stage.disconnect(this._eventId); global.stage.disconnect(this._eventId);
@ -247,7 +246,7 @@ const GrabHelper = new Lang.Class({
let prePopInputMode = global.stage_input_mode; let prePopInputMode = global.stage_input_mode;
if (this._modalCount > 0) { if (wasModal) {
Main.popModal(this._owner); Main.popModal(this._owner);
global.sync_pointer(); global.sync_pointer();
} }