Skip to content
This repository was archived by the owner on Jul 15, 2024. It is now read-only.

Fix mouse tracking on macOS 13 #38

Merged
merged 1 commit into from
Nov 27, 2022
Merged
Changes from all commits
Commits
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
25 changes: 12 additions & 13 deletions src/backend/mac/window.rs
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,18 @@ impl WindowBuilder {
let frame = NSView::frame(content_view);
view.initWithFrame_(frame);

// The rect of the tracking area doesn't matter, because
// we use the InVisibleRect option where the OS syncs the size automatically.
let rect = NSRect::new(NSPoint::new(0., 0.), NSSize::new(0., 0.));
let opts = NSTrackingAreaOptions::MouseEnteredAndExited
| NSTrackingAreaOptions::MouseMoved
| NSTrackingAreaOptions::ActiveAlways
| NSTrackingAreaOptions::InVisibleRect;
let tracking_area = NSTrackingArea::alloc(nil)
.initWithRect_options_owner_userInfo(rect, opts, view, nil)
.autorelease();
view.addTrackingArea(tracking_area);

let () = msg_send![window, setDelegate: view];

if let Some(menu) = self.menu {
Expand Down Expand Up @@ -565,19 +577,6 @@ fn make_view(handler: Box<dyn WinHandler>) -> (id, Weak<Mutex<Vec<IdleKind>>>) {
(*view).set_ivar("viewState", state_ptr as *mut c_void);
let options: NSAutoresizingMaskOptions = NSViewWidthSizable | NSViewHeightSizable;
view.setAutoresizingMask_(options);

// The rect of the tracking area doesn't matter, because
// we use the InVisibleRect option where the OS syncs the size automatically.
let rect = NSRect::new(NSPoint::new(0., 0.), NSSize::new(0., 0.));
let opts = NSTrackingAreaOptions::MouseEnteredAndExited
| NSTrackingAreaOptions::MouseMoved
| NSTrackingAreaOptions::ActiveAlways
| NSTrackingAreaOptions::InVisibleRect;
let tracking_area = NSTrackingArea::alloc(nil)
.initWithRect_options_owner_userInfo(rect, opts, view, nil)
.autorelease();
view.addTrackingArea(tracking_area);

(view.autorelease(), queue_handle)
}
}
Expand Down