diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2021-08-16 15:50:20 +0700 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2021-08-16 15:50:20 +0700 |
| commit | 663c3685da4140c9224ae6b189245c991508624b (patch) | |
| tree | 7255dcc61530ae802af7b72e2ed7c1190ae8e725 /winit | |
| parent | 1b2e66ec4f856e95d2655d2d41b840deee01080e (diff) | |
| download | iced-663c3685da4140c9224ae6b189245c991508624b.tar.gz iced-663c3685da4140c9224ae6b189245c991508624b.tar.bz2 iced-663c3685da4140c9224ae6b189245c991508624b.zip | |
Update `winit` and `glutin` dependencies
Diffstat (limited to 'winit')
| -rw-r--r-- | winit/Cargo.toml | 2 | ||||
| -rw-r--r-- | winit/src/conversion.rs | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/winit/Cargo.toml b/winit/Cargo.toml index b1192135..16218098 100644 --- a/winit/Cargo.toml +++ b/winit/Cargo.toml @@ -21,7 +21,7 @@ thiserror = "1.0" [dependencies.winit] version = "0.25" git = "https://github.com/iced-rs/winit" -rev = "844485272a7412cb35cdbfac3524decdf59475ca" +rev = "eba45b9567d3efdba5165381960b4f914fffeb96" [dependencies.iced_native] version = "0.4" diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs index e0934f43..8e2dd02d 100644 --- a/winit/src/conversion.rs +++ b/winit/src/conversion.rs @@ -229,9 +229,9 @@ fn hotkey(hotkey: keyboard::Hotkey) -> winit::window::Hotkey { pub fn menu<Message>(menu: &Menu<Message>) -> winit::window::Menu { fn menu_i<Message>( converted: &mut winit::window::Menu, - starting_id: usize, + starting_id: u16, menu: &Menu<Message>, - ) -> usize { + ) -> u16 { let mut id = starting_id; for item in menu.iter() { @@ -267,15 +267,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: u32) -> Option<Message> +pub fn menu_message<Message>(menu: &Menu<Message>, id: u16) -> Option<Message> where Message: Clone, { fn find_message<Message>( - target: u32, - starting_id: u32, + target: u16, + starting_id: u16, menu: &Menu<Message>, - ) -> Result<Message, u32> + ) -> Result<Message, u16> where Message: Clone, { |