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

Update winit to 0.29.4

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-12-15 13:15:44 +01:00
parent dd249a1d11
commit e819c2390b
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
19 changed files with 654 additions and 846 deletions
Download patch file Download diff file Expand all files Collapse all files

24
winit/src/application/state.rs
View file

@ -22,7 +22,7 @@ where
viewport: Viewport,
viewport_version: usize,
cursor_position: Option<winit::dpi::PhysicalPosition<f64>>,
modifiers: winit::event::ModifiersState,
modifiers: winit::keyboard::ModifiersState,
theme: <A::Renderer as core::Renderer>::Theme,
appearance: application::Appearance,
application: PhantomData<A>,
@ -54,7 +54,7 @@ where
viewport,
viewport_version: 0,
cursor_position: None,
modifiers: winit::event::ModifiersState::default(),
modifiers: winit::keyboard::ModifiersState::default(),
theme,
appearance,
application: PhantomData,
@ -102,7 +102,7 @@ where
}
/// Returns the current keyboard modifiers of the [`State`].
pub fn modifiers(&self) -> winit::event::ModifiersState {
pub fn modifiers(&self) -> winit::keyboard::ModifiersState {
self.modifiers
}
@ -126,7 +126,7 @@ where
pub fn update(
&mut self,
window: &Window,
event: &WindowEvent<'_>,
event: &WindowEvent,
_debug: &mut Debug,
) {
match event {
@ -142,10 +142,9 @@ where
}
WindowEvent::ScaleFactorChanged {
scale_factor: new_scale_factor,
new_inner_size,
..
} => {
let size =
Size::new(new_inner_size.width, new_inner_size.height);
let size = self.viewport.physical_size();
self.viewport = Viewport::with_physical_size(
size,
@ -164,13 +163,16 @@ where
self.cursor_position = None;
}
WindowEvent::ModifiersChanged(new_modifiers) => {
self.modifiers = *new_modifiers;
self.modifiers = new_modifiers.state();
}
#[cfg(feature = "debug")]
WindowEvent::KeyboardInput {
input:
winit::event::KeyboardInput {
virtual_keycode: Some(winit::event::VirtualKeyCode::F12),
event:
winit::event::KeyEvent {
logical_key:
winit::keyboard::Key::Named(
winit::keyboard::NamedKey::F12,
),
state: winit::event::ElementState::Pressed,
..
},