Fix N_SE_52891(BIDIAligment issue) and N_SE_52531

Change-Id: I9254e920338b9921e877146bcf018c1cf3f26ae6

diff --git a/src/ui/controls/FUiCtrl_EditPresenter.cpp b/src/ui/controls/FUiCtrl_EditPresenter.cpp
old mode 100644 (file)
new mode 100755 (executable)
index b0ef144..fb0fe41
--- a/src/ui/controls/FUiCtrl_EditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditPresenter.cpp
@@ -3551,6 +3551,10 @@ _EditPresenter::OnTouchReleased(const _Control& source, const _TouchInfo& touchI
                {
                        if ((__pEdit->GetEditStyle() & EDIT_STYLE_SINGLE_LINE) == false)
                        {
+                               if (__isInputConnectionBound == true && __isTextComposing == true)
+                               {
+                                       __pInputConnection->FinishTextComposition();
+                               }
                                SetCursorPosition(GetTextLength());
                        }
                }
@@ -5704,14 +5708,14 @@ _EditPresenter::SetText(const String& text)
        }
        __pTextBuffer[length] = 0;
 
+       __pTextObject->RemoveAll();
+       TextSimple* pSimpleText = new (std::nothrow)TextSimple(__pTextBuffer, length,TEXT_ELEMENT_SOURCE_TYPE_EXTERNAL, __pFont);
+       __pTextObject->AppendElement(*pSimpleText);
+
        if (__isInitialized == true)
        {
                AdjustRTLTextAlignment(EDIT_TEXT_TYPE_INPUT);
        }
-
-       __pTextObject->RemoveAll();
-       TextSimple* pSimpleText = new (std::nothrow)TextSimple(__pTextBuffer, length,TEXT_ELEMENT_SOURCE_TYPE_EXTERNAL, __pFont);
-       __pTextObject->AppendElement(*pSimpleText);
        __pTextObject->Compose();
 
        ReplaceTextIntoPasswordHyphenString();