From c459ef6888c8ddd0cd52e15f183f3b191ebf20b1 Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Thu, 29 May 2014 23:26:25 +0200 Subject: [PATCH] Use new meta_key_binding_is_reversed() method Now that mutter gives a way to check if a MetaKeyBinding was marked as 'reversed' or not, gnome-shell does not have to hardcode that a MetaKeyBinding using a shift modifier is reversed, it can directly check if the appropriate flag is set. https://bugzilla.gnome.org/show_bug.cgi?id=732296 --- js/ui/status/keyboard.js | 3 +-- js/ui/windowManager.js | 12 +++--------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js index e4bd2107c..032b9d529 100644 --- a/js/ui/status/keyboard.js +++ b/js/ui/status/keyboard.js @@ -473,8 +473,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; - if (!popup.show(backwards, binding.get_name(), binding.get_mask())) + if (!popup.show(binding.is_reversed(), binding.get_name(), binding.get_mask())) popup.destroy(); }, diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js index da4d780bb..101f9a8d7 100644 --- a/js/ui/windowManager.js +++ b/js/ui/windowManager.js @@ -1385,9 +1385,7 @@ const WindowManager = new Lang.Class({ let tabPopup = new AltTab.AppSwitcherPopup(); - let modifiers = binding.get_modifiers(); - let backwards = modifiers & Meta.VirtualModifier.SHIFT_MASK; - if (!tabPopup.show(backwards, binding.get_name(), binding.get_mask())) + if (!tabPopup.show(binding.is_reversed(), binding.get_name(), binding.get_mask())) tabPopup.destroy(); }, @@ -1398,16 +1396,12 @@ const WindowManager = new Lang.Class({ let tabPopup = new AltTab.WindowSwitcherPopup(); - let modifiers = binding.get_modifiers(); - let backwards = modifiers & Meta.VirtualModifier.SHIFT_MASK; - if (!tabPopup.show(backwards, binding.get_name(), binding.get_mask())) + if (!tabPopup.show(binding.is_reversed(), binding.get_name(), binding.get_mask())) tabPopup.destroy(); }, _startA11ySwitcher : function(display, screen, window, binding) { - let modifiers = binding.get_modifiers(); - let backwards = modifiers & Meta.VirtualModifier.SHIFT_MASK; - Main.ctrlAltTabManager.popup(backwards, binding.get_name(), binding.get_mask()); + Main.ctrlAltTabManager.popup(binding.is_reversed(), binding.get_name(), binding.get_mask()); }, _toggleAppMenu : function(display, screen, window, event, binding) {