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

Merge pull request #1410 from wyatt-herkamp/0.27_update

Browse source 
Update `winit` to `0.27` and `glutin` to `0.29`
This commit is contained in:
Héctor Ramón 2022-08-29 14:50:40 +02:00 • committed by GitHub
commit ab1ac8228f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 16 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" version = "0.4"
[dependencies.glutin] [dependencies.glutin]
version = "0.28" version = "0.29"
git = "https://github.com/iced-rs/glutin" git = "https://github.com/iced-rs/glutin"
rev = "7a0ee02782eb2bf059095e0c953c4bb53f1eef0e" rev = "da8d291486b4c9bec12487a46c119c4b1d386abf"
[dependencies.iced_native] [dependencies.iced_native]
version = "0.5" version = "0.5"

8
glutin/src/application.rs
View file

@ -31,14 +31,14 @@ where
{ {
use futures::task; use futures::task;
use futures::Future; use futures::Future;
use glutin::event_loop::EventLoop; use glutin::event_loop::EventLoopBuilder;
use glutin::platform::run_return::EventLoopExtRunReturn; use glutin::platform::run_return::EventLoopExtRunReturn;
use glutin::ContextBuilder; use glutin::ContextBuilder;
let mut debug = Debug::new(); let mut debug = Debug::new();
debug.startup_started(); 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 proxy = event_loop.create_proxy();
let runtime = { let runtime = {
@ -139,10 +139,10 @@ where
let mut context = task::Context::from_waker(task::noop_waker_ref()); 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; use glutin::event_loop::ControlFlow;
if let ControlFlow::Exit = control_flow { if let ControlFlow::ExitWithCode(_) = control_flow {
return; return;
} }

6
winit/Cargo.toml
View file

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

14
winit/src/application.rs
View file

@ -116,12 +116,12 @@ where
{ {
use futures::task; use futures::task;
use futures::Future; use futures::Future;
use winit::event_loop::EventLoop; use winit::event_loop::EventLoopBuilder;
let mut debug = Debug::new(); let mut debug = Debug::new();
debug.startup_started(); 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 proxy = event_loop.create_proxy();
let runtime = { let runtime = {
@ -186,7 +186,7 @@ where
platform::run(event_loop, move |event, _, control_flow| { platform::run(event_loop, move |event, _, control_flow| {
use winit::event_loop::ControlFlow; use winit::event_loop::ControlFlow;
if let ControlFlow::Exit = control_flow { if let ControlFlow::ExitWithCode(_) = control_flow {
return; return;
} }
@ -635,7 +635,11 @@ pub fn run_command<A, E>(
)); ));
} }
window::Action::FetchMode(tag) => { window::Action::FetchMode(tag) => {
let mode = conversion::mode(window.fullscreen()); let mode = if window.is_visible().unwrap_or(true) {
conversion::mode(window.fullscreen())
} else {
window::Mode::Hidden
};
proxy proxy
.send_event(tag(mode)) .send_event(tag(mode))
@ -713,7 +717,7 @@ mod platform {
{ {
use winit::platform::run_return::EventLoopExtRunReturn; use winit::platform::run_return::EventLoopExtRunReturn;
event_loop.run_return(event_handler); let _ = event_loop.run_return(event_handler);
Ok(()) Ok(())
} }

2
winit/src/settings.rs
View file

@ -138,7 +138,7 @@ impl Window {
use ::winit::platform::unix::WindowBuilderExtUnix; use ::winit::platform::unix::WindowBuilderExtUnix;
if let Some(id) = _id { if let Some(id) = _id {
window_builder = window_builder.with_app_id(id); window_builder = window_builder.with_name(id.clone(), id);
} }
} }

2
winit/src/settings/windows.rs
View file

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