godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #51405 from bruvzg/macos_recenter_mouse 

[macOS] Move captured mouse cursor to the center when window gain focus.
This commit is contained in:
Rémi Verschelde 2021-08-09 00:18:09 +02:00 committed by GitHub
parent e010e05b3d ae7dbb678c
commit 7fc570b5ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
platform/osx/display_server_osx.mm
View File

@ -318,8 +318,16 @@ static NSCursor *_cursorFromSelector(SEL selector, SEL fallback = nil) {
} }
DisplayServerOSX::WindowData &wd = DS_OSX->windows[window_id]; DisplayServerOSX::WindowData &wd = DS_OSX->windows[window_id];
if (DS_OSX->mouse_mode == DisplayServer::MOUSE_MODE_CAPTURED) {
const NSRect contentRect = [wd.window_view frame];
NSRect pointInWindowRect = NSMakeRect(contentRect.size.width / 2, contentRect.size.height / 2, 0, 0);
NSPoint pointOnScreen = [[wd.window_view window] convertRectToScreen:pointInWindowRect].origin;
CGPoint lMouseWarpPos = { pointOnScreen.x, CGDisplayBounds(CGMainDisplayID()).size.height - pointOnScreen.y };
CGWarpMouseCursorPosition(lMouseWarpPos);
} else {
_get_mouse_pos(wd, [wd.window_object mouseLocationOutsideOfEventStream]); _get_mouse_pos(wd, [wd.window_object mouseLocationOutsideOfEventStream]);
Input::get_singleton()->set_mouse_position(wd.mouse_pos); Input::get_singleton()->set_mouse_position(wd.mouse_pos);
}
DS_OSX->window_focused = true; DS_OSX->window_focused = true;
DS_OSX->_send_window_event(wd, DisplayServerOSX::WINDOW_EVENT_FOCUS_IN); DS_OSX->_send_window_event(wd, DisplayServerOSX::WINDOW_EVENT_FOCUS_IN);