Fixed the bug of GroupItem's background bitmap.

Modified the drawing logic of EnrichedText.

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

diff --git a/src/ui/controls/FUiCtrl_GroupItemImpl.cpp b/src/ui/controls/FUiCtrl_GroupItemImpl.cpp
index 461cf9f..cbda951 100644 (file)
--- a/src/ui/controls/FUiCtrl_GroupItemImpl.cpp
+++ b/src/ui/controls/FUiCtrl_GroupItemImpl.cpp
@@ -109,7 +109,13 @@ _GroupItemImpl::Construct(const FloatDimension& itemSize)
 result
 _GroupItemImpl::SetBackgroundBitmap(const Bitmap* pBitmap)
 {
-       return _ListItemBaseImpl::SetBackgroundBitmap(LIST_ITEM_DRAWING_STATUS_NORMAL, pBitmap);
+       result r = E_SUCCESS;
+
+       r = _ListItemBaseImpl::SetBackgroundBitmap(LIST_ITEM_DRAWING_STATUS_NORMAL, pBitmap);
+       r = _ListItemBaseImpl::SetBackgroundBitmap(LIST_ITEM_DRAWING_STATUS_PRESSED, pBitmap);
+       r = _ListItemBaseImpl::SetBackgroundBitmap(LIST_ITEM_DRAWING_STATUS_HIGHLIGHTED, pBitmap);
+
+       return r;
 }
 
 result

diff --git a/src/ui/controls/FUiCtrl_ListItemBaseImpl.cpp b/src/ui/controls/FUiCtrl_ListItemBaseImpl.cpp
index 1979509..da2e78c 100644 (file)
--- a/src/ui/controls/FUiCtrl_ListItemBaseImpl.cpp
+++ b/src/ui/controls/FUiCtrl_ListItemBaseImpl.cpp
@@ -274,39 +274,39 @@ _ListItemBaseImpl::SetDescriptionTextColor(const Color& color)
 float
 _ListItemBaseImpl::GetAnnexWidth(ListAnnexStyle style)
 {
-       float annexWidth = 0.0f;
+       TableViewAnnexStyle annexStyle = TABLE_VIEW_ANNEX_STYLE_NORMAL;
 
        switch (style)
        {
        case LIST_ANNEX_STYLE_NORMAL:
-               annexWidth = 0.0f;
+               annexStyle = TABLE_VIEW_ANNEX_STYLE_NORMAL;
                break;
 
        case LIST_ANNEX_STYLE_MARK:
-               GET_SHAPE_CONFIG(TABLEVIEW::ITEM_ANNEX_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, annexWidth);
+               annexStyle = TABLE_VIEW_ANNEX_STYLE_MARK;
                break;
 
        case LIST_ANNEX_STYLE_ONOFF_SLIDING:
-               GET_SHAPE_CONFIG(TABLEVIEW::ITEM_ANNEX_ONOFF_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, annexWidth);
+               annexStyle = TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING;
                break;
 
        case LIST_ANNEX_STYLE_DETAILED:
-               GET_SHAPE_CONFIG(TABLEVIEW::ITEM_ANNEX_MORE_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, annexWidth);
+               annexStyle = TABLE_VIEW_ANNEX_STYLE_DETAILED;
                break;
 
        case LIST_ANNEX_STYLE_RADIO:
-               GET_SHAPE_CONFIG(TABLEVIEW::ITEM_ANNEX_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, annexWidth);
+               annexStyle = TABLE_VIEW_ANNEX_STYLE_RADIO;
                break;
 
        case LIST_ANNEX_STYLE_ONOFF_SLIDING_WITH_DIVIDER:
-               GET_SHAPE_CONFIG(TABLEVIEW::ITEM_ANNEX_ONOFF_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, annexWidth);
+               annexStyle = TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING_WITH_DIVIDER;
                break;
 
        default:
                break;
        }
 
-       return annexWidth;
+       return _TableViewItem::GetAnnexWidth(annexStyle);
 }
 
 ListAnnexStyle

diff --git a/src/ui/controls/FUiCtrl_ListViewItem.cpp b/src/ui/controls/FUiCtrl_ListViewItem.cpp
index 0eb12ea..5b56ddb 100755 (executable)
--- a/src/ui/controls/FUiCtrl_ListViewItem.cpp
+++ b/src/ui/controls/FUiCtrl_ListViewItem.cpp
@@ -1362,7 +1362,7 @@ _ListViewItem::DrawText(FloatRectangle& rect, ListViewItemDrawingStatus status,
                        pText->pTextObject->SetCutLinkViewMode(true);
                }
        }
-       else
+       else if (pText->pEnrichedText == null)
        {
                if (IsItemEnabled())
                {