Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/src/mouse/interaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
pub enum Interaction {
#[default]
None,
Hidden,
Idle,
Pointer,
Grab,
Expand Down
14 changes: 10 additions & 4 deletions examples/integration/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -286,11 +286,17 @@ pub fn main() -> Result<(), winit::error::EventLoopError> {
..
} = state
{
window.set_cursor(
conversion::mouse_interaction(
// Update the mouse cursor
if let Some(icon) =
iced_winit::conversion::mouse_interaction(
mouse_interaction,
),
);
)
{
window.set_cursor(icon);
window.set_cursor_visible(true);
} else {
window.set_cursor_visible(false);
}
}

// Draw the interface
Expand Down
11 changes: 8 additions & 3 deletions winit/src/conversion.rs
Original file line number Diff line number Diff line change
Expand Up @@ -467,10 +467,13 @@ pub fn window_theme(mode: theme::Mode) -> Option<winit::window::Theme> {
/// [`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 {
let icon = match interaction {
Interaction::Hidden => {
return None;
}
Interaction::None | Interaction::Idle => {
winit::window::CursorIcon::Default
}
Expand All @@ -497,7 +500,9 @@ pub fn mouse_interaction(
Interaction::Move => winit::window::CursorIcon::Move,
Interaction::Copy => winit::window::CursorIcon::Copy,
Interaction::Help => winit::window::CursorIcon::Help,
}
};

Some(icon)
}

/// Converts a `MouseButton` from [`winit`] to an [`iced`] mouse button.
Expand Down
11 changes: 9 additions & 2 deletions winit/src/window.rs
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,15 @@ where

pub fn update_mouse(&mut self, interaction: mouse::Interaction) {
if interaction != self.mouse_interaction {
self.raw
.set_cursor(conversion::mouse_interaction(interaction));
if let Some(icon) = conversion::mouse_interaction(interaction) {
self.raw.set_cursor(icon);

if self.mouse_interaction == mouse::Interaction::Hidden {
self.raw.set_cursor_visible(true);
}
} else {
self.raw.set_cursor_visible(false);
}

self.mouse_interaction = interaction;
}
Expand Down
Loading