Make Gamepad and Touch Controls Mutually Exclusive [AARD-1945]
#1229
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
…h modes mutually exclusive
rutmanz
requested review from
azaleacolburn,
ryanzhangofficial,
PepperLola and
BrandonPacewic
AlexD717
added
the
ui/ux
5 tasks
Comment on lines
-14
to
+15
| const [useGamepad, setUseGamepad] = useState<boolean>(selectedScheme.usesGamepad) | ||
| const [useTouchControls, setUseTouchControls] = useState<boolean>(selectedScheme.usesTouchControls) | ||
| const [useGamepad, setUseGamepad] = useState(selectedScheme.usesGamepad) | ||
| const [useTouchControls, setUseTouchControls] = useState(selectedScheme.usesTouchControls) |
There was a problem hiding this comment.
I feel as though keeping the will help with code readability
There was a problem hiding this comment.
I think usesGamepad and usesTouchControls are pretty clearly boolean values.
There was a problem hiding this comment.
to be a bit more clear I mean that it doesn't necessarily hurt to keep <boolean>
azaleacolburn
approved these changes
Jul 22, 2025
Comment on lines
-14
to
+15
| const [useGamepad, setUseGamepad] = useState<boolean>(selectedScheme.usesGamepad) | ||
| const [useTouchControls, setUseTouchControls] = useState<boolean>(selectedScheme.usesTouchControls) | ||
| const [useGamepad, setUseGamepad] = useState(selectedScheme.usesGamepad) | ||
| const [useTouchControls, setUseTouchControls] = useState(selectedScheme.usesTouchControls) |
There was a problem hiding this comment.
I think usesGamepad and usesTouchControls are pretty clearly boolean values.
PepperLola
added a commit
that referenced
this pull request
Jul 25, 2025
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.
Task
AARD-1945
Symptom
Previously, both "Use Controller" and "Use Touch Controls" could be enabled, in which case the UI would show the configuration for the controller. This doesn't really make sense because the use touch controls property is basically ignored (although still set in the JS object)
Solution
Updated checkboxes to allow passing your own state variable, while still keeping the old "stateless" option to avoid requiring extra code wherever checkboxes are used
Verification
Opened the input configuration panel and attempted to turn both on, and observed that while both could be off, turning on one would turn off the other. I also opened the robot switch panel to confirm that the index-based checkboxes still worked as intended. I also opened the preference panel to confirm that normal checkboxes worked correctly.
Before merging, ensure the following criteria are met: