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

Update winit and glutin dependencies

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2021-08-16 15:50:20 +07:00
parent 1b2e66ec4f
commit 663c3685da
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
glutin/Cargo.toml
View file

@ -16,7 +16,7 @@ debug = ["iced_winit/debug"]
[dependencies.glutin]
version = "0.27"
git = "https://github.com/iced-rs/glutin"
rev = "03437d8a1826d83c62017b2bb7bf18bfc9e352cc"
rev = "6f15ac1c5e138e081e95b4a91072d7922a4b7db4"
[dependencies.iced_native]
version = "0.4"

2
winit/Cargo.toml
View file

@ -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"

12
winit/src/conversion.rs
View file

@ -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,
{