diff --git a/users/t4corun/features/combo.c b/users/t4corun/features/combo.c index 0e0a5a9a..8ffa1fa9 100644 --- a/users/t4corun/features/combo.c +++ b/users/t4corun/features/combo.c @@ -11,9 +11,8 @@ uint16_t get_combo_term(uint16_t index, combo_t *combo) { } bool get_combo_must_tap(uint16_t index, combo_t *combo) { - - switch (index) { + switch (index) { #if defined(MOUSEKEY_ENABLE) case MOUSE_BUTTON3: @@ -63,8 +62,13 @@ bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode switch (combo_index) { - case KEY_ESC: case KEY_ENT: + if ( get_highest_layer(layer_state) == _SYMBOL ) { + return false; + } + break; + + case KEY_ESC: case KEY_TAB: if ( get_highest_layer(layer_state) == _NAVIGATION || get_highest_layer(layer_state) == _SYMBOL ) { @@ -78,9 +82,7 @@ bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode case MOUSE_BUTTON4: case MOUSE_BUTTON5: case MOUSE_DRGTOG: - if ( get_highest_layer(layer_state) == _NAVIGATION || - get_highest_layer(layer_state) == _NUMBER || - get_highest_layer(layer_state) == _SYMBOL ) { + if ( get_highest_layer(layer_state) > _DEFAULT_LAYER_1 ) { return false; } break; diff --git a/users/t4corun/t4corun.h b/users/t4corun/t4corun.h index df95cd55..02ac2483 100644 --- a/users/t4corun/t4corun.h +++ b/users/t4corun/t4corun.h @@ -249,20 +249,4 @@ If I was going to combine number and symbols together, it'd look like this _GACS_MODS________________________, TR_GRV, TR_SCLN, KC_4, KC_5, KC_6, TR_EQL, \ _UCCPR_L___________________________________, KC_SLSH, KC_1, KC_2, KC_3, KC_BSLS, \ _LAYER_TRANS_____________, KC_SPC, NAV_0, ___x___ - - -nav and the N key together for config (not using combo) -- move all the rgb settings over one -- move rgb toggle to right encoder press -- move baselyr to left encoder press - -If we want to get rid of the mouse combos -- put all the mouse buttons on the top number layer row -- get rid of snipping tool and file explorer shortcuts -- 53214 is the button layout -- drag scroll toggle goes left of shift maybe - -if i want to force the use of enter combo -- i have to remove it from the navigation layer - */ \ No newline at end of file