diff options
author | 2022-08-29 14:50:40 +0200 | |
---|---|---|
committer | 2022-08-29 14:50:40 +0200 | |
commit | ab1ac8228f2ab9ef53303e2c5b1770eaa9a513ad (patch) | |
tree | 855d8f33fe06806ed884cf4440e568b41a195d38 /glutin | |
parent | 94fc3d993e3eb5f4646b3e6559e7b25a9f227460 (diff) | |
parent | 28a30079d1b583fa62b1c48c90cdb8906923fed6 (diff) | |
download | iced-ab1ac8228f2ab9ef53303e2c5b1770eaa9a513ad.tar.gz iced-ab1ac8228f2ab9ef53303e2c5b1770eaa9a513ad.tar.bz2 iced-ab1ac8228f2ab9ef53303e2c5b1770eaa9a513ad.zip |
Merge pull request #1410 from wyatt-herkamp/0.27_update
Update `winit` to `0.27` and `glutin` to `0.29`
Diffstat (limited to '')
-rw-r--r-- | glutin/Cargo.toml | 4 | ||||
-rw-r--r-- | glutin/src/application.rs | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/glutin/Cargo.toml b/glutin/Cargo.toml index 5ad038c0..d84f9d70 100644 --- 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 index c6bb3e48..f474cbba 100644 --- 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; } |