reivilibre/iced-mobile
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #215 from hecrj/improvement/update-winit

Browse Source 
Update `winit` to `0.22`
This commit is contained in:
Héctor Ramón 2020-03-11 01:03:16 +01:00 committed by GitHub
commit 3f785472c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
examples/integration/src/main.rs
View File

@ -10,7 +10,7 @@ use iced_wgpu::{
use iced_winit::{winit, Cache, Clipboard, MouseCursor, Size, UserInterface};
use winit::{
event::{DeviceEvent, Event, ModifiersState, WindowEvent},
event::{Event, ModifiersState, WindowEvent},
event_loop::{ControlFlow, EventLoop},
};
@ -66,14 +66,11 @@ pub fn main() {
*control_flow = ControlFlow::Wait;
match event {
Event::DeviceEvent {
event: DeviceEvent::ModifiersChanged(new_modifiers),
..
} => {
modifiers = new_modifiers;
}
Event::WindowEvent { event, .. } => {
match event {
WindowEvent::ModifiersChanged(new_modifiers) => {
modifiers = new_modifiers;
}
WindowEvent::Resized(new_size) => {
logical_size =
new_size.to_logical(window.scale_factor());
@ -82,6 +79,7 @@ pub fn main() {
WindowEvent::CloseRequested => {
*control_flow = ControlFlow::Exit;
}
_ => {}
}

2
winit/Cargo.toml
View File

@ -14,7 +14,7 @@ categories = ["gui"]
debug = []
[dependencies]
winit = "0.21"
winit = "0.22"
log = "0.4"
[dependencies.iced_native]

9
winit/src/application.rs
View File

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