Fix for issue N_SE-56439

Change-Id: I6a9cd85763f57f9ea4df5b8df8f6b0b7302f60ef
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 92bd44b..a29aa32 100644 (file)
--- a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
@@ -1640,7 +1640,7 @@ _TokenEditPresenter::SetInitialBounds(void)
 
                float tempTextRectWidth = 0.0f;
                tempTextRectWidth = tokenEditBounds.width - pToken->displayRect.x - pToken->displayRect.width - tokenHorizontalSpacing - rightMargin - __pTokenEdit->GetHorizontalMarginF(EDIT_TEXT_RIGHT_MARGIN);
-               if (tokenMinWidth > tempTextRectWidth && IsFocused())        // Line change
+               if (tokenMinWidth > tempTextRectWidth && __pTokenEdit->IsFocusable() && __pTokenEdit->IsEnabled())        // Line change
                {
                        tokenTextRect.x = leftMargin + __pTokenEdit->GetHorizontalMarginF(EDIT_TEXT_LEFT_MARGIN);
                        tokenTextRect.y = pToken->displayRect.y + tokenHeight + tokenVerticalSpacing + __lineSpacing + textBoundsAlignValue;