Fix for N_SE-33786

Change-Id: I5945d624d63c71789af0878077120cd57b0da213
Signed-off-by: Saravana Balaji <saravana.bs@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
index e393423..0086b36 100755 (executable)
--- a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
@@ -1162,6 +1162,9 @@ _TokenEditPresenter::RemoveTokenAt(int index, bool isClearText)
                else if (index == __pressedTokenIndex)
                {
                        __pressedTokenIndex = -1;
+                       StopCursorTimer();
+                       SetCursorDisabled(false);
+                       StartCursorTimer();
                }
                else if (index >= 0 && index < __pressedTokenIndex)
                {
@@ -2589,6 +2592,13 @@ _TokenEditPresenter::OnFocusGained(void)
                pTextObject->Compose();
        }
 
+       if (__pressedTokenIndex < 0)
+       {
+               StopCursorTimer();
+               SetCursorDisabled(false);
+               StartCursorTimer();
+       }
+
        return _EditPresenter::OnFocusGained();
 }
 
@@ -3170,6 +3180,12 @@ _TokenEditPresenter::OnSurroundingTextDeleted(int offset, int charCount)
        if (__pressedTokenIndex >= 0 && __edittingTokenIndex < 0 && !__isEditingToken)
        {
                RemoveTokenAt(__pressedTokenIndex);
+               if (__pressedTokenIndex < 0)
+               {
+                       StopCursorTimer();
+                       SetCursorDisabled(false);
+                       StartCursorTimer();
+               }
                __pTokenEdit->Invalidate();
                return;
        }