diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-06-05 11:39:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-05 11:39:43 +0200 |
| commit | ac2619ec1c50120de3642534e894f884e03885fd (patch) | |
| tree | adeb19bca637ad52eea39d3970f7777eb8fdb6c5 /platform/javascript/display_server_javascript.cpp | |
| parent | c7632208fe1dd3336217a5eccf872a69ccf09695 (diff) | |
| parent | 0a35b97b62dc1f275a8c84397fe8319ecfc233e7 (diff) | |
| download | redot-engine-ac2619ec1c50120de3642534e894f884e03885fd.tar.gz | |
Merge pull request #39298 from Faless/js/keyCode40
Switch HTML5 key detection from keyCode to code.
Diffstat (limited to 'platform/javascript/display_server_javascript.cpp')
| -rw-r--r-- | platform/javascript/display_server_javascript.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/javascript/display_server_javascript.cpp b/platform/javascript/display_server_javascript.cpp index b95674efc3..0312efb377 100644 --- a/platform/javascript/display_server_javascript.cpp +++ b/platform/javascript/display_server_javascript.cpp @@ -143,8 +143,8 @@ static Ref<InputEventKey> setup_key_event(const EmscriptenKeyboardEvent *emscrip ev.instance(); ev->set_echo(emscripten_event->repeat); dom2godot_mod(emscripten_event, ev); - ev->set_keycode(dom2godot_keycode(emscripten_event->keyCode)); - ev->set_physical_keycode(dom2godot_keycode(emscripten_event->keyCode)); + ev->set_keycode(dom_code2godot_scancode(emscripten_event->code, emscripten_event->key, false)); + ev->set_physical_keycode(dom_code2godot_scancode(emscripten_event->code, emscripten_event->key, true)); String unicode = String::utf8(emscripten_event->key); // Check if empty or multi-character (e.g. `CapsLock`). |