Implement macOS cursor setting and hiding support

src/platform/macos/cursor.rs

@@ -9,6 +9,7 @@ use crate::MouseCursor;
 pub enum Cursor {
  Native(fn() -> Retained<NSCursor>),
  Undocumented(Sel),
+ Hidden,
 }
 
 impl From<MouseCursor> for Cursor {
@@ -60,34 +61,34 @@ impl From<MouseCursor> for Cursor {
  Cursor::Undocumented(sel!(busyButClickableCursor))
  }
 
- _ => Cursor::Native(NSCursor::arrowCursor),
- // MouseCursor::Hidden => todo!(),
- // MouseCursor::Move => todo!(),
- // MouseCursor::AllScroll => todo!(),
- // MouseCursor::Cell => todo!(),
+ MouseCursor::Move => Cursor::Native(NSCursor::arrowCursor),
+ MouseCursor::AllScroll => Cursor::Native(NSCursor::arrowCursor),
+ MouseCursor::Cell => Cursor::Native(NSCursor::crosshairCursor),
+ MouseCursor::Hidden => Cursor::Hidden,
  }
  }
 }
 
 impl Cursor {
- pub fn load(&self) -> Retained<NSCursor> {
+ pub fn load(&self) -> Option<Retained<NSCursor>> {
  match self {
- Cursor::Native(loader) => loader(),
+ Cursor::Native(loader) => Some(loader()),
  Cursor::Undocumented(sel) => {
  let class = NSCursor::class();
 
  // NOTE: class.responds_to does not yield the same result (probably because NSCursor overrides respondsToSelector)
  let responds_to: bool = unsafe { msg_send![class, respondsToSelector: *sel] };
 
  if !responds_to {
- return NSCursor::arrowCursor();
+ return Some(NSCursor::arrowCursor());
  }
 
  let raw: *mut NSCursor = unsafe { class.send_message(*sel, ()) };
  let cursor = unsafe { Retained::retain(raw) };
 
- cursor.unwrap_or_else(NSCursor::arrowCursor)
+Some(cursor.unwrap_or_else(NSCursor::arrowCursor))
  }
+ Cursor::Hidden => None,
  }
  }
 }

src/platform/macos/view.rs

@@ -11,7 +11,7 @@ use crate::{
 use objc2::__framework_prelude::Retained;
 use objc2::rc::Weak;
 use objc2::runtime::{NSObjectProtocol, ProtocolObject};
-use objc2::{msg_send, AllocAnyThread};
+use objc2::{msg_send, AllocAnyThread, ClassType};
 use objc2_app_kit::{
  NSApplication, NSDragOperation, NSDraggingInfo, NSEvent, NSFilenamesPboardType, NSTrackingArea,
  NSTrackingAreaOptions, NSView, NSWindow,
@@ -230,6 +230,11 @@ impl BaseviewView {
 impl Drop for BaseviewView {
  fn drop(&mut self) {
  self.state.closed.set(true);
+ if self.state.cursor_hidden.get() {
+ unsafe {
+ let _: () = objc2::msg_send![objc2_app_kit::NSCursor::class(), unhide];
+ }
+ }
  }
 }
 

src/platform/macos/window.rs

@@ -3,7 +3,7 @@ use std::rc::Rc;
 
 use objc2::rc::{autoreleasepool, Weak};
 use objc2::runtime::NSObjectProtocol;
-use objc2::MainThreadMarker;
+use objc2::{ClassType, MainThreadMarker};
 use objc2_app_kit::{
  NSApplication, NSApplicationActivationPolicy, NSPasteboard, NSPasteboardTypeString,
 };
@@ -156,7 +156,21 @@ impl<'a> Window<'a> {
 
  pub fn set_mouse_cursor(&self, cursor: MouseCursor) {
  let native_cursor = Cursor::from(cursor);
- self.view.addCursorRect_cursor(self.view.bounds(), &native_cursor.load());
+ unsafe {
+ if let Some(loaded_cursor) = native_cursor.load() {
+ if self.inner.state.cursor_hidden.get() {
+ let _: () = objc2::msg_send![objc2_app_kit::NSCursor::class(), unhide];
+ self.inner.state.cursor_hidden.set(false);
+ }
+ let _: () = objc2::msg_send![&loaded_cursor, set];
+ self.view.addCursorRect_cursor(self.view.bounds(), &loaded_cursor);
+ } else {
+ if !self.inner.state.cursor_hidden.get() {
+ let _: () = objc2::msg_send![objc2_app_kit::NSCursor::class(), hide];
+ self.inner.state.cursor_hidden.set(true);
+ }
+ }
+ }
  }
 
  #[cfg(feature = "opengl")]
@@ -169,13 +183,15 @@ pub(crate) struct WindowSharedState {
  /// The last known window info for this window.
  pub window_info: Cell<WindowInfo>,
  pub closed: Cell<bool>,
+ pub cursor_hidden: Cell<bool>,
 }
 
 impl WindowSharedState {
  pub fn new(options: &WindowOpenOptions) -> Self {
  Self {
  window_info: WindowInfo::from_logical_size(options.size, 1.0).into(),
  closed: false.into(),
+ cursor_hidden: false.into(),
  }
  }
 }