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

Rename keyboard::ModifiersState to Modifiers

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2020-11-25 05:31:45 +01:00
parent 08e0b9ffbd
commit d612bf5678
6 changed files with 22 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

12
winit/src/conversion.rs
View file

@ -3,7 +3,7 @@
//! [`winit`]: https://github.com/rust-windowing/winit
//! [`iced_native`]: https://github.com/hecrj/iced/tree/master/native
use crate::{
keyboard::{self, KeyCode, ModifiersState},
keyboard::{self, KeyCode, Modifiers},
mouse, window, Event, Mode, Point,
};
@ -89,7 +89,7 @@ pub fn window_event(
..
} => Some(Event::Keyboard({
let key_code = key_code(*virtual_keycode);
let modifiers = modifiers_state(modifiers);
let modifiers = self::modifiers(modifiers);
match state {
winit::event::ElementState::Pressed => {
@ -107,7 +107,7 @@ pub fn window_event(
}
})),
WindowEvent::ModifiersChanged(new_modifiers) => Some(Event::Keyboard(
keyboard::Event::ModifiersChanged(modifiers_state(*new_modifiers)),
keyboard::Event::ModifiersChanged(self::modifiers(*new_modifiers)),
)),
WindowEvent::HoveredFile(path) => {
Some(Event::Window(window::Event::FileHovered(path.clone())))
@ -180,10 +180,8 @@ pub fn mouse_button(mouse_button: winit::event::MouseButton) -> mouse::Button {
///
/// [`winit`]: https://github.com/rust-windowing/winit
/// [`iced_native`]: https://github.com/hecrj/iced/tree/master/native
pub fn modifiers_state(
modifiers: winit::event::ModifiersState,
) -> ModifiersState {
ModifiersState {
pub fn modifiers(modifiers: winit::event::ModifiersState) -> Modifiers {
Modifiers {
shift: modifiers.shift(),
control: modifiers.ctrl(),
alt: modifiers.alt(),