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

Merge branch 'master' into feature/panes-widget

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2020-03-17 03:23:10 +01:00
commit c7583f1227
9 changed files with 49 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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