Fix for N_SE-35827, N_SE-35901, N_SE-35908.

Signed-off-by: sriram.k <sriram.k@samsung.com>
Change-Id: I64290c335aedf15b84ff1dee09d8a3a1e98fc878

diff --git a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
index 4bc4514..57cf51d 100644 (file)
--- a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
@@ -2056,6 +2056,7 @@ _TokenEditPresenter::ProcessTokeningByTouchEvent(const _Control& source, const _
                        //Comment below to Block Copy & Paste functionality in Token Edit mode
                        __edittingTokenIndex = __pressedTokenIndex;
                        __isEditingToken = true;
+                       __isTokenEditingFinished = false;
                        if (prevEditedTokenIndex != __edittingTokenIndex)
                        {
                                SetEditingTokenTextBounds(__edittingTokenIndex);
@@ -2128,11 +2129,12 @@ _TokenEditPresenter::ProcessTokeningByTouchEvent(const _Control& source, const _
                        }
 
                        ClearText();
+                       //Flex height adjusted since token can move to another line
+                       AdjustFlexibleHeight();
                        __edittingTokenIndex = -1;
                        __isTokenEditingFinished = true;
                        __isEditingToken = false;
-                       //Flex height adjusted since token can move to another line
-                       AdjustFlexibleHeight();
+                       _EditPresenter::SetTextSize(__editContentFontSize);
 
                        SetCursorDisabled(true);
                }