Fixed the N_SE-29380. Modified the bug to overlapped between text and annex in Simple...

Change-Id: Ic856da74abf6756c9a23cb4497dc8160a14675c0
Signed-off-by: Hyeonmi Kim <hm_85.kim@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_ListViewItem.cpp b/src/ui/controls/FUiCtrl_ListViewItem.cpp
index 92344fe..6ebcab5 100644 (file)
--- a/src/ui/controls/FUiCtrl_ListViewItem.cpp
+++ b/src/ui/controls/FUiCtrl_ListViewItem.cpp
@@ -1314,11 +1314,9 @@ _ListViewItem::DrawText(FloatRectangle& rect, ListViewItemDrawingStatus status,
                {
                        if ((!_FloatCompare(bounds.width, textDimension.width)) || (!_FloatCompare(bounds.height, textDimension.height)))
                        {
-                               float itemWidth = GetBoundsF().width;
-
                                bounds.x = rect.x;
                                bounds.y = rect.y + ((rect.height - textDimension.height) / 2.0f);
-                               bounds.width = ((itemWidth > bounds.x + textDimension.width) ? textDimension.width : (itemWidth - bounds.x));
+                               bounds.width = (bounds.width > textDimension.width) ? textDimension.width : bounds.width;
                                bounds.height = textDimension.height;
 
                                rect = bounds;

diff --git a/src/ui/controls/FUiCtrl_SimpleItemImpl.cpp b/src/ui/controls/FUiCtrl_SimpleItemImpl.cpp
index dae13cf..fa76d4a 100644 (file)
--- a/src/ui/controls/FUiCtrl_SimpleItemImpl.cpp
+++ b/src/ui/controls/FUiCtrl_SimpleItemImpl.cpp
@@ -123,7 +123,7 @@ _SimpleItemImpl::SetElement(const String& text, const Bitmap* pBitmap)
        ListAnnexStyle style = GetListItemAnnexStyle();
        float leftMargin = 0.0f;
        float itemHeight = GetItemSize().height;
-       float annexWidth = GetAnnexWidth(style);
+       float annexWidth = 0.0f;
        float elementSpacing = 0.0f;
        float textSize = 0.0f;
        result r = E_SUCCESS;
@@ -138,6 +138,10 @@ _SimpleItemImpl::SetElement(const String& text, const Bitmap* pBitmap)
        {
                bitmapRect.x += GetAnnexWidth(style) + elementSpacing;
        }
+       else
+       {
+               annexWidth = GetAnnexWidth(style);
+       }
 
        // Add Bitmap element (optional)
        if (pBitmap != null)