#3183 '-' now removes the shortcut

Xpra-org · Jun 29, 2021 · 9096ffb · 9096ffb
1 parent 5e6cfe7
commit 9096ffb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/xpra/client/keyboard_helper.py b/xpra/client/keyboard_helper.py
@@ -153,7 +153,7 @@ def _check_shortcut(self, window, key_name, modifiers, depressed, shortcut):
         if not depressed:
             #when the key is released, just ignore it - do NOT send it to the server!
             return True
-        if action in ("pass", "_"):
+        if action=="pass":
             return False
         try:
             method = getattr(window, action)

diff --git a/xpra/client/keyboard_shortcuts_parser.py b/xpra/client/keyboard_shortcuts_parser.py
@@ -156,7 +156,8 @@ def parse_shortcuts(strs=(), shortcut_modifiers=(), modifier_names=()):
         key_shortcuts = shortcuts.get(keyname, [])
         #remove any existing action using the same modifiers:
         key_shortcuts = [x for x in key_shortcuts if x[0]!=modifiers]
-        key_shortcuts.append((modifiers, action, args))
+        if action!="_":
+            key_shortcuts.append((modifiers, action, args))
         shortcuts[keyname] = key_shortcuts
         log("shortcut(%s)=%s", s, csv((modifiers, action, args)))
     log("parse_shortcuts(%s)=%s" % (str(strs), shortcuts))