From 8e1f9693459d06c4273f4423d16394615f6dfafe Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Tue, 29 Dec 2020 19:16:13 +0900 Subject: [PATCH] Set multiline input hint before IME activates - All input panel properties, such as layout, return key type, and input hint, should be set before input panel activates (or shows). Change-Id: I72738eee2e772dd3f6358fa52c61ec7100e8a953 Signed-off-by: Seoyeon Kim --- dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp | 3 +++ dali-toolkit/internal/controls/text-controls/text-field-impl.cpp | 2 ++ 2 files changed, 5 insertions(+) diff --git a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp index 23799c3..7e64b6e 100644 --- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp @@ -1514,6 +1514,9 @@ void TextEditor::OnKeyInputFocusGained() DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextEditor::OnKeyInputFocusGained %p\n", mController.Get() ); if ( mInputMethodContext && IsEditable() ) { + // All input panel properties, such as layout, return key type, and input hint, should be set before input panel activates (or shows). + mInputMethodContext.NotifyTextInputMultiLine( true ); + mInputMethodContext.StatusChangedSignal().Connect( this, &TextEditor::KeyboardStatusChanged ); mInputMethodContext.EventReceivedSignal().Connect( this, &TextEditor::OnInputMethodContextEvent ); diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp index fc09fd8..e87ba2f 100644 --- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp @@ -1519,7 +1519,9 @@ void TextField::OnKeyInputFocusGained() DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField::OnKeyInputFocusGained %p\n", mController.Get() ); if ( mInputMethodContext && IsEditable() ) { + // All input panel properties, such as layout, return key type, and input hint, should be set before input panel activates (or shows). mInputMethodContext.ApplyOptions( mInputMethodOptions ); + mInputMethodContext.NotifyTextInputMultiLine( false ); mInputMethodContext.StatusChangedSignal().Connect( this, &TextField::KeyboardStatusChanged ); -- 2.7.4