godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-13 13:31:48 +00:00
Code Releases 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
parent 2fcfc83da9 97fecd1b69
commit 6c367f8e0d
58 changed files with 398 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
platform/android/display_server_android.cpp
View File

@@ -490,10 +490,10 @@ void DisplayServerAndroid::process_joy_event(DisplayServerAndroid::JoypadEvent p
}
void DisplayServerAndroid::_set_key_modifier_state(Ref<InputEventWithModifiers> ev) {
ev->set_shift(shift_mem);
ev->set_alt(alt_mem);
ev->set_metakey(meta_mem);
ev->set_control(control_mem);
ev->set_shift_pressed(shift_mem);
ev->set_alt_pressed(alt_mem);
ev->set_meta_pressed(meta_mem);
ev->set_ctrl_pressed(control_mem);
}
void DisplayServerAndroid::process_key_event(int p_keycode, int p_scancode, int p_unicode_char, bool p_pressed) {
@@ -528,7 +528,7 @@ void DisplayServerAndroid::process_key_event(int p_keycode, int p_scancode, int
if (keycode == KEY_ALT) {
alt_mem = p_pressed;
}
if (keycode == KEY_CONTROL) {
if (keycode == KEY_CTRL) {
control_mem = p_pressed;
}
if (keycode == KEY_META) {