summaryrefslogtreecommitdiffstats
path: root/winit
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2020-11-25 05:31:45 +0100
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2020-11-26 02:05:42 +0100
commitd612bf56784b41346f18ad9eda4f6d54d699dcb5 (patch)
tree091cc60b513067cc1d3c8254ed1bcd3072b8410e /winit
parent08e0b9ffbd931928ad10c0147b84c09ce083276d (diff)
downloadiced-d612bf56784b41346f18ad9eda4f6d54d699dcb5.tar.gz
iced-d612bf56784b41346f18ad9eda4f6d54d699dcb5.tar.bz2
iced-d612bf56784b41346f18ad9eda4f6d54d699dcb5.zip
Rename `keyboard::ModifiersState` to `Modifiers`
Diffstat (limited to 'winit')
-rw-r--r--winit/src/conversion.rs12
1 files changed, 5 insertions, 7 deletions
diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs
index de38f246..a9fa2ffc 100644
--- a/winit/src/conversion.rs
+++ b/winit/src/conversion.rs
@@ -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(),