feat: add Hide variant to mouse Interaction

pop-os · Oct 7, 2024 · 3032cec · 3032cec
1 parent 423ad32
commit 3032cec
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/core/src/mouse/interaction.rs b/core/src/mouse/interaction.rs
@@ -22,4 +22,5 @@ pub enum Interaction {
     Move,
     Copy,
     Help,
+    Hide,
 }
diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs
@@ -437,10 +437,10 @@ pub fn mode(mode: Option<winit::window::Fullscreen>) -> window::Mode {
 /// [`winit`]: https://github.com/rust-windowing/winit
 pub fn mouse_interaction(
     interaction: mouse::Interaction,
-) -> winit::window::CursorIcon {
+) -> Option<winit::window::CursorIcon> {
     use mouse::Interaction;
 
-    match interaction {
+    Some(match interaction {
         Interaction::None | Interaction::Idle => {
             winit::window::CursorIcon::Default
         }
@@ -467,7 +467,10 @@ pub fn mouse_interaction(
         Interaction::Move => winit::window::CursorIcon::Move,
         Interaction::Copy => winit::window::CursorIcon::Copy,
         Interaction::Help => winit::window::CursorIcon::Help,
-    }
+        Interaction::Hide => {
+            return None;
+        }
+    })
 }
 
 /// Converts a `MouseButton` from [`winit`] to an [`iced`] mouse button.

diff --git a/winit/src/program.rs b/winit/src/program.rs
@@ -389,10 +389,22 @@ where
                     compositor.load_font(font);
                 }
 
+                let hide_cursor = winit::window::CustomCursor::from_rgba(
+                    [0, 0, 0, 0],
+                    1,
+                    1,
+                    0,
+                    0,
+                )
+                .unwrap();
+                let hide_cursor =
+                    event_loop.create_custom_cursor(hide_cursor).unwrap();
+
                 sender
                     .send(Boot {
                         compositor,
                         is_wayland,
+                        hide_cursor: winit::window::Cursor::Custom(hide_cursor),
                     })
                     .ok()
                     .expect("Send boot event");
@@ -639,6 +651,7 @@ where
 struct Boot<C> {
     compositor: C,
     is_wayland: bool,
+    hide_cursor: winit::window::Cursor,
 }
 
 pub(crate) enum Event<Message: 'static> {
@@ -705,6 +718,7 @@ async fn run_instance<'a, P, C>(
     let Boot {
         mut compositor,
         is_wayland,
+        hide_cursor,
     } = boot.await.expect("Receive boot");
 
     let mut platform_specific_handler =
@@ -1173,7 +1187,8 @@ async fn run_instance<'a, P, C>(
                                 conversion::mouse_interaction(
                                     new_mouse_interaction,
                                 )
-                                .into(),
+                                .map(|c| c.into())
+                                .unwrap_or_else(|| hide_cursor.clone()),
                             );
 
                             window.mouse_interaction = new_mouse_interaction;
@@ -1342,7 +1357,8 @@ async fn run_instance<'a, P, C>(
                                     conversion::mouse_interaction(
                                         new_mouse_interaction,
                                     )
-                                    .into(),
+                                    .map(|c| c.into())
+                                    .unwrap_or_else(|| hide_cursor.clone()),
                                 );
 
                                 window.mouse_interaction =
@@ -1677,7 +1693,8 @@ async fn run_instance<'a, P, C>(
                             conversion::mouse_interaction(
                                 new_mouse_interaction,
                             )
-                            .into(),
+                            .map(|c| c.into())
+                            .unwrap_or_else(|| hide_cursor.clone()),
                         );
 
                         window.mouse_interaction = new_mouse_interaction;