Replaced bitmap changes for IconListView

Change-Id: I8ff25cb6b436515b6ab1fb453d67292d05e000a4
Signed-off-by: Sreedeep Moulik <sreedeep.m@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_IconListItemDrawingProperty.cpp b/src/ui/controls/FUiCtrl_IconListItemDrawingProperty.cpp
index f378690..6f62319 100644 (file)
--- a/src/ui/controls/FUiCtrl_IconListItemDrawingProperty.cpp
+++ b/src/ui/controls/FUiCtrl_IconListItemDrawingProperty.cpp
@@ -44,7 +44,6 @@ _IconListItemDrawingProperty::_IconListItemDrawingProperty(void)
        , __highlightedTextColor(0)
        , __size(0.0f, 0.0f)
        , __bitmapBounds(0.0f, 0.0f, 0.0f, 0.0f)
-       , __pDropShadowBitmap(null)
        , __pFocusBitmap(null)
        , __pDropShadowBitmapWithReplacementColor(null)
        , __dropShadowBorderWidth(0.0f)
@@ -83,9 +82,6 @@ _IconListItemDrawingProperty::_IconListItemDrawingProperty(void)
 
 _IconListItemDrawingProperty::~_IconListItemDrawingProperty(void)
 {
-       delete __pDropShadowBitmap;
-       __pDropShadowBitmap = null;
-
        delete __pFocusBitmap;
        __pFocusBitmap = null;
 
@@ -136,17 +132,12 @@ _IconListItemDrawingProperty::Initialize(void)
        GET_FIXED_VALUE_CONFIG(ICONLIST::DROP_SHADOW_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, width);
        GET_FIXED_VALUE_CONFIG(ICONLIST::DROP_SHADOW_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, height);
 
+       GET_COLOR_CONFIG(ICONLIST::ITEM_BORDER_NORMAL, __normalBorderColor);
+
        if (!_FloatCompareLE(width, 0.0f) && !_FloatCompareLE(height, 0.0f))
        {
-               r = GET_BITMAP_CONFIG_N(ICONLIST::ITEM_BORDER_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDropShadowBitmap);
-               if (r != E_SUCCESS)
-               {
-                       delete __pDropShadowBitmap;
-                       __pDropShadowBitmap = null;
-
-                       SysLogException(NID_UI_CTRL, r, "[%s] Propagating.", GetErrorMessage(r));
-                       return r;
-               }
+               r = GET_REPLACED_BITMAP_CONFIG_N(ICONLIST::ITEM_BORDER_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __normalBorderColor, __pDropShadowBitmapWithReplacementColor);
+               SysTryReturn(NID_UI_CTRL, (r == E_SUCCESS) && (__pDropShadowBitmapWithReplacementColor != null), r, r, "[%s] Propagating.", GetErrorMessage(r));
 
                r = GET_BITMAP_CONFIG_N(ICONLIST::ITEM_BORDER_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pFocusBitmap);
                if (r != E_SUCCESS)
@@ -208,17 +199,8 @@ _IconListItemDrawingProperty::Initialize(void)
        __pressedBackgroundColor.SetAlpha(0x80);
 
        // Load border color
-       GET_COLOR_CONFIG(ICONLIST::ITEM_BORDER_NORMAL, __normalBorderColor);
        GET_COLOR_CONFIG(ICONLIST::ITEM_BORDER_HIGHLIGHTED, __focusBorderColor);
 
-       // Load Drop Shadow Bitmap with Replacement Color
-       if (__pDropShadowBitmap != null)
-       {
-               __pDropShadowBitmapWithReplacementColor = _BitmapImpl::GetColorReplacedBitmapN(*__pDropShadowBitmap,
-                               Color::GetColor(COLOR_ID_MAGENTA), __normalBorderColor);
-               SysTryReturn(NID_UI_CTRL, (__pDropShadowBitmapWithReplacementColor != null), r, r, "[%s] Propagating.", GetErrorMessage(r));
-       }
-
        // Load Item Text Size & color
        GET_SHAPE_CONFIG(ICONLIST::FONT_SIZE, _CONTROL_ORIENTATION_PORTRAIT, __textSize);
        GET_COLOR_CONFIG(ICONLIST::INNER_TEXT_BG_NORMAL, __inTextBackgroundColor);