me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1797 from bbb651/master

Browse source 
Make mouse::Button::Other take u16 instead of u8
This commit is contained in:
Héctor Ramón 2023-05-23 02:52:14 +02:00 • committed by GitHub
commit e31582e59e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/src/mouse/button.rs
View file

@ -11,5 +11,5 @@ pub enum Button {
Middle, Middle,
/// Some other button. /// Some other button.
Other(u8), Other(u16),
} }

4
winit/src/conversion.rs
View file

@ -250,9 +250,7 @@ pub fn mouse_button(mouse_button: winit::event::MouseButton) -> mouse::Button {
winit::event::MouseButton::Left => mouse::Button::Left, winit::event::MouseButton::Left => mouse::Button::Left,
winit::event::MouseButton::Right => mouse::Button::Right, winit::event::MouseButton::Right => mouse::Button::Right,
winit::event::MouseButton::Middle => mouse::Button::Middle, winit::event::MouseButton::Middle => mouse::Button::Middle,
winit::event::MouseButton::Other(other) => { winit::event::MouseButton::Other(other) => mouse::Button::Other(other),
mouse::Button::Other(other as u8)
}
} }
} }