Update winit and glutin forks

eliotbo · Aug 29, 2022 · 7ec4747 · 7ec4747
1 parent 94fc3d9
commit 7ec4747
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/glutin/Cargo.toml b/glutin/Cargo.toml
@@ -18,9 +18,9 @@ system = ["iced_winit/system"]
 version = "0.4"
 
 [dependencies.glutin]
-version = "0.28"
+version = "0.29"
 git = "https://github.com/iced-rs/glutin"
-rev = "7a0ee02782eb2bf059095e0c953c4bb53f1eef0e"
+rev = "da8d291486b4c9bec12487a46c119c4b1d386abf"
 
 [dependencies.iced_native]
 version = "0.5"

diff --git a/glutin/src/application.rs b/glutin/src/application.rs
@@ -31,14 +31,14 @@ where
 {
     use futures::task;
     use futures::Future;
-    use glutin::event_loop::EventLoop;
+    use glutin::event_loop::EventLoopBuilder;
     use glutin::platform::run_return::EventLoopExtRunReturn;
     use glutin::ContextBuilder;
 
     let mut debug = Debug::new();
     debug.startup_started();
 
-    let mut event_loop = EventLoop::with_user_event();
+    let mut event_loop = EventLoopBuilder::with_user_event().build();
     let proxy = event_loop.create_proxy();
 
     let runtime = {
@@ -139,10 +139,10 @@ where
 
     let mut context = task::Context::from_waker(task::noop_waker_ref());
 
-    event_loop.run_return(move |event, _, control_flow| {
+    let _ = event_loop.run_return(move |event, _, control_flow| {
         use glutin::event_loop::ControlFlow;
 
-        if let ControlFlow::Exit = control_flow {
+        if let ControlFlow::ExitWithCode(_) = control_flow {
             return;
         }
 

diff --git a/winit/Cargo.toml b/winit/Cargo.toml
@@ -20,9 +20,9 @@ log = "0.4"
 thiserror = "1.0"
 
 [dependencies.winit]
-version = "0.26"
-git = "https://github.com/iced-rs/winit"
-rev = "02a12380960cec2f351c09a33d6a7cc2789d96a6"
+version = "0.27"
+git = "https://github.com/iced-rs/winit.git"
+rev = "940457522e9fb9f5dac228b0ecfafe0138b4048c"
 
 [dependencies.iced_native]
 version = "0.5"

diff --git a/winit/src/application.rs b/winit/src/application.rs
@@ -116,12 +116,12 @@ where
 {
     use futures::task;
     use futures::Future;
-    use winit::event_loop::EventLoop;
+    use winit::event_loop::EventLoopBuilder;
 
     let mut debug = Debug::new();
     debug.startup_started();
 
-    let event_loop = EventLoop::with_user_event();
+    let event_loop = EventLoopBuilder::with_user_event().build();
     let proxy = event_loop.create_proxy();
 
     let runtime = {
@@ -186,7 +186,7 @@ where
     platform::run(event_loop, move |event, _, control_flow| {
         use winit::event_loop::ControlFlow;
 
-        if let ControlFlow::Exit = control_flow {
+        if let ControlFlow::ExitWithCode(_) = control_flow {
             return;
         }
 
@@ -713,7 +713,7 @@ mod platform {
     {
         use winit::platform::run_return::EventLoopExtRunReturn;
 
-        event_loop.run_return(event_handler);
+        let _ = event_loop.run_return(event_handler);
 
         Ok(())
     }

diff --git a/winit/src/settings.rs b/winit/src/settings.rs
@@ -138,7 +138,7 @@ impl Window {
             use ::winit::platform::unix::WindowBuilderExtUnix;
 
             if let Some(id) = _id {
-                window_builder = window_builder.with_app_id(id);
+                window_builder = window_builder.with_name(id.clone(), id);
             }
         }
 

diff --git a/winit/src/settings/windows.rs b/winit/src/settings/windows.rs
@@ -5,7 +5,7 @@
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct PlatformSpecific {
     /// Parent window
-    pub parent: Option<winapi::shared::windef::HWND>,
+    pub parent: Option<winit::platform::windows::HWND>,
 
     /// Drag and drop support
     pub drag_and_drop: bool,