[gnome-shell] Remove 'backwards' argument from SwitcherPopup:_keyPressHandler
- From: Christophe Fergeau <teuf src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] Remove 'backwards' argument from SwitcherPopup:_keyPressHandler
- Date: Sun, 17 Aug 2014 18:14:34 +0000 (UTC)
commit d450b74e10610c6164ed13345ab4ff4b0bb69ee3
Author: Christophe Fergeau <cfergeau redhat com>
Date: Tue Aug 12 17:55:22 2014 +0200
Remove 'backwards' argument from SwitcherPopup:_keyPressHandler
All derived classes are already checking explicitly for action names
(FOO and FOO_BACKWARDS). mutter used to have a META_KEY_BINDING_REVERSES
flag for keybindings which required special handling of "shift"+FOO as
FOO_BACKWARDS, but this has been removed now, so this special handling
is no longer necessary.
https://bugzilla.gnome.org/show_bug.cgi?id=732296
js/ui/altTab.js | 6 +++---
js/ui/ctrlAltTab.js | 6 +++---
js/ui/status/keyboard.js | 6 +++---
js/ui/switcherPopup.js | 6 ++----
4 files changed, 11 insertions(+), 13 deletions(-)
---
diff --git a/js/ui/altTab.js b/js/ui/altTab.js
index 4960b55..c734dea 100644
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@@ -151,13 +151,13 @@ const AppSwitcherPopup = new Lang.Class({
this._items[this._selectedIndex].cachedWindows.length);
},
- _keyPressHandler: function(keysym, backwards, action) {
+ _keyPressHandler: function(keysym, action) {
if (action == Meta.KeyBindingAction.SWITCH_GROUP) {
- this._select(this._selectedIndex, backwards ? this._previousWindow() : this._nextWindow());
+ this._select(this._selectedIndex, this._nextWindow());
} else if (action == Meta.KeyBindingAction.SWITCH_GROUP_BACKWARD) {
this._select(this._selectedIndex, this._previousWindow());
} else if (action == Meta.KeyBindingAction.SWITCH_APPLICATIONS) {
- this._select(backwards ? this._previous() : this._next());
+ this._select(this._next());
} else if (action == Meta.KeyBindingAction.SWITCH_APPLICATIONS_BACKWARD) {
this._select(this._previous());
} else if (this._thumbnailsFocused) {
diff --git a/js/ui/ctrlAltTab.js b/js/ui/ctrlAltTab.js
index 570c73d..fc884ae 100644
--- a/js/ui/ctrlAltTab.js
+++ b/js/ui/ctrlAltTab.js
@@ -156,11 +156,11 @@ const CtrlAltTabPopup = new Lang.Class({
this._select(this._selectedIndex);
},
- _keyPressHandler: function(keysym, backwards, action) {
+ _keyPressHandler: function(keysym, action) {
if (action == Meta.KeyBindingAction.SWITCH_PANELS)
- this._select(backwards ? this._previous() : this._next());
+ this._select(this._next());
else if (action == Meta.KeyBindingAction.SWITCH_PANELS_BACKWARD)
- this._select(backwards ? this._next() : this._previous());
+ this._select(this._previous());
else if (keysym == Clutter.Left)
this._select(this._previous());
else if (keysym == Clutter.Right)
diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index 51b90fa..8889959 100644
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -283,11 +283,11 @@ const InputSourcePopup = new Lang.Class({
this._select(this._selectedIndex);
},
- _keyPressHandler: function(keysym, backwards, action) {
+ _keyPressHandler: function(keysym, action) {
if (action == this._action)
- this._select(backwards ? this._previous() : this._next());
+ this._select(this._next());
else if (action == this._actionBackward)
- this._select(backwards ? this._next() : this._previous());
+ this._select(this._previous());
else if (keysym == Clutter.Left)
this._select(this._previous());
else if (keysym == Clutter.Right)
diff --git a/js/ui/switcherPopup.js b/js/ui/switcherPopup.js
index 64df5fe..2d4ec2a 100644
--- a/js/ui/switcherPopup.js
+++ b/js/ui/switcherPopup.js
@@ -184,13 +184,11 @@ const SwitcherPopup = new Lang.Class({
_keyPressEvent: function(actor, event) {
let keysym = event.get_key_symbol();
- let event_state = event.get_state();
- let backwards = event_state & Clutter.ModifierType.SHIFT_MASK;
- let action = global.display.get_keybinding_action(event.get_key_code(), event_state);
+ let action = global.display.get_keybinding_action(event.get_key_code(), event.get_state());
this._disableHover();
- if (this._keyPressHandler(keysym, backwards, action) != Clutter.EVENT_PROPAGATE)
+ if (this._keyPressHandler(keysym, action) != Clutter.EVENT_PROPAGATE)
return Clutter.EVENT_STOP;
if (keysym == Clutter.Escape)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]