8000 Fix macOS cursor grab warp position by 73v3 · Pull Request #629 · not-fl3/miniquad · GitHub
[go: up one dir, main page]
Skip to content

Fix macOS cursor grab warp position #629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
not-fl3 merged 1 commit into from
May 20, 2026
Merged

Fix macOS cursor grab warp position #629

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 40 additions & 5 deletions src/native/macos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,46 @@ impl MacosDisplay {

fn move_mouse_inside_window(&self, _window: *mut Object) {
unsafe {
let frame: NSRect = msg_send![self.window, frame];
let origin = self.transform_mouse_point(&frame.origin);
// Use the drawable/content view, not the outer NSWindow frame.
// NSWindow frame includes titlebar/borders and uses AppKit's bottom-left
// screen coordinate system. CGWarpMouseCursorPosition expects CoreGraphics
// screen coordinates, whose Y axis is flipped.
let bounds: NSRect = msg_send![self.view, bounds];

let center_in_view = NSPoint {
x: bounds.origin.x + bounds.size.width * 0.5,
y: bounds.origin.y + bounds.size.height * 0.5,
};

let center_in_window: NSPoint = msg_send![
self.view,
convertPoint: center_in_view
toView: nil
];

let center_rect = NSRect {
origin: center_in_window,
size: NSSize {
width: 0.0,
height: 0.0,
},
};

let center_on_screen: NSRect = msg_send![
self.window,
convertRectToScreen: center_rect
];

// AppKit screen coordinates are bottom-left origin.
// CoreGraphics cursor warp coordinates are top-left origin.
let main_screen: ObjcId = msg_send![class!(NSScreen), mainScreen];
let main_screen_frame: NSRect = msg_send![main_screen, frame];

let point = NSPoint {
x: (origin.0 as f64) + (frame.size.width / 2.0),
y: (origin.1 as f64) + (frame.size.height / 2.0),
x: center_on_screen.origin.x,
y: main_screen_frame.size.height - center_on_screen.origin.y,
};

CGWarpMouseCursorPosition(point);
}
}
Expand Down Expand Up @@ -1249,7 +1283,8 @@ where
(*view).set_ivar("display_ptr", &mut display as *mut _ as *mut c_void);

// Tell the view to accept file drops. Without this, dragging files onto the window will do nothing.
let dragged_types: ObjcId = msg_send![class!(NSArray), arrayWithObject: NSPasteboardTypeFileURL];
let dragged_types: ObjcId =
msg_send![class!(NSArray), arrayWithObject: NSPasteboardTypeFileURL];
let () = msg_send![view, registerForDraggedTypes: dragged_types];

display.window = window;
Expand Down
Loading
0