Fix for issue N_SE-51675

Change-Id: I0e1f1c4cd58c6d60212c77914c0fe16c71c28f3d
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 c30ae77..3908151 100644 (file)
--- a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
@@ -1956,23 +1956,17 @@ _TokenEditPresenter::DrawDescriptionText(void)
 
        if (IsFocused())
        {
-               if (__pDescriptionTextTextObject->GetTextLengthAt(0) < __pDescriptionTextTextObject->GetTextLength())
-               {
-                       if (titleAction != TEXT_OBJECT_ACTION_TYPE_SLIDE_LEFT)
-                       {
-                               __pDescriptionTextTextObject->SetAction(TEXT_OBJECT_ACTION_TYPE_SLIDE_LEFT);
-                               __pDescriptionTextTextObject->Compose();
-                       }
-               }
-               else
+
+               if (titleAction != TEXT_OBJECT_ACTION_TYPE_SLIDE_LEFT)
                {
-                       if (titleAction != TEXT_OBJECT_ACTION_TYPE_NONE)
-                       {
-                               __pDescriptionTextTextObject->SetAction(TEXT_OBJECT_ACTION_TYPE_NONE);
-                               __pDescriptionTextTextObject->Compose();
-                       }
+                       __pDescriptionTextTextObject->SetAction(TEXT_OBJECT_ACTION_TYPE_SLIDE_LEFT);
+                       __pDescriptionTextTextObject->Compose();
                }
 
+               // Draw title text
+               __pDescriptionTextTextObject->SetBounds(tempDescriptionTextRect);
+               __pDescriptionTextTextObject->Draw(*_CanvasImpl::GetInstance(*pDescriptionTextCanvas));
+
                if (!__isTitleSliding)
                {
                        _EditPresenter::StopTitleSlidingTimer();
@@ -1990,11 +1984,11 @@ _TokenEditPresenter::DrawDescriptionText(void)
                        __pDescriptionTextTextObject->SetAction(TEXT_OBJECT_ACTION_TYPE_ABBREV);
                        __pDescriptionTextTextObject->Compose();
                }
-       }
 
-       // Draw title text
-       __pDescriptionTextTextObject->SetBounds(tempDescriptionTextRect);
-       __pDescriptionTextTextObject->Draw(*_CanvasImpl::GetInstance(*pDescriptionTextCanvas));
+               // Draw title text
+               __pDescriptionTextTextObject->SetBounds(tempDescriptionTextRect);
+               __pDescriptionTextTextObject->Draw(*_CanvasImpl::GetInstance(*pDescriptionTextCanvas));
+       }
 
        delete pDescriptionTextCanvas;
 
@@ -3685,7 +3679,7 @@ _TokenEditPresenter::OnTimerExpired(Timer& timer)
        Timer* onTimer = &timer;
        Canvas* pDescriptionTextCanvas = null;
 
-       if (onTimer == _EditPresenter::__pTitleSlidingTimer)
+       if (onTimer == __pTitleSlidingTimer)
        {
                if (!IsFocused())
                {