feat: add Hide variant to mouse Interaction

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

Hide file tree

Showing 3 changed files with 44 additions and 15 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
@@ -1169,12 +1169,21 @@ async fn run_instance<'a, P, C>(
                         debug.draw_finished();
 
                         if new_mouse_interaction != window.mouse_interaction {
-                            window.raw.set_cursor(
+                            if let Some(interaction) =
                                 conversion::mouse_interaction(
                                     new_mouse_interaction,
                                 )
-                                .into(),
-                            );
+                            {
+                                if matches!(
+                                    window.mouse_interaction,
+                                    mouse::Interaction::Hide
+                                ) {
+                                    window.raw.set_cursor_visible(true);
+                                }
+                                window.raw.set_cursor(interaction.into())
+                            } else {
+                                window.raw.set_cursor_visible(false);
+                            }
 
                             window.mouse_interaction = new_mouse_interaction;
                         }
@@ -1338,12 +1347,21 @@ async fn run_instance<'a, P, C>(
 
                             if new_mouse_interaction != window.mouse_interaction
                             {
-                                window.raw.set_cursor(
+                                if let Some(interaction) =
                                     conversion::mouse_interaction(
                                         new_mouse_interaction,
                                     )
-                                    .into(),
-                                );
+                                {
+                                    if matches!(
+                                        window.mouse_interaction,
+                                        mouse::Interaction::Hide
+                                    ) {
+                                        window.raw.set_cursor_visible(true);
+                                    }
+                                    window.raw.set_cursor(interaction.into())
+                                } else {
+                                    window.raw.set_cursor_visible(false);
+                                }
 
                                 window.mouse_interaction =
                                     new_mouse_interaction;
@@ -1673,12 +1691,19 @@ async fn run_instance<'a, P, C>(
                     };
 
                     if new_mouse_interaction != window.mouse_interaction {
-                        window.raw.set_cursor(
-                            conversion::mouse_interaction(
-                                new_mouse_interaction,
-                            )
-                            .into(),
-                        );
+                        if let Some(interaction) =
+                            conversion::mouse_interaction(new_mouse_interaction)
+                        {
+                            if matches!(
+                                window.mouse_interaction,
+                                mouse::Interaction::Hide
+                            ) {
+                                window.raw.set_cursor_visible(true);
+                            }
+                            window.raw.set_cursor(interaction.into())
+                        } else {
+                            window.raw.set_cursor_visible(false);
+                        }
 
                         window.mouse_interaction = new_mouse_interaction;
                     }