leyoda/iced-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 19

Merge pull request #2815 from edwloef/extend-mouse-interactions

Browse source 
add more missing mouse interactions
This commit is contained in:
Héctor 2025-11-21 01:00:09 +01:00 • committed by GitHub
commit 23723f8624
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 30 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

23
core/src/mouse/interaction.rs
View file

@ -6,21 +6,28 @@ pub enum Interaction {
None, None,
Hidden, Hidden,
Idle, Idle,
ContextMenu,
Help,
Pointer, Pointer,
Grab, Progress,
Text, Wait,
Cell,
Crosshair, Crosshair,
Working, Text,
Alias,
Copy,
Move,
NoDrop,
NotAllowed,
Grab,
Grabbing, Grabbing,
ResizingHorizontally, ResizingHorizontally,
ResizingVertically, ResizingVertically,
ResizingDiagonallyUp, ResizingDiagonallyUp,
ResizingDiagonallyDown, ResizingDiagonallyDown,
NotAllowed, ResizingColumn,
ResizingRow,
AllScroll,
ZoomIn, ZoomIn,
ZoomOut, ZoomOut,
Cell,
Move,
Copy,
Help,
} }

23
winit/src/conversion.rs
View file

@ -487,12 +487,21 @@ pub fn mouse_interaction(
Interaction::None | Interaction::Idle => { Interaction::None | Interaction::Idle => {
winit::window::CursorIcon::Default winit::window::CursorIcon::Default
} }
Interaction::ContextMenu => winit::window::CursorIcon::ContextMenu,
Interaction::Help => winit::window::CursorIcon::Help,
Interaction::Pointer => winit::window::CursorIcon::Pointer, Interaction::Pointer => winit::window::CursorIcon::Pointer,
Interaction::Working => winit::window::CursorIcon::Progress, Interaction::Progress => winit::window::CursorIcon::Progress,
Interaction::Grab => winit::window::CursorIcon::Grab, Interaction::Wait => winit::window::CursorIcon::Wait,
Interaction::Grabbing => winit::window::CursorIcon::Grabbing, Interaction::Cell => winit::window::CursorIcon::Cell,
Interaction::Crosshair => winit::window::CursorIcon::Crosshair, Interaction::Crosshair => winit::window::CursorIcon::Crosshair,
Interaction::Text => winit::window::CursorIcon::Text, Interaction::Text => winit::window::CursorIcon::Text,
Interaction::Alias => winit::window::CursorIcon::Alias,
Interaction::Copy => winit::window::CursorIcon::Copy,
Interaction::Move => winit::window::CursorIcon::Move,
Interaction::NoDrop => winit::window::CursorIcon::NoDrop,
Interaction::NotAllowed => winit::window::CursorIcon::NotAllowed,
Interaction::Grab => winit::window::CursorIcon::Grab,
Interaction::Grabbing => winit::window::CursorIcon::Grabbing,
Interaction::ResizingHorizontally => { Interaction::ResizingHorizontally => {
winit::window::CursorIcon::EwResize winit::window::CursorIcon::EwResize
} }
@ -503,13 +512,11 @@ pub fn mouse_interaction(
Interaction::ResizingDiagonallyDown => { Interaction::ResizingDiagonallyDown => {
winit::window::CursorIcon::NwseResize winit::window::CursorIcon::NwseResize
} }
Interaction::NotAllowed => winit::window::CursorIcon::NotAllowed, Interaction::ResizingColumn => winit::window::CursorIcon::ColResize,
Interaction::ResizingRow => winit::window::CursorIcon::RowResize,
Interaction::AllScroll => winit::window::CursorIcon::AllScroll,
Interaction::ZoomIn => winit::window::CursorIcon::ZoomIn, Interaction::ZoomIn => winit::window::CursorIcon::ZoomIn,
Interaction::ZoomOut => winit::window::CursorIcon::ZoomOut, Interaction::ZoomOut => winit::window::CursorIcon::ZoomOut,
Interaction::Cell => winit::window::CursorIcon::Cell,
Interaction::Move => winit::window::CursorIcon::Move,
Interaction::Copy => winit::window::CursorIcon::Copy,
Interaction::Help => winit::window::CursorIcon::Help,
}; };
Some(icon) Some(icon)