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

main: Add a better comment about shifting the modal stack

Browse Source 
It took me a few minutes to realize why, so let's just add this
in for future reference.

https://bugzilla.gnome.org/show_bug.cgi?id=690965
This commit is contained in:
Jasper St. Pierre 2013-01-02 09:19:41 -05:00
parent 2d9ddd4bc8
commit 73388f30fd
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/ui/main.js
View File

@ -606,6 +606,21 @@ function popModal(actor, timestamp) {
keybindingMode = record.keybindingMode; keybindingMode = record.keybindingMode;
global.stage.set_key_focus(record.prevFocus); global.stage.set_key_focus(record.prevFocus);
} else { } else {
// If we have:
// global.stage.set_focus(a);
// Main.pushModal(b);
// Main.pushModal(c);
// Main.pushModal(d);
//
// then we have the stack:
// [{ prevFocus: a, actor: b },
// { prevFocus: b, actor: c },
// { prevFocus: c, actor: d }]
//
// When actor c is destroyed/popped, if we only simply remove the
// record, then the focus stack will be [a, c], rather than the correct
// [a, b]. Shift the focus stack up before removing the record to ensure
// that we get the correct result.
let t = modalActorFocusStack[modalActorFocusStack.length - 1]; let t = modalActorFocusStack[modalActorFocusStack.length - 1];
if (t.prevFocus) if (t.prevFocus)
t.prevFocus.disconnect(t.prevFocusDestroyId); t.prevFocus.disconnect(t.prevFocusDestroyId);