me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update winit and glutin forks

Browse source
This commit is contained in:
Wyatt Herkamp 2022-08-15 08:10:28 -04:00 • committed by Héctor Ramón Jiménez
parent 94fc3d993e
commit 7ec4747304
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
6 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
glutin/Cargo.toml
View file

@ -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"

8
glutin/src/application.rs
View file

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