Merge pull request #430 from hecrj/feature/keyboard-modifiers-event
Add `ModifiersChanged` to `keyboard::Event`
This commit is contained in:
commit
79aa225001
@ -28,4 +28,7 @@ pub enum Event {
|
|||||||
|
|
||||||
/// A unicode character was received.
|
/// A unicode character was received.
|
||||||
CharacterReceived(char),
|
CharacterReceived(char),
|
||||||
|
|
||||||
|
/// The keyboard modifiers have changed.
|
||||||
|
ModifiersChanged(ModifiersState),
|
||||||
}
|
}
|
||||||
|
@ -539,10 +539,8 @@ where
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
*self.pressed_modifiers = modifiers;
|
|
||||||
}
|
}
|
||||||
keyboard::Event::KeyReleased { modifiers, .. } => {
|
keyboard::Event::ModifiersChanged(modifiers) => {
|
||||||
*self.pressed_modifiers = modifiers;
|
*self.pressed_modifiers = modifiers;
|
||||||
}
|
}
|
||||||
_ => {}
|
_ => {}
|
||||||
|
@ -92,6 +92,9 @@ pub fn window_event(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
})),
|
})),
|
||||||
|
WindowEvent::ModifiersChanged(new_modifiers) => Some(Event::Keyboard(
|
||||||
|
keyboard::Event::ModifiersChanged(modifiers_state(*new_modifiers)),
|
||||||
|
)),
|
||||||
WindowEvent::HoveredFile(path) => {
|
WindowEvent::HoveredFile(path) => {
|
||||||
Some(Event::Window(window::Event::FileHovered(path.clone())))
|
Some(Event::Window(window::Event::FileHovered(path.clone())))
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user