fix prevent

Change-Id: I2acb70086ef61dc0aa0270565d3efa722b27ca1d

diff --git a/src/ui/controls/FUiCtrl_ButtonPresenter.cpp b/src/ui/controls/FUiCtrl_ButtonPresenter.cpp
index 3be1fb0..c835a45 100644 (file)
--- a/src/ui/controls/FUiCtrl_ButtonPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ButtonPresenter.cpp
@@ -432,18 +432,18 @@ _ButtonPresenter::DrawBackground(void)
                                                pCanvas->DrawBitmap(bounds, *pBackgroundBitmap, FloatRectangle(0.0f, 0.0f, pBackgroundBitmap->GetWidthF(), pBackgroundBitmap->GetHeightF()));
                                        }
                                }
-                       }
 
-                       if (pHighlightedBackgroundBitmap)
-                       {
-                               if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pHighlightedBackgroundBitmap))
-                               {
-                                       pCanvas->DrawNinePatchedBitmap(bounds, *pHighlightedBackgroundBitmap);
-                               }
-                               else
+                               if (pHighlightedBackgroundBitmap)
                                {
-                                       pCanvas->DrawBitmap(bounds, *pHighlightedBackgroundBitmap,
+                                       if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pHighlightedBackgroundBitmap))
+                                       {
+                                               pCanvas->DrawNinePatchedBitmap(bounds, *pHighlightedBackgroundBitmap);
+                                       }
+                                       else
+                                       {
+                                               pCanvas->DrawBitmap(bounds, *pHighlightedBackgroundBitmap,
                                                        FloatRectangle(0.0f, 0.0f, pHighlightedBackgroundBitmap->GetWidthF(), pHighlightedBackgroundBitmap->GetHeightF()));
+                                       }
                                }
                        }
                }
@@ -635,6 +635,7 @@ _ButtonPresenter::DrawBackground(void)
        }
 
        delete pReplacementColorBackgroundBitmap;
+       delete pHighlightedReplacementColorBackgroundBitmap;
 
        return;
 }
@@ -1252,7 +1253,10 @@ _ButtonPresenter::OnCanvasRequestedN(const FloatRectangle& bounds)
 
                if (pBackgroundBitmap != null)
                {
-                       pBackgroundBitmap->IsNinePatchedBitmap();
+                       if (pBackgroundBitmap->IsNinePatchedBitmap()) // just decode // fix prevent CHECKED_RETURN
+                       {
+                               // empty
+                       }
                }
 
                __lazyDecode = false;

diff --git a/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp b/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp
index a28b2ee..80ee268 100644 (file)
--- a/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp
@@ -220,11 +220,11 @@ _CheckButtonPresenter::DrawBackground(void)
                return;
        }
 
-       Bitmap* pBackgroundBitmap = null;
-       Bitmap* pReplacementColorBackgroundBitmap = null;
+       Bitmap* pBgBitmap = null;
+       Bitmap* pReColorBgBitmap = null;
 
-       Bitmap* pHighlightedBackgroundBitmap = null;
-       Bitmap* pHighlightedReplacementColorBackgroundBitmap = null;
+       Bitmap* pHighlightedBgBitmap = null;
+       Bitmap* pHighlightedReColorBgBitmap = null;
 
        FloatDimension minDimension(0.0f, 0.0f);
        FloatDimension minDimensionWithAnnex(0.0f, 0.0f);
@@ -276,51 +276,51 @@ _CheckButtonPresenter::DrawBackground(void)
                }
                else
                {
-                       pBackgroundBitmap = __pCheckButton->GetBackgroundBitmap(__pCheckButton->GetGroupStyle(), _CHECK_BUTTON_STATUS_NORMAL);
+                       pBgBitmap = __pCheckButton->GetBackgroundBitmap(__pCheckButton->GetGroupStyle(), _CHECK_BUTTON_STATUS_NORMAL);
 
-                       if (pBackgroundBitmap && _BitmapImpl::CheckNinePatchedBitmapStrictly(*pBackgroundBitmap))
+                       if (pBgBitmap && _BitmapImpl::CheckNinePatchedBitmapStrictly(*pBgBitmap))
                        {
-                               pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackgroundBitmap, Color::GetColor(COLOR_ID_MAGENTA),
+                               pReColorBgBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBgBitmap, Color::GetColor(COLOR_ID_MAGENTA),
                                                __pCheckButton->GetColor(_CHECK_BUTTON_STATUS_NORMAL));
-                               if (pReplacementColorBackgroundBitmap)
+                               if (pReColorBgBitmap)
                                {
-                                       pCanvas->DrawNinePatchedBitmap(bounds, *pReplacementColorBackgroundBitmap);
+                                       pCanvas->DrawNinePatchedBitmap(bounds, *pReColorBgBitmap);
                                }
 
-                               bool themeBackgroundBitmap = false;
+                               bool themeBgBitmap = false;
 
                                if (__pCheckButton->GetGroupStyle() == GROUP_STYLE_SINGLE)
                                {
-                                       themeBackgroundBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_SINGLE_BG_NORMAL);
+                                       themeBgBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_SINGLE_BG_NORMAL);
                                }
                                else if (__pCheckButton->GetGroupStyle() == GROUP_STYLE_TOP)
                                {
-                                       themeBackgroundBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_TOP_BG_NORMAL);
+                                       themeBgBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_TOP_BG_NORMAL);
                                }
                                else if (__pCheckButton->GetGroupStyle() == GROUP_STYLE_MIDDLE)
                                {
-                                       themeBackgroundBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_MIDDLE_BG_NORMAL);
+                                       themeBgBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_MIDDLE_BG_NORMAL);
                                }
                                else if (__pCheckButton->GetGroupStyle() == GROUP_STYLE_BOTTOM)
                                {
-                                       themeBackgroundBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_BOTTOM_BG_NORMAL);
+                                       themeBgBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_BOTTOM_BG_NORMAL);
                                }
 
-                               if (themeBackgroundBitmap == false)
+                               if (themeBgBitmap == false)
                                {
-                                       Bitmap* pBackgroundNormalEffectBitmap = __pCheckButton->GetBackgroundNormalEffectBitmap(__pCheckButton->GetGroupStyle());
+                                       Bitmap* pBgNormalEffectBitmap = __pCheckButton->GetBackgroundNormalEffectBitmap(__pCheckButton->GetGroupStyle());
 
-                                       if (pBackgroundNormalEffectBitmap)
+                                       if (pBgNormalEffectBitmap)
                                        {
-                                               pCanvas->DrawNinePatchedBitmap(bounds, *pBackgroundNormalEffectBitmap);
+                                               pCanvas->DrawNinePatchedBitmap(bounds, *pBgNormalEffectBitmap);
                                        }
                                }
                        }
                        else
                        {
-                               if (pBackgroundBitmap)
+                               if (pBgBitmap)
                                {
-                                       pCanvas->DrawBitmap(FloatRectangle(0.0f, 0.0f, bounds.width, bounds.height), *pBackgroundBitmap);
+                                       pCanvas->DrawBitmap(FloatRectangle(0.0f, 0.0f, bounds.width, bounds.height), *pBgBitmap);
                                }
                        }
                }
@@ -334,51 +334,51 @@ _CheckButtonPresenter::DrawBackground(void)
                }
                else
                {
-                       pBackgroundBitmap = __pCheckButton->GetBackgroundBitmap(__pCheckButton->GetGroupStyle(), _CHECK_BUTTON_STATUS_DISABLED);
+                       pBgBitmap = __pCheckButton->GetBackgroundBitmap(__pCheckButton->GetGroupStyle(), _CHECK_BUTTON_STATUS_DISABLED);
 
-                       if (pBackgroundBitmap && _BitmapImpl::CheckNinePatchedBitmapStrictly(*pBackgroundBitmap))
+                       if (pBgBitmap && _BitmapImpl::CheckNinePatchedBitmapStrictly(*pBgBitmap))
                        {
-                               pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackgroundBitmap, Color::GetColor(COLOR_ID_MAGENTA),
+                               pReColorBgBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBgBitmap, Color::GetColor(COLOR_ID_MAGENTA),
                                                __pCheckButton->GetColor(_CHECK_BUTTON_STATUS_DISABLED));
-                               if (pReplacementColorBackgroundBitmap)
+                               if (pReColorBgBitmap)
                                {
-                                       pCanvas->DrawNinePatchedBitmap(bounds, *pReplacementColorBackgroundBitmap);
+                                       pCanvas->DrawNinePatchedBitmap(bounds, *pReColorBgBitmap);
                                }
 
-                               bool themeBackgroundBitmap = false;
+                               bool themeBgBitmap = false;
 
                                if (__pCheckButton->GetGroupStyle() == GROUP_STYLE_SINGLE)
                                {
-                                       themeBackgroundBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_SINGLE_BG_DISABLED);
+                                       themeBgBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_SINGLE_BG_DISABLED);
                                }
                                else if (__pCheckButton->GetGroupStyle() == GROUP_STYLE_TOP)
                                {
-                                       themeBackgroundBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_TOP_BG_DISABLED);
+                                       themeBgBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_TOP_BG_DISABLED);
                                }
                                else if (__pCheckButton->GetGroupStyle() == GROUP_STYLE_MIDDLE)
                                {
-                                       themeBackgroundBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_MIDDLE_BG_DISABLED);
+                                       themeBgBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_MIDDLE_BG_DISABLED);
                                }
                                else if (__pCheckButton->GetGroupStyle() == GROUP_STYLE_BOTTOM)
                                {
-                                       themeBackgroundBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_BOTTOM_BG_DISABLED);
+                                       themeBgBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_BOTTOM_BG_DISABLED);
                                }
 
-                               if (themeBackgroundBitmap == false)
+                               if (themeBgBitmap == false)
                                {
-                                       Bitmap* pBackgroundNormalEffectBitmap = __pCheckButton->GetBackgroundNormalEffectBitmap(__pCheckButton->GetGroupStyle());
+                                       Bitmap* pBgNormalEffectBitmap = __pCheckButton->GetBackgroundNormalEffectBitmap(__pCheckButton->GetGroupStyle());
 
-                                       if (pBackgroundNormalEffectBitmap)
+                                       if (pBgNormalEffectBitmap)
                                        {
-                                               pCanvas->DrawNinePatchedBitmap(bounds, *pBackgroundNormalEffectBitmap);
+                                               pCanvas->DrawNinePatchedBitmap(bounds, *pBgNormalEffectBitmap);
                                        }
                                }
                        }
                        else
                        {
-                               if (pBackgroundBitmap)
+                               if (pBgBitmap)
                                {
-                                       pCanvas->DrawBitmap(FloatRectangle(0.0f, 0.0f, bounds.width, bounds.height), *pBackgroundBitmap);
+                                       pCanvas->DrawBitmap(FloatRectangle(0.0f, 0.0f, bounds.width, bounds.height), *pBgBitmap);
                                }
                        }
                }
@@ -392,51 +392,51 @@ _CheckButtonPresenter::DrawBackground(void)
                }
                else
                {
-                       pBackgroundBitmap = __pCheckButton->GetBackgroundBitmap(__pCheckButton->GetGroupStyle(), _CHECK_BUTTON_STATUS_PRESSED);
+                       pBgBitmap = __pCheckButton->GetBackgroundBitmap(__pCheckButton->GetGroupStyle(), _CHECK_BUTTON_STATUS_PRESSED);
 
-                       if (pBackgroundBitmap && _BitmapImpl::CheckNinePatchedBitmapStrictly(*pBackgroundBitmap))
+                       if (pBgBitmap && _BitmapImpl::CheckNinePatchedBitmapStrictly(*pBgBitmap))
                        {
-                               pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackgroundBitmap, Color::GetColor(COLOR_ID_MAGENTA),
+                               pReColorBgBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBgBitmap, Color::GetColor(COLOR_ID_MAGENTA),
                                                __pCheckButton->GetColor(_CHECK_BUTTON_STATUS_PRESSED));
-                               if (pReplacementColorBackgroundBitmap)
+                               if (pReColorBgBitmap)
                                {
-                                       pCanvas->DrawNinePatchedBitmap(bounds, *pReplacementColorBackgroundBitmap);
+                                       pCanvas->DrawNinePatchedBitmap(bounds, *pReColorBgBitmap);
                                }
 
-                               bool themeBackgroundBitmap = false;
+                               bool themeBgBitmap = false;
 
                                if (__pCheckButton->GetGroupStyle() == GROUP_STYLE_SINGLE)
                                {
-                                       themeBackgroundBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_SINGLE_BG_PRESSED);
+                                       themeBgBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_SINGLE_BG_PRESSED);
                                }
                                else if (__pCheckButton->GetGroupStyle() == GROUP_STYLE_TOP)
                                {
-                                       themeBackgroundBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_TOP_BG_PRESSED);
+                                       themeBgBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_TOP_BG_PRESSED);
                                }
                                else if (__pCheckButton->GetGroupStyle() == GROUP_STYLE_MIDDLE)
                                {
-                                       themeBackgroundBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_MIDDLE_BG_PRESSED);
+                                       themeBgBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_MIDDLE_BG_PRESSED);
                                }
                                else if (__pCheckButton->GetGroupStyle() == GROUP_STYLE_BOTTOM)
                                {
-                                       themeBackgroundBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_BOTTOM_BG_PRESSED);
+                                       themeBgBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_BOTTOM_BG_PRESSED);
                                }
 
-                               if (themeBackgroundBitmap == false)
+                               if (themeBgBitmap == false)
                                {
-                                       Bitmap* pBackgroundPressedEffectBitmap = __pCheckButton->GetBackgroundPressedEffectBitmap(__pCheckButton->GetGroupStyle());
+                                       Bitmap* pBgPressedEffectBitmap = __pCheckButton->GetBackgroundPressedEffectBitmap(__pCheckButton->GetGroupStyle());
 
-                                       if (pBackgroundPressedEffectBitmap)
+                                       if (pBgPressedEffectBitmap)
                                        {
-                                               pCanvas->DrawNinePatchedBitmap(bounds, *pBackgroundPressedEffectBitmap);
+                                               pCanvas->DrawNinePatchedBitmap(bounds, *pBgPressedEffectBitmap);
                                        }
                                }
                        }
                        else
                        {
-                               if (pBackgroundBitmap)
+                               if (pBgBitmap)
                                {
-                                       pCanvas->DrawBitmap(FloatRectangle(0.0f, 0.0f, bounds.width, bounds.height), *pBackgroundBitmap);
+                                       pCanvas->DrawBitmap(FloatRectangle(0.0f, 0.0f, bounds.width, bounds.height), *pBgBitmap);
                                }
                        }
                }
@@ -450,69 +450,69 @@ _CheckButtonPresenter::DrawBackground(void)
                }
                else
                {
-                       pBackgroundBitmap = __pCheckButton->GetBackgroundBitmap(__pCheckButton->GetGroupStyle(), _CHECK_BUTTON_STATUS_NORMAL);
+                       pBgBitmap = __pCheckButton->GetBackgroundBitmap(__pCheckButton->GetGroupStyle(), _CHECK_BUTTON_STATUS_NORMAL);
 
-                       if (pBackgroundBitmap && _BitmapImpl::CheckNinePatchedBitmapStrictly(*pBackgroundBitmap))
+                       if (pBgBitmap && _BitmapImpl::CheckNinePatchedBitmapStrictly(*pBgBitmap))
                        {
-                               pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackgroundBitmap, Color::GetColor(COLOR_ID_MAGENTA),
+                               pReColorBgBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBgBitmap, Color::GetColor(COLOR_ID_MAGENTA),
                                                __pCheckButton->GetColor(_CHECK_BUTTON_STATUS_NORMAL));
-                               if (pReplacementColorBackgroundBitmap)
+                               if (pReColorBgBitmap)
                                {
-                                       pCanvas->DrawNinePatchedBitmap(bounds, *pReplacementColorBackgroundBitmap);
+                                       pCanvas->DrawNinePatchedBitmap(bounds, *pReColorBgBitmap);
                                }
 
-                               bool themeBackgroundBitmap = false;
+                               bool themeBgBitmap = false;
 
                                if (__pCheckButton->GetGroupStyle() == GROUP_STYLE_SINGLE)
                                {
-                                       themeBackgroundBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_SINGLE_BG_HIGHLIGHTED);
+                                       themeBgBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_SINGLE_BG_HIGHLIGHTED);
                                }
                                else if (__pCheckButton->GetGroupStyle() == GROUP_STYLE_TOP)
                                {
-                                       themeBackgroundBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_TOP_BG_HIGHLIGHTED);
+                                       themeBgBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_TOP_BG_HIGHLIGHTED);
                                }
                                else if (__pCheckButton->GetGroupStyle() == GROUP_STYLE_MIDDLE)
                                {
-                                       themeBackgroundBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_MIDDLE_BG_HIGHLIGHTED);
+                                       themeBgBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_MIDDLE_BG_HIGHLIGHTED);
                                }
                                else if (__pCheckButton->GetGroupStyle() == GROUP_STYLE_BOTTOM)
                                {
-                                       themeBackgroundBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_BOTTOM_BG_HIGHLIGHTED);
+                                       themeBgBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_BOTTOM_BG_HIGHLIGHTED);
                                }
 
-                               if (themeBackgroundBitmap == false)
+                               if (themeBgBitmap == false)
                                {
-                                       Bitmap* pBackgroundPressedEffectBitmap = __pCheckButton->GetBackgroundPressedEffectBitmap(__pCheckButton->GetGroupStyle());
+                                       Bitmap* pBgPressedEffectBitmap = __pCheckButton->GetBackgroundPressedEffectBitmap(__pCheckButton->GetGroupStyle());
 
-                                       if (pBackgroundPressedEffectBitmap)
+                                       if (pBgPressedEffectBitmap)
                                        {
-                                               pCanvas->DrawNinePatchedBitmap(bounds, *pBackgroundPressedEffectBitmap);
+                                               pCanvas->DrawNinePatchedBitmap(bounds, *pBgPressedEffectBitmap);
                                        }
                                }
                        }
                        else
                        {
-                               if (pBackgroundBitmap)
+                               if (pBgBitmap)
                                {
-                                       pCanvas->DrawBitmap(FloatRectangle(0.0f, 0.0f, bounds.width, bounds.height), *pBackgroundBitmap);
+                                       pCanvas->DrawBitmap(FloatRectangle(0.0f, 0.0f, bounds.width, bounds.height), *pBgBitmap);
                                }
                        }
 
-                       pHighlightedBackgroundBitmap = __pCheckButton->GetBackgroundBitmap(__pCheckButton->GetGroupStyle(), _CHECK_BUTTON_STATUS_HIGHLIGHTED);
+                       pHighlightedBgBitmap = __pCheckButton->GetBackgroundBitmap(__pCheckButton->GetGroupStyle(), _CHECK_BUTTON_STATUS_HIGHLIGHTED);
 
-                       pHighlightedReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pHighlightedBackgroundBitmap,
+                       pHighlightedReColorBgBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pHighlightedBgBitmap,
                                        Color::GetColor(COLOR_ID_MAGENTA), __pCheckButton->GetColor(_CHECK_BUTTON_STATUS_HIGHLIGHTED));
 
-                       if (pHighlightedReplacementColorBackgroundBitmap)
+                       if (pHighlightedReColorBgBitmap)
                        {
-                               if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pHighlightedReplacementColorBackgroundBitmap))
+                               if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pHighlightedReColorBgBitmap))
                                {
-                                       pCanvas->DrawNinePatchedBitmap(bounds, *pHighlightedReplacementColorBackgroundBitmap);
+                                       pCanvas->DrawNinePatchedBitmap(bounds, *pHighlightedReColorBgBitmap);
                                }
                                else
                                {
-                                       pCanvas->DrawBitmap(bounds, *pHighlightedReplacementColorBackgroundBitmap,
-                                                       FloatRectangle(0.0f, 0.0f, pHighlightedReplacementColorBackgroundBitmap->GetWidthF(), pHighlightedReplacementColorBackgroundBitmap->GetHeightF()));
+                                       pCanvas->DrawBitmap(bounds, *pHighlightedReColorBgBitmap,
+                                                       FloatRectangle(0.0f, 0.0f, pHighlightedReColorBgBitmap->GetWidthF(), pHighlightedReColorBgBitmap->GetHeightF()));
                                }
                        }
                }
@@ -526,59 +526,59 @@ _CheckButtonPresenter::DrawBackground(void)
                }
                else
                {
-                       pBackgroundBitmap = __pCheckButton->GetBackgroundBitmap(__pCheckButton->GetGroupStyle(), __pCheckButton->GetCheckButtonStatus());
+                       pBgBitmap = __pCheckButton->GetBackgroundBitmap(__pCheckButton->GetGroupStyle(), __pCheckButton->GetCheckButtonStatus());
 
-                       if (pBackgroundBitmap && _BitmapImpl::CheckNinePatchedBitmapStrictly(*pBackgroundBitmap))
+                       if (pBgBitmap && _BitmapImpl::CheckNinePatchedBitmapStrictly(*pBgBitmap))
                        {
-                               pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBackgroundBitmap, Color::GetColor(COLOR_ID_MAGENTA),
+                               pReColorBgBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pBgBitmap, Color::GetColor(COLOR_ID_MAGENTA),
                                                __pCheckButton->GetColor(_CHECK_BUTTON_STATUS_SELECTED));
-                               if (pReplacementColorBackgroundBitmap)
+                               if (pReColorBgBitmap)
                                {
-                                       pCanvas->DrawNinePatchedBitmap(bounds, *pReplacementColorBackgroundBitmap);
+                                       pCanvas->DrawNinePatchedBitmap(bounds, *pReColorBgBitmap);
                                }
 
-                               bool themeBackgroundBitmap = false;
+                               bool themeBgBitmap = false;
 
                                if (__pCheckButton->GetGroupStyle() == GROUP_STYLE_SINGLE)
                                {
-                                       themeBackgroundBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_SINGLE_BG_SELECTED);
+                                       themeBgBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_SINGLE_BG_SELECTED);
                                }
                                else if (__pCheckButton->GetGroupStyle() == GROUP_STYLE_TOP)
                                {
-                                       themeBackgroundBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_TOP_BG_SELECTED);
+                                       themeBgBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_TOP_BG_SELECTED);
                                }
                                else if (__pCheckButton->GetGroupStyle() == GROUP_STYLE_MIDDLE)
                                {
-                                       themeBackgroundBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_MIDDLE_BG_SELECTED);
+                                       themeBgBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_MIDDLE_BG_SELECTED);
                                }
                                else if (__pCheckButton->GetGroupStyle() == GROUP_STYLE_BOTTOM)
                                {
-                                       themeBackgroundBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_BOTTOM_BG_SELECTED);
+                                       themeBgBitmap = IS_CUSTOM_BITMAP(PANEL::GROUPED_BOTTOM_BG_SELECTED);
                                }
 
-                               if (themeBackgroundBitmap == false)
+                               if (themeBgBitmap == false)
                                {
-                                       Bitmap* pBackgroundNormalEffectBitmap = __pCheckButton->GetBackgroundNormalEffectBitmap(__pCheckButton->GetGroupStyle());
+                                       Bitmap* pBgNormalEffectBitmap = __pCheckButton->GetBackgroundNormalEffectBitmap(__pCheckButton->GetGroupStyle());
 
-                                       if (pBackgroundNormalEffectBitmap)
+                                       if (pBgNormalEffectBitmap)
                                        {
-                                               pCanvas->DrawNinePatchedBitmap(bounds, *pBackgroundNormalEffectBitmap);
+                                               pCanvas->DrawNinePatchedBitmap(bounds, *pBgNormalEffectBitmap);
                                        }
                                }
                        }
                        else
                        {
-                               if (pBackgroundBitmap)
+                               if (pBgBitmap)
                                {
-                                       pCanvas->DrawBitmap(FloatRectangle(0.0f, 0.0f, bounds.width, bounds.height), *pBackgroundBitmap);
+                                       pCanvas->DrawBitmap(FloatRectangle(0.0f, 0.0f, bounds.width, bounds.height), *pBgBitmap);
                                }
                        }
                }
        }
 
        delete pCanvas;
-       delete pReplacementColorBackgroundBitmap;
-       delete pHighlightedReplacementColorBackgroundBitmap;
+       delete pReColorBgBitmap;
+       delete pHighlightedReColorBgBitmap;
 
        return;
 }
@@ -594,11 +594,11 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                return;
        }
 
-       Color detailedNormalBackgroundColor;
-       Color detailedDisabledBackgroundColor;
-       Color detailedPressedBackgroundColor;
-       Color detailedHighlightedBackgroundColor;
-       Color detailedSelectedBackgroundColor;
+       Color detailedNormalBgColor;
+       Color detailedDisabledBgColor;
+       Color detailedPressedBgColor;
+       Color detailedHighlightedBgColor;
+       Color detailedSelectedBgColor;
 
        Color detailedRightNormalColor;
        Color detailedRightDisabledColor;
@@ -606,11 +606,11 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
        Color detailedRightHighlightedColor;
        Color detailedRightSelectedColor;
 
-       GET_COLOR_CONFIG(CHECKBUTTON::DETAILED_ICON_BG_NORMAL, detailedNormalBackgroundColor);
-       GET_COLOR_CONFIG(CHECKBUTTON::DETAILED_ICON_BG_DISABLED, detailedDisabledBackgroundColor);
-       GET_COLOR_CONFIG(CHECKBUTTON::DETAILED_ICON_BG_PRESSED, detailedPressedBackgroundColor);
-       GET_COLOR_CONFIG(CHECKBUTTON::DETAILED_ICON_BG_HIGHLIGHTED, detailedHighlightedBackgroundColor);
-       GET_COLOR_CONFIG(CHECKBUTTON::DETAILED_ICON_BG_SELECTED, detailedSelectedBackgroundColor);
+       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);
@@ -618,8 +618,8 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
        GET_COLOR_CONFIG(CHECKBUTTON::DETAILED_ICON_TEXT_HIGHLIGHTED, detailedRightHighlightedColor);
        GET_COLOR_CONFIG(CHECKBUTTON::DETAILED_ICON_TEXT_SELECTED, detailedRightSelectedColor);
 
-       Bitmap* pReplacementColorBackgroundBitmap = null;
-       Bitmap* pReplacementColorRightBitmap = null;
+       Bitmap* pReColorCircleBitmap = null;
+       Bitmap* pReColorRightBitmap = null;
 
        _CheckButtonStatus checkStatus = __pCheckButton->GetCheckButtonStatus();
        CheckButtonStyle checkStyle = __pCheckButton->GetCheckButtonStyle();
@@ -644,31 +644,31 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
 
                                if (pCircleNormalBitmap)
                                {
-                                       pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedNormalBackgroundColor);
+                                       pReColorCircleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedNormalBgColor);
                                }
 
                                if (pDetailedRightNormalBitmap)
                                {
-                                       pReplacementColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightNormalColor);
+                                       pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightNormalColor);
                                }
 
-                               if (pReplacementColorBackgroundBitmap)
+                               if (pReColorCircleBitmap)
                                {
-                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReplacementColorBackgroundBitmap);
+                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleBitmap);
                                }
 
-                               if (pReplacementColorRightBitmap)
+                               if (pReColorRightBitmap)
                                {
-                                       float arrowWidth = pReplacementColorRightBitmap->GetWidthF();
-                                       float arrowHeight = pReplacementColorRightBitmap->GetHeightF();
+                                       float arrowWidth = pReColorRightBitmap->GetWidthF();
+                                       float arrowHeight = pReColorRightBitmap->GetHeightF();
 
                                        pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x + (__detailedButtonBounds.width - arrowWidth) / 2.0f
-                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReplacementColorRightBitmap);
+                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReColorRightBitmap);
                                }
 
-                               bool themeBackgroundBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_NORMAL);
+                               bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_NORMAL);
 
-                               if (themeBackgroundBitmap == false)
+                               if (themeBgBitmap == false)
                                {
                                        Bitmap* pCircleNormalEffectBitmap = __pCheckButton->GetCircleNormalEffectBitmap();
 
@@ -695,31 +695,31 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
 
                                if (pCircleDisabledBitmap)
                                {
-                                       pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleDisabledBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedDisabledBackgroundColor);
+                                       pReColorCircleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleDisabledBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedDisabledBgColor);
                                }
 
                                if (pDetailedRightDisabledBitmap)
                                {
-                                       pReplacementColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightDisabledBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightDisabledColor);
+                                       pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightDisabledBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightDisabledColor);
                                }
 
-                               if (pReplacementColorBackgroundBitmap)
+                               if (pReColorCircleBitmap)
                                {
-                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReplacementColorBackgroundBitmap);
+                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleBitmap);
                                }
 
-                               if (pReplacementColorRightBitmap)
+                               if (pReColorRightBitmap)
                                {
-                                       float arrowWidth = pReplacementColorRightBitmap->GetWidthF();
-                                       float arrowHeight = pReplacementColorRightBitmap->GetHeightF();
+                                       float arrowWidth = pReColorRightBitmap->GetWidthF();
+                                       float arrowHeight = pReColorRightBitmap->GetHeightF();
 
                                        pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x + (__detailedButtonBounds.width - arrowWidth) / 2.0f
-                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReplacementColorRightBitmap);
+                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReColorRightBitmap);
                                }
 
-                               bool themeBackgroundBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_DISABLED);
+                               bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_DISABLED);
 
-                               if (themeBackgroundBitmap == false)
+                               if (themeBgBitmap == false)
                                {
                                        Bitmap* pCircleNormalEffectBitmap = __pCheckButton->GetCircleNormalEffectBitmap();
 
@@ -746,31 +746,31 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
 
                                if (pCirclePressedBitmap)
                                {
-                                       pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCirclePressedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedPressedBackgroundColor);
+                                       pReColorCircleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCirclePressedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedPressedBgColor);
                                }
 
                                if (pDetailedRightPressedBitmap)
                                {
-                                       pReplacementColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightPressedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightPressedColor);
+                                       pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightPressedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightPressedColor);
                                }
 
-                               if (pReplacementColorBackgroundBitmap)
+                               if (pReColorCircleBitmap)
                                {
-                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReplacementColorBackgroundBitmap);
+                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleBitmap);
                                }
 
-                               if (pReplacementColorRightBitmap)
+                               if (pReColorRightBitmap)
                                {
-                                       float arrowWidth = pReplacementColorRightBitmap->GetWidthF();
-                                       float arrowHeight = pReplacementColorRightBitmap->GetHeightF();
+                                       float arrowWidth = pReColorRightBitmap->GetWidthF();
+                                       float arrowHeight = pReColorRightBitmap->GetHeightF();
 
                                        pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x + (__detailedButtonBounds.width - arrowWidth) / 2.0f
-                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReplacementColorRightBitmap);
+                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReColorRightBitmap);
                                }
 
-                               bool themeBackgroundBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_PRESSED);
+                               bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_PRESSED);
 
-                               if (themeBackgroundBitmap == false)
+                               if (themeBgBitmap == false)
                                {
                                        Bitmap* pCirclePressedEffectBitmap = __pCheckButton->GetCirclePressedEffectBitmap();
 
@@ -791,16 +791,21 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                pCanvas->DrawBitmap(FloatPoint(__defaultButtonBounds.x, __defaultButtonBounds.y), *pMarkBgNormalBitmap);
                        }
 
+                       Bitmap* pReColorMarkBgHighlightedBitmap = null;
+
                        if (pMarkBgHighlightedBitmap)
                        {
-                               pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pMarkBgHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedHighlightedBackgroundColor);
+                               pReColorMarkBgHighlightedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pMarkBgHighlightedBitmap,
+                                               Color::GetColor(COLOR_ID_MAGENTA), detailedHighlightedBgColor);
                        }
 
-                       if (pReplacementColorBackgroundBitmap)
+                       if (pReColorMarkBgHighlightedBitmap)
                        {
-                               pCanvas->DrawBitmap(FloatPoint(__defaultButtonBounds.x, __defaultButtonBounds.y), *pReplacementColorBackgroundBitmap);
+                               pCanvas->DrawBitmap(FloatPoint(__defaultButtonBounds.x, __defaultButtonBounds.y), *pReColorMarkBgHighlightedBitmap);
                        }
 
+                       delete pReColorMarkBgHighlightedBitmap;
+
                        if (checkStyle == CHECK_BUTTON_STYLE_MARK_WITH_DETAILED_BUTTON)
                        {
                                Bitmap* pCircleNormalBitmap = __pCheckButton->GetCircleBitmap(_CHECK_BUTTON_STATUS_NORMAL);
@@ -809,31 +814,31 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
 
                                if (pCircleNormalBitmap)
                                {
-                                       pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedNormalBackgroundColor);
+                                       pReColorCircleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedNormalBgColor);
                                }
 
                                if (pDetailedRightHighlightedBitmap)
                                {
-                                       pReplacementColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightHighlightedColor);
+                                       pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightHighlightedColor);
                                }
 
-                               if (pReplacementColorBackgroundBitmap)
+                               if (pReColorCircleBitmap)
                                {
-                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReplacementColorBackgroundBitmap);
+                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleBitmap);
                                }
 
-                               if (pReplacementColorRightBitmap)
+                               if (pReColorRightBitmap)
                                {
-                                       float arrowWidth = pReplacementColorRightBitmap->GetWidthF();
-                                       float arrowHeight = pReplacementColorRightBitmap->GetHeightF();
+                                       float arrowWidth = pReColorRightBitmap->GetWidthF();
+                                       float arrowHeight = pReColorRightBitmap->GetHeightF();
 
                                        pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x + (__detailedButtonBounds.width - arrowWidth) / 2.0f
-                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReplacementColorRightBitmap);
+                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReColorRightBitmap);
                                }
 
-                               bool themeBackgroundBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_HIGHLIGHTED);
+                               bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_HIGHLIGHTED);
 
-                               if (themeBackgroundBitmap == false)
+                               if (themeBgBitmap == false)
                                {
                                        Bitmap* pCirclePressedEffectBitmap = __pCheckButton->GetCirclePressedEffectBitmap();
 
@@ -843,15 +848,19 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        }
                                }
 
+                               Bitmap* pReColorCircleHighlightedBitmap = null;
+
                                if (pCircleHighlightedBitmap)
                                {
-                                       pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedHighlightedBackgroundColor);
+                                       pReColorCircleHighlightedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedHighlightedBgColor);
                                }
 
-                               if (pReplacementColorBackgroundBitmap)
+                               if (pReColorCircleHighlightedBitmap)
                                {
-                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReplacementColorBackgroundBitmap);
+                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleHighlightedBitmap);
                                }
+
+                               delete pReColorCircleHighlightedBitmap;
                        }
                }
                else if (checkStatus == _CHECK_BUTTON_STATUS_SELECTED)
@@ -870,31 +879,31 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
 
                                if (pCircleSelectedBitmap)
                                {
-                                       pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleSelectedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedSelectedBackgroundColor);
+                                       pReColorCircleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleSelectedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedSelectedBgColor);
                                }
 
                                if (pDetailedRightSelectedBitmap)
                                {
-                                       pReplacementColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightSelectedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightSelectedColor);
+                                       pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightSelectedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightSelectedColor);
                                }
 
-                               if (pReplacementColorBackgroundBitmap)
+                               if (pReColorCircleBitmap)
                                {
-                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReplacementColorBackgroundBitmap);
+                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleBitmap);
                                }
 
-                               if (pReplacementColorRightBitmap)
+                               if (pReColorRightBitmap)
                                {
-                                       float arrowWidth = pReplacementColorRightBitmap->GetWidthF();
-                                       float arrowHeight = pReplacementColorRightBitmap->GetHeightF();
+                                       float arrowWidth = pReColorRightBitmap->GetWidthF();
+                                       float arrowHeight = pReColorRightBitmap->GetHeightF();
 
                                        pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x + (__detailedButtonBounds.width - arrowWidth) / 2.0f
-                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReplacementColorRightBitmap);
+                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReColorRightBitmap);
                                }
 
-                               bool themeBackgroundBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_SELECTED);
+                               bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_SELECTED);
 
-                               if (themeBackgroundBitmap == false)
+                               if (themeBgBitmap == false)
                                {
                                        Bitmap* pCircleNormalEffectBitmap = __pCheckButton->GetCircleNormalEffectBitmap();
 
@@ -919,31 +928,31 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
 
                                if (pCircleNormalBitmap)
                                {
-                                       pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedNormalBackgroundColor);
+                                       pReColorCircleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedNormalBgColor);
                                }
 
                                if (pDetailedRightNormalBitmap)
                                {
-                                       pReplacementColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightNormalColor);
+                                       pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightNormalColor);
                                }
 
-                               if (pReplacementColorBackgroundBitmap)
+                               if (pReColorCircleBitmap)
                                {
-                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReplacementColorBackgroundBitmap);
+                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleBitmap);
                                }
 
-                               if (pReplacementColorRightBitmap)
+                               if (pReColorRightBitmap)
                                {
-                                       float arrowWidth = pReplacementColorRightBitmap->GetWidthF();
-                                       float arrowHeight = pReplacementColorRightBitmap->GetHeightF();
+                                       float arrowWidth = pReColorRightBitmap->GetWidthF();
+                                       float arrowHeight = pReColorRightBitmap->GetHeightF();
 
                                        pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x + (__detailedButtonBounds.width - arrowWidth) / 2.0f
-                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReplacementColorRightBitmap);
+                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReColorRightBitmap);
                                }
 
-                               bool themeBackgroundBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_NORMAL);
+                               bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_NORMAL);
 
-                               if (themeBackgroundBitmap == false)
+                               if (themeBgBitmap == false)
                                {
                                        Bitmap* pCircleNormalEffectBitmap = __pCheckButton->GetCircleNormalEffectBitmap();
 
@@ -963,31 +972,31 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
 
                                if (pCircleDisabledBitmap)
                                {
-                                       pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleDisabledBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedDisabledBackgroundColor);
+                                       pReColorCircleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleDisabledBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedDisabledBgColor);
                                }
 
                                if (pDetailedRightDisabledBitmap)
                                {
-                                       pReplacementColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightDisabledBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightDisabledColor);
+                                       pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightDisabledBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightDisabledColor);
                                }
 
-                               if (pReplacementColorBackgroundBitmap)
+                               if (pReColorCircleBitmap)
                                {
-                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReplacementColorBackgroundBitmap);
+                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleBitmap);
                                }
 
-                               if (pReplacementColorRightBitmap)
+                               if (pReColorRightBitmap)
                                {
-                                       float arrowWidth = pReplacementColorRightBitmap->GetWidthF();
-                                       float arrowHeight = pReplacementColorRightBitmap->GetHeightF();
+                                       float arrowWidth = pReColorRightBitmap->GetWidthF();
+                                       float arrowHeight = pReColorRightBitmap->GetHeightF();
 
                                        pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x + (__detailedButtonBounds.width - arrowWidth) / 2.0f
-                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReplacementColorRightBitmap);
+                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReColorRightBitmap);
                                }
 
-                               bool themeBackgroundBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_DISABLED);
+                               bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_DISABLED);
 
-                               if (themeBackgroundBitmap == false)
+                               if (themeBgBitmap == false)
                                {
                                        Bitmap* pCircleNormalEffectBitmap = __pCheckButton->GetCircleNormalEffectBitmap();
 
@@ -1007,31 +1016,31 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
 
                                if (pCirclePressedBitmap)
                                {
-                                       pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCirclePressedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedPressedBackgroundColor);
+                                       pReColorCircleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCirclePressedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedPressedBgColor);
                                }
 
                                if (pDetailedRightPressedBitmap)
                                {
-                                       pReplacementColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightPressedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightPressedColor);
+                                       pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightPressedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightPressedColor);
                                }
 
-                               if (pReplacementColorBackgroundBitmap)
+                               if (pReColorCircleBitmap)
                                {
-                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReplacementColorBackgroundBitmap);
+                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleBitmap);
                                }
 
-                               if (pReplacementColorRightBitmap)
+                               if (pReColorRightBitmap)
                                {
-                                       float arrowWidth = pReplacementColorRightBitmap->GetWidthF();
-                                       float arrowHeight = pReplacementColorRightBitmap->GetHeightF();
+                                       float arrowWidth = pReColorRightBitmap->GetWidthF();
+                                       float arrowHeight = pReColorRightBitmap->GetHeightF();
 
                                        pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x + (__detailedButtonBounds.width - arrowWidth) / 2.0f
-                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReplacementColorRightBitmap);
+                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReColorRightBitmap);
                                }
 
-                               bool themeBackgroundBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_PRESSED);
+                               bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_PRESSED);
 
-                               if (themeBackgroundBitmap == false)
+                               if (themeBgBitmap == false)
                                {
                                        Bitmap* pCirclePressedEffectBitmap = __pCheckButton->GetCirclePressedEffectBitmap();
 
@@ -1052,31 +1061,31 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
 
                                if (pCircleNormalBitmap)
                                {
-                                       pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedNormalBackgroundColor);
+                                       pReColorCircleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedNormalBgColor);
                                }
 
                                if (pDetailedRightHighlightedBitmap)
                                {
-                                       pReplacementColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightHighlightedColor);
+                                       pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightHighlightedColor);
                                }
 
-                               if (pReplacementColorBackgroundBitmap)
+                               if (pReColorCircleBitmap)
                                {
-                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReplacementColorBackgroundBitmap);
+                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleBitmap);
                                }
 
-                               if (pReplacementColorRightBitmap)
+                               if (pReColorRightBitmap)
                                {
-                                       float arrowWidth = pReplacementColorRightBitmap->GetWidthF();
-                                       float arrowHeight = pReplacementColorRightBitmap->GetHeightF();
+                                       float arrowWidth = pReColorRightBitmap->GetWidthF();
+                                       float arrowHeight = pReColorRightBitmap->GetHeightF();
 
                                        pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x + (__detailedButtonBounds.width - arrowWidth) / 2.0f
-                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReplacementColorRightBitmap);
+                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReColorRightBitmap);
                                }
 
-                               bool themeBackgroundBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_HIGHLIGHTED);
+                               bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_HIGHLIGHTED);
 
-                               if (themeBackgroundBitmap == false)
+                               if (themeBgBitmap == false)
                                {
                                        Bitmap* pCirclePressedEffectBitmap = __pCheckButton->GetCirclePressedEffectBitmap();
 
@@ -1086,15 +1095,19 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        }
                                }
 
+                               Bitmap* pReColorCircleHighlightedBitmap = null;
+
                                if (pCircleHighlightedBitmap)
                                {
-                                       pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedHighlightedBackgroundColor);
+                                       pReColorCircleHighlightedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedHighlightedBgColor);
                                }
 
-                               if (pReplacementColorBackgroundBitmap)
+                               if (pReColorCircleHighlightedBitmap)
                                {
-                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReplacementColorBackgroundBitmap);
+                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleHighlightedBitmap);
                                }
+
+                               delete pReColorCircleHighlightedBitmap;
                        }
                }
                else if (checkStatus == _CHECK_BUTTON_STATUS_SELECTED)
@@ -1106,31 +1119,31 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
 
                                if (pCircleSelectedBitmap)
                                {
-                                       pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleSelectedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedSelectedBackgroundColor);
+                                       pReColorCircleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pCircleSelectedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedSelectedBgColor);
                                }
 
                                if (pDetailedRightSelectedBitmap)
                                {
-                                       pReplacementColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightSelectedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightSelectedColor);
+                                       pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightSelectedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightSelectedColor);
                                }
 
-                               if (pReplacementColorBackgroundBitmap)
+                               if (pReColorCircleBitmap)
                                {
-                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReplacementColorBackgroundBitmap);
+                                       pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleBitmap);
                                }
 
-                               if (pReplacementColorRightBitmap)
+                               if (pReColorRightBitmap)
                                {
-                                       float arrowWidth = pReplacementColorRightBitmap->GetWidthF();
-                                       float arrowHeight = pReplacementColorRightBitmap->GetHeightF();
+                                       float arrowWidth = pReColorRightBitmap->GetWidthF();
+                                       float arrowHeight = pReColorRightBitmap->GetHeightF();
 
                                        pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x + (__detailedButtonBounds.width - arrowWidth) / 2.0f
-                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReplacementColorRightBitmap);
+                                                       , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReColorRightBitmap);
                                }
 
-                               bool themeBackgroundBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_SELECTED);
+                               bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_SELECTED);
 
-                               if (themeBackgroundBitmap == false)
+                               if (themeBgBitmap == false)
                                {
                                        Bitmap* pCircleNormalEffectBitmap = __pCheckButton->GetCircleNormalEffectBitmap();
 
@@ -1211,15 +1224,19 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                pCanvas->DrawBitmap(FloatPoint(__defaultButtonBounds.x, __defaultButtonBounds.y), *pOnOffHighlightedBitmap);
                        }
 
+                       Bitmap* pReColorOnOffBgHighlightedBitmap = null;
+
                        if (pOnOffBgHighlightedBitmap)
                        {
-                               pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pOnOffBgHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedHighlightedBackgroundColor);
+                               pReColorOnOffBgHighlightedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pOnOffBgHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedHighlightedBgColor);
                        }
 
-                       if (pReplacementColorBackgroundBitmap)
+                       if (pReColorOnOffBgHighlightedBitmap)
                        {
-                               pCanvas->DrawBitmap(FloatPoint(__defaultButtonBounds.x, __defaultButtonBounds.y), *pReplacementColorBackgroundBitmap);
+                               pCanvas->DrawBitmap(FloatPoint(__defaultButtonBounds.x, __defaultButtonBounds.y), *pReColorOnOffBgHighlightedBitmap);
                        }
+
+                       delete pReColorOnOffBgHighlightedBitmap;
                }
                else if (checkStatus == _CHECK_BUTTON_STATUS_SELECTED)
                {
@@ -1282,8 +1299,8 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
        }
 
        delete pCanvas;
-       delete pReplacementColorBackgroundBitmap;
-       delete pReplacementColorRightBitmap;
+       delete pReColorCircleBitmap;
+       delete pReColorRightBitmap;
 
        return;
 }
@@ -1734,10 +1751,10 @@ _CheckButtonPresenter::DrawOnOffSlidingHandler(float handlerPosition)
                return;
        }
 
-       Bitmap* pReplacementColorBackgroundBitmap = null;
+       Bitmap* pReColorBgBitmap = null;
 
-       Color detailedHighlightedBackgroundColor;
-       GET_COLOR_CONFIG(CHECKBUTTON::DETAILED_ICON_BG_HIGHLIGHTED, detailedHighlightedBackgroundColor);
+       Color detailedHighlightedBgColor;
+       GET_COLOR_CONFIG(CHECKBUTTON::DETAILED_ICON_BG_HIGHLIGHTED, detailedHighlightedBgColor);
 
        float handlerMargin = 0.0f;
        float handlerWidth = 0.0f;
@@ -1827,13 +1844,13 @@ _CheckButtonPresenter::DrawOnOffSlidingHandler(float handlerPosition)
 
                        if (pOnOffSlidingOffHandlerHighlightedBitmap)
                        {
-                               pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pOnOffSlidingOffHandlerHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA),
-                                               detailedHighlightedBackgroundColor);
+                               pReColorBgBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pOnOffSlidingOffHandlerHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA),
+                                               detailedHighlightedBgColor);
                        }
 
-                       if (pReplacementColorBackgroundBitmap)
+                       if (pReColorBgBitmap)
                        {
-                               pCanvas->DrawBitmap(FloatPoint(handlerPosition, __onOffSlidingButtonBounds.y - handlerMargin), *pReplacementColorBackgroundBitmap);
+                               pCanvas->DrawBitmap(FloatPoint(handlerPosition, __onOffSlidingButtonBounds.y - handlerMargin), *pReColorBgBitmap);
                        }
                }
                else if (checkStatus == _CHECK_BUTTON_STATUS_SELECTED)
@@ -1923,13 +1940,13 @@ _CheckButtonPresenter::DrawOnOffSlidingHandler(float handlerPosition)
 
                        if (pOnOffSlidingOnHandlerHighlightedBitmap)
                        {
-                               pReplacementColorBackgroundBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pOnOffSlidingOnHandlerHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA),
-                                               detailedHighlightedBackgroundColor);
+                               pReColorBgBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pOnOffSlidingOnHandlerHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA),
+                                               detailedHighlightedBgColor);
                        }
 
-                       if (pReplacementColorBackgroundBitmap)
+                       if (pReColorBgBitmap)
                        {
-                               pCanvas->DrawBitmap(FloatPoint(handlerPosition, __onOffSlidingButtonBounds.y - handlerMargin), *pReplacementColorBackgroundBitmap);
+                               pCanvas->DrawBitmap(FloatPoint(handlerPosition, __onOffSlidingButtonBounds.y - handlerMargin), *pReColorBgBitmap);
                        }
                }
                else if (checkStatus == _CHECK_BUTTON_STATUS_SELECTED)
@@ -1951,7 +1968,7 @@ _CheckButtonPresenter::DrawOnOffSlidingHandler(float handlerPosition)
        }
 
        delete pCanvas;
-       delete pReplacementColorBackgroundBitmap;
+       delete pReColorBgBitmap;
 
        return;
 }

diff --git a/src/ui/controls/FUiCtrl_LabelPresenter.cpp b/src/ui/controls/FUiCtrl_LabelPresenter.cpp
index 1d6f980..11a0988 100644 (file)
--- a/src/ui/controls/FUiCtrl_LabelPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_LabelPresenter.cpp
@@ -477,7 +477,10 @@ _LabelPresenter::OnCanvasRequestedN(const FloatRectangle& bounds)
 
                if (pBitmap != null)
                {
-                       pBitmap->IsNinePatchedBitmap();
+                       if (pBitmap->IsNinePatchedBitmap()) // just decode // fix prevent CHECKED_RETURN
+                       {
+                               // empty
+                       }
                }
 
                Draw();