diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-12-12 00:54:25 +0100 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-12-12 00:54:25 +0100 |
| commit | 742086e19063c6ea35195a3e84619ae2b5503a68 (patch) | |
| tree | 6ac8de07e4d6d50ef75b96a21ebd20b411ef8a56 | |
| parent | d16b9cf7cd98a3d65ea5408ac9b72298cb267e85 (diff) | |
| download | iced-742086e19063c6ea35195a3e84619ae2b5503a68.tar.gz iced-742086e19063c6ea35195a3e84619ae2b5503a68.tar.bz2 iced-742086e19063c6ea35195a3e84619ae2b5503a68.zip | |
Update `winit` and `glutin`
We avoid a breaking change in `mouse::Button::Other` for the time being.
| -rw-r--r-- | glutin/Cargo.toml | 2 | ||||
| -rw-r--r-- | winit/Cargo.toml | 2 | ||||
| -rw-r--r-- | winit/src/conversion.rs | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/glutin/Cargo.toml b/glutin/Cargo.toml index c6b9a34f..505ee7e5 100644 --- a/glutin/Cargo.toml +++ b/glutin/Cargo.toml @@ -14,7 +14,7 @@ categories = ["gui"] debug = ["iced_winit/debug"] [dependencies] -glutin = "0.25" +glutin = "0.26" [dependencies.iced_native] version = "0.3" 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) + } } } |