Update winit and glutin dependencies
This commit is contained in:
parent
1b2e66ec4f
commit
663c3685da
3 changed files with 8 additions and 8 deletions
|
|
@ -16,7 +16,7 @@ debug = ["iced_winit/debug"]
|
||||||
[dependencies.glutin]
|
[dependencies.glutin]
|
||||||
version = "0.27"
|
version = "0.27"
|
||||||
git = "https://github.com/iced-rs/glutin"
|
git = "https://github.com/iced-rs/glutin"
|
||||||
rev = "03437d8a1826d83c62017b2bb7bf18bfc9e352cc"
|
rev = "6f15ac1c5e138e081e95b4a91072d7922a4b7db4"
|
||||||
|
|
||||||
[dependencies.iced_native]
|
[dependencies.iced_native]
|
||||||
version = "0.4"
|
version = "0.4"
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ thiserror = "1.0"
|
||||||
[dependencies.winit]
|
[dependencies.winit]
|
||||||
version = "0.25"
|
version = "0.25"
|
||||||
git = "https://github.com/iced-rs/winit"
|
git = "https://github.com/iced-rs/winit"
|
||||||
rev = "844485272a7412cb35cdbfac3524decdf59475ca"
|
rev = "eba45b9567d3efdba5165381960b4f914fffeb96"
|
||||||
|
|
||||||
[dependencies.iced_native]
|
[dependencies.iced_native]
|
||||||
version = "0.4"
|
version = "0.4"
|
||||||
|
|
|
||||||
|
|
@ -229,9 +229,9 @@ fn hotkey(hotkey: keyboard::Hotkey) -> winit::window::Hotkey {
|
||||||
pub fn menu<Message>(menu: &Menu<Message>) -> winit::window::Menu {
|
pub fn menu<Message>(menu: &Menu<Message>) -> winit::window::Menu {
|
||||||
fn menu_i<Message>(
|
fn menu_i<Message>(
|
||||||
converted: &mut winit::window::Menu,
|
converted: &mut winit::window::Menu,
|
||||||
starting_id: usize,
|
starting_id: u16,
|
||||||
menu: &Menu<Message>,
|
menu: &Menu<Message>,
|
||||||
) -> usize {
|
) -> u16 {
|
||||||
let mut id = starting_id;
|
let mut id = starting_id;
|
||||||
|
|
||||||
for item in menu.iter() {
|
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
|
/// Given a [`Menu`] and an identifier of a [`menu::Entry`], it returns the
|
||||||
/// `Message` that should be produced when that entry is activated.
|
/// `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
|
where
|
||||||
Message: Clone,
|
Message: Clone,
|
||||||
{
|
{
|
||||||
fn find_message<Message>(
|
fn find_message<Message>(
|
||||||
target: u32,
|
target: u16,
|
||||||
starting_id: u32,
|
starting_id: u16,
|
||||||
menu: &Menu<Message>,
|
menu: &Menu<Message>,
|
||||||
) -> Result<Message, u32>
|
) -> Result<Message, u16>
|
||||||
where
|
where
|
||||||
Message: Clone,
|
Message: Clone,
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue