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

Add modified_key to keyboard::Event

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-09-13 03:07:52 +02:00
parent cbe91d4a7c
commit 94c8b9639c
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/src/keyboard/event.rs
View file

@ -15,6 +15,9 @@ pub enum Event {
/// The key pressed.
key: Key,
/// The key pressed with all keyboard modifiers applied, except Ctrl.
modified_key: Key,
/// The physical key pressed.
physical_key: key::Physical,

10
winit/src/conversion.rs
View file

@ -192,7 +192,7 @@ pub fn window_event(
}
},
WindowEvent::KeyboardInput { event, .. } => Some(Event::Keyboard({
let logical_key = {
let key = {
#[cfg(not(target_arch = "wasm32"))]
{
use winit::platform::modifier_supplement::KeyEventExtModifierSupplement;
@ -202,7 +202,7 @@ pub fn window_event(
#[cfg(target_arch = "wasm32")]
{
// TODO: Fix inconsistent API on Wasm
event.logical_key
event.logical_key.clone()
}
};
@ -225,10 +225,13 @@ pub fn window_event(
let winit::event::KeyEvent {
state,
location,
logical_key,
physical_key,
..
} = event;
let key = key(logical_key);
let key = self::key(key);
let modified_key = self::key(logical_key);
let physical_key = self::physical_key(physical_key);
let modifiers = self::modifiers(modifiers);
@ -249,6 +252,7 @@ pub fn window_event(
winit::event::ElementState::Pressed => {
keyboard::Event::KeyPressed {
key,
modified_key,
physical_key,
modifiers,
location,