fix: some cursor shape is wrong

waycrate · Sep 27, 2024 · 3d0bdc4 · 3d0bdc4
1 parent 02e1f5e
commit 3d0bdc4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/iced_layershell/src/conversion.rs b/iced_layershell/src/conversion.rs
@@ -129,7 +129,8 @@ pub(crate) fn mouse_interaction(interaction: mouse::Interaction) -> String {
     use layershellev::reexport::wp_cursor_shape_device_v1::{Shape, ShapeName};
     use mouse::Interaction;
     match interaction {
-        Interaction::Idle => Shape::Default.name().to_owned(),
+        Interaction::None => Shape::Default.name().to_owned(),
+        Interaction::Idle => Shape::Wait.name().to_owned(),
         Interaction::Pointer => Shape::Pointer.name().to_owned(),
         Interaction::Working => Shape::Pointer.name().to_owned(),
         Interaction::Grab => Shape::Grab.name().to_owned(),
@@ -140,7 +141,6 @@ pub(crate) fn mouse_interaction(interaction: mouse::Interaction) -> String {
         Interaction::NotAllowed => Shape::NotAllowed.name().to_owned(),
         Interaction::ResizingVertically => Shape::NsResize.name().to_owned(),
         Interaction::ResizingHorizontally => Shape::EwResize.name().to_owned(),
-        Interaction::None => Shape::Pointer.name().to_owned(),
         Interaction::Cell => Shape::Cell.name().to_owned(),
         Interaction::Move => Shape::Move.name().to_owned(),
         Interaction::Copy => Shape::Copy.name().to_owned(),

diff --git a/iced_sessionlock/src/conversion.rs b/iced_sessionlock/src/conversion.rs
@@ -130,7 +130,8 @@ pub(crate) fn mouse_interaction(interaction: mouse::Interaction) -> String {
     use mouse::Interaction;
     use sessionlockev::reexport::wp_cursor_shape_device_v1::{Shape, ShapeName};
     match interaction {
-        Interaction::Idle => Shape::Default.name().to_owned(),
+        Interaction::None => Shape::Default.name().to_owned(),
+        Interaction::Idle => Shape::Wait.name().to_owned(),
         Interaction::Pointer => Shape::Pointer.name().to_owned(),
         Interaction::Working => Shape::Pointer.name().to_owned(),
         Interaction::Grab => Shape::Grab.name().to_owned(),
@@ -141,7 +142,6 @@ pub(crate) fn mouse_interaction(interaction: mouse::Interaction) -> String {
         Interaction::NotAllowed => Shape::NotAllowed.name().to_owned(),
         Interaction::ResizingVertically => Shape::NsResize.name().to_owned(),
         Interaction::ResizingHorizontally => Shape::EwResize.name().to_owned(),
-        Interaction::None => Shape::Pointer.name().to_owned(),
         Interaction::Cell => Shape::Cell.name().to_owned(),
         Interaction::Move => Shape::Move.name().to_owned(),
         Interaction::Copy => Shape::Copy.name().to_owned(),