masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix combo_ref_from_layer respect different default layer [#21780] (#21781)

This commit is contained in:
Ben Cooper 2023-09-25 05:32:20 +03:00 committed by GitHub
parent 9d3c0018c1
commit 4ebb065f94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
quantum/process_keycode/process_combo.c
View File

@ -557,7 +557,7 @@ bool process_combo(uint16_t keycode, keyrecord_t *record) {
/* Only check keycodes from one layer. */ /* Only check keycodes from one layer. */
keycode = keymap_key_to_keycode(COMBO_ONLY_FROM_LAYER, record->event.key); keycode = keymap_key_to_keycode(COMBO_ONLY_FROM_LAYER, record->event.key);
#else #else
uint8_t highest_layer = get_highest_layer(layer_state); uint8_t highest_layer = get_highest_layer(layer_state | default_layer_state);
uint8_t ref_layer = combo_ref_from_layer(highest_layer); uint8_t ref_layer = combo_ref_from_layer(highest_layer);
if (ref_layer != highest_layer) { if (ref_layer != highest_layer) {
keycode = keymap_key_to_keycode(ref_layer, record->event.key); keycode = keymap_key_to_keycode(ref_layer, record->event.key);