key_widget&keymap_editor: fix anykey for masked keycodes
parent
5d760330a6
commit
f51b6d4c73
|
|
@ -47,9 +47,9 @@ class KeyWidget(KeyboardWidget):
|
||||||
def on_anykey(self):
|
def on_anykey(self):
|
||||||
if self.active_key is None:
|
if self.active_key is None:
|
||||||
return
|
return
|
||||||
dlg = AnyKeycodeDialog(self.keycode)
|
dlg = AnyKeycodeDialog((self.keycode & 0xFF) if self.active_mask else self.keycode)
|
||||||
if dlg.exec_() and dlg.value >= 0:
|
if dlg.exec_() and dlg.value >= 0:
|
||||||
self.set_keycode(dlg.value)
|
self.on_keycode_changed(dlg.value)
|
||||||
|
|
||||||
def set_keycode(self, kc):
|
def set_keycode(self, kc):
|
||||||
if kc == self.keycode:
|
if kc == self.keycode:
|
||||||
|
|
|
||||||
|
|
@ -138,6 +138,8 @@ class KeymapEditor(BasicEditor):
|
||||||
if self.container.active_key is None:
|
if self.container.active_key is None:
|
||||||
return
|
return
|
||||||
current_code = self.code_for_widget(self.container.active_key)
|
current_code = self.code_for_widget(self.container.active_key)
|
||||||
|
if self.container.active_mask:
|
||||||
|
current_code &= 0xFF
|
||||||
dlg = AnyKeycodeDialog(current_code)
|
dlg = AnyKeycodeDialog(current_code)
|
||||||
if dlg.exec_() and dlg.value >= 0:
|
if dlg.exec_() and dlg.value >= 0:
|
||||||
self.on_keycode_changed(dlg.value)
|
self.on_keycode_changed(dlg.value)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue