Use None instead of Confined fallback for CursorGrabMode - #25273
Open
piedoom wants to merge 2 commits into
Open
Conversation
Contributor
|
Welcome, new contributor! Please make sure you've read our contributing guide, as well as our policy regarding AI usage, and we look forward to reviewing your pull request shortly ✨ |
kfc35
added
C-Bug
kfc35
approved these changes
Aug 2, 2026
CorvusPrudens
approved these changes
Aug 2, 2026
CorvusPrudens
added
S-Ready-For-Final-Review
mockersf
requested changes
Aug 4, 2026
mockersf
left a comment
mockersf
left a comment
Member
There was a problem hiding this comment.
doc comment describing the fallback should be updated
kfc35
approved these changes
Aug 4, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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
MacOS does not support
CursorGrabMode::Confined, and falls back toLocked. This is problematic, asConfinedis used for dragging gizmos. The result is that Mac users cannot interact.This should fix #18732 #24476
Solution
This PR changes the fallback for when
Confineddoes not exist toNone, instead ofConfined. There does not appear to be a nice fallback that retains the functionality ofConfined, but I believe usingNoneis an OK tradeoff, and will re-enable mac functionality.Testing
Changes were tested by changing the problematic line and testing an example on MacOS, setting the cursor to
Confined. Before the change, the cursor is locked. After the change, it is freed.I also tested the transform gizmo example on Mac which is now working.
Note this may have consequences if users are relying on this fallback behavior for Mac.
I have only tested this on Mac. Viewing the code, it appears that the other exception (X11) would be unaffected. I don't know much about web.