diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2021-07-20 21:34:20 +0700 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2021-07-20 21:34:44 +0700 |
| commit | 82db3c78b6cfa2cc55ece6ffa46811bfb5195f60 (patch) | |
| tree | 49b1011ad3dbc4fec78a52fef78628754ae9217e /winit | |
| parent | b97954a1ee3ec7bc85d1d41b397e994752ff1831 (diff) | |
| download | iced-82db3c78b6cfa2cc55ece6ffa46811bfb5195f60.tar.gz iced-82db3c78b6cfa2cc55ece6ffa46811bfb5195f60.tar.bz2 iced-82db3c78b6cfa2cc55ece6ffa46811bfb5195f60.zip | |
Update `winit` and `glutin` dependencies
... and remove crates.io patch
Diffstat (limited to 'winit')
| -rw-r--r-- | winit/Cargo.toml | 4 | ||||
| -rw-r--r-- | winit/src/conversion.rs | 17 |
2 files changed, 7 insertions, 14 deletions
diff --git a/winit/Cargo.toml b/winit/Cargo.toml index 87fd23d5..b1192135 100644 --- a/winit/Cargo.toml +++ b/winit/Cargo.toml @@ -20,8 +20,8 @@ thiserror = "1.0" [dependencies.winit] version = "0.25" -# git = "https://github.com/iced-rs/winit" -# rev = "e351421a32bf01b428325dde44dea39ee2656153" +git = "https://github.com/iced-rs/winit" +rev = "844485272a7412cb35cdbfac3524decdf59475ca" [dependencies.iced_native] version = "0.4" diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs index e61611aa..5a8b9fd8 100644 --- a/winit/src/conversion.rs +++ b/winit/src/conversion.rs @@ -218,17 +218,15 @@ pub fn menu<Message>(menu: &Menu<Message>) -> winit::window::Menu { /// Given a [`Menu`] and an identifier of a [`menu::Entry`], it returns the /// `Message` that should be produced when that entry is activated. -pub fn menu_message<Message>(menu: &Menu<Message>, id: isize) -> Option<Message> +pub fn menu_message<Message>(menu: &Menu<Message>, id: u32) -> Option<Message> where Message: Clone, { - use std::convert::TryFrom; - fn find_message<Message>( - target: usize, - starting_id: usize, + target: u32, + starting_id: u32, menu: &Menu<Message>, - ) -> Result<Message, usize> + ) -> Result<Message, u32> where Message: Clone, { @@ -260,12 +258,7 @@ where Err(id - starting_id) } - // TODO: Does `winit` really need to provide an `isize`? - if let Ok(id) = usize::try_from(id) { - find_message(id, 0, menu).ok() - } else { - None - } + find_message(id, 0, menu).ok() } /// Converts a `MouseCursor` from [`iced_native`] to a [`winit`] cursor icon. |