Update key modifier functions #1152
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We really shouldn't be merging these two checks. Shift behaviour is independent of Caps Locks for most control key combinations. For typing and capitalization, it should be XOR of Shift and Caps, not the OR of them.
Reduce code duplication. Ensure functions with similar names behave in the same manner. Previously the `shift` and `query_shift` functions treated Caps Lock differently.
There is sufficient context for function overloading to distinguish which method should be called. The main difference is if a `KeyModifier` is already known, or needs to be queried from the current keyboard state. When no `KeyModifier` is given, a reasonable assumption is to query for the information. Removing the `_` makes the name more consistent with other methods, which prefer camelCase.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #1151
Mark
KeyModifiermethods asstatic.Remove Caps Lock checking from
shift. We probably don't want to checkCapsin that method. For control key combos, they should be unaffected byCaps. For text capitalization, we need toxorthe state ofShiftandCaps(rather thanorthem). Removing this check also makes theshiftfunction consistent withquery_shift.Implement the
query_prefixed methods in terms of thestaticmethods.Strip the
query_prefix from non-static methods that query the current keyboard state.