Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-20 08:23:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #48168 from LightningAA/control-to-ctrl-4.0

Browse source
This commit is contained in:
Rémi Verschelde 2021-05-17 17:38:02 +02:00 • committed by GitHub
commit 6c367f8e0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
58 changed files with 398 additions and 398 deletions
Download patch file Download diff file Expand all files Collapse all files

16
platform/javascript/display_server_javascript.cpp
View file

@ -120,10 +120,10 @@ void DisplayServerJavaScript::request_quit_callback() {
template <typename T>
void DisplayServerJavaScript::dom2godot_mod(T *emscripten_event_ptr, Ref<InputEventWithModifiers> godot_event) {
godot_event->set_shift(emscripten_event_ptr->shiftKey);
godot_event->set_alt(emscripten_event_ptr->altKey);
godot_event->set_control(emscripten_event_ptr->ctrlKey);
godot_event->set_metakey(emscripten_event_ptr->metaKey);
godot_event->set_shift_pressed(emscripten_event_ptr->shiftKey);
godot_event->set_alt_pressed(emscripten_event_ptr->altKey);
godot_event->set_ctrl_pressed(emscripten_event_ptr->ctrlKey);
godot_event->set_meta_pressed(emscripten_event_ptr->metaKey);
}
Ref<InputEventKey> DisplayServerJavaScript::setup_key_event(const EmscriptenKeyboardEvent *emscripten_event) {
@ -455,10 +455,10 @@ EM_BOOL DisplayServerJavaScript::wheel_callback(int p_event_type, const Emscript
ev->set_position(input->get_mouse_position());
ev->set_global_position(ev->get_position());
ev->set_shift(input->is_key_pressed(KEY_SHIFT));
ev->set_alt(input->is_key_pressed(KEY_ALT));
ev->set_control(input->is_key_pressed(KEY_CONTROL));
ev->set_metakey(input->is_key_pressed(KEY_META));
ev->set_shift_pressed(input->is_key_pressed(KEY_SHIFT));
ev->set_alt_pressed(input->is_key_pressed(KEY_ALT));
ev->set_ctrl_pressed(input->is_key_pressed(KEY_CTRL));
ev->set_meta_pressed(input->is_key_pressed(KEY_META));
if (p_event->deltaY < 0)
ev->set_button_index(MOUSE_BUTTON_WHEEL_UP);