feat: add Hide variant to mouse Interaction

pop-os · Oct 7, 2024 · 4a4195f · 4a4195f
1 parent 3dc0bbf
commit 4a4195f
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 18 deletions.
diff --git a/core/src/mouse/interaction.rs b/core/src/mouse/interaction.rs
@@ -13,4 +13,5 @@ pub enum Interaction {
     ResizingHorizontally,
     ResizingVertically,
     NotAllowed,
+    Hide,
 }
diff --git a/sctk/src/conversion.rs b/sctk/src/conversion.rs
@@ -80,8 +80,8 @@ pub fn modifiers_to_native(mods: Modifiers) -> keyboard::Modifiers {
 //     key_conversion.get(&keysym).cloned()
 // }
 
-pub(crate) fn cursor_icon(cursor: Interaction) -> CursorIcon {
-    match cursor {
+pub(crate) fn cursor_icon(cursor: Interaction) -> Option<CursorIcon> {
+    Some(match cursor {
         Interaction::Idle => CursorIcon::Default,
         Interaction::Pointer => CursorIcon::Pointer,
         Interaction::Grab => CursorIcon::Grab,
@@ -92,5 +92,6 @@ pub(crate) fn cursor_icon(cursor: Interaction) -> CursorIcon {
         Interaction::ResizingHorizontally => CursorIcon::EwResize,
         Interaction::ResizingVertically => CursorIcon::NsResize,
         Interaction::NotAllowed => CursorIcon::NotAllowed,
-    }
+        Interaction::Hide => return None,
+    })
 }
diff --git a/sctk/src/event_loop/mod.rs b/sctk/src/event_loop/mod.rs
@@ -842,9 +842,15 @@ where
                     },
                     Event::SetCursor(iced_icon) => {
                         if let Some(seat) = self.state.seats.get_mut(0) {
-                            let icon = conversion::cursor_icon(iced_icon);
-                            seat.icon = Some(icon);
-                            seat.set_cursor(self.wayland_dispatcher.as_source_ref().connection(), icon);
+                            if let Some(icon) = conversion::cursor_icon(iced_icon) {
+                                seat.icon = Some(icon);
+                                seat.set_cursor(self.wayland_dispatcher.as_source_ref().connection(), icon);
+                            } else {
+                                if let Some(ptr) = seat.ptr.as_ref() {
+                                    _ = ptr.hide_cursor();
+                                }
+                            }
+
                         }
 
                     }

diff --git a/widget/src/container.rs b/widget/src/container.rs
@@ -245,6 +245,7 @@ where
         viewport: &Rectangle,
         renderer: &Renderer,
     ) -> mouse::Interaction {
+        return mouse::Interaction::Hide;
         self.content.as_widget().mouse_interaction(
             tree,
             layout.children().next().unwrap(),

diff --git a/winit/src/application.rs b/winit/src/application.rs
@@ -691,9 +691,17 @@ async fn run_instance<A, E, C>(
                 debug.draw_finished();
 
                 if new_mouse_interaction != mouse_interaction {
-                    window.set_cursor_icon(conversion::mouse_interaction(
-                        new_mouse_interaction,
-                    ));
+                    if let Some(interation) =
+                        conversion::mouse_interaction(new_mouse_interaction)
+                    {
+                        if matches!(mouse_interaction, mouse::Interaction::Hide)
+                        {
+                            window.set_cursor_visible(true);
+                        }
+                        window.set_cursor_icon(interation);
+                    } else {
+                        window.set_cursor_visible(false);
+                    }
 
                     mouse_interaction = new_mouse_interaction;
                 }

diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs
@@ -375,10 +375,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::Idle => winit::window::CursorIcon::Default,
         Interaction::Pointer => winit::window::CursorIcon::Pointer,
         Interaction::Working => winit::window::CursorIcon::Progress,
@@ -391,7 +391,8 @@ pub fn mouse_interaction(
         }
         Interaction::ResizingVertically => winit::window::CursorIcon::NsResize,
         Interaction::NotAllowed => winit::window::CursorIcon::NotAllowed,
-    }
+        Interaction::Hide => return None,
+    })
 }
 
 /// Converts a `MouseButton` from [`winit`] to an [`iced`] mouse button.

diff --git a/winit/src/multi_window.rs b/winit/src/multi_window.rs
@@ -575,11 +575,21 @@ async fn run_instance<A, E, C>(
                         debug.draw_finished();
 
                         if new_mouse_interaction != window.mouse_interaction {
-                            window.raw.set_cursor_icon(
+                            if let Some(interation) =
                                 conversion::mouse_interaction(
                                     new_mouse_interaction,
-                                ),
-                            );
+                                )
+                            {
+                                if matches!(
+                                    mouse_interaction,
+                                    mouse::Interaction::Hide
+                                ) {
+                                    window.set_cursor_visible(true);
+                                }
+                                window.set_cursor_icon(interation);
+                            } else {
+                                window.set_cursor_visible(false);
+                            }
 
                             window.mouse_interaction = new_mouse_interaction;
                         }
@@ -916,11 +926,21 @@ async fn run_instance<A, E, C>(
 
                             if new_mouse_interaction != window.mouse_interaction
                             {
-                                window.raw.set_cursor_icon(
+                                if let Some(interation) =
                                     conversion::mouse_interaction(
                                         new_mouse_interaction,
-                                    ),
-                                );
+                                    )
+                                {
+                                    if matches!(
+                                        mouse_interaction,
+                                        mouse::Interaction::Hide
+                                    ) {
+                                        window.set_cursor_visible(true);
+                                    }
+                                    window.set_cursor_icon(interation);
+                                } else {
+                                    window.set_cursor_visible(false);
+                                }
 
                                 window.mouse_interaction =
                                     new_mouse_interaction;