From 17672accfed6f3885811a05ae0e2715af73ae958 Mon Sep 17 00:00:00 2001 From: Rui Matos Date: Wed, 23 Feb 2011 10:52:25 +0000 Subject: [PATCH] altTab.js: remove the rest of Alt+Tab's special case Remove the other case in the App Switcher where Tab vs Above_Tab behaved inconsistently. https://bugzilla.gnome.org/show_bug.cgi?id=647907 --- js/ui/altTab.js | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/js/ui/altTab.js b/js/ui/altTab.js index 5581d0dbd..9a62432ea 100644 --- a/js/ui/altTab.js +++ b/js/ui/altTab.js @@ -217,33 +217,21 @@ AltTabPopup.prototype = { this._disableHover(); - if (action == Meta.KeyBindingAction.SWITCH_GROUP) - this._select(this._currentApp, backwards ? this._previousWindow() : this._nextWindow()); - else if (keysym == Clutter.Escape) + if (keysym == Clutter.Escape) { this.destroy(); - else if (this._thumbnailsFocused) { - if (action == Meta.KeyBindingAction.SWITCH_WINDOWS) - if (backwards) { - if (this._currentWindow == 0 || this._currentWindow == -1) - this._select(this._previousApp()); - else - this._select(this._currentApp, this._previousWindow()); - } else { - if (this._currentWindow == this._appIcons[this._currentApp].cachedWindows.length - 1) - this._select(this._nextApp()); - else - this._select(this._currentApp, this._nextWindow()); - } - else if (keysym == Clutter.Left) + } else if (action == Meta.KeyBindingAction.SWITCH_GROUP) { + this._select(this._currentApp, backwards ? this._previousWindow() : this._nextWindow()); + } else if (action == Meta.KeyBindingAction.SWITCH_WINDOWS) { + this._select(backwards ? this._previousApp() : this._nextApp()); + } else if (this._thumbnailsFocused) { + if (keysym == Clutter.Left) this._select(this._currentApp, this._previousWindow()); else if (keysym == Clutter.Right) this._select(this._currentApp, this._nextWindow()); else if (keysym == Clutter.Up) this._select(this._currentApp, null, true); } else { - if (action == Meta.KeyBindingAction.SWITCH_WINDOWS) - this._select(backwards ? this._previousApp() : this._nextApp()); - else if (keysym == Clutter.Left) + if (keysym == Clutter.Left) this._select(this._previousApp()); else if (keysym == Clutter.Right) this._select(this._nextApp());