Merge branch 'master' into feature/panes-widget

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"

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;
             }