mirror of
https://github.com/qmk/qmk_userspace.git
synced 2025-05-12 02:24:16 -04:00
Bunch of stuff
- Fixed OLED layer list order - Altered and combined symbols in tap hold behaviors - removed the mousekeys optional keycode thing since mousekeys are required - cleaned up unused tapholds
This commit is contained in:
parent
ec97151d14
commit
90ef9a3b22
10 changed files with 82 additions and 105 deletions
|
@ -9,9 +9,12 @@ bool get_combo_must_tap(uint16_t index, combo_t *combo) {
|
|||
case MOUSE_BUTTON4:
|
||||
case MOUSE_BUTTON5:
|
||||
case MOUSE_DRGTOG:
|
||||
return true;
|
||||
#endif //MOUSEKEY_ENABLEdf
|
||||
|
||||
case KEY_ENT:
|
||||
case KEY_TAB:
|
||||
return true;
|
||||
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
|
@ -26,6 +29,19 @@ bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode
|
|||
|
||||
switch (combo_index) {
|
||||
|
||||
case KEY_ENT:
|
||||
if ( get_highest_layer(layer_state) == _SYMBOL ) {
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
|
||||
case KEY_TAB:
|
||||
if ( get_highest_layer(layer_state) == _NAVIGATION ||
|
||||
get_highest_layer(layer_state) == _SYMBOL ) {
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
|
||||
case MOUSE_BUTTON1:
|
||||
case MOUSE_BUTTON2:
|
||||
case MOUSE_BUTTON3:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue