FreeCam: stop cursor from remaining grabbed when camera controller is disabled
#21485
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
janis-bhm
added
C-Bug
alice-i-cecile
approved these changes
Oct 9, 2025
alice-i-cecile
added
the
D-Straightforward
Aceeri
approved these changes
Oct 10, 2025
alice-i-cecile
added
S-Ready-For-Final-Review
mate-h
pushed a commit
to mate-h/bevy
that referenced
this pull request
Oct 22, 2025
…is disabled (bevyengine#21485) # Objective Fixes bevyengine#21482 ## Solution Before exiting the system when the controller is disabled, check if either of the cursor grab flags are set and ungrab any windows if so. Note: I think it's a bit strange that the camera un-grabs every window, not just the one with focus, but I've just copied this behaviour from further down in the function. In this case, it might be more correct to do this anyway, since the controller might be disabled when the respective window isn't focused. ## Testing I used bevyengine#21477 to test this
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Objective
Fixes #21482
Solution
Before exiting the system when the controller is disabled, check if either of the cursor grab flags are set and ungrab any windows if so.
Note: I think it's a bit strange that the camera un-grabs every window, not just the one with focus, but I've just copied this behaviour from further down in the function. In this case, it might be more correct to do this anyway, since the controller might be disabled when the respective window isn't focused.
Testing
I used #21477 to test this