diff options
| author | Rui Matos <tiagomatos@gmail.com> | 2013-04-03 01:14:08 +0200 |
|---|---|---|
| committer | Rui Matos <tiagomatos@gmail.com> | 2013-04-05 18:12:48 +0200 |
| commit | 11bf65e2b48415483ba39d2b26d78a0a3356182c (patch) | |
| tree | fd2ad07018bc329f59ecd36aaf092b422b2d0a33 | |
| parent | a8b7e559aa4fe75645c06f3c0209f3fb252ea3cd (diff) | |
| download | gnome-shell-wip/is-switch-fixes.tar.gz | |
status/keyboard: Disregard the backwards flag for the popup switcherwip/is-switch-fixes
This seems to cause more harm than good. It puzzles users looking at
the shortcuts list in g-c-c and it prevents otherwise valid shortcuts
like Shift+Hangul from working.
https://bugzilla.gnome.org/show_bug.cgi?id=695823
| -rw-r--r-- | js/ui/status/keyboard.js | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js index 790b6d48d..160bb270a 100644 --- a/js/ui/status/keyboard.js +++ b/js/ui/status/keyboard.js @@ -293,11 +293,11 @@ const InputSourcePopup = new Lang.Class({ this._select(this._selectedIndex); }, - _keyPressHandler: function(keysym, backwards, action) { + _keyPressHandler: function(keysym, _ignored, 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) @@ -367,14 +367,13 @@ const InputSourceIndicator = new Lang.Class({ this._keybindingAction = Main.wm.addKeybinding('switch-input-source', new Gio.Settings({ schema: "org.gnome.desktop.wm.keybindings" }), - Meta.KeyBindingFlags.REVERSES, + Meta.KeyBindingFlags.NONE, Shell.KeyBindingMode.ALL, Lang.bind(this, this._switchInputSource)); this._keybindingActionBackward = Main.wm.addKeybinding('switch-input-source-backward', new Gio.Settings({ schema: "org.gnome.desktop.wm.keybindings" }), - Meta.KeyBindingFlags.REVERSES | - Meta.KeyBindingFlags.REVERSED, + Meta.KeyBindingFlags.NONE, Shell.KeyBindingMode.ALL, Lang.bind(this, this._switchInputSource)); this._settings = new Gio.Settings({ schema: DESKTOP_INPUT_SOURCES_SCHEMA }); @@ -472,7 +471,7 @@ const InputSourceIndicator = new Lang.Class({ let popup = new InputSourcePopup(this._mruSources, this._keybindingAction, this._keybindingActionBackward); let modifiers = binding.get_modifiers(); - let backwards = modifiers & Meta.VirtualModifier.SHIFT_MASK; + let backwards = false; // Not using this if (!popup.show(backwards, binding.get_name(), binding.get_mask())) popup.destroy(); }, |