Skip to content

Commit 42e162a

Browse files
n0samuadrian17
authored andcommitted
desktop: Fire both KeyDown and TextControl events
Fixup for #11059, which broke left/right arrows on desktop
1 parent b94f9f3 commit 42e162a

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

desktop/src/main.rs

+13-7
Original file line numberDiff line numberDiff line change
@@ -587,21 +587,27 @@ impl App {
587587
if let Some(key) = input.virtual_keycode {
588588
let key_code = winit_to_ruffle_key_code(key);
589589
let key_char = winit_key_to_char(key, modifiers.shift());
590-
let event = match input.state {
590+
match input.state {
591591
ElementState::Pressed => {
592+
player_lock.handle_event(PlayerEvent::KeyDown {
593+
key_code,
594+
key_char,
595+
});
592596
if let Some(control_code) =
593597
winit_to_ruffle_text_control(key, modifiers)
594598
{
595-
PlayerEvent::TextControl { code: control_code }
596-
} else {
597-
PlayerEvent::KeyDown { key_code, key_char }
599+
player_lock.handle_event(PlayerEvent::TextControl {
600+
code: control_code,
601+
});
598602
}
599603
}
600604
ElementState::Released => {
601-
PlayerEvent::KeyUp { key_code, key_char }
605+
player_lock.handle_event(PlayerEvent::KeyUp {
606+
key_code,
607+
key_char,
608+
});
602609
}
603-
};
604-
player_lock.handle_event(event);
610+
}
605611
if player_lock.needs_render() {
606612
self.window.request_redraw();
607613
}

0 commit comments

Comments
 (0)