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

[AltTab] fix Alt-Shift-Tab again

Browse Source 
In Clutter 1.2, clutter_event_get_keysym() ignored the state of the
Shift key. In 1.4, it does not, so we have to adjust our comparisons
accordingly.

https://bugzilla.gnome.org/show_bug.cgi?id=627782
This commit is contained in:
Dan Winship 2010-08-27 15:44:31 -04:00
parent d1f0a1e33a
commit b9f9dd948a
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
js/ui/altTab.js
View File

@ -215,6 +215,9 @@ AltTabPopup.prototype = {
_keyPressEvent : function(actor, event) { _keyPressEvent : function(actor, event) {
let keysym = event.get_key_symbol(); let keysym = event.get_key_symbol();
let shift = (Shell.get_event_state(event) & Clutter.ModifierType.SHIFT_MASK); let shift = (Shell.get_event_state(event) & Clutter.ModifierType.SHIFT_MASK);
// X allows servers to represent Shift+Tab in two different ways
if (shift && keysym == Clutter.Tab)
keysym = Clutter.ISO_Left_Tab;
this._disableHover(); this._disableHover();
@ -222,17 +225,22 @@ AltTabPopup.prototype = {
// keys aren't mapped correctly // keys aren't mapped correctly
if (keysym == Clutter.grave) if (keysym == Clutter.grave)
this._select(this._currentApp, shift ? this._previousWindow() : this._nextWindow()); this._select(this._currentApp, this._nextWindow());
else if (keysym == Clutter.asciitilde)
this._select(this._currentApp, this._previousWindow());
else if (keysym == Clutter.Escape) else if (keysym == Clutter.Escape)
this.destroy(); this.destroy();
else if (this._thumbnailsFocused) { else if (this._thumbnailsFocused) {
if (keysym == Clutter.Tab) { if (keysym == Clutter.Tab) {
if (shift && (this._currentWindow == 0 || this._currentWindow == -1)) if (this._currentWindow == this._appIcons[this._currentApp].cachedWindows.length - 1)
this._select(this._previousApp());
else if (!shift && this._currentWindow == this._appIcons[this._currentApp].cachedWindows.length - 1)
this._select(this._nextApp()); this._select(this._nextApp());
else else
this._select(this._currentApp, shift ? this._previousWindow() : this._nextWindow()); this._select(this._currentApp, this._nextWindow());
} else if (keysym == Clutter.ISO_Left_Tab) {
if (this._currentWindow == 0 || this._currentWindow == -1)
this._select(this._previousApp());
else
this._select(this._currentApp, this._previousWindow());
} else if (keysym == Clutter.Left || keysym == Clutter.a) } else if (keysym == Clutter.Left || keysym == Clutter.a)
this._select(this._currentApp, this._previousWindow()); this._select(this._currentApp, this._previousWindow());
else if (keysym == Clutter.Right || keysym == Clutter.d) else if (keysym == Clutter.Right || keysym == Clutter.d)
@ -241,7 +249,9 @@ AltTabPopup.prototype = {
this._select(this._currentApp, null, true); this._select(this._currentApp, null, true);
} else { } else {
if (keysym == Clutter.Tab) if (keysym == Clutter.Tab)
this._select(shift ? this._previousApp() : this._nextApp()); this._select(this._nextApp());
else if (keysym == Clutter.ISO_Left_Tab)
this._select(this._previousApp());
else if (keysym == Clutter.Left || keysym == Clutter.a) else if (keysym == Clutter.Left || keysym == Clutter.a)
this._select(this._previousApp()); this._select(this._previousApp());
else if (keysym == Clutter.Right || keysym == Clutter.d) else if (keysym == Clutter.Right || keysym == Clutter.d)