apply bitmap scale high

Change-Id: I7bfe15ab21578b8132334a8680583c06bc028e40

diff --git a/src/app/FApp_AppResourceBitmapUtil.cpp b/src/app/FApp_AppResourceBitmapUtil.cpp
index e5fbb37..cdbd21d 100644 (file)
--- a/src/app/FApp_AppResourceBitmapUtil.cpp
+++ b/src/app/FApp_AppResourceBitmapUtil.cpp
@@ -480,6 +480,7 @@ _AppResourceBitmapUtil::GetBitmapN(const String& resourcePath, const _Density re
                r = GetLastResult();
                SysTryReturn(NID_APP, r == E_SUCCESS, null, E_SYSTEM, "[E_SYSTEM] A system error has occurred.");
 
+               pBitmap->SetScalingQuality(BITMAP_SCALING_QUALITY_HIGH);
                r = pBitmap->Scale(logicalImageSize);
                SysTryReturn(NID_APP, r == E_SUCCESS, null, E_SYSTEM, "[E_SYSTEM] A system error has occurred.");
        }

diff --git a/src/ui/FUi_ResourceManager.cpp b/src/ui/FUi_ResourceManager.cpp
index 17da445..6c7aec4 100755 (executable)
--- a/src/ui/FUi_ResourceManager.cpp
+++ b/src/ui/FUi_ResourceManager.cpp
@@ -749,8 +749,11 @@ _ResourceManager::GetBitmapInternalN(const String& fileName, BitmapPixelFormat p
                                                        delete pTempBitmap;
                                                        pTempBitmap = pReplacementBitmap;
                                                }
-                                               pTempBitmap->SetScalingQuality(BITMAP_SCALING_QUALITY_HIGH);
+
                                        }
+
+                                       pTempBitmap->SetScalingQuality(BITMAP_SCALING_QUALITY_HIGH);
+
                                        float scaleFactor = (float)((float)__targetWidth/(float)foundFolderWidth);
                                        r = pTempBitmap->Scale(Dimension(pTempBitmap->GetWidth()*scaleFactor, pTempBitmap->GetHeight()*scaleFactor));
                                        if (r == E_SUCCESS)

diff --git a/src/ui/controls/FUiCtrl_CheckButton.cpp b/src/ui/controls/FUiCtrl_CheckButton.cpp
index 6a4bee7..d989f5a 100644 (file)
--- a/src/ui/controls/FUiCtrl_CheckButton.cpp
+++ b/src/ui/controls/FUiCtrl_CheckButton.cpp
@@ -175,9 +175,9 @@ _CheckButton::_CheckButton(void)
 
        for (int i = 0; i < NUMBER_OF_CHECK_BUTTON_STATUS; i++)
        {
-               __pMarkBgNormalBitmap[i] = null;
+               __pMarkBgBitmap[i] = null;
                __pMarkBitmap[i] = null;
-               __pOnOffBgNormalBitmap[i] = null;
+               __pOnOffBgBitmap[i] = null;
                __pOnOffBitmap[i] = null;
                __pOnOffSlidingBgBitmap[i] = null;
                __pOnOffSlidingOnHandlerBitmap[i] = null;
@@ -261,10 +261,10 @@ _CheckButton::~_CheckButton(void)
 
        for (int i = 0; i < NUMBER_OF_CHECK_BUTTON_STATUS; i++)
        {
-               if (__pMarkBgNormalBitmap[i])
+               if (__pMarkBgBitmap[i])
                {
-                       delete __pMarkBgNormalBitmap[i];
-                       __pMarkBgNormalBitmap[i] = null;
+                       delete __pMarkBgBitmap[i];
+                       __pMarkBgBitmap[i] = null;
                }
 
                if (__pMarkBitmap[i])
@@ -273,10 +273,10 @@ _CheckButton::~_CheckButton(void)
                        __pMarkBitmap[i] = null;
                }
 
-               if (__pOnOffBgNormalBitmap[i])
+               if (__pOnOffBgBitmap[i])
                {
-                       delete __pOnOffBgNormalBitmap[i];
-                       __pOnOffBgNormalBitmap[i] = null;
+                       delete __pOnOffBgBitmap[i];
+                       __pOnOffBgBitmap[i] = null;
                }
 
                if (__pOnOffBitmap[i])
@@ -951,11 +951,14 @@ _CheckButton::LoadDefaultBitmap(void)
        if (__checkButtonStyle == CHECK_BUTTON_STYLE_MARK || __checkButtonStyle == CHECK_BUTTON_STYLE_MARK_WITH_DIVIDER
                        || __checkButtonStyle == CHECK_BUTTON_STYLE_MARK_WITH_DETAILED_BUTTON)
        {
-               r = GET_BITMAP_CONFIG_N(CHECKBUTTON::MARK_ICON_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pMarkBgNormalBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
-               r = GET_BITMAP_CONFIG_N(CHECKBUTTON::MARK_ICON_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pMarkBgNormalBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
-               r = GET_BITMAP_CONFIG_N(CHECKBUTTON::MARK_ICON_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pMarkBgNormalBitmap[_CHECK_BUTTON_STATUS_PRESSED]);
-               r = GET_BITMAP_CONFIG_N(CHECKBUTTON::MARK_ICON_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pMarkBgNormalBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
-               r = GET_BITMAP_CONFIG_N(CHECKBUTTON::MARK_ICON_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pMarkBgNormalBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
+               Color markIconBgHighlighted;
+               GET_COLOR_CONFIG(CHECKBUTTON::BG_HIGHLIGHTED, markIconBgHighlighted);
+
+               r = GET_BITMAP_CONFIG_N(CHECKBUTTON::MARK_ICON_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pMarkBgBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
+               r = GET_BITMAP_CONFIG_N(CHECKBUTTON::MARK_ICON_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pMarkBgBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
+               r = GET_BITMAP_CONFIG_N(CHECKBUTTON::MARK_ICON_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pMarkBgBitmap[_CHECK_BUTTON_STATUS_PRESSED]);
+               r = GET_REPLACED_BITMAP_CONFIG_N(CHECKBUTTON::MARK_ICON_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, markIconBgHighlighted, __pMarkBgBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
+               r = GET_BITMAP_CONFIG_N(CHECKBUTTON::MARK_ICON_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pMarkBgBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
        }
 
        if (__checkButtonStyle == CHECK_BUTTON_STYLE_MARK || __checkButtonStyle == CHECK_BUTTON_STYLE_MARK_WITH_DIVIDER || __checkButtonStyle == CHECK_BUTTON_STYLE_MARK_WITH_DETAILED_BUTTON
@@ -970,11 +973,14 @@ _CheckButton::LoadDefaultBitmap(void)
 
        if (__checkButtonStyle == CHECK_BUTTON_STYLE_ONOFF || __checkButtonStyle == CHECK_BUTTON_STYLE_ONOFF_WITH_DIVIDER)
        {
-               r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_ICON_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffBgNormalBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
-               r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_ICON_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffBgNormalBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
-               r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_ICON_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffBgNormalBitmap[_CHECK_BUTTON_STATUS_PRESSED]);
-               r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_ICON_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffBgNormalBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
-               r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_ICON_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffBgNormalBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
+               Color onOffIconBgHighlighted;
+               GET_COLOR_CONFIG(CHECKBUTTON::BG_HIGHLIGHTED, onOffIconBgHighlighted);
+
+               r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_ICON_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffBgBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
+               r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_ICON_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffBgBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
+               r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_ICON_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffBgBitmap[_CHECK_BUTTON_STATUS_PRESSED]);
+               r = GET_REPLACED_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_ICON_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, onOffIconBgHighlighted, __pOnOffBgBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
+               r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_ICON_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffBgBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
 
                r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_ICON_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
                r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_ICON_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
@@ -985,6 +991,9 @@ _CheckButton::LoadDefaultBitmap(void)
 
        if (__checkButtonStyle == CHECK_BUTTON_STYLE_ONOFF_SLIDING || __checkButtonStyle == CHECK_BUTTON_STYLE_ONOFF_SLIDING_WITH_DIVIDER)
        {
+               Color onOffSlidingHandlerHighlighted;
+               GET_COLOR_CONFIG(CHECKBUTTON::BG_HIGHLIGHTED, onOffSlidingHandlerHighlighted);
+
                r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingBgBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
                r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingBgBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
                r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingBgBitmap[_CHECK_BUTTON_STATUS_PRESSED]);
@@ -994,32 +1003,56 @@ _CheckButton::LoadDefaultBitmap(void)
                r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_ON_HANDLER_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingOnHandlerBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
                r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_ON_HANDLER_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingOnHandlerBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
                r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_ON_HANDLER_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingOnHandlerBitmap[_CHECK_BUTTON_STATUS_PRESSED]);
-               r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_ON_HANDLER_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingOnHandlerBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
+               r = GET_REPLACED_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_ON_HANDLER_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, onOffSlidingHandlerHighlighted, __pOnOffSlidingOnHandlerBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
                r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_ON_HANDLER_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingOnHandlerBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
 
                r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_OFF_HANDLER_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingOffHandlerBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
                r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_OFF_HANDLER_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingOffHandlerBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
                r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_OFF_HANDLER_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingOffHandlerBitmap[_CHECK_BUTTON_STATUS_PRESSED]);
-               r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_OFF_HANDLER_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingOffHandlerBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
+               r = GET_REPLACED_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_OFF_HANDLER_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, onOffSlidingHandlerHighlighted, __pOnOffSlidingOffHandlerBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
                r = GET_BITMAP_CONFIG_N(CHECKBUTTON::ONOFF_SLIDING_OFF_HANDLER_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pOnOffSlidingOffHandlerBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
        }
 
        if (__checkButtonStyle == CHECK_BUTTON_STYLE_MARK_WITH_DETAILED_BUTTON || __checkButtonStyle == CHECK_BUTTON_STYLE_RADIO_WITH_DETAILED_BUTTON)
        {
-               r = GET_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pCircleBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
-               r = GET_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pCircleBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
-               r = GET_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pCircleBitmap[_CHECK_BUTTON_STATUS_PRESSED]);
-               r = GET_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pCircleBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
-               r = GET_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pCircleBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
+               Color detailedNormalBgColor;
+               Color detailedDisabledBgColor;
+               Color detailedPressedBgColor;
+               Color detailedHighlightedBgColor;
+               Color detailedSelectedBgColor;
+
+               Color detailedRightNormalColor;
+               Color detailedRightDisabledColor;
+               Color detailedRightPressedColor;
+               Color detailedRightHighlightedColor;
+               Color detailedRightSelectedColor;
+
+               GET_COLOR_CONFIG(CHECKBUTTON::DETAILED_ICON_BG_NORMAL, detailedNormalBgColor);
+               GET_COLOR_CONFIG(CHECKBUTTON::DETAILED_ICON_BG_DISABLED, detailedDisabledBgColor);
+               GET_COLOR_CONFIG(CHECKBUTTON::DETAILED_ICON_BG_PRESSED, detailedPressedBgColor);
+               GET_COLOR_CONFIG(CHECKBUTTON::DETAILED_ICON_BG_HIGHLIGHTED, detailedHighlightedBgColor);
+               GET_COLOR_CONFIG(CHECKBUTTON::DETAILED_ICON_BG_SELECTED, detailedSelectedBgColor);
+
+               GET_COLOR_CONFIG(CHECKBUTTON::DETAILED_ICON_TEXT_NORMAL, detailedRightNormalColor);
+               GET_COLOR_CONFIG(CHECKBUTTON::DETAILED_ICON_TEXT_DISABLED, detailedRightDisabledColor);
+               GET_COLOR_CONFIG(CHECKBUTTON::DETAILED_ICON_TEXT_PRESSED, detailedRightPressedColor);
+               GET_COLOR_CONFIG(CHECKBUTTON::DETAILED_ICON_TEXT_HIGHLIGHTED, detailedRightHighlightedColor);
+               GET_COLOR_CONFIG(CHECKBUTTON::DETAILED_ICON_TEXT_SELECTED, detailedRightSelectedColor);
+
+               r = GET_REPLACED_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, detailedNormalBgColor, __pCircleBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
+               r = GET_REPLACED_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, detailedDisabledBgColor, __pCircleBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
+               r = GET_REPLACED_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, detailedPressedBgColor, __pCircleBitmap[_CHECK_BUTTON_STATUS_PRESSED]);
+               r = GET_REPLACED_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, detailedHighlightedBgColor, __pCircleBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
+               r = GET_REPLACED_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, detailedSelectedBgColor, __pCircleBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
 
                r = GET_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pCircleNormalEffectBitmap);
                r = GET_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pCirclePressedEffectBitmap);
 
-               r = GET_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_ICON_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDetailedRightBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
-               r = GET_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_ICON_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pDetailedRightBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
-               r = GET_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_ICON_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pDetailedRightBitmap[_CHECK_BUTTON_STATUS_PRESSED]);
-               r = GET_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_ICON_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pDetailedRightBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
-               r = GET_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_ICON_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pDetailedRightBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
+               r = GET_REPLACED_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_ICON_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, detailedRightNormalColor, __pDetailedRightBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
+               r = GET_REPLACED_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_ICON_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, detailedRightDisabledColor, __pDetailedRightBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
+               r = GET_REPLACED_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_ICON_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, detailedRightPressedColor, __pDetailedRightBitmap[_CHECK_BUTTON_STATUS_PRESSED]);
+               r = GET_REPLACED_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_ICON_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, detailedRightHighlightedColor, __pDetailedRightBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
+               r = GET_REPLACED_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_ICON_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, detailedRightSelectedColor, __pDetailedRightBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
 
                r = GET_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_ICON_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDetailedRightNormalEffectBitmap);
                r = GET_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_ICON_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pDetailedRightPressedEffectBitmap);
@@ -1173,7 +1206,6 @@ _CheckButton::SetHighlightedTextColor(const Color& color)
 Color
 _CheckButton::GetHighlightedTextColor(void) const
 {
-
        Variant color = GetProperty(L"highlightedTextColor");
 
        return color.ToColor();
@@ -1188,7 +1220,6 @@ _CheckButton::SetSelectedTextColor(const Color& color)
 Color
 _CheckButton::GetSelectedTextColor(void) const
 {
-
        Variant color = GetProperty(L"selectedTextColor");
 
        return color.ToColor();
@@ -1623,7 +1654,7 @@ _CheckButton::GetCheckButtonStatus(void) const
 Bitmap*
 _CheckButton::GetMarkBgBitmap(_CheckButtonStatus checkButtonStatus) const
 {
-       return __pMarkBgNormalBitmap[checkButtonStatus];
+       return __pMarkBgBitmap[checkButtonStatus];
 }
 
 Bitmap*
@@ -1635,7 +1666,7 @@ _CheckButton::GetMarkBitmap(_CheckButtonStatus checkButtonStatus) const
 Bitmap*
 _CheckButton::GetOnOffBgBitmap(_CheckButtonStatus checkButtonStatus) const
 {
-       return __pOnOffBgNormalBitmap[checkButtonStatus];
+       return __pOnOffBgBitmap[checkButtonStatus];
 }
 
 Bitmap*

diff --git a/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp b/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp
index ddad176..7ccc4dd 100644 (file)
--- a/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp
@@ -658,45 +658,31 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
 
                        if (checkStyle == CHECK_BUTTON_STYLE_MARK_WITH_DETAILED_BUTTON)
                        {
-                               Bitmap* pCircleNormalBitmap = __pCheckButton->GetCircleBitmap(_CHECK_BUTTON_STATUS_NORMAL);
-                               Bitmap* pDetailedRightNormalBitmap = __pCheckButton->GetDetailedRightBitmap(_CHECK_BUTTON_STATUS_NORMAL);
+                               Bitmap* pCircleBitmap = null;
+                               Bitmap* pDetailedRightBitmap = null;
                                Bitmap* pCircleEffectBitmap = null;
                                Bitmap* pDetailedRightEffectBitmap = null;
 
                                if (__detailedPressed == true)
                                {
-                                       if (pCircleNormalBitmap)
-                                       {
-                                               pReColorCircleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedPressedBgColor);
-                                       }
-
-                                       if (pDetailedRightNormalBitmap)
-                                       {
-                                               pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightPressedColor);
-                                       }
+                                       pCircleBitmap = __pCheckButton->GetCircleBitmap(_CHECK_BUTTON_STATUS_PRESSED);
+                                       pDetailedRightBitmap = __pCheckButton->GetDetailedRightBitmap(_CHECK_BUTTON_STATUS_PRESSED);
 
                                        pCircleEffectBitmap = __pCheckButton->GetCirclePressedEffectBitmap();
                                        pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightPressedEffectBitmap();
                                }
                                else
                                {
-                                       if (pCircleNormalBitmap)
-                                       {
-                                               pReColorCircleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedNormalBgColor);
-                                       }
-
-                                       if (pDetailedRightNormalBitmap)
-                                       {
-                                               pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightNormalColor);
-                                       }
+                                       pCircleBitmap = __pCheckButton->GetCircleBitmap(checkStatus);
+                                       pDetailedRightBitmap = __pCheckButton->GetDetailedRightBitmap(checkStatus);
 
                                        pCircleEffectBitmap = __pCheckButton->GetCircleNormalEffectBitmap();
                                        pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightNormalEffectBitmap();
                                }
 
-                               if (pReColorCircleBitmap)
+                               if (pCircleBitmap)
                                {
-                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleBitmap);
+                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pCircleBitmap);
                                }
 
                                bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_NORMAL);
@@ -709,13 +695,13 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        }
                                }
 
-                               if (pReColorRightBitmap)
+                               if (pDetailedRightBitmap)
                                {
-                                       float arrowWidth = pReColorRightBitmap->GetWidthF();
-                                       float arrowHeight = pReColorRightBitmap->GetHeightF();
+                                       float arrowWidth = pDetailedRightBitmap->GetWidthF();
+                                       float arrowHeight = pDetailedRightBitmap->GetHeightF();
 
                                        pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x + (__detailedButtonBounds.width - arrowWidth) / 2.0f
-                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReColorRightBitmap);
+                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pDetailedRightBitmap);
                                }
 
                                themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_ICON_NORMAL);
@@ -744,24 +730,14 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
 
                        if (checkStyle == CHECK_BUTTON_STYLE_MARK_WITH_DETAILED_BUTTON)
                        {
-                               Bitmap* pCircleDisabledBitmap = __pCheckButton->GetCircleBitmap(_CHECK_BUTTON_STATUS_DISABLED);
-                               Bitmap* pDetailedRightDisabledBitmap = __pCheckButton->GetDetailedRightBitmap(_CHECK_BUTTON_STATUS_DISABLED);
+                               Bitmap* pCircleBitmap = __pCheckButton->GetCircleBitmap(checkStatus);
+                               Bitmap* pDetailedRightBitmap = __pCheckButton->GetDetailedRightBitmap(checkStatus);
                                Bitmap* pCircleEffectBitmap = __pCheckButton->GetCircleNormalEffectBitmap();
                                Bitmap* pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightNormalEffectBitmap();
 
-                               if (pCircleDisabledBitmap)
-                               {
-                                       pReColorCircleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleDisabledBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedDisabledBgColor);
-                               }
-
-                               if (pDetailedRightDisabledBitmap)
-                               {
-                                       pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightDisabledBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightDisabledColor);
-                               }
-
-                               if (pReColorCircleBitmap)
+                               if (pCircleBitmap)
                                {
-                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleBitmap);
+                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pCircleBitmap);
                                }
 
                                bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_DISABLED);
@@ -774,13 +750,13 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        }
                                }
 
-                               if (pReColorRightBitmap)
+                               if (pDetailedRightBitmap)
                                {
-                                       float arrowWidth = pReColorRightBitmap->GetWidthF();
-                                       float arrowHeight = pReColorRightBitmap->GetHeightF();
+                                       float arrowWidth = pDetailedRightBitmap->GetWidthF();
+                                       float arrowHeight = pDetailedRightBitmap->GetHeightF();
 
                                        pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x + (__detailedButtonBounds.width - arrowWidth) / 2.0f
-                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReColorRightBitmap);
+                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pDetailedRightBitmap);
                                }
 
                                themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_ICON_DISABLED);
@@ -809,45 +785,31 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
 
                        if (checkStyle == CHECK_BUTTON_STYLE_MARK_WITH_DETAILED_BUTTON)
                        {
-                               Bitmap* pCirclePressedBitmap = __pCheckButton->GetCircleBitmap(_CHECK_BUTTON_STATUS_PRESSED);
-                               Bitmap* pDetailedRightPressedBitmap = __pCheckButton->GetDetailedRightBitmap(_CHECK_BUTTON_STATUS_PRESSED);
+                               Bitmap* pCircleBitmap = null;
+                               Bitmap* pDetailedRightBitmap = null;
                                Bitmap* pCircleEffectBitmap = null;
                                Bitmap* pDetailedRightEffectBitmap = null;
 
                                if (__detailedPressed == true)
                                {
-                                       if (pCirclePressedBitmap)
-                                       {
-                                               pReColorCircleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCirclePressedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedPressedBgColor);
-                                       }
-
-                                       if (pDetailedRightPressedBitmap)
-                                       {
-                                               pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightPressedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightPressedColor);
-                                       }
+                                       pCircleBitmap = __pCheckButton->GetCircleBitmap(checkStatus);
+                                       pDetailedRightBitmap = __pCheckButton->GetDetailedRightBitmap(checkStatus);
 
                                        pCircleEffectBitmap = __pCheckButton->GetCirclePressedEffectBitmap();
                                        pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightPressedEffectBitmap();
                                }
                                else
                                {
-                                       if (pCirclePressedBitmap)
-                                       {
-                                               pReColorCircleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCirclePressedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedNormalBgColor);
-                                       }
-
-                                       if (pDetailedRightPressedBitmap)
-                                       {
-                                               pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightPressedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightNormalColor);
-                                       }
+                                       pCircleBitmap = __pCheckButton->GetCircleBitmap(_CHECK_BUTTON_STATUS_NORMAL);
+                                       pDetailedRightBitmap = __pCheckButton->GetDetailedRightBitmap(_CHECK_BUTTON_STATUS_NORMAL);
 
                                        pCircleEffectBitmap = __pCheckButton->GetCircleNormalEffectBitmap();
                                        pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightNormalEffectBitmap();
                                }
 
-                               if (pReColorCircleBitmap)
+                               if (pCircleBitmap)
                                {
-                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleBitmap);
+                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pCircleBitmap);
                                }
 
                                bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_PRESSED);
@@ -860,13 +822,13 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        }
                                }
 
-                               if (pReColorRightBitmap)
+                               if (pDetailedRightBitmap)
                                {
-                                       float arrowWidth = pReColorRightBitmap->GetWidthF();
-                                       float arrowHeight = pReColorRightBitmap->GetHeightF();
+                                       float arrowWidth = pDetailedRightBitmap->GetWidthF();
+                                       float arrowHeight = pDetailedRightBitmap->GetHeightF();
 
                                        pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x + (__detailedButtonBounds.width - arrowWidth) / 2.0f
-                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReColorRightBitmap);
+                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pDetailedRightBitmap);
                                }
 
                                themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_ICON_PRESSED);
@@ -894,63 +856,40 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                pCanvas->DrawBitmap(FloatPoint(__defaultButtonBounds.x, __defaultButtonBounds.y), *pMarkBgNormalBitmap);
                        }
 
-                       Bitmap* pReColorMarkBgHighlightedBitmap = null;
-
-                       if (pMarkBgHighlightedBitmap)
-                       {
-                               pReColorMarkBgHighlightedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pMarkBgHighlightedBitmap,
-                                               Color::GetColor(COLOR_ID_MAGENTA), detailedHighlightedBgColor);
-                       }
-
-                       if (pReColorMarkBgHighlightedBitmap && __highlightedIndex == 1)
+                       if (pMarkBgHighlightedBitmap && __highlightedIndex == 1)
                        {
-                               pCanvas->DrawBitmap(FloatPoint(__defaultButtonBounds.x, __defaultButtonBounds.y), *pReColorMarkBgHighlightedBitmap);
+                               pCanvas->DrawBitmap(FloatPoint(__defaultButtonBounds.x, __defaultButtonBounds.y), *pMarkBgHighlightedBitmap);
                        }
 
-                       delete pReColorMarkBgHighlightedBitmap;
-
                        if (checkStyle == CHECK_BUTTON_STYLE_MARK_WITH_DETAILED_BUTTON)
                        {
-                               Bitmap* pCircleNormalBitmap = __pCheckButton->GetCircleBitmap(_CHECK_BUTTON_STATUS_NORMAL);
-                               Bitmap* pCircleHighlightedBitmap = __pCheckButton->GetCircleBitmap(_CHECK_BUTTON_STATUS_HIGHLIGHTED);
-                               Bitmap* pDetailedRightHighlightedBitmap = __pCheckButton->GetDetailedRightBitmap(_CHECK_BUTTON_STATUS_HIGHLIGHTED);
+                               Bitmap* pCircleHighlightedBitmap = __pCheckButton->GetCircleBitmap(checkStatus);
+
+                               Bitmap* pCircleBitmap = null;
+                               Bitmap* pDetailedRightBitmap = null;
                                Bitmap* pCircleEffectBitmap = null;
                                Bitmap* pDetailedRightEffectBitmap = null;
 
                                if (__detailedPressed == true)
                                {
-                                       if (pCircleNormalBitmap)
-                                       {
-                                               pReColorCircleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedPressedBgColor);
-                                       }
-
-                                       if (pDetailedRightHighlightedBitmap)
-                                       {
-                                               pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightPressedColor);
-                                       }
+                                       pCircleBitmap = __pCheckButton->GetCircleBitmap(_CHECK_BUTTON_STATUS_PRESSED);
+                                       pDetailedRightBitmap = __pCheckButton->GetDetailedRightBitmap(_CHECK_BUTTON_STATUS_PRESSED);
 
                                        pCircleEffectBitmap = __pCheckButton->GetCirclePressedEffectBitmap();
                                        pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightPressedEffectBitmap();
                                }
                                else
                                {
-                                       if (pCircleNormalBitmap)
-                                       {
-                                               pReColorCircleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedNormalBgColor);
-                                       }
-
-                                       if (pDetailedRightHighlightedBitmap)
-                                       {
-                                               pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightHighlightedColor);
-                                       }
+                                       pCircleBitmap = __pCheckButton->GetCircleBitmap(_CHECK_BUTTON_STATUS_NORMAL);
+                                       pDetailedRightBitmap = __pCheckButton->GetDetailedRightBitmap(_CHECK_BUTTON_STATUS_NORMAL);
 
                                        pCircleEffectBitmap = __pCheckButton->GetCircleNormalEffectBitmap();
                                        pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightNormalEffectBitmap();
                                }
 
-                               if (pReColorCircleBitmap)
+                               if (pCircleBitmap)
                                {
-                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleBitmap);
+                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pCircleBitmap);
                                }
 
                                bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_HIGHLIGHTED);
@@ -963,13 +902,13 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        }
                                }
 
-                               if (pReColorRightBitmap)
+                               if (pDetailedRightBitmap)
                                {
-                                       float arrowWidth = pReColorRightBitmap->GetWidthF();
-                                       float arrowHeight = pReColorRightBitmap->GetHeightF();
+                                       float arrowWidth = pDetailedRightBitmap->GetWidthF();
+                                       float arrowHeight = pDetailedRightBitmap->GetHeightF();
 
                                        pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x + (__detailedButtonBounds.width - arrowWidth) / 2.0f
-                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReColorRightBitmap);
+                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pDetailedRightBitmap);
                                }
 
                                themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_ICON_HIGHLIGHTED);
@@ -986,19 +925,10 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        }
                                }
 
-                               Bitmap* pReColorCircleHighlightedBitmap = null;
-
-                               if (pCircleHighlightedBitmap)
-                               {
-                                       pReColorCircleHighlightedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedHighlightedBgColor);
-                               }
-
-                               if (pReColorCircleHighlightedBitmap && __highlightedIndex == 2)
+                               if (pCircleHighlightedBitmap && __highlightedIndex == 2)
                                {
-                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleHighlightedBitmap);
+                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pCircleHighlightedBitmap);
                                }
-
-                               delete pReColorCircleHighlightedBitmap;
                        }
                }
                else if (checkStatus == _CHECK_BUTTON_STATUS_SELECTED)
@@ -1012,45 +942,31 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
 
                        if (checkStyle == CHECK_BUTTON_STYLE_MARK_WITH_DETAILED_BUTTON)
                        {
-                               Bitmap* pCircleSelectedBitmap = __pCheckButton->GetCircleBitmap(_CHECK_BUTTON_STATUS_SELECTED);
-                               Bitmap* pDetailedRightSelectedBitmap = __pCheckButton->GetDetailedRightBitmap(_CHECK_BUTTON_STATUS_SELECTED);
+                               Bitmap* pCircleBitmap = null;
+                               Bitmap* pDetailedRightBitmap = null;
                                Bitmap* pCircleEffectBitmap = null;
                                Bitmap* pDetailedRightEffectBitmap = null;
 
                                if (__detailedPressed == true)
                                {
-                                       if (pCircleSelectedBitmap)
-                                       {
-                                               pReColorCircleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleSelectedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedPressedBgColor);
-                                       }
-
-                                       if (pDetailedRightSelectedBitmap)
-                                       {
-                                               pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightSelectedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightPressedColor);
-                                       }
+                                       pCircleBitmap = __pCheckButton->GetCircleBitmap(_CHECK_BUTTON_STATUS_PRESSED);
+                                       pDetailedRightBitmap = __pCheckButton->GetDetailedRightBitmap(_CHECK_BUTTON_STATUS_PRESSED);
 
                                        pCircleEffectBitmap = __pCheckButton->GetCirclePressedEffectBitmap();
                                        pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightPressedEffectBitmap();
                                }
                                else
                                {
-                                       if (pCircleSelectedBitmap)
-                                       {
-                                               pReColorCircleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleSelectedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedSelectedBgColor);
-                                       }
-
-                                       if (pDetailedRightSelectedBitmap)
-                                       {
-                                               pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightSelectedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightSelectedColor);
-                                       }
+                                       pCircleBitmap = __pCheckButton->GetCircleBitmap(checkStatus);
+                                       pDetailedRightBitmap = __pCheckButton->GetDetailedRightBitmap(checkStatus);
 
                                        pCircleEffectBitmap = __pCheckButton->GetCircleNormalEffectBitmap();
                                        pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightNormalEffectBitmap();
                                }
 
-                               if (pReColorCircleBitmap)
+                               if (pCircleBitmap)
                                {
-                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleBitmap);
+                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pCircleBitmap);
                                }
 
                                bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_SELECTED);
@@ -1063,13 +979,13 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        }
                                }
 
-                               if (pReColorRightBitmap)
+                               if (pDetailedRightBitmap)
                                {
-                                       float arrowWidth = pReColorRightBitmap->GetWidthF();
-                                       float arrowHeight = pReColorRightBitmap->GetHeightF();
+                                       float arrowWidth = pDetailedRightBitmap->GetWidthF();
+                                       float arrowHeight = pDetailedRightBitmap->GetHeightF();
 
                                        pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x + (__detailedButtonBounds.width - arrowWidth) / 2.0f
-                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReColorRightBitmap);
+                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pDetailedRightBitmap);
                                }
 
                                themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_ICON_SELECTED);
@@ -1096,45 +1012,31 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                {
                        if (checkStyle == CHECK_BUTTON_STYLE_RADIO_WITH_DETAILED_BUTTON)
                        {
-                               Bitmap* pCircleNormalBitmap = __pCheckButton->GetCircleBitmap(_CHECK_BUTTON_STATUS_NORMAL);
-                               Bitmap* pDetailedRightNormalBitmap = __pCheckButton->GetDetailedRightBitmap(_CHECK_BUTTON_STATUS_NORMAL);
+                               Bitmap* pCircleBitmap = null;
+                               Bitmap* pDetailedRightBitmap = null;
                                Bitmap* pCircleEffectBitmap = null;
                                Bitmap* pDetailedRightEffectBitmap = null;
 
                                if (__detailedPressed == true)
                                {
-                                       if (pCircleNormalBitmap)
-                                       {
-                                               pReColorCircleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedPressedBgColor);
-                                       }
-
-                                       if (pDetailedRightNormalBitmap)
-                                       {
-                                               pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightPressedColor);
-                                       }
+                                       pCircleBitmap = __pCheckButton->GetCircleBitmap(_CHECK_BUTTON_STATUS_PRESSED);
+                                       pDetailedRightBitmap = __pCheckButton->GetDetailedRightBitmap(_CHECK_BUTTON_STATUS_PRESSED);
 
                                        pCircleEffectBitmap = __pCheckButton->GetCirclePressedEffectBitmap();
                                        pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightPressedEffectBitmap();
                                }
                                else
                                {
-                                       if (pCircleNormalBitmap)
-                                       {
-                                               pReColorCircleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedNormalBgColor);
-                                       }
-
-                                       if (pDetailedRightNormalBitmap)
-                                       {
-                                               pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightNormalColor);
-                                       }
+                                       pCircleBitmap = __pCheckButton->GetCircleBitmap(checkStatus);
+                                       pDetailedRightBitmap = __pCheckButton->GetDetailedRightBitmap(checkStatus);
 
                                        pCircleEffectBitmap = __pCheckButton->GetCircleNormalEffectBitmap();
                                        pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightNormalEffectBitmap();
                                }
 
-                               if (pReColorCircleBitmap)
+                               if (pCircleBitmap)
                                {
-                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleBitmap);
+                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pCircleBitmap);
                                }
 
                                bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_NORMAL);
@@ -1147,13 +1049,13 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        }
                                }
 
-                               if (pReColorRightBitmap)
+                               if (pDetailedRightBitmap)
                                {
-                                       float arrowWidth = pReColorRightBitmap->GetWidthF();
-                                       float arrowHeight = pReColorRightBitmap->GetHeightF();
+                                       float arrowWidth = pDetailedRightBitmap->GetWidthF();
+                                       float arrowHeight = pDetailedRightBitmap->GetHeightF();
 
                                        pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x + (__detailedButtonBounds.width - arrowWidth) / 2.0f
-                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReColorRightBitmap);
+                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pDetailedRightBitmap);
                                }
 
                                themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_ICON_NORMAL);
@@ -1175,24 +1077,14 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                {
                        if (checkStyle == CHECK_BUTTON_STYLE_RADIO_WITH_DETAILED_BUTTON)
                        {
-                               Bitmap* pCircleDisabledBitmap = __pCheckButton->GetCircleBitmap(_CHECK_BUTTON_STATUS_DISABLED);
-                               Bitmap* pDetailedRightDisabledBitmap = __pCheckButton->GetDetailedRightBitmap(_CHECK_BUTTON_STATUS_DISABLED);
+                               Bitmap* pCircleBitmap = __pCheckButton->GetCircleBitmap(checkStatus);
+                               Bitmap* pDetailedRightBitmap = __pCheckButton->GetDetailedRightBitmap(checkStatus);
                                Bitmap* pCircleEffectBitmap = __pCheckButton->GetCircleNormalEffectBitmap();
                                Bitmap* pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightNormalEffectBitmap();
 
-                               if (pCircleDisabledBitmap)
+                               if (pCircleBitmap)
                                {
-                                       pReColorCircleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleDisabledBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedDisabledBgColor);
-                               }
-
-                               if (pDetailedRightDisabledBitmap)
-                               {
-                                       pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightDisabledBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightDisabledColor);
-                               }
-
-                               if (pReColorCircleBitmap)
-                               {
-                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleBitmap);
+                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pCircleBitmap);
                                }
 
                                bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_DISABLED);
@@ -1205,13 +1097,13 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        }
                                }
 
-                               if (pReColorRightBitmap)
+                               if (pDetailedRightBitmap)
                                {
-                                       float arrowWidth = pReColorRightBitmap->GetWidthF();
-                                       float arrowHeight = pReColorRightBitmap->GetHeightF();
+                                       float arrowWidth = pDetailedRightBitmap->GetWidthF();
+                                       float arrowHeight = pDetailedRightBitmap->GetHeightF();
 
                                        pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x + (__detailedButtonBounds.width - arrowWidth) / 2.0f
-                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReColorRightBitmap);
+                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pDetailedRightBitmap);
                                }
 
                                themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_ICON_DISABLED);
@@ -1233,45 +1125,31 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                {
                        if (checkStyle == CHECK_BUTTON_STYLE_RADIO_WITH_DETAILED_BUTTON)
                        {
-                               Bitmap* pCirclePressedBitmap = __pCheckButton->GetCircleBitmap(_CHECK_BUTTON_STATUS_PRESSED);
-                               Bitmap* pDetailedRightPressedBitmap = __pCheckButton->GetDetailedRightBitmap(_CHECK_BUTTON_STATUS_PRESSED);
+                               Bitmap* pCircleBitmap = null;
+                               Bitmap* pDetailedRightBitmap = null;
                                Bitmap* pCircleEffectBitmap = null;
                                Bitmap* pDetailedRightEffectBitmap = null;
 
                                if (__detailedPressed == true)
                                {
-                                       if (pCirclePressedBitmap)
-                                       {
-                                               pReColorCircleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCirclePressedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedPressedBgColor);
-                                       }
-
-                                       if (pDetailedRightPressedBitmap)
-                                       {
-                                               pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightPressedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightPressedColor);
-                                       }
+                                       pCircleBitmap = __pCheckButton->GetCircleBitmap(checkStatus);
+                                       pDetailedRightBitmap = __pCheckButton->GetDetailedRightBitmap(checkStatus);
 
                                        pCircleEffectBitmap = __pCheckButton->GetCirclePressedEffectBitmap();
                                        pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightPressedEffectBitmap();
                                }
                                else
                                {
-                                       if (pCirclePressedBitmap)
-                                       {
-                                               pReColorCircleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCirclePressedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedNormalBgColor);
-                                       }
-
-                                       if (pDetailedRightPressedBitmap)
-                                       {
-                                               pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightPressedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightNormalColor);
-                                       }
+                                       pCircleBitmap = __pCheckButton->GetCircleBitmap(_CHECK_BUTTON_STATUS_NORMAL);
+                                       pDetailedRightBitmap = __pCheckButton->GetDetailedRightBitmap(_CHECK_BUTTON_STATUS_NORMAL);
 
                                        pCircleEffectBitmap = __pCheckButton->GetCircleNormalEffectBitmap();
                                        pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightNormalEffectBitmap();
                                }
 
-                               if (pReColorCircleBitmap)
+                               if (pCircleBitmap)
                                {
-                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleBitmap);
+                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pCircleBitmap);
                                }
 
                                bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_PRESSED);
@@ -1284,13 +1162,13 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        }
                                }
 
-                               if (pReColorRightBitmap)
+                               if (pDetailedRightBitmap)
                                {
-                                       float arrowWidth = pReColorRightBitmap->GetWidthF();
-                                       float arrowHeight = pReColorRightBitmap->GetHeightF();
+                                       float arrowWidth = pDetailedRightBitmap->GetWidthF();
+                                       float arrowHeight = pDetailedRightBitmap->GetHeightF();
 
                                        pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x + (__detailedButtonBounds.width - arrowWidth) / 2.0f
-                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReColorRightBitmap);
+                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pDetailedRightBitmap);
                                }
 
                                themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_ICON_PRESSED);
@@ -1312,46 +1190,33 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                {
                        if (checkStyle == CHECK_BUTTON_STYLE_RADIO_WITH_DETAILED_BUTTON)
                        {
-                               Bitmap* pCircleNormalBitmap = __pCheckButton->GetCircleBitmap(_CHECK_BUTTON_STATUS_NORMAL);
-                               Bitmap* pCircleHighlightedBitmap = __pCheckButton->GetCircleBitmap(_CHECK_BUTTON_STATUS_HIGHLIGHTED);
-                               Bitmap* pDetailedRightHighlightedBitmap = __pCheckButton->GetDetailedRightBitmap(_CHECK_BUTTON_STATUS_HIGHLIGHTED);
+                               Bitmap* pCircleHighlightedBitmap = __pCheckButton->GetCircleBitmap(checkStatus);
+
+                               Bitmap* pCircleBitmap = null;
+                               Bitmap* pDetailedRightBitmap = null;
                                Bitmap* pCircleEffectBitmap = null;
                                Bitmap* pDetailedRightEffectBitmap = null;
 
                                if (__detailedPressed == true)
                                {
-                                       if (pCircleNormalBitmap)
-                                       {
-                                               pReColorCircleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedPressedBgColor);
-                                       }
-
-                                       if (pDetailedRightHighlightedBitmap)
-                                       {
-                                               pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightPressedColor);
-                                       }
+                                       pCircleBitmap = __pCheckButton->GetCircleBitmap(_CHECK_BUTTON_STATUS_PRESSED);
+                                       pDetailedRightBitmap = __pCheckButton->GetDetailedRightBitmap(_CHECK_BUTTON_STATUS_PRESSED);
 
                                        pCircleEffectBitmap = __pCheckButton->GetCirclePressedEffectBitmap();
                                        pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightPressedEffectBitmap();
                                }
                                else
                                {
-                                       if (pCircleNormalBitmap)
-                                       {
-                                               pReColorCircleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedNormalBgColor);
-                                       }
-
-                                       if (pDetailedRightHighlightedBitmap)
-                                       {
-                                               pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightHighlightedColor);
-                                       }
+                                       pCircleBitmap = __pCheckButton->GetCircleBitmap(_CHECK_BUTTON_STATUS_NORMAL);
+                                       pDetailedRightBitmap = __pCheckButton->GetDetailedRightBitmap(_CHECK_BUTTON_STATUS_NORMAL);
 
                                        pCircleEffectBitmap = __pCheckButton->GetCircleNormalEffectBitmap();
                                        pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightNormalEffectBitmap();
                                }
 
-                               if (pReColorCircleBitmap)
+                               if (pCircleBitmap)
                                {
-                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleBitmap);
+                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pCircleBitmap);
                                }
 
                                bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_HIGHLIGHTED);
@@ -1364,13 +1229,13 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        }
                                }
 
-                               if (pReColorRightBitmap)
+                               if (pDetailedRightBitmap)
                                {
-                                       float arrowWidth = pReColorRightBitmap->GetWidthF();
-                                       float arrowHeight = pReColorRightBitmap->GetHeightF();
+                                       float arrowWidth = pDetailedRightBitmap->GetWidthF();
+                                       float arrowHeight = pDetailedRightBitmap->GetHeightF();
 
                                        pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x + (__detailedButtonBounds.width - arrowWidth) / 2.0f
-                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReColorRightBitmap);
+                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pDetailedRightBitmap);
                                }
 
                                themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_ICON_HIGHLIGHTED);
@@ -1387,64 +1252,41 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        }
                                }
 
-                               Bitmap* pReColorCircleHighlightedBitmap = null;
-
-                               if (pCircleHighlightedBitmap)
-                               {
-                                       pReColorCircleHighlightedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedHighlightedBgColor);
-                               }
-
-                               if (pReColorCircleHighlightedBitmap && __highlightedIndex == 1)
+                               if (pCircleHighlightedBitmap && __highlightedIndex == 1)
                                {
-                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleHighlightedBitmap);
+                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pCircleHighlightedBitmap);
                                }
-
-                               delete pReColorCircleHighlightedBitmap;
                        }
                }
                else if (checkStatus == _CHECK_BUTTON_STATUS_SELECTED)
                {
                        if (checkStyle == CHECK_BUTTON_STYLE_RADIO_WITH_DETAILED_BUTTON)
                        {
-                               Bitmap* pCircleSelectedBitmap = __pCheckButton->GetCircleBitmap(_CHECK_BUTTON_STATUS_SELECTED);
-                               Bitmap* pDetailedRightSelectedBitmap = __pCheckButton->GetDetailedRightBitmap(_CHECK_BUTTON_STATUS_SELECTED);
+                               Bitmap* pCircleBitmap = null;
+                               Bitmap* pDetailedRightBitmap = null;
                                Bitmap* pCircleEffectBitmap = null;
                                Bitmap* pDetailedRightEffectBitmap = null;
 
                                if (__detailedPressed == true)
                                {
-                                       if (pCircleSelectedBitmap)
-                                       {
-                                               pReColorCircleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleSelectedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedPressedBgColor);
-                                       }
-
-                                       if (pDetailedRightSelectedBitmap)
-                                       {
-                                               pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightSelectedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightPressedColor);
-                                       }
+                                       pCircleBitmap = __pCheckButton->GetCircleBitmap(_CHECK_BUTTON_STATUS_PRESSED);
+                                       pDetailedRightBitmap = __pCheckButton->GetDetailedRightBitmap(_CHECK_BUTTON_STATUS_PRESSED);
 
                                        pCircleEffectBitmap = __pCheckButton->GetCirclePressedEffectBitmap();
                                        pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightPressedEffectBitmap();
                                }
                                else
                                {
-                                       if (pCircleSelectedBitmap)
-                                       {
-                                               pReColorCircleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleSelectedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedSelectedBgColor);
-                                       }
-
-                                       if (pDetailedRightSelectedBitmap)
-                                       {
-                                               pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightSelectedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightSelectedColor);
-                                       }
+                                       pCircleBitmap = __pCheckButton->GetCircleBitmap(checkStatus);
+                                       pDetailedRightBitmap = __pCheckButton->GetDetailedRightBitmap(checkStatus);
 
                                        pCircleEffectBitmap = __pCheckButton->GetCircleNormalEffectBitmap();
                                        pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightNormalEffectBitmap();
                                }
 
-                               if (pReColorCircleBitmap)
+                               if (pCircleBitmap)
                                {
-                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleBitmap);
+                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pCircleBitmap);
                                }
 
                                bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_SELECTED);
@@ -1457,13 +1299,13 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        }
                                }
 
-                               if (pReColorRightBitmap)
+                               if (pDetailedRightBitmap)
                                {
-                                       float arrowWidth = pReColorRightBitmap->GetWidthF();
-                                       float arrowHeight = pReColorRightBitmap->GetHeightF();
+                                       float arrowWidth = pDetailedRightBitmap->GetWidthF();
+                                       float arrowHeight = pDetailedRightBitmap->GetHeightF();
 
                                        pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x + (__detailedButtonBounds.width - arrowWidth) / 2.0f
-                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReColorRightBitmap);
+                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pDetailedRightBitmap);
                                }
 
                                themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_ICON_SELECTED);
@@ -1551,19 +1393,10 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                pCanvas->DrawBitmap(FloatPoint(__defaultButtonBounds.x, __defaultButtonBounds.y), *pOnOffHighlightedBitmap);
                        }
 
-                       Bitmap* pReColorOnOffBgHighlightedBitmap = null;
-
-                       if (pOnOffBgHighlightedBitmap)
-                       {
-                               pReColorOnOffBgHighlightedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pOnOffBgHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedHighlightedBgColor);
-                       }
-
-                       if (pReColorOnOffBgHighlightedBitmap && __highlightedIndex == 1)
+                       if (pOnOffBgHighlightedBitmap && __highlightedIndex == 1)
                        {
-                               pCanvas->DrawBitmap(FloatPoint(__defaultButtonBounds.x, __defaultButtonBounds.y), *pReColorOnOffBgHighlightedBitmap);
+                               pCanvas->DrawBitmap(FloatPoint(__defaultButtonBounds.x, __defaultButtonBounds.y), *pOnOffBgHighlightedBitmap);
                        }
-
-                       delete pReColorOnOffBgHighlightedBitmap;
                }
                else if (checkStatus == _CHECK_BUTTON_STATUS_SELECTED)
                {
@@ -2230,15 +2063,9 @@ _CheckButtonPresenter::DrawOnOffSlidingHandler(float handlerPosition)
 
                        Bitmap* pOnOffSlidingOffHandlerHighlightedBitmap = __pCheckButton->GetOnOffSlidingOffHandlerBitmap(_CHECK_BUTTON_STATUS_HIGHLIGHTED);
 
-                       if (pOnOffSlidingOffHandlerHighlightedBitmap)
-                       {
-                               pReColorBgBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pOnOffSlidingOffHandlerHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA),
-                                               detailedHighlightedBgColor);
-                       }
-
-                       if (pReColorBgBitmap && __highlightedIndex == 1)
+                       if (pOnOffSlidingOffHandlerHighlightedBitmap && __highlightedIndex == 1)
                        {
-                               pCanvas->DrawBitmap(FloatPoint(handlerPosition, __onOffSlidingButtonBounds.y - handlerMargin), *pReColorBgBitmap);
+                               pCanvas->DrawBitmap(FloatPoint(handlerPosition, __onOffSlidingButtonBounds.y - handlerMargin), *pOnOffSlidingOffHandlerHighlightedBitmap);
                        }
                }
                else if (checkStatus == _CHECK_BUTTON_STATUS_SELECTED)
@@ -2326,15 +2153,9 @@ _CheckButtonPresenter::DrawOnOffSlidingHandler(float handlerPosition)
 
                        Bitmap* pOnOffSlidingOnHandlerHighlightedBitmap = __pCheckButton->GetOnOffSlidingOnHandlerBitmap(_CHECK_BUTTON_STATUS_HIGHLIGHTED);
 
-                       if (pOnOffSlidingOnHandlerHighlightedBitmap)
-                       {
-                               pReColorBgBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pOnOffSlidingOnHandlerHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA),
-                                               detailedHighlightedBgColor);
-                       }
-
-                       if (pReColorBgBitmap && __highlightedIndex == 1)
+                       if (pOnOffSlidingOnHandlerHighlightedBitmap && __highlightedIndex == 1)
                        {
-                               pCanvas->DrawBitmap(FloatPoint(handlerPosition, __onOffSlidingButtonBounds.y - handlerMargin), *pReColorBgBitmap);
+                               pCanvas->DrawBitmap(FloatPoint(handlerPosition, __onOffSlidingButtonBounds.y - handlerMargin), *pOnOffSlidingOnHandlerHighlightedBitmap);
                        }
                }
                else if (checkStatus == _CHECK_BUTTON_STATUS_SELECTED)

diff --git a/src/ui/inc/FUiCtrl_CheckButton.h b/src/ui/inc/FUiCtrl_CheckButton.h
index 306e46c..2dc2381 100644 (file)
--- a/src/ui/inc/FUiCtrl_CheckButton.h
+++ b/src/ui/inc/FUiCtrl_CheckButton.h
@@ -314,10 +314,10 @@ private:
        Tizen::Graphics::Color __highlightedColor;
        Tizen::Graphics::Color __selectedColor;
 
-       Tizen::Graphics::Bitmap* __pMarkBgNormalBitmap[NUMBER_OF_CHECK_BUTTON_STATUS];
+       Tizen::Graphics::Bitmap* __pMarkBgBitmap[NUMBER_OF_CHECK_BUTTON_STATUS];
        Tizen::Graphics::Bitmap* __pMarkBitmap[NUMBER_OF_CHECK_BUTTON_STATUS];
 
-       Tizen::Graphics::Bitmap* __pOnOffBgNormalBitmap[NUMBER_OF_CHECK_BUTTON_STATUS];
+       Tizen::Graphics::Bitmap* __pOnOffBgBitmap[NUMBER_OF_CHECK_BUTTON_STATUS];
        Tizen::Graphics::Bitmap* __pOnOffBitmap[NUMBER_OF_CHECK_BUTTON_STATUS];
 
        Tizen::Graphics::Bitmap* __pOnOffSlidingBgBitmap[NUMBER_OF_CHECK_BUTTON_STATUS];