Fix N_SE-38867

Change-Id: I9458c28a14f08170254e030c334b9c896290e439

diff --git a/src/ui/controls/FUiCtrl_EditPresenter.cpp b/src/ui/controls/FUiCtrl_EditPresenter.cpp
index 5d8cd1d..eec5ab6 100644 (file)
--- a/src/ui/controls/FUiCtrl_EditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditPresenter.cpp
@@ -2885,7 +2885,7 @@ _EditPresenter::OnTouchPressed(const _Control& source, const _TouchInfo& touchIn
                }
        }
 
-       if (__pEdit->GetEditStyle() & EDIT_STYLE_CLEAR)
+       if (__pEdit->GetEditStyle() & EDIT_STYLE_CLEAR && __pTextString->GetLength() > 0)
        {
                if ((__pressedPoint.x >= __clearIconBounds.x) && (__pressedPoint.x <= __clearIconBounds.x + __clearIconBounds.width)) // Clear Icon Pressed
                {
@@ -5723,6 +5723,13 @@ _EditPresenter::UpdateComponentInformation(void)
                                ScrollText(-textGapFromBottom);
                        }
                }
+               else
+               {
+                       if (firstDisplayY > 0)
+                       {
+                               ScrollText(-firstDisplayY);
+                       }
+               }
 
                FloatRectangle absCursorBounds(0.0f, 0.0f, 0.0f, 0.0f);
                CalculateAbsoluteCursorBounds(__cursorPos, absCursorBounds);