Skip to content

Commit

Permalink
Allow combo key orders with only the per combo option
Browse files Browse the repository at this point in the history
  • Loading branch information
sevanteri committed Jan 6, 2022
1 parent 891c32d commit 0d3198b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions quantum/process_keycode/process_combo.c
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ combo_t* overlaps(combo_t *combo1, combo_t *combo2) {
return combo1;
}

#ifdef COMBO_MUST_PRESS_IN_ORDER
#if defined(COMBO_MUST_PRESS_IN_ORDER) || defined(COMBO_MUST_PRESS_IN_ORDER_PER_COMBO)
static bool keys_pressed_in_order(uint16_t combo_index, combo_t *combo, uint16_t key_index, uint16_t keycode, keyrecord_t *record) {
# ifdef COMBO_MUST_PRESS_IN_ORDER_PER_COMBO
if (!get_combo_must_press_in_order(combo_index, combo)) {
Expand Down Expand Up @@ -375,7 +375,7 @@ static bool process_single_combo(combo_t *combo, uint16_t keycode, keyrecord_t *
}

bool key_is_part_of_combo = (!COMBO_DISABLED(combo) && is_combo_enabled()
#ifdef COMBO_MUST_PRESS_IN_ORDER
#if defined(COMBO_MUST_PRESS_IN_ORDER) || defined(COMBO_MUST_PRESS_IN_ORDER_PER_COMBO)
&& keys_pressed_in_order(combo_index, combo, key_index, keycode, record)
#endif
#ifdef COMBO_SHOULD_TRIGGER
Expand Down

0 comments on commit 0d3198b

Please sign in to comment.