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

Don't clear keys on layer change unless STRICT_LAYER_RELEASE is enabled (#18577) 

* Don't clear mousekeys unless clearing keys

* Revert "Don't clear mousekeys unless clearing keys"

This reverts commit 29a0c06b547d72b80d416a8b6fab478c77fbd247.

* Just don't clear anything on layer set

* Fix lint

* Enable test?
This commit is contained in:
Drashna Jaelre 2022-11-11 18:11:50 -08:00 committed by GitHub
parent 092228571c
commit 1caedd10c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
quantum/action_layer.c
View File

@ -45,9 +45,9 @@ static void default_layer_state_set(layer_state_t state) {
default_layer_state = state; default_layer_state = state;
default_layer_debug(); default_layer_debug();
debug("\n"); debug("\n");
#ifdef STRICT_LAYER_RELEASE #if defined(STRICT_LAYER_RELEASE)
clear_keyboard_but_mods(); // To avoid stuck keys clear_keyboard_but_mods(); // To avoid stuck keys
#else #elif defined(SEMI_STRICT_LAYER_RELEASE)
clear_keyboard_but_mods_and_keys(); // Don't reset held keys clear_keyboard_but_mods_and_keys(); // Don't reset held keys
#endif #endif
} }
@ -125,9 +125,9 @@ void layer_state_set(layer_state_t state) {
layer_state = state; layer_state = state;
layer_debug(); layer_debug();
dprintln(); dprintln();
# ifdef STRICT_LAYER_RELEASE # if defined(STRICT_LAYER_RELEASE)
clear_keyboard_but_mods(); // To avoid stuck keys clear_keyboard_but_mods(); // To avoid stuck keys
# else # elif defined(SEMI_STRICT_LAYER_RELEASE)
clear_keyboard_but_mods_and_keys(); // Don't reset held keys clear_keyboard_but_mods_and_keys(); // Don't reset held keys
# endif # endif
} }

1
tests/basic/test_action_layer.cpp
View File

@ -360,7 +360,6 @@ TEST_F(ActionLayer, LayerTapToggleWithToggleWithKeypress) {
} }
TEST_F(ActionLayer, LayerTapReleasedBeforeKeypressReleaseWithModifiers) { TEST_F(ActionLayer, LayerTapReleasedBeforeKeypressReleaseWithModifiers) {
GTEST_SKIP() << "TODO: Modifiers are erroneously discarded on layer changes, although a key that introduced the modifier is still held.";
TestDriver driver; TestDriver driver;
InSequence s; InSequence s;