Fix for issue N_SE-51939

Change-Id: I6639b310c72468b754540c085ff979bccf9a71bb
Signed-off-by: Kunal Sinha <kunal.sinha@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
index 790cf36..17c6577 100644 (file)
--- a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
@@ -3182,6 +3182,7 @@ _TokenEditPresenter::OnSurroundingTextDeleted(int offset, int charCount)
                                        }
                                }
 
+                               _EditPresenter::SetTextSize(__editContentFontSize);
                                RemoveTokenAt(__editingTokenIndex);
 
                                CalculateTokenPositionFromIndex(__editingTokenIndex);
@@ -3198,7 +3199,6 @@ _TokenEditPresenter::OnSurroundingTextDeleted(int offset, int charCount)
                                __pressedTokenIndex = -1;
                                __editingTokenIndex = -1;
                                __isEditingToken = false;
-                               _EditPresenter::SetTextSize(__editContentFontSize);
                                __isTokenEditingFinished = false;
 
                                AdjustFlexibleHeight();
@@ -3945,11 +3945,11 @@ _TokenEditPresenter::ExitTokenEditingMode(void)
                inputTokenString = replacementString;
        }
 
-       r = RemoveTokenAt(__editingTokenIndex);
-
        _EditPresenter::SetTextSize(__editContentFontSize);
        SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
 
+       r = RemoveTokenAt(__editingTokenIndex);
+
        if (inputTokenString.GetLength() > 0)
        {
                r = InsertTokenAt(__editingTokenIndex, inputTokenString);