diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-03-17 03:23:10 +0100 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-03-17 03:23:10 +0100 |
| commit | c7583f12270082dc2f4d766aea50be7bd49b6c50 (patch) | |
| tree | bf4529c0deec92a72f72a157b35299b6d1e7d4de /winit | |
| parent | a373682fa4e8d57d66707faef1fb6b373f4297eb (diff) | |
| parent | 9da6ce474c2cd178ca5365d46760ba0882ce7121 (diff) | |
| download | iced-c7583f12270082dc2f4d766aea50be7bd49b6c50.tar.gz iced-c7583f12270082dc2f4d766aea50be7bd49b6c50.tar.bz2 iced-c7583f12270082dc2f4d766aea50be7bd49b6c50.zip | |
Merge branch 'master' into feature/panes-widget
Diffstat (limited to 'winit')
| -rw-r--r-- | winit/Cargo.toml | 7 | ||||
| -rw-r--r-- | winit/src/application.rs | 9 |
2 files changed, 5 insertions, 11 deletions
diff --git a/winit/Cargo.toml b/winit/Cargo.toml index 63df1d63..ca2018c7 100644 --- a/winit/Cargo.toml +++ b/winit/Cargo.toml @@ -14,16 +14,13 @@ categories = ["gui"] debug = [] [dependencies] -winit = "0.21" +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" 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; } |