From aac7ad3e14aaa9faf7d52fe9b91bc64cb037d576 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Mon, 9 Mar 2020 22:35:25 +0100 Subject: Update `winit` to `0.22` --- winit/Cargo.toml | 2 +- winit/src/application.rs | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'winit') diff --git a/winit/Cargo.toml b/winit/Cargo.toml index 63df1d63..a70ecb9d 100644 --- a/winit/Cargo.toml +++ b/winit/Cargo.toml @@ -14,7 +14,7 @@ categories = ["gui"] debug = [] [dependencies] -winit = "0.21" +winit = "0.22" log = "0.4" [dependencies.iced_native] diff --git a/winit/src/application.rs b/winit/src/application.rs index f5aa799c..891b8f12 100644 --- a/winit/src/application.rs +++ b/winit/src/application.rs @@ -347,6 +347,9 @@ pub trait Application: Sized { WindowEvent::CloseRequested => { *control_flow = ControlFlow::Exit; } + WindowEvent::ModifiersChanged(new_modifiers) => { + modifiers = new_modifiers; + } #[cfg(target_os = "macos")] WindowEvent::KeyboardInput { input: @@ -382,12 +385,6 @@ pub trait Application: Sized { events.push(event); } } - event::Event::DeviceEvent { - event: event::DeviceEvent::ModifiersChanged(new_modifiers), - .. - } => { - modifiers = new_modifiers; - } _ => { *control_flow = ControlFlow::Wait; } -- cgit From f1168187c917f84130e97be81e2ccd4181fe9539 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 12 Mar 2020 07:32:04 +0100 Subject: Update `window_clipboard` in `iced_winit` --- winit/Cargo.toml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'winit') diff --git a/winit/Cargo.toml b/winit/Cargo.toml index a70ecb9d..ca2018c7 100644 --- a/winit/Cargo.toml +++ b/winit/Cargo.toml @@ -15,15 +15,12 @@ debug = [] [dependencies] winit = "0.22" +window_clipboard = "0.1" log = "0.4" [dependencies.iced_native] version = "0.1.0-alpha" path = "../native" -[dependencies.window_clipboard] -git = "https://github.com/hecrj/window_clipboard" -rev = "22c6dd6c04cd05d528029b50a30c56417cd4bebf" - [target.'cfg(target_os = "windows")'.dependencies.winapi] version = "0.3.6" -- cgit