diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-03-24 19:08:21 +0100 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-03-24 19:08:21 +0100 |
| commit | e77fa175aa0eaf62be4ebafbd8e0dbc5df18f006 (patch) | |
| tree | 78608f77c6db3ff1e61a58008bd54d114f32352c /winit | |
| parent | 7cb1452d29ddfdcd29fd7ecc7c96a79ea2681fce (diff) | |
| parent | fd7d9622e333a0a2cd5c2e8e6cc38cc09d7981e4 (diff) | |
| download | iced-e77fa175aa0eaf62be4ebafbd8e0dbc5df18f006.tar.gz iced-e77fa175aa0eaf62be4ebafbd8e0dbc5df18f006.tar.bz2 iced-e77fa175aa0eaf62be4ebafbd8e0dbc5df18f006.zip | |
Merge branch 'master' into feature/text-selection
Diffstat (limited to '')
| -rw-r--r-- | winit/Cargo.toml | 7 | ||||
| -rw-r--r-- | winit/src/application.rs | 9 | ||||
| -rw-r--r-- | winit/src/conversion.rs | 4 |
3 files changed, 9 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; } diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs index b6a0b64b..74852876 100644 --- a/winit/src/conversion.rs +++ b/winit/src/conversion.rs @@ -116,6 +116,10 @@ pub fn mouse_cursor(mouse_cursor: MouseCursor) -> winit::window::CursorIcon { MouseCursor::Grab => winit::window::CursorIcon::Grab, MouseCursor::Grabbing => winit::window::CursorIcon::Grabbing, MouseCursor::Text => winit::window::CursorIcon::Text, + MouseCursor::ResizingHorizontally => { + winit::window::CursorIcon::EwResize + } + MouseCursor::ResizingVertically => winit::window::CursorIcon::NsResize, } } |