Fix modifier order in keycode string generation #108260
Open
+23
−28
Conversation
This file contains hidden or 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
Fix the order in which modifier keys are appended in as_text() and keycode_get_string() to ensure consistent and logical ordering (Ctrl, Alt, Shift, Meta). Refactored keycode_get_string() to use a vector for building the key string, improving readability and maintainability.
Sauermann
approved these changes
Jul 4, 2025
There was a problem hiding this comment.
It looks like the chosen order is consistent with reccomendations from Windows and Mac (https://superuser.com/questions/1238058/key-combination-order). So this PR is headed in the right direction.
I believe, that it is unlikely, that this change will affect users negatively. (that would require users to process the text output, which seems a silly idea)
Calinou
reviewed
Jul 4, 2025
There was a problem hiding this comment.
Code looks good to me.
I suggest adding unit tests for this in tests/core/input/test_input_event_key.h (look for existing instances of as_text in that file).
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.
Fix the order in which modifier keys are appended in as_text() and keycode_get_string() to ensure consistent and logical ordering (Ctrl, Alt, Shift, Meta). Refactored keycode_get_string() to use a vector for building the key string, improving readability and maintainability.
For example, creating a PopupMenu with an accelerator with ctrl, shift, n would result in the text displayed as "Shift + Ctrl + N" while adding the short cut with event N and modifiers ctrl and shift would result in text displayed as "Ctrl + Shift + N".
Both are now consistent.