Tuning clear button position to avoid overlapping with cursor(N_SE-51634)

Change-Id: I64d51f9a2c145c6058a10eb78000be4a9709594f

diff --git a/src/ui/controls/FUiCtrl_EditPresenter.cpp b/src/ui/controls/FUiCtrl_EditPresenter.cpp
index 200537d..1cfbd4b 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditPresenter.cpp
@@ -2338,10 +2338,12 @@ _EditPresenter::DrawClearIcon(Canvas& canvas)
 
        float clearIconWidth = 0.0f;
        float clearIconHeight = 0.0f;
+       float cursorWidth = 0.0f;
 
        _ControlOrientation orientation = __pEdit->GetOrientation();
        GET_SHAPE_CONFIG(EDIT::CLEAR_ICON_WIDTH, orientation, clearIconWidth);
        GET_SHAPE_CONFIG(EDIT::CLEAR_ICON_HEIGHT, orientation, clearIconHeight);
+       GET_SHAPE_CONFIG(EDIT::CURSOR_WIDTH, __pEdit->GetOrientation(), cursorWidth);
 
        if (__pTextString->GetLength() == 0)
        {
@@ -2382,7 +2384,7 @@ _EditPresenter::DrawClearIcon(Canvas& canvas)
        }
 
        FloatRectangle textRect = __textObjectBounds;
-       FloatRectangle afterClearIconRect(textRect.x + textRect.width, textRect.y + (textRect.height - clearIconHeight) / 2.0f, clearIconWidth, clearIconHeight);
+       FloatRectangle afterClearIconRect(textRect.x + textRect.width + cursorWidth, textRect.y + (textRect.height - clearIconHeight) / 2.0f, clearIconWidth, clearIconHeight);
        FloatRectangle editBounds = __pEdit->GetBoundsF();
 
        if (__clearIconBounds != afterClearIconRect)