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/uwp | |
| 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/uwp')
| -rw-r--r-- | platform/uwp/os_uwp.cpp | 2 | ||||
| -rw-r--r-- | platform/uwp/os_uwp.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/platform/uwp/os_uwp.cpp b/platform/uwp/os_uwp.cpp index ee25754704..1dddb07990 100644 --- a/platform/uwp/os_uwp.cpp +++ b/platform/uwp/os_uwp.cpp @@ -715,7 +715,7 @@ bool OS_UWP::has_virtual_keyboard() const { return UIViewSettings::GetForCurrentView()->UserInteractionMode == UserInteractionMode::Touch; } -void OS_UWP::show_virtual_keyboard(const String &p_existing_text, const Rect2 &p_screen_rect, int p_max_input_length, int p_cursor_start, int p_cursor_end) { +void OS_UWP::show_virtual_keyboard(const String &p_existing_text, const Rect2 &p_screen_rect, bool p_multiline, int p_max_input_length, int p_cursor_start, int p_cursor_end) { InputPane ^ pane = InputPane::GetForCurrentView(); pane->TryShow(); } diff --git a/platform/uwp/os_uwp.h b/platform/uwp/os_uwp.h index c35b634353..892327bac5 100644 --- a/platform/uwp/os_uwp.h +++ b/platform/uwp/os_uwp.h @@ -234,7 +234,7 @@ public: virtual bool has_touchscreen_ui_hint() const; virtual bool has_virtual_keyboard() const; - virtual void show_virtual_keyboard(const String &p_existing_text, const Rect2 &p_screen_rect = Rect2(), int p_max_input_length = -1, int p_cursor_start = -1, int p_cursor_end = -1); + virtual void show_virtual_keyboard(const String &p_existing_text, const Rect2 &p_screen_rect = Rect2(), bool p_multiline = false, int p_max_input_length = -1, int p_cursor_start = -1, int p_cursor_end = -1); virtual void hide_virtual_keyboard(); virtual Error open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path = false); |