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/iphone | |
| parent | f5a224ac925cf4ecc3e7844674514ef0fd4e3b20 (diff) | |
| parent | 8c05dadcffbd31c4faeb09d222da0d3ca07c5ab0 (diff) | |
Merge pull request #40487 from nekomatata/virtual-keyboard-enter-fixes
Fix Return key events in LineEdit & TextEdit on Android
Diffstat (limited to 'platform/iphone')
| -rw-r--r-- | platform/iphone/display_server_iphone.h | 2 | ||||
| -rw-r--r-- | platform/iphone/display_server_iphone.mm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/platform/iphone/display_server_iphone.h b/platform/iphone/display_server_iphone.h index e82cef4122..229b1e80db 100644 --- a/platform/iphone/display_server_iphone.h +++ b/platform/iphone/display_server_iphone.h @@ -178,7 +178,7 @@ public: virtual bool screen_is_touchscreen(int p_screen) const override; - virtual void 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) override; + virtual void 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) override; virtual void virtual_keyboard_hide() override; void virtual_keyboard_set_height(int height); diff --git a/platform/iphone/display_server_iphone.mm b/platform/iphone/display_server_iphone.mm index 498be89e48..aafee49594 100644 --- a/platform/iphone/display_server_iphone.mm +++ b/platform/iphone/display_server_iphone.mm @@ -638,7 +638,7 @@ bool DisplayServerIPhone::screen_is_touchscreen(int p_screen) const { return true; } -void DisplayServerIPhone::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 DisplayServerIPhone::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) { [AppDelegate.viewController.godotView becomeFirstResponderWithString:p_existing_text]; } |