diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-07-26 20:25:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-26 20:25:53 +0200 |
| commit | b19b896e061b3f117dd1a5c55123a7b710aedc75 (patch) | |
| tree | cb1ad5c9b0458ab147823a34c2a9c465f40dab0e /platform/android/display_server_android.cpp | |
| parent | f5a224ac925cf4ecc3e7844674514ef0fd4e3b20 (diff) | |
| parent | 8c05dadcffbd31c4faeb09d222da0d3ca07c5ab0 (diff) | |
| download | redot-engine-b19b896e061b3f117dd1a5c55123a7b710aedc75.tar.gz | |
Merge pull request #40487 from nekomatata/virtual-keyboard-enter-fixes
Fix Return key events in LineEdit & TextEdit on Android
Diffstat (limited to 'platform/android/display_server_android.cpp')
| -rw-r--r-- | platform/android/display_server_android.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/android/display_server_android.cpp b/platform/android/display_server_android.cpp index 7193519a52..235c9ff665 100644 --- a/platform/android/display_server_android.cpp +++ b/platform/android/display_server_android.cpp @@ -155,12 +155,12 @@ bool DisplayServerAndroid::screen_is_touchscreen(int p_screen) const { return true; } -void DisplayServerAndroid::virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect, int p_max_length, int p_cursor_start, int p_cursor_end) { +void DisplayServerAndroid::virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect, bool p_multiline, int p_max_length, int p_cursor_start, int p_cursor_end) { GodotIOJavaWrapper *godot_io_java = OS_Android::get_singleton()->get_godot_io_java(); ERR_FAIL_COND(!godot_io_java); if (godot_io_java->has_vk()) { - godot_io_java->show_vk(p_existing_text, p_max_length, p_cursor_start, p_cursor_end); + godot_io_java->show_vk(p_existing_text, p_multiline, p_max_length, p_cursor_start, p_cursor_end); } else { ERR_PRINT("Virtual keyboard not available"); } |
