From f51b6d4c73f33d2986352324746b25b2dd58006e Mon Sep 17 00:00:00 2001 From: Ilya Zhuravlev Date: Tue, 27 Jul 2021 23:14:25 -0400 Subject: [PATCH] key_widget&keymap_editor: fix anykey for masked keycodes --- src/main/python/key_widget.py | 4 ++-- src/main/python/keymap_editor.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/python/key_widget.py b/src/main/python/key_widget.py index 607fdcf..4e58e00 100644 --- a/src/main/python/key_widget.py +++ b/src/main/python/key_widget.py @@ -47,9 +47,9 @@ class KeyWidget(KeyboardWidget): def on_anykey(self): if self.active_key is None: return - dlg = AnyKeycodeDialog(self.keycode) + dlg = AnyKeycodeDialog((self.keycode & 0xFF) if self.active_mask else self.keycode) if dlg.exec_() and dlg.value >= 0: - self.set_keycode(dlg.value) + self.on_keycode_changed(dlg.value) def set_keycode(self, kc): if kc == self.keycode: diff --git a/src/main/python/keymap_editor.py b/src/main/python/keymap_editor.py index ce2d328..3805906 100644 --- a/src/main/python/keymap_editor.py +++ b/src/main/python/keymap_editor.py @@ -138,6 +138,8 @@ class KeymapEditor(BasicEditor): if self.container.active_key is None: return current_code = self.code_for_widget(self.container.active_key) + if self.container.active_mask: + current_code &= 0xFF dlg = AnyKeycodeDialog(current_code) if dlg.exec_() and dlg.value >= 0: self.on_keycode_changed(dlg.value)