Fix for issue N_SE-38863

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

diff --git a/src/ui/controls/FUiCtrl_EditPresenter.cpp b/src/ui/controls/FUiCtrl_EditPresenter.cpp
index 222adb4..b5374c6 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditPresenter.cpp
@@ -8933,6 +8933,11 @@ result
 _EditPresenter::SetTextBounds(Rectangle& bounds)
 {
        __textObjectBounds = _CoordinateSystemUtils::ConvertToFloat(bounds);
+       if (__pEdit->GetEditStyle() & EDIT_STYLE_TOKEN)
+       {
+               __pTextObject->SetBounds(__textObjectBounds);
+               __pTextObject->Compose();
+       }
        return E_SUCCESS;
 }
 
@@ -8940,6 +8945,11 @@ result
 _EditPresenter::SetTextBounds(FloatRectangle& bounds)
 {
        __textObjectBounds = bounds;
+       if (__pEdit->GetEditStyle() & EDIT_STYLE_TOKEN)
+       {
+               __pTextObject->SetBounds(__textObjectBounds);
+               __pTextObject->Compose();
+       }
        return E_SUCCESS;
 }
 

diff --git a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
index 09dadf1..4eafbba 100644 (file)
--- a/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
@@ -2049,7 +2049,6 @@ _TokenEditPresenter::SetEditingTokenTextBounds(int index, bool isSetText)
                pToken->pTextObject->RemoveAll(true);
        }
 
-       __editContentFontSize = GetTextSize();
        _EditPresenter::SetTextSize(tokenFontSize);
 
        SetTextBounds(tempTextDspRect);
@@ -2837,11 +2836,9 @@ result
 _TokenEditPresenter::SetTextSize(const int size)
 {
        result r = E_SUCCESS;
-       if (__isEditingToken)
-       {
-               __editContentFontSize = size;
-       }
-       else
+       __editContentFontSize = size;
+
+       if (!__isEditingToken)
        {
                r = _EditPresenter::SetTextSize(size);
                r = SetInitialBounds();
@@ -2855,11 +2852,9 @@ result
 _TokenEditPresenter::SetTextSize(const float size)
 {
        result r = E_SUCCESS;
-       if (__isEditingToken)
-       {
-               __editContentFontSize = size;
-       }
-       else
+       __editContentFontSize = size;
+
+       if (!__isEditingToken)
        {
                r = _EditPresenter::SetTextSize(size);
                r = SetInitialBounds();