diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-05-17 17:38:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-17 17:38:02 +0200 |
| commit | 6c367f8e0d22ae5430d48dbbee9396345933e233 (patch) | |
| tree | 6ceafa9ee3010dca7a485e716614628670609f9b /platform/android | |
| parent | 2fcfc83da91ca6c2e4670d3cdf01ee27d65f667b (diff) | |
| parent | 97fecd1b69e837a3e3300bb7209ef72131abe599 (diff) | |
Merge pull request #48168 from LightningAA/control-to-ctrl-4.0
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/android_keys_utils.h | 4 | ||||
| -rw-r--r-- | platform/android/display_server_android.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/platform/android/android_keys_utils.h b/platform/android/android_keys_utils.h index e0ee2888c0..6d25a366a4 100644 --- a/platform/android/android_keys_utils.h +++ b/platform/android/android_keys_utils.h @@ -127,8 +127,8 @@ static _WinTranslatePair _ak_to_keycode[] = { { KEY_BACKSLASH, AKEYCODE_BACKSLASH }, { KEY_BRACKETLEFT, AKEYCODE_LEFT_BRACKET }, { KEY_BRACKETRIGHT, AKEYCODE_RIGHT_BRACKET }, - { KEY_CONTROL, AKEYCODE_CTRL_LEFT }, - { KEY_CONTROL, AKEYCODE_CTRL_RIGHT }, + { KEY_CTRL, AKEYCODE_CTRL_LEFT }, + { KEY_CTRL, AKEYCODE_CTRL_RIGHT }, { KEY_UNKNOWN, 0 } }; /* diff --git a/platform/android/display_server_android.cpp b/platform/android/display_server_android.cpp index 7a32184139..005497b82f 100644 --- a/platform/android/display_server_android.cpp +++ b/platform/android/display_server_android.cpp @@ -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) { |