diff options
| author |  Héctor Ramón <hector0193@gmail.com> | 2020-12-15 03:27:42 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2020-12-15 03:27:42 +0100 |
| commit | a42b3c6998274e75fd10f5ff3cecbdb37b9e3895 (patch) | |
| tree | 6ac8de07e4d6d50ef75b96a21ebd20b411ef8a56 /winit | |
| parent | d16b9cf7cd98a3d65ea5408ac9b72298cb267e85 (diff) | |
| parent | 742086e19063c6ea35195a3e84619ae2b5503a68 (diff) | |
| download | iced-a42b3c6998274e75fd10f5ff3cecbdb37b9e3895.tar.gz iced-a42b3c6998274e75fd10f5ff3cecbdb37b9e3895.tar.bz2 iced-a42b3c6998274e75fd10f5ff3cecbdb37b9e3895.zip | |
Merge pull request #658 from hecrj/update-winit-and-glutin
Update `winit` and `glutin`
Diffstat (limited to 'winit')
| -rw-r--r-- | winit/Cargo.toml | 2 | ||||
| -rw-r--r-- | winit/src/conversion.rs | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/winit/Cargo.toml b/winit/Cargo.toml index 8929564a..39a6a5fa 100644 --- a/winit/Cargo.toml +++ b/winit/Cargo.toml @@ -14,7 +14,7 @@ categories = ["gui"] debug = ["iced_native/debug"] [dependencies] -winit = "0.23" +winit = "0.24" window_clipboard = "0.1" log = "0.4" thiserror = "1.0" diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs index 6102b4b3..138bc64d 100644 --- a/winit/src/conversion.rs +++ b/winit/src/conversion.rs @@ -170,7 +170,9 @@ pub fn mouse_button(mouse_button: winit::event::MouseButton) -> mouse::Button { winit::event::MouseButton::Left => mouse::Button::Left, winit::event::MouseButton::Right => mouse::Button::Right, winit::event::MouseButton::Middle => mouse::Button::Middle, - winit::event::MouseButton::Other(other) => mouse::Button::Other(other), + winit::event::MouseButton::Other(other) => { + mouse::Button::Other(other as u8) + } } } |