apply check detail right effect

Change-Id: Ia05380e574613c803b54aa947f341d67f8ebe8c8

diff --git a/res/common/usr/share/osp/bitmaps/480x800/00_button_right.png b/res/common/usr/share/osp/bitmaps/480x800/00_button_right.png
index 028a11a..8cf0f3b 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/00_button_right.png and b/res/common/usr/share/osp/bitmaps/480x800/00_button_right.png differ

diff --git a/res/common/usr/share/osp/bitmaps/480x800/white/00_button_right_ef.png b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_right_ef.png
index 608a090..479d13a 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/480x800/white/00_button_right_ef.png and b/res/common/usr/share/osp/bitmaps/480x800/white/00_button_right_ef.png differ

diff --git a/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_right_ef.png b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_right_ef.png
index b94eb15..1a377a2 100644 (file)
Binary files a/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_right_ef.png and b/res/common/usr/share/osp/bitmaps/720x1280/white/00_button_right_ef.png differ

diff --git a/src/ui/controls/FUiCtrl_CheckButton.cpp b/src/ui/controls/FUiCtrl_CheckButton.cpp
index 4cd913f..3c2af4c 100644 (file)
--- a/src/ui/controls/FUiCtrl_CheckButton.cpp
+++ b/src/ui/controls/FUiCtrl_CheckButton.cpp
@@ -122,6 +122,8 @@ _CheckButton::_CheckButton(void)
        , __titleText(L"")
        , __pCircleNormalEffectBitmap(null)
        , __pCirclePressedEffectBitmap(null)
+       , __pDetailedRightNormalEffectBitmap(null)
+       , __pDetailedRightPressedEffectBitmap(null)
        , __pBackgroundNormalEffectBitmap(null)
        , __pBackgroundPressedEffectBitmap(null)
        , __pBackgroundTopNormalEffectBitmap(null)
@@ -340,6 +342,18 @@ _CheckButton::~_CheckButton(void)
                __pCirclePressedEffectBitmap = null;
        }
 
+       if (__pDetailedRightNormalEffectBitmap)
+       {
+               delete __pDetailedRightNormalEffectBitmap;
+               __pDetailedRightNormalEffectBitmap = null;
+       }
+
+       if (__pDetailedRightPressedEffectBitmap)
+       {
+               delete __pDetailedRightPressedEffectBitmap;
+               __pDetailedRightPressedEffectBitmap = null;
+       }
+
        if (__pBackgroundNormalEffectBitmap)
        {
                delete __pBackgroundNormalEffectBitmap;
@@ -974,6 +988,9 @@ _CheckButton::LoadDefaultBackgroundBitmap(void)
        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_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);
+
        return r;
 }
 
@@ -1630,6 +1647,18 @@ _CheckButton::GetCirclePressedEffectBitmap(void) const
 }
 
 Bitmap*
+_CheckButton::GetDetailedRightNormalEffectBitmap(void) const
+{
+       return __pDetailedRightNormalEffectBitmap;
+}
+
+Bitmap*
+_CheckButton::GetDetailedRightPressedEffectBitmap(void) const
+{
+       return __pDetailedRightPressedEffectBitmap;
+}
+
+Bitmap*
 _CheckButton::GetDetailedRightBitmap(_CheckButtonStatus checkButtonStatus) const
 {
        return __pDetailedRightBitmap[checkButtonStatus];

diff --git a/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp b/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp
index a558c93..f85b2a8 100644 (file)
--- a/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp
@@ -660,6 +660,8 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                        {
                                Bitmap* pCircleNormalBitmap = __pCheckButton->GetCircleBitmap(_CHECK_BUTTON_STATUS_NORMAL);
                                Bitmap* pDetailedRightNormalBitmap = __pCheckButton->GetDetailedRightBitmap(_CHECK_BUTTON_STATUS_NORMAL);
+                               Bitmap* pCircleEffectBitmap = null;
+                               Bitmap* pDetailedRightEffectBitmap = null;
 
                                if (__detailedPressed == true)
                                {
@@ -672,6 +674,9 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        {
                                                pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightPressedColor);
                                        }
+
+                                       pCircleEffectBitmap = __pCheckButton->GetCirclePressedEffectBitmap();
+                                       pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightPressedEffectBitmap();
                                }
                                else
                                {
@@ -684,6 +689,9 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        {
                                                pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightNormalColor);
                                        }
+
+                                       pCircleEffectBitmap = __pCheckButton->GetCircleNormalEffectBitmap();
+                                       pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightNormalEffectBitmap();
                                }
 
                                if (pReColorCircleBitmap)
@@ -691,6 +699,16 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleBitmap);
                                }
 
+                               bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_NORMAL);
+
+                               if (themeBgBitmap == false)
+                               {
+                                       if (pCircleEffectBitmap)
+                                       {
+                                               pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pCircleEffectBitmap);
+                                       }
+                               }
+
                                if (pReColorRightBitmap)
                                {
                                        float arrowWidth = pReColorRightBitmap->GetWidthF();
@@ -700,15 +718,17 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                                        , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReColorRightBitmap);
                                }
 
-                               bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_NORMAL);
+                               themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_ICON_NORMAL);
 
                                if (themeBgBitmap == false)
                                {
-                                       Bitmap* pCircleNormalEffectBitmap = __pCheckButton->GetCircleNormalEffectBitmap();
-
-                                       if (pCircleNormalEffectBitmap)
+                                       if (pDetailedRightEffectBitmap)
                                        {
-                                               pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pCircleNormalEffectBitmap);
+                                               float arrowWidth = pDetailedRightEffectBitmap->GetWidthF();
+                                               float arrowHeight = pDetailedRightEffectBitmap->GetHeightF();
+
+                                               pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x + (__detailedButtonBounds.width - arrowWidth) / 2.0f
+                                                               , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pDetailedRightEffectBitmap);
                                        }
                                }
                        }
@@ -726,6 +746,8 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                        {
                                Bitmap* pCircleDisabledBitmap = __pCheckButton->GetCircleBitmap(_CHECK_BUTTON_STATUS_DISABLED);
                                Bitmap* pDetailedRightDisabledBitmap = __pCheckButton->GetDetailedRightBitmap(_CHECK_BUTTON_STATUS_DISABLED);
+                               Bitmap* pCircleEffectBitmap = __pCheckButton->GetCircleNormalEffectBitmap();
+                               Bitmap* pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightNormalEffectBitmap();
 
                                if (pCircleDisabledBitmap)
                                {
@@ -742,6 +764,16 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleBitmap);
                                }
 
+                               bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_DISABLED);
+
+                               if (themeBgBitmap == false)
+                               {
+                                       if (pCircleEffectBitmap)
+                                       {
+                                               pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pCircleEffectBitmap);
+                                       }
+                               }
+
                                if (pReColorRightBitmap)
                                {
                                        float arrowWidth = pReColorRightBitmap->GetWidthF();
@@ -751,15 +783,17 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                                        , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReColorRightBitmap);
                                }
 
-                               bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_DISABLED);
+                               themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_ICON_DISABLED);
 
                                if (themeBgBitmap == false)
                                {
-                                       Bitmap* pCircleNormalEffectBitmap = __pCheckButton->GetCircleNormalEffectBitmap();
-
-                                       if (pCircleNormalEffectBitmap)
+                                       if (pDetailedRightEffectBitmap)
                                        {
-                                               pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pCircleNormalEffectBitmap);
+                                               float arrowWidth = pDetailedRightEffectBitmap->GetWidthF();
+                                               float arrowHeight = pDetailedRightEffectBitmap->GetHeightF();
+
+                                               pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x + (__detailedButtonBounds.width - arrowWidth) / 2.0f
+                                                               , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pDetailedRightEffectBitmap);
                                        }
                                }
                        }
@@ -777,6 +811,8 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                        {
                                Bitmap* pCirclePressedBitmap = __pCheckButton->GetCircleBitmap(_CHECK_BUTTON_STATUS_PRESSED);
                                Bitmap* pDetailedRightPressedBitmap = __pCheckButton->GetDetailedRightBitmap(_CHECK_BUTTON_STATUS_PRESSED);
+                               Bitmap* pCircleEffectBitmap = null;
+                               Bitmap* pDetailedRightEffectBitmap = null;
 
                                if (__detailedPressed == true)
                                {
@@ -789,6 +825,9 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        {
                                                pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightPressedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightPressedColor);
                                        }
+
+                                       pCircleEffectBitmap = __pCheckButton->GetCirclePressedEffectBitmap();
+                                       pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightPressedEffectBitmap();
                                }
                                else
                                {
@@ -801,6 +840,9 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        {
                                                pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightPressedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightNormalColor);
                                        }
+
+                                       pCircleEffectBitmap = __pCheckButton->GetCircleNormalEffectBitmap();
+                                       pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightNormalEffectBitmap();
                                }
 
                                if (pReColorCircleBitmap)
@@ -808,6 +850,16 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleBitmap);
                                }
 
+                               bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_PRESSED);
+
+                               if (themeBgBitmap == false)
+                               {
+                                       if (pCircleEffectBitmap)
+                                       {
+                                               pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pCircleEffectBitmap);
+                                       }
+                               }
+
                                if (pReColorRightBitmap)
                                {
                                        float arrowWidth = pReColorRightBitmap->GetWidthF();
@@ -817,15 +869,17 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                                        , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReColorRightBitmap);
                                }
 
-                               bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_PRESSED);
+                               themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_ICON_PRESSED);
 
                                if (themeBgBitmap == false)
                                {
-                                       Bitmap* pCirclePressedEffectBitmap = __pCheckButton->GetCirclePressedEffectBitmap();
-
-                                       if (pCirclePressedEffectBitmap)
+                                       if (pDetailedRightEffectBitmap)
                                        {
-                                               pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pCirclePressedEffectBitmap);
+                                               float arrowWidth = pDetailedRightEffectBitmap->GetWidthF();
+                                               float arrowHeight = pDetailedRightEffectBitmap->GetHeightF();
+
+                                               pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x + (__detailedButtonBounds.width - arrowWidth) / 2.0f
+                                                               , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pDetailedRightEffectBitmap);
                                        }
                                }
                        }
@@ -860,6 +914,8 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                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* pCircleEffectBitmap = null;
+                               Bitmap* pDetailedRightEffectBitmap = null;
 
                                if (__detailedPressed == true)
                                {
@@ -872,6 +928,9 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        {
                                                pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightPressedColor);
                                        }
+
+                                       pCircleEffectBitmap = __pCheckButton->GetCirclePressedEffectBitmap();
+                                       pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightPressedEffectBitmap();
                                }
                                else
                                {
@@ -884,6 +943,9 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        {
                                                pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightHighlightedColor);
                                        }
+
+                                       pCircleEffectBitmap = __pCheckButton->GetCircleNormalEffectBitmap();
+                                       pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightNormalEffectBitmap();
                                }
 
                                if (pReColorCircleBitmap)
@@ -891,6 +953,16 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleBitmap);
                                }
 
+                               bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_HIGHLIGHTED);
+
+                               if (themeBgBitmap == false)
+                               {
+                                       if (pCircleEffectBitmap)
+                                       {
+                                               pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pCircleEffectBitmap);
+                                       }
+                               }
+
                                if (pReColorRightBitmap)
                                {
                                        float arrowWidth = pReColorRightBitmap->GetWidthF();
@@ -900,15 +972,17 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                                        , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReColorRightBitmap);
                                }
 
-                               bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_HIGHLIGHTED);
+                               themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_ICON_HIGHLIGHTED);
 
                                if (themeBgBitmap == false)
                                {
-                                       Bitmap* pCirclePressedEffectBitmap = __pCheckButton->GetCirclePressedEffectBitmap();
-
-                                       if (pCirclePressedEffectBitmap)
+                                       if (pDetailedRightEffectBitmap)
                                        {
-                                               pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pCirclePressedEffectBitmap);
+                                               float arrowWidth = pDetailedRightEffectBitmap->GetWidthF();
+                                               float arrowHeight = pDetailedRightEffectBitmap->GetHeightF();
+
+                                               pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x + (__detailedButtonBounds.width - arrowWidth) / 2.0f
+                                                               , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pDetailedRightEffectBitmap);
                                        }
                                }
 
@@ -940,6 +1014,8 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                        {
                                Bitmap* pCircleSelectedBitmap = __pCheckButton->GetCircleBitmap(_CHECK_BUTTON_STATUS_SELECTED);
                                Bitmap* pDetailedRightSelectedBitmap = __pCheckButton->GetDetailedRightBitmap(_CHECK_BUTTON_STATUS_SELECTED);
+                               Bitmap* pCircleEffectBitmap = null;
+                               Bitmap* pDetailedRightEffectBitmap = null;
 
                                if (__detailedPressed == true)
                                {
@@ -952,6 +1028,9 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        {
                                                pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightSelectedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightPressedColor);
                                        }
+
+                                       pCircleEffectBitmap = __pCheckButton->GetCirclePressedEffectBitmap();
+                                       pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightPressedEffectBitmap();
                                }
                                else
                                {
@@ -964,6 +1043,9 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        {
                                                pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightSelectedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightSelectedColor);
                                        }
+
+                                       pCircleEffectBitmap = __pCheckButton->GetCircleNormalEffectBitmap();
+                                       pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightNormalEffectBitmap();
                                }
 
                                if (pReColorCircleBitmap)
@@ -971,6 +1053,16 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleBitmap);
                                }
 
+                               bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_SELECTED);
+
+                               if (themeBgBitmap == false)
+                               {
+                                       if (pCircleEffectBitmap)
+                                       {
+                                               pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pCircleEffectBitmap);
+                                       }
+                               }
+
                                if (pReColorRightBitmap)
                                {
                                        float arrowWidth = pReColorRightBitmap->GetWidthF();
@@ -980,15 +1072,17 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                                        , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReColorRightBitmap);
                                }
 
-                               bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_SELECTED);
+                               themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_ICON_SELECTED);
 
                                if (themeBgBitmap == false)
                                {
-                                       Bitmap* pCircleNormalEffectBitmap = __pCheckButton->GetCircleNormalEffectBitmap();
-
-                                       if (pCircleNormalEffectBitmap)
+                                       if (pDetailedRightEffectBitmap)
                                        {
-                                               pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pCircleNormalEffectBitmap);
+                                               float arrowWidth = pDetailedRightEffectBitmap->GetWidthF();
+                                               float arrowHeight = pDetailedRightEffectBitmap->GetHeightF();
+
+                                               pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x + (__detailedButtonBounds.width - arrowWidth) / 2.0f
+                                                               , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pDetailedRightEffectBitmap);
                                        }
                                }
                        }
@@ -1004,6 +1098,8 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                        {
                                Bitmap* pCircleNormalBitmap = __pCheckButton->GetCircleBitmap(_CHECK_BUTTON_STATUS_NORMAL);
                                Bitmap* pDetailedRightNormalBitmap = __pCheckButton->GetDetailedRightBitmap(_CHECK_BUTTON_STATUS_NORMAL);
+                               Bitmap* pCircleEffectBitmap = null;
+                               Bitmap* pDetailedRightEffectBitmap = null;
 
                                if (__detailedPressed == true)
                                {
@@ -1016,6 +1112,9 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        {
                                                pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightPressedColor);
                                        }
+
+                                       pCircleEffectBitmap = __pCheckButton->GetCirclePressedEffectBitmap();
+                                       pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightPressedEffectBitmap();
                                }
                                else
                                {
@@ -1028,6 +1127,9 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        {
                                                pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightNormalColor);
                                        }
+
+                                       pCircleEffectBitmap = __pCheckButton->GetCircleNormalEffectBitmap();
+                                       pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightNormalEffectBitmap();
                                }
 
                                if (pReColorCircleBitmap)
@@ -1035,6 +1137,16 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleBitmap);
                                }
 
+                               bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_NORMAL);
+
+                               if (themeBgBitmap == false)
+                               {
+                                       if (pCircleEffectBitmap)
+                                       {
+                                               pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pCircleEffectBitmap);
+                                       }
+                               }
+
                                if (pReColorRightBitmap)
                                {
                                        float arrowWidth = pReColorRightBitmap->GetWidthF();
@@ -1044,15 +1156,17 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                                        , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReColorRightBitmap);
                                }
 
-                               bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_NORMAL);
+                               themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_ICON_NORMAL);
 
                                if (themeBgBitmap == false)
                                {
-                                       Bitmap* pCircleNormalEffectBitmap = __pCheckButton->GetCircleNormalEffectBitmap();
-
-                                       if (pCircleNormalEffectBitmap)
+                                       if (pDetailedRightEffectBitmap)
                                        {
-                                               pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pCircleNormalEffectBitmap);
+                                               float arrowWidth = pDetailedRightEffectBitmap->GetWidthF();
+                                               float arrowHeight = pDetailedRightEffectBitmap->GetHeightF();
+
+                                               pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x + (__detailedButtonBounds.width - arrowWidth) / 2.0f
+                                                               , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pDetailedRightEffectBitmap);
                                        }
                                }
                        }
@@ -1063,6 +1177,8 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                        {
                                Bitmap* pCircleDisabledBitmap = __pCheckButton->GetCircleBitmap(_CHECK_BUTTON_STATUS_DISABLED);
                                Bitmap* pDetailedRightDisabledBitmap = __pCheckButton->GetDetailedRightBitmap(_CHECK_BUTTON_STATUS_DISABLED);
+                               Bitmap* pCircleEffectBitmap = __pCheckButton->GetCircleNormalEffectBitmap();
+                               Bitmap* pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightNormalEffectBitmap();
 
                                if (pCircleDisabledBitmap)
                                {
@@ -1079,6 +1195,16 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleBitmap);
                                }
 
+                               bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_DISABLED);
+
+                               if (themeBgBitmap == false)
+                               {
+                                       if (pCircleEffectBitmap)
+                                       {
+                                               pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pCircleEffectBitmap);
+                                       }
+                               }
+
                                if (pReColorRightBitmap)
                                {
                                        float arrowWidth = pReColorRightBitmap->GetWidthF();
@@ -1088,15 +1214,17 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                                        , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReColorRightBitmap);
                                }
 
-                               bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_DISABLED);
+                               themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_ICON_DISABLED);
 
                                if (themeBgBitmap == false)
                                {
-                                       Bitmap* pCircleNormalEffectBitmap = __pCheckButton->GetCircleNormalEffectBitmap();
-
-                                       if (pCircleNormalEffectBitmap)
+                                       if (pDetailedRightEffectBitmap)
                                        {
-                                               pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pCircleNormalEffectBitmap);
+                                               float arrowWidth = pDetailedRightEffectBitmap->GetWidthF();
+                                               float arrowHeight = pDetailedRightEffectBitmap->GetHeightF();
+
+                                               pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x + (__detailedButtonBounds.width - arrowWidth) / 2.0f
+                                                               , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pDetailedRightEffectBitmap);
                                        }
                                }
                        }
@@ -1107,6 +1235,8 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                        {
                                Bitmap* pCirclePressedBitmap = __pCheckButton->GetCircleBitmap(_CHECK_BUTTON_STATUS_PRESSED);
                                Bitmap* pDetailedRightPressedBitmap = __pCheckButton->GetDetailedRightBitmap(_CHECK_BUTTON_STATUS_PRESSED);
+                               Bitmap* pCircleEffectBitmap = null;
+                               Bitmap* pDetailedRightEffectBitmap = null;
 
                                if (__detailedPressed == true)
                                {
@@ -1119,6 +1249,9 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        {
                                                pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightPressedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightPressedColor);
                                        }
+
+                                       pCircleEffectBitmap = __pCheckButton->GetCirclePressedEffectBitmap();
+                                       pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightPressedEffectBitmap();
                                }
                                else
                                {
@@ -1131,6 +1264,9 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        {
                                                pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightPressedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightNormalColor);
                                        }
+
+                                       pCircleEffectBitmap = __pCheckButton->GetCircleNormalEffectBitmap();
+                                       pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightNormalEffectBitmap();
                                }
 
                                if (pReColorCircleBitmap)
@@ -1138,6 +1274,16 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleBitmap);
                                }
 
+                               bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_PRESSED);
+
+                               if (themeBgBitmap == false)
+                               {
+                                       if (pCircleEffectBitmap)
+                                       {
+                                               pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pCircleEffectBitmap);
+                                       }
+                               }
+
                                if (pReColorRightBitmap)
                                {
                                        float arrowWidth = pReColorRightBitmap->GetWidthF();
@@ -1147,15 +1293,17 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                                        , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReColorRightBitmap);
                                }
 
-                               bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_PRESSED);
+                               themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_ICON_PRESSED);
 
                                if (themeBgBitmap == false)
                                {
-                                       Bitmap* pCirclePressedEffectBitmap = __pCheckButton->GetCirclePressedEffectBitmap();
-
-                                       if (pCirclePressedEffectBitmap)
+                                       if (pDetailedRightEffectBitmap)
                                        {
-                                               pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pCirclePressedEffectBitmap);
+                                               float arrowWidth = pDetailedRightEffectBitmap->GetWidthF();
+                                               float arrowHeight = pDetailedRightEffectBitmap->GetHeightF();
+
+                                               pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x + (__detailedButtonBounds.width - arrowWidth) / 2.0f
+                                                               , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pDetailedRightEffectBitmap);
                                        }
                                }
                        }
@@ -1167,6 +1315,8 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                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* pCircleEffectBitmap = null;
+                               Bitmap* pDetailedRightEffectBitmap = null;
 
                                if (__detailedPressed == true)
                                {
@@ -1179,6 +1329,9 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        {
                                                pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightPressedColor);
                                        }
+
+                                       pCircleEffectBitmap = __pCheckButton->GetCirclePressedEffectBitmap();
+                                       pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightPressedEffectBitmap();
                                }
                                else
                                {
@@ -1191,6 +1344,9 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        {
                                                pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightHighlightedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightHighlightedColor);
                                        }
+
+                                       pCircleEffectBitmap = __pCheckButton->GetCircleNormalEffectBitmap();
+                                       pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightNormalEffectBitmap();
                                }
 
                                if (pReColorCircleBitmap)
@@ -1198,6 +1354,16 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleBitmap);
                                }
 
+                               bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_HIGHLIGHTED);
+
+                               if (themeBgBitmap == false)
+                               {
+                                       if (pCircleEffectBitmap)
+                                       {
+                                               pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pCircleEffectBitmap);
+                                       }
+                               }
+
                                if (pReColorRightBitmap)
                                {
                                        float arrowWidth = pReColorRightBitmap->GetWidthF();
@@ -1207,15 +1373,17 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                                        , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReColorRightBitmap);
                                }
 
-                               bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_HIGHLIGHTED);
+                               themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_ICON_HIGHLIGHTED);
 
                                if (themeBgBitmap == false)
                                {
-                                       Bitmap* pCirclePressedEffectBitmap = __pCheckButton->GetCirclePressedEffectBitmap();
-
-                                       if (pCirclePressedEffectBitmap)
+                                       if (pDetailedRightEffectBitmap)
                                        {
-                                               pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pCirclePressedEffectBitmap);
+                                               float arrowWidth = pDetailedRightEffectBitmap->GetWidthF();
+                                               float arrowHeight = pDetailedRightEffectBitmap->GetHeightF();
+
+                                               pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x + (__detailedButtonBounds.width - arrowWidth) / 2.0f
+                                                               , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pDetailedRightEffectBitmap);
                                        }
                                }
 
@@ -1240,6 +1408,8 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                        {
                                Bitmap* pCircleSelectedBitmap = __pCheckButton->GetCircleBitmap(_CHECK_BUTTON_STATUS_SELECTED);
                                Bitmap* pDetailedRightSelectedBitmap = __pCheckButton->GetDetailedRightBitmap(_CHECK_BUTTON_STATUS_SELECTED);
+                               Bitmap* pCircleEffectBitmap = null;
+                               Bitmap* pDetailedRightEffectBitmap = null;
 
                                if (__detailedPressed == true)
                                {
@@ -1252,6 +1422,9 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        {
                                                pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightSelectedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightPressedColor);
                                        }
+
+                                       pCircleEffectBitmap = __pCheckButton->GetCirclePressedEffectBitmap();
+                                       pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightPressedEffectBitmap();
                                }
                                else
                                {
@@ -1264,6 +1437,9 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        {
                                                pReColorRightBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDetailedRightSelectedBitmap, Color::GetColor(COLOR_ID_MAGENTA), detailedRightSelectedColor);
                                        }
+
+                                       pCircleEffectBitmap = __pCheckButton->GetCircleNormalEffectBitmap();
+                                       pDetailedRightEffectBitmap = __pCheckButton->GetDetailedRightNormalEffectBitmap();
                                }
 
                                if (pReColorCircleBitmap)
@@ -1271,6 +1447,16 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                        pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pReColorCircleBitmap);
                                }
 
+                               bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_SELECTED);
+
+                               if (themeBgBitmap == false)
+                               {
+                                       if (pCircleEffectBitmap)
+                                       {
+                                               pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pCircleEffectBitmap);
+                                       }
+                               }
+
                                if (pReColorRightBitmap)
                                {
                                        float arrowWidth = pReColorRightBitmap->GetWidthF();
@@ -1280,15 +1466,17 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
                                                        , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pReColorRightBitmap);
                                }
 
-                               bool themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_BG_SELECTED);
+                               themeBgBitmap = IS_CUSTOM_BITMAP(CHECKBUTTON::DETAILED_ICON_SELECTED);
 
                                if (themeBgBitmap == false)
                                {
-                                       Bitmap* pCircleNormalEffectBitmap = __pCheckButton->GetCircleNormalEffectBitmap();
-
-                                       if (pCircleNormalEffectBitmap)
+                                       if (pDetailedRightEffectBitmap)
                                        {
-                                               pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x, __detailedButtonBounds.y), *pCircleNormalEffectBitmap);
+                                               float arrowWidth = pDetailedRightEffectBitmap->GetWidthF();
+                                               float arrowHeight = pDetailedRightEffectBitmap->GetHeightF();
+
+                                               pCanvas->DrawBitmap(FloatPoint(__detailedButtonBounds.x + (__detailedButtonBounds.width - arrowWidth) / 2.0f
+                                                               , __detailedButtonBounds.y + (__detailedButtonBounds.height - arrowHeight) / 2.0f), *pDetailedRightEffectBitmap);
                                        }
                                }
                        }

diff --git a/src/ui/inc/FUiCtrl_CheckButton.h b/src/ui/inc/FUiCtrl_CheckButton.h
index 02602ad..0deb2a9 100644 (file)
--- a/src/ui/inc/FUiCtrl_CheckButton.h
+++ b/src/ui/inc/FUiCtrl_CheckButton.h
@@ -244,6 +244,9 @@ public:
        Tizen::Graphics::Bitmap* GetCircleNormalEffectBitmap(void) const;
        Tizen::Graphics::Bitmap* GetCirclePressedEffectBitmap(void) const;
 
+       Tizen::Graphics::Bitmap* GetDetailedRightNormalEffectBitmap(void) const;
+       Tizen::Graphics::Bitmap* GetDetailedRightPressedEffectBitmap(void) const;
+
        Tizen::Graphics::Bitmap* GetBackgroundBitmap(GroupStyle groupStyle, _CheckButtonStatus checkButtonStatus) const;
        Tizen::Graphics::Bitmap* GetBackgroundNormalEffectBitmap(GroupStyle groupStyle) const;
        Tizen::Graphics::Bitmap* GetBackgroundPressedEffectBitmap(GroupStyle groupStyle) const;
@@ -326,6 +329,8 @@ private:
        Tizen::Graphics::Bitmap* __pCirclePressedEffectBitmap;
 
        Tizen::Graphics::Bitmap* __pDetailedRightBitmap[NUMBER_OF_CHECK_BUTTON_STATUS];
+       Tizen::Graphics::Bitmap* __pDetailedRightNormalEffectBitmap;
+       Tizen::Graphics::Bitmap* __pDetailedRightPressedEffectBitmap;
 
        Tizen::Graphics::Bitmap* __pBackgroundBitmap[NUMBER_OF_CHECK_BUTTON_STATUS];
        Tizen::Graphics::Bitmap* __pBackgroundNormalEffectBitmap;