NEW: Added support for F13 to F24 keys #2075
Draft
+598
−83
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
ekcoh
reviewed
Dec 6, 2024
| .WithLayout(new InternedString("Keyboard")) | ||
| .WithStateBlock(new InputStateBlock { format = new FourCC(1262836051), sizeInBits = 112 }); | ||
| .WithStateBlock(new InputStateBlock { format = new FourCC(1262836051), sizeInBits = 136 }); |
There was a problem hiding this comment.
I use this is what we get for FourCC form the generator, just reacted to it but realised its generated :)
| [InputControl(name = "f22", displayName = "F22", layout = "Key", bit = (int)Key.F22)] | ||
| [InputControl(name = "f23", displayName = "F23", layout = "Key", bit = (int)Key.F23)] | ||
| [InputControl(name = "f24", displayName = "F24", layout = "Key", bit = (int)Key.F24)] | ||
| [InputControl(name = "IMESelected", layout = "Button", bit = (int)KeyEx.RemapedIMESelected, synthetic = true)] // Use the last bit to hold IME selected state. |
There was a problem hiding this comment.
Have you checked that this works for ImeSelected when using an older Unity version?
| /// Don't use this. This is a dummy key that is only used internally to represent the IME selected state. | ||
| /// Will be removed in the future. | ||
| /// </summary> | ||
| [Obsolete("Don't use this. This is a dummy key that is only used internally to represent the IME selected state. Will be removed in the future.", true)] |
There was a problem hiding this comment.
Older Input Systems would still rely on this bit
| keyboardState->Set(KeyEx.RemapedIMESelected, true); | ||
| } | ||
|
|
||
| //stateEvent->stateSizeInBytes = KeyboardState.kSizeInBytes; |
There was a problem hiding this comment.
I am guessing this would be removed?
| @@ -2674,7 +2674,7 @@ public void Devices_AnyKeyOnKeyboard_DoesNotReactToIMESelected() | |||
| { | |||
| var keyboard = InputSystem.AddDevice<Keyboard>(); | |||
|
|
|||
| InputSystem.QueueStateEvent(keyboard, new KeyboardState(Key.IMESelected)); | |||
| InputSystem.QueueStateEvent(keyboard, new KeyboardState(IMESelected: true)); | |||
There was a problem hiding this comment.
Would be good to have a test that has an underlying struct/memory representation that looks like the previous one to prove that its backwards compatible?
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.
Description
Please fill this section with a description what the pull request is trying to address and what changes were made.
Testing status & QA
Please describe the testing already done by you and what testing you request/recommend QA to execute. If you used or created any testing project please link them here too for QA.
Overall Product Risks
Please rate the potential complexity and halo effect from low to high for the reviewers. Note down potential risks to specific Editor branches if any.
Comments to reviewers
Please describe any additional information such as what to focus on, or historical info for the reviewers.
Checklist
Before review:
Changed,Fixed,Addedsections.Area_CanDoX,Area_CanDoX_EvenIfYIsTheCase,Area_WhenIDoX_AndYHappens_ThisIsTheResult.During merge:
NEW: ___.FIX: ___.DOCS: ___.CHANGE: ___.RELEASE: 1.1.0-preview.3.After merge: