griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v5.0-release'

Browse Source
This commit is contained in:
Jonas Holzman
2025-10-14 14:41:13 +02:00
parent 28f84831c3 e6064b2be3
commit 4db85e7a8e
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
intern/ghost/intern/GHOST_WindowCocoa.mm
View File

@@ -1187,6 +1187,10 @@ GHOST_TSuccess GHOST_WindowCocoa::setWindowCursorGrab(GHOST_TGrabCursorMode mode
setCursorGrabAccum(0, 0);
if (mode == GHOST_kGrabHide) {
/* Dissociate cursor movements from the mouse while hidden to prevent the cursor from
* being accidentally revealed whe hovering over desktop elements like the Dock. */
CGAssociateMouseAndMouseCursorPosition(false);
setWindowCursorVisibility(false);
}
@@ -1198,6 +1202,7 @@ GHOST_TSuccess GHOST_WindowCocoa::setWindowCursorGrab(GHOST_TGrabCursorMode mode
else {
if (cursor_grab_ == GHOST_kGrabHide) {
system_cocoa_->setCursorPosition(cursor_grab_init_pos_[0], cursor_grab_init_pos_[1]);
CGAssociateMouseAndMouseCursorPosition(true);
setWindowCursorVisibility(true);
}