apply v4.6 gui for toolbar and button

Change-Id: Ie1ebade930e5c68597b3c5f6758e339ba74e3b64

diff --git a/src/ui/controls/FUiCtrl_ButtonPresenter.cpp b/src/ui/controls/FUiCtrl_ButtonPresenter.cpp
index c835a45..cb1bbfc 100644 (file)
--- a/src/ui/controls/FUiCtrl_ButtonPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ButtonPresenter.cpp
@@ -432,18 +432,25 @@ _ButtonPresenter::DrawBackground(void)
                                                pCanvas->DrawBitmap(bounds, *pBackgroundBitmap, FloatRectangle(0.0f, 0.0f, pBackgroundBitmap->GetWidthF(), pBackgroundBitmap->GetHeightF()));
                                        }
                                }
+                       }
 
-                               if (pHighlightedBackgroundBitmap)
+                       pCanvas = __pButton->GetCanvasN();
+                       if (pCanvas == null)
+                       {
+                               SysLog(NID_UI_CTRL, "Cannot get a canvas.");
+                               return;
+                       }
+
+                       if (pHighlightedBackgroundBitmap)
+                       {
+                               if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pHighlightedBackgroundBitmap))
                                {
-                                       if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pHighlightedBackgroundBitmap))
-                                       {
-                                               pCanvas->DrawNinePatchedBitmap(bounds, *pHighlightedBackgroundBitmap);
-                                       }
-                                       else
-                                       {
-                                               pCanvas->DrawBitmap(bounds, *pHighlightedBackgroundBitmap,
+                                       pCanvas->DrawNinePatchedBitmap(bounds, *pHighlightedBackgroundBitmap);
+                               }
+                               else
+                               {
+                                       pCanvas->DrawBitmap(bounds, *pHighlightedBackgroundBitmap,
                                                        FloatRectangle(0.0f, 0.0f, pHighlightedBackgroundBitmap->GetWidthF(), pHighlightedBackgroundBitmap->GetHeightF()));
-                                       }
                                }
                        }
                }

diff --git a/src/ui/controls/FUiCtrl_HeaderImpl.cpp b/src/ui/controls/FUiCtrl_HeaderImpl.cpp
index f2338c4..becc27c 100644 (file)
--- a/src/ui/controls/FUiCtrl_HeaderImpl.cpp
+++ b/src/ui/controls/FUiCtrl_HeaderImpl.cpp
@@ -1997,48 +1997,45 @@ protected:
                                        headerItem.SetText(headerItemString);
                                }
 
-                               if (HEADER_STYLE_TITLE_BUTTON == hstyle || HEADER_STYLE_TAB_LARGE == hstyle)
+                               // headeritem icon bitmap setting
+                               // normal
+                               if (pControl->GetItemElement(i, "normalIconPath", headerItemString))
                                {
-                                       // headeritem icon bitmap setting
-                                       // normal
-                                       if (pControl->GetItemElement(i, "normalIconPath", headerItemString))
-                                       {
-                                               Bitmap* pBitmap = null;
-                                               pBitmap = LoadBitmapN(headerItemString);
-                                               headerItem.SetIcon(HEADER_ITEM_STATUS_NORMAL, pBitmap);
-                                       }
+                                       Bitmap* pBitmap = null;
+                                       pBitmap = LoadBitmapN(headerItemString);
+                                       headerItem.SetIcon(HEADER_ITEM_STATUS_NORMAL, pBitmap);
+                               }
 
-                                       // pressed
-                                       if (pControl->GetItemElement(i, "pressedIconPath", headerItemString))
-                                       {
-                                               Bitmap* pBitmap = null;
-                                               pBitmap = LoadBitmapN(headerItemString);
-                                               headerItem.SetIcon(HEADER_ITEM_STATUS_PRESSED, pBitmap);
-                                       }
+                               // pressed
+                               if (pControl->GetItemElement(i, "pressedIconPath", headerItemString))
+                               {
+                                       Bitmap* pBitmap = null;
+                                       pBitmap = LoadBitmapN(headerItemString);
+                                       headerItem.SetIcon(HEADER_ITEM_STATUS_PRESSED, pBitmap);
+                               }
 
-                                       // selected
-                                       if (pControl->GetItemElement(i, "selectedIconPath", headerItemString))
-                                       {
-                                               Bitmap* pBitmap = null;
-                                               pBitmap = LoadBitmapN(headerItemString);
-                                               headerItem.SetIcon(HEADER_ITEM_STATUS_SELECTED, pBitmap);
-                                       }
+                               // selected
+                               if (pControl->GetItemElement(i, "selectedIconPath", headerItemString))
+                               {
+                                       Bitmap* pBitmap = null;
+                                       pBitmap = LoadBitmapN(headerItemString);
+                                       headerItem.SetIcon(HEADER_ITEM_STATUS_SELECTED, pBitmap);
+                               }
 
-                                       // highlighted
-                                       if (pControl->GetItemElement(i, "highlightedIconPath", headerItemString))
-                                       {
-                                               Bitmap* pBitmap = null;
-                                               pBitmap = LoadBitmapN(headerItemString);
-                                               headerItem.SetIcon(HEADER_ITEM_STATUS_HIGHLIGHTED, pBitmap);
-                                       }
+                               // highlighted
+                               if (pControl->GetItemElement(i, "highlightedIconPath", headerItemString))
+                               {
+                                       Bitmap* pBitmap = null;
+                                       pBitmap = LoadBitmapN(headerItemString);
+                                       headerItem.SetIcon(HEADER_ITEM_STATUS_HIGHLIGHTED, pBitmap);
+                               }
 
-                                       // disabled
-                                       if (pControl->GetItemElement(i, "disabledIconPath", headerItemString))
-                                       {
-                                               Bitmap* pBitmap = null;
-                                               pBitmap = LoadBitmapN(headerItemString);
-                                               headerItem.SetIcon(HEADER_ITEM_STATUS_DISABLED, pBitmap);
-                                       }
+                               // disabled
+                               if (pControl->GetItemElement(i, "disabledIconPath", headerItemString))
+                               {
+                                       Bitmap* pBitmap = null;
+                                       pBitmap = LoadBitmapN(headerItemString);
+                                       headerItem.SetIcon(HEADER_ITEM_STATUS_DISABLED, pBitmap);
                                }
 
                                // headeritem background bitmap path setting

diff --git a/src/ui/controls/FUiCtrl_Toolbar.cpp b/src/ui/controls/FUiCtrl_Toolbar.cpp
index 4ade072..b0d9c35 100644 (file)
--- a/src/ui/controls/FUiCtrl_Toolbar.cpp
+++ b/src/ui/controls/FUiCtrl_Toolbar.cpp
@@ -109,6 +109,7 @@ _Toolbar::_Toolbar(void)
        , __pLongPressGesture(null)
        , __pFlickGesture(null)
        , __pToolbarBackgroundBitmap(null)
+       , __pToolbarBackgroundEffectBitmap(null)
        , __pTitleIcon(null)
        , __titleText(L"")
        , __descriptionText(L"")
@@ -237,6 +238,12 @@ _Toolbar::~_Toolbar(void)
                __pToolbarBackgroundBitmap = null;
        }
 
+       if (__pToolbarBackgroundEffectBitmap)
+       {
+               delete __pToolbarBackgroundEffectBitmap;
+               __pToolbarBackgroundEffectBitmap = null;
+       }
+
        if (__pTitleIcon)
        {
                delete __pTitleIcon;
@@ -894,6 +901,38 @@ _Toolbar::GetBackgroundBitmap(void) const
        return pToolbar->__pToolbarBackgroundBitmap;
 }
 
+Bitmap*
+_Toolbar::GetBackgroundEffectBitmap(void) const
+{
+       result r = E_SUCCESS;
+
+       _Toolbar* pToolbar = const_cast<_Toolbar*>(this);
+
+       if (!pToolbar->__pToolbarBackgroundEffectBitmap)
+       {
+               if(__header == true)
+               {
+                       bool customTheme = IS_CUSTOM_BITMAP(HEADER::BG_NORMAL);
+                       if (customTheme == false)
+                       {
+                               r = GET_BITMAP_CONFIG_N(HEADER::BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pToolbar->__pToolbarBackgroundEffectBitmap);
+                               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, null, r, "[%s] Propagating.", GetErrorMessage(r));
+                       }
+               }
+               else
+               {
+                       bool customTheme = IS_CUSTOM_BITMAP(FOOTER::BG_NORMAL);
+                       if (customTheme == false)
+                       {
+                               r = GET_BITMAP_CONFIG_N(FOOTER::BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pToolbar->__pToolbarBackgroundEffectBitmap);
+                               SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, null, r, "[%s] Propagating.", GetErrorMessage(r));
+                       }
+               }
+       }
+
+       return pToolbar->__pToolbarBackgroundEffectBitmap;
+}
+
 _Button*
 _Toolbar::GetButton(ToolbarButton position) const
 {
@@ -2756,15 +2795,34 @@ _Toolbar::SetTransparent(bool transparent)
                __pToolbarBackgroundBitmap = null;
        }
 
+       if (__pToolbarBackgroundEffectBitmap)
+       {
+               delete __pToolbarBackgroundEffectBitmap;
+               __pToolbarBackgroundEffectBitmap = null;
+       }
+
+
        if (__transparent == true)
        {
                if (__header == true)
                {
                        GET_BITMAP_CONFIG_N(HEADER::TRANSLUCENT_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pMagentaBackgroundBitmap);
+
+                       bool customTheme = IS_CUSTOM_BITMAP(HEADER::TRANSLUCENT_BG_NORMAL);
+                       if (customTheme == false)
+                       {
+                               GET_BITMAP_CONFIG_N(HEADER::TRANSLUCENT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pToolbarBackgroundEffectBitmap);
+                       }
                }
                else
                {
                        GET_BITMAP_CONFIG_N(FOOTER::TRANSLUCENT_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pMagentaBackgroundBitmap);
+
+                       bool customTheme = IS_CUSTOM_BITMAP(FOOTER::TRANSLUCENT_BG_NORMAL);
+                       if (customTheme == false)
+                       {
+                               GET_BITMAP_CONFIG_N(FOOTER::TRANSLUCENT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pToolbarBackgroundEffectBitmap);
+                       }
                }
        }
        else
@@ -2772,10 +2830,22 @@ _Toolbar::SetTransparent(bool transparent)
                if (__header == true)
                {
                        GET_BITMAP_CONFIG_N(HEADER::BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pMagentaBackgroundBitmap);
+
+                       bool customTheme = IS_CUSTOM_BITMAP(HEADER::BG_NORMAL);
+                       if (customTheme == false)
+                       {
+                               GET_BITMAP_CONFIG_N(HEADER::BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pToolbarBackgroundEffectBitmap);
+                       }
                }
                else
                {
                        GET_BITMAP_CONFIG_N(FOOTER::BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pMagentaBackgroundBitmap);
+
+                       bool customTheme = IS_CUSTOM_BITMAP(FOOTER::BG_NORMAL);
+                       if (customTheme == false)
+                       {
+                               GET_BITMAP_CONFIG_N(FOOTER::BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pToolbarBackgroundEffectBitmap);
+                       }
                }
        }
 
@@ -5486,40 +5556,143 @@ _Toolbar::ApplyUserGUI(ButtonType buttonType, _Button* pButton)
                Bitmap* pPressedBackgroundBitmap = null;
                Bitmap* pHighlightedBackgroundBitmap = null;
 
+               Bitmap* pNormalBackgroundEffectBitmap = null;
+               Bitmap* pDisabledBackgroundEffectBitmap = null;
+               Bitmap* pPressedBackgroundEffectBitmap = null;
+               Bitmap* pHighlightedBackgroundEffectBitmap = null;
+
                Bitmap* pColorReplacedBitmap = null;
 
+               bool customTheme = false;
+
                if (__header == true)
                {
                        if (__transparent == true)
                        {
-                               GET_BITMAP_CONFIG_N(HEADER::BUTTON_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pNormalBackgroundBitmap);
-                               GET_BITMAP_CONFIG_N(HEADER::BUTTON_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pDisabledBackgroundBitmap);
-                               GET_BITMAP_CONFIG_N(HEADER::BUTTON_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundBitmap);
-                               GET_BITMAP_CONFIG_N(HEADER::BUTTON_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundBitmap);
-                       }
-                       else
-                       {
                                GET_BITMAP_CONFIG_N(HEADER::BUTTON_TRANSLUCENT_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pNormalBackgroundBitmap);
                                GET_BITMAP_CONFIG_N(HEADER::BUTTON_TRANSLUCENT_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pDisabledBackgroundBitmap);
                                GET_BITMAP_CONFIG_N(HEADER::BUTTON_TRANSLUCENT_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundBitmap);
                                GET_BITMAP_CONFIG_N(HEADER::BUTTON_TRANSLUCENT_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundBitmap);
+
+                               customTheme = IS_CUSTOM_BITMAP(HEADER::BUTTON_TRANSLUCENT_BG_NORMAL);
+                               if (customTheme == false)
+                               {
+                                       GET_BITMAP_CONFIG_N(HEADER::BUTTON_TRANSLUCENT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pNormalBackgroundEffectBitmap);
+                               }
+
+                               customTheme = IS_CUSTOM_BITMAP(HEADER::BUTTON_TRANSLUCENT_BG_DISABLED);
+                               if (customTheme == false)
+                               {
+                                       GET_BITMAP_CONFIG_N(HEADER::BUTTON_TRANSLUCENT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pDisabledBackgroundEffectBitmap);
+                               }
+
+                               customTheme = IS_CUSTOM_BITMAP(HEADER::BUTTON_TRANSLUCENT_BG_PRESSED);
+                               if (customTheme == false)
+                               {
+                                       GET_BITMAP_CONFIG_N(HEADER::BUTTON_TRANSLUCENT_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundEffectBitmap);
+                               }
+
+                               customTheme = IS_CUSTOM_BITMAP(HEADER::BUTTON_TRANSLUCENT_BG_HIGHLIGHTED);
+                               if (customTheme == false)
+                               {
+                                       GET_BITMAP_CONFIG_N(HEADER::BUTTON_TRANSLUCENT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundEffectBitmap);
+                               }
+                       }
+                       else
+                       {
+                               GET_BITMAP_CONFIG_N(HEADER::BUTTON_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pNormalBackgroundBitmap);
+                               GET_BITMAP_CONFIG_N(HEADER::BUTTON_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pDisabledBackgroundBitmap);
+                               GET_BITMAP_CONFIG_N(HEADER::BUTTON_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundBitmap);
+                               GET_BITMAP_CONFIG_N(HEADER::BUTTON_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundBitmap);
+
+                               customTheme = IS_CUSTOM_BITMAP(HEADER::BUTTON_BG_NORMAL);
+                               if (customTheme == false)
+                               {
+                                       GET_BITMAP_CONFIG_N(HEADER::BUTTON_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pNormalBackgroundEffectBitmap);
+                               }
+
+                               customTheme = IS_CUSTOM_BITMAP(HEADER::BUTTON_BG_DISABLED);
+                               if (customTheme == false)
+                               {
+                                       GET_BITMAP_CONFIG_N(HEADER::BUTTON_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pDisabledBackgroundEffectBitmap);
+                               }
+
+                               customTheme = IS_CUSTOM_BITMAP(HEADER::BUTTON_BG_PRESSED);
+                               if (customTheme == false)
+                               {
+                                       GET_BITMAP_CONFIG_N(HEADER::BUTTON_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundEffectBitmap);
+                               }
+
+                               customTheme = IS_CUSTOM_BITMAP(HEADER::BUTTON_BG_HIGHLIGHTED);
+                               if (customTheme == false)
+                               {
+                                       GET_BITMAP_CONFIG_N(HEADER::BUTTON_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundEffectBitmap);
+                               }
                        }
                }
                else
                {
                        if (__transparent == true)
                        {
-                               GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pNormalBackgroundBitmap);
-                               GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pDisabledBackgroundBitmap);
-                               GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundBitmap);
-                               GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundBitmap);
-                       }
-                       else
-                       {
                                GET_BITMAP_CONFIG_N(FOOTER::BUTTON_TRANSLUCENT_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pNormalBackgroundBitmap);
                                GET_BITMAP_CONFIG_N(FOOTER::BUTTON_TRANSLUCENT_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pDisabledBackgroundBitmap);
                                GET_BITMAP_CONFIG_N(FOOTER::BUTTON_TRANSLUCENT_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundBitmap);
                                GET_BITMAP_CONFIG_N(FOOTER::BUTTON_TRANSLUCENT_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundBitmap);
+
+                               customTheme = IS_CUSTOM_BITMAP(FOOTER::BUTTON_TRANSLUCENT_BG_NORMAL);
+                               if (customTheme == false)
+                               {
+                                       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_TRANSLUCENT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pNormalBackgroundEffectBitmap);
+                               }
+
+                               customTheme = IS_CUSTOM_BITMAP(FOOTER::BUTTON_TRANSLUCENT_BG_DISABLED);
+                               if (customTheme == false)
+                               {
+                                       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_TRANSLUCENT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pDisabledBackgroundEffectBitmap);
+                               }
+
+                               customTheme = IS_CUSTOM_BITMAP(FOOTER::BUTTON_TRANSLUCENT_BG_PRESSED);
+                               if (customTheme == false)
+                               {
+                                       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_TRANSLUCENT_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundEffectBitmap);
+                               }
+
+                               customTheme = IS_CUSTOM_BITMAP(FOOTER::BUTTON_TRANSLUCENT_BG_HIGHLIGHTED);
+                               if (customTheme == false)
+                               {
+                                       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_TRANSLUCENT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundEffectBitmap);
+                               }
+                       }
+                       else
+                       {
+                               GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pNormalBackgroundBitmap);
+                               GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pDisabledBackgroundBitmap);
+                               GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundBitmap);
+                               GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundBitmap);
+
+                               customTheme = IS_CUSTOM_BITMAP(FOOTER::BUTTON_BG_NORMAL);
+                               if (customTheme == false)
+                               {
+                                       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pNormalBackgroundEffectBitmap);
+                               }
+
+                               customTheme = IS_CUSTOM_BITMAP(FOOTER::BUTTON_BG_DISABLED);
+                               if (customTheme == false)
+                               {
+                                       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pDisabledBackgroundEffectBitmap);
+                               }
+
+                               customTheme = IS_CUSTOM_BITMAP(FOOTER::BUTTON_BG_PRESSED);
+                               if (customTheme == false)
+                               {
+                                       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundEffectBitmap);
+                               }
+
+                               customTheme = IS_CUSTOM_BITMAP(FOOTER::BUTTON_BG_HIGHLIGHTED);
+                               if (customTheme == false)
+                               {
+                                       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundEffectBitmap);
+                               }
                        }
                }
 
@@ -5617,6 +5790,30 @@ _Toolbar::ApplyUserGUI(ButtonType buttonType, _Button* pButton)
                                delete pHighlightedBackgroundBitmap;
                        }
                }
+
+               if (__style != TOOLBAR_SOFTKEY)
+               {
+                       //if (pNormalBackgroundEffectBitmap)
+                       //{
+                       //      pButton->SetBackgroundEffectBitmap(_BUTTON_STATUS_NORMAL, *pNormalBackgroundEffectBitmap);
+                       //      delete pNormalBackgroundEffectBitmap;
+                       //}
+                       //if (pDisabledBackgroundEffectBitmap)
+                       //{
+                       //      pButton->SetBackgroundEffectBitmap(_BUTTON_STATUS_DISABLED, *pDisabledBackgroundEffectBitmap);
+                       //      delete pDisabledBackgroundEffectBitmap;
+                       //}
+                       if (pPressedBackgroundEffectBitmap)
+                       {
+                               pButton->SetBackgroundEffectBitmap(_BUTTON_STATUS_PRESSED, *pPressedBackgroundEffectBitmap);
+                               delete pPressedBackgroundEffectBitmap;
+                       }
+                       //if (pHighlightedBackgroundEffectBitmap)
+                       //{
+                       //      pButton->SetBackgroundEffectBitmap(_BUTTON_STATUS_HIGHLIGHTED, *pHighlightedBackgroundEffectBitmap);
+                       //      delete pHighlightedBackgroundEffectBitmap;
+                       //}
+               }
        }
        else if (TOOLBAR_ITEM == buttonType)
        {
@@ -5630,6 +5827,7 @@ _Toolbar::ApplyUserGUI(ButtonType buttonType, _Button* pButton)
                Bitmap* pDisabledBackgroundEffectBitmap = null;
                Bitmap* pPressedBackgroundEffectBitmap = null;
                Bitmap* pHighlightedBackgroundEffectBitmap = null;
+               Bitmap* pSelectedBackgroundEffectBitmap = null;
 
                Bitmap* pColorReplacedBitmap = null;
 
@@ -5649,25 +5847,25 @@ _Toolbar::ApplyUserGUI(ButtonType buttonType, _Button* pButton)
                                        customTheme = IS_CUSTOM_BITMAP(HEADER::BUTTON_ITEM_TRANSLUCENT_BG_NORMAL);
                                        if (customTheme == false)
                                        {
-                                               GET_BITMAP_CONFIG_N(HEADER::BUTTON_ITEM_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pNormalBackgroundEffectBitmap);
+                                               GET_BITMAP_CONFIG_N(HEADER::BUTTON_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pNormalBackgroundEffectBitmap);
                                        }
 
                                        customTheme = IS_CUSTOM_BITMAP(HEADER::BUTTON_ITEM_TRANSLUCENT_BG_DISABLED);
                                        if (customTheme == false)
                                        {
-                                               GET_BITMAP_CONFIG_N(HEADER::BUTTON_ITEM_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pDisabledBackgroundEffectBitmap);
+                                               GET_BITMAP_CONFIG_N(HEADER::BUTTON_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pDisabledBackgroundEffectBitmap);
                                        }
 
                                        customTheme = IS_CUSTOM_BITMAP(HEADER::BUTTON_ITEM_TRANSLUCENT_BG_PRESSED);
                                        if (customTheme == false)
                                        {
-                                               GET_BITMAP_CONFIG_N(HEADER::BUTTON_ITEM_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundEffectBitmap);
+                                               GET_BITMAP_CONFIG_N(HEADER::BUTTON_ITEM_TRANSLUCENT_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundEffectBitmap);
                                        }
 
                                        customTheme = IS_CUSTOM_BITMAP(HEADER::BUTTON_ITEM_TRANSLUCENT_BG_HIGHLIGHTED);
                                        if (customTheme == false)
                                        {
-                                               GET_BITMAP_CONFIG_N(HEADER::BUTTON_ITEM_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundEffectBitmap);
+                                               GET_BITMAP_CONFIG_N(HEADER::BUTTON_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundEffectBitmap);
                                        }
                                }
                                else
@@ -5698,7 +5896,7 @@ _Toolbar::ApplyUserGUI(ButtonType buttonType, _Button* pButton)
                                        customTheme = IS_CUSTOM_BITMAP(HEADER::BUTTON_ITEM_BG_HIGHLIGHTED);
                                        if (customTheme == false)
                                        {
-                                               GET_BITMAP_CONFIG_N(HEADER::BUTTON_ITEM_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundEffectBitmap);
+                                               GET_BITMAP_CONFIG_N(HEADER::BUTTON_ITEM_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundEffectBitmap);
                                        }
                                }
                        }
@@ -5714,25 +5912,25 @@ _Toolbar::ApplyUserGUI(ButtonType buttonType, _Button* pButton)
                                        customTheme = IS_CUSTOM_BITMAP(FOOTER::BUTTON_ITEM_TRANSLUCENT_BG_NORMAL);
                                        if (customTheme == false)
                                        {
-                                               GET_BITMAP_CONFIG_N(FOOTER::BUTTON_ITEM_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pNormalBackgroundEffectBitmap);
+                                               GET_BITMAP_CONFIG_N(FOOTER::BUTTON_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pNormalBackgroundEffectBitmap);
                                        }
 
                                        customTheme = IS_CUSTOM_BITMAP(FOOTER::BUTTON_ITEM_TRANSLUCENT_BG_DISABLED);
                                        if (customTheme == false)
                                        {
-                                               GET_BITMAP_CONFIG_N(FOOTER::BUTTON_ITEM_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pDisabledBackgroundEffectBitmap);
+                                               GET_BITMAP_CONFIG_N(FOOTER::BUTTON_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pDisabledBackgroundEffectBitmap);
                                        }
 
                                        customTheme = IS_CUSTOM_BITMAP(FOOTER::BUTTON_ITEM_TRANSLUCENT_BG_PRESSED);
                                        if (customTheme == false)
                                        {
-                                               GET_BITMAP_CONFIG_N(FOOTER::BUTTON_ITEM_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundEffectBitmap);
+                                               GET_BITMAP_CONFIG_N(FOOTER::BUTTON_ITEM_TRANSLUCENT_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundEffectBitmap);
                                        }
 
                                        customTheme = IS_CUSTOM_BITMAP(FOOTER::BUTTON_ITEM_TRANSLUCENT_BG_HIGHLIGHTED);
                                        if (customTheme == false)
                                        {
-                                               GET_BITMAP_CONFIG_N(FOOTER::BUTTON_ITEM_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundEffectBitmap);
+                                               GET_BITMAP_CONFIG_N(FOOTER::BUTTON_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundEffectBitmap);
                                        }
                                }
                                else
@@ -5763,7 +5961,7 @@ _Toolbar::ApplyUserGUI(ButtonType buttonType, _Button* pButton)
                                        customTheme = IS_CUSTOM_BITMAP(FOOTER::BUTTON_ITEM_BG_HIGHLIGHTED);
                                        if (customTheme == false)
                                        {
-                                               GET_BITMAP_CONFIG_N(FOOTER::BUTTON_ITEM_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundEffectBitmap);
+                                               GET_BITMAP_CONFIG_N(FOOTER::BUTTON_ITEM_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundEffectBitmap);
                                        }
                                }
                        }
@@ -5781,10 +5979,35 @@ _Toolbar::ApplyUserGUI(ButtonType buttonType, _Button* pButton)
                                        GET_BITMAP_CONFIG_N(HEADER::SEGMENTED_ITEM_TRANSLUCENT_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundBitmap);
                                        GET_BITMAP_CONFIG_N(HEADER::SEGMENTED_ITEM_TRANSLUCENT_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, pSelectedBackgroundBitmap);
 
+
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::SEGMENTED_ITEM_TRANSLUCENT_BG_NORMAL);
+                                       if (customTheme == false)
+                                       {
+                                               GET_BITMAP_CONFIG_N(HEADER::SEGMENTED_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pNormalBackgroundEffectBitmap);
+                                       }
+
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::SEGMENTED_ITEM_TRANSLUCENT_BG_DISABLED);
+                                       if (customTheme == false)
+                                       {
+                                               GET_BITMAP_CONFIG_N(HEADER::SEGMENTED_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pDisabledBackgroundEffectBitmap);
+                                       }
+
                                        customTheme = IS_CUSTOM_BITMAP(HEADER::SEGMENTED_ITEM_TRANSLUCENT_BG_PRESSED);
                                        if (customTheme == false)
                                        {
-                                               GET_BITMAP_CONFIG_N(HEADER::TAB_ITEM_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundEffectBitmap);
+                                               GET_BITMAP_CONFIG_N(HEADER::SEGMENTED_ITEM_TRANSLUCENT_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundEffectBitmap);
+                                       }
+
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::SEGMENTED_ITEM_TRANSLUCENT_BG_HIGHLIGHTED);
+                                       if (customTheme == false)
+                                       {
+                                               GET_BITMAP_CONFIG_N(HEADER::SEGMENTED_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundEffectBitmap);
+                                       }
+
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::SEGMENTED_ITEM_TRANSLUCENT_BG_SELECTED);
+                                       if (customTheme == false)
+                                       {
+                                               GET_BITMAP_CONFIG_N(HEADER::SEGMENTED_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pSelectedBackgroundEffectBitmap);
                                        }
                                }
                                else
@@ -5795,10 +6018,34 @@ _Toolbar::ApplyUserGUI(ButtonType buttonType, _Button* pButton)
                                        GET_BITMAP_CONFIG_N(HEADER::SEGMENTED_ITEM_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundBitmap);
                                        GET_BITMAP_CONFIG_N(HEADER::SEGMENTED_ITEM_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, pSelectedBackgroundBitmap);
 
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::SEGMENTED_ITEM_BG_NORMAL);
+                                       if (customTheme == false)
+                                       {
+                                               GET_BITMAP_CONFIG_N(HEADER::SEGMENTED_ITEM_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pNormalBackgroundEffectBitmap);
+                                       }
+
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::SEGMENTED_ITEM_BG_DISABLED);
+                                       if (customTheme == false)
+                                       {
+                                               GET_BITMAP_CONFIG_N(HEADER::SEGMENTED_ITEM_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pDisabledBackgroundEffectBitmap);
+                                       }
+
                                        customTheme = IS_CUSTOM_BITMAP(HEADER::SEGMENTED_ITEM_BG_PRESSED);
                                        if (customTheme == false)
                                        {
-                                               GET_BITMAP_CONFIG_N(HEADER::TAB_ITEM_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundEffectBitmap);
+                                               GET_BITMAP_CONFIG_N(HEADER::SEGMENTED_ITEM_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundEffectBitmap);
+                                       }
+
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::SEGMENTED_ITEM_BG_HIGHLIGHTED);
+                                       if (customTheme == false)
+                                       {
+                                               GET_BITMAP_CONFIG_N(HEADER::SEGMENTED_ITEM_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundEffectBitmap);
+                                       }
+
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::SEGMENTED_ITEM_BG_SELECTED);
+                                       if (customTheme == false)
+                                       {
+                                               GET_BITMAP_CONFIG_N(HEADER::SEGMENTED_ITEM_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pSelectedBackgroundEffectBitmap);
                                        }
                                }
                        }
@@ -5812,10 +6059,34 @@ _Toolbar::ApplyUserGUI(ButtonType buttonType, _Button* pButton)
                                        GET_BITMAP_CONFIG_N(FOOTER::SEGMENTED_ITEM_TRANSLUCENT_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundBitmap);
                                        GET_BITMAP_CONFIG_N(FOOTER::SEGMENTED_ITEM_TRANSLUCENT_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, pSelectedBackgroundBitmap);
 
-                                       customTheme = IS_CUSTOM_BITMAP(FOOTER::SEGMENTED_ITEM_TRANSLUCENT_BG_PRESSED);
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::SEGMENTED_ITEM_TRANSLUCENT_BG_NORMAL);
+                                       if (customTheme == false)
+                                       {
+                                               GET_BITMAP_CONFIG_N(HEADER::SEGMENTED_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pNormalBackgroundEffectBitmap);
+                                       }
+
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::SEGMENTED_ITEM_TRANSLUCENT_BG_DISABLED);
+                                       if (customTheme == false)
+                                       {
+                                               GET_BITMAP_CONFIG_N(HEADER::SEGMENTED_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pDisabledBackgroundEffectBitmap);
+                                       }
+
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::SEGMENTED_ITEM_TRANSLUCENT_BG_PRESSED);
+                                       if (customTheme == false)
+                                       {
+                                               GET_BITMAP_CONFIG_N(HEADER::SEGMENTED_ITEM_TRANSLUCENT_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundEffectBitmap);
+                                       }
+
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::SEGMENTED_ITEM_TRANSLUCENT_BG_HIGHLIGHTED);
                                        if (customTheme == false)
                                        {
-                                               GET_BITMAP_CONFIG_N(FOOTER::TAB_ITEM_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundEffectBitmap);
+                                               GET_BITMAP_CONFIG_N(HEADER::SEGMENTED_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundEffectBitmap);
+                                       }
+
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::SEGMENTED_ITEM_TRANSLUCENT_BG_SELECTED);
+                                       if (customTheme == false)
+                                       {
+                                               GET_BITMAP_CONFIG_N(HEADER::SEGMENTED_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pSelectedBackgroundEffectBitmap);
                                        }
                                }
                                else
@@ -5826,10 +6097,34 @@ _Toolbar::ApplyUserGUI(ButtonType buttonType, _Button* pButton)
                                        GET_BITMAP_CONFIG_N(FOOTER::SEGMENTED_ITEM_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundBitmap);
                                        GET_BITMAP_CONFIG_N(FOOTER::SEGMENTED_ITEM_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, pSelectedBackgroundBitmap);
 
-                                       customTheme = IS_CUSTOM_BITMAP(FOOTER::SEGMENTED_ITEM_BG_PRESSED);
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::SEGMENTED_ITEM_BG_NORMAL);
+                                       if (customTheme == false)
+                                       {
+                                               GET_BITMAP_CONFIG_N(HEADER::SEGMENTED_ITEM_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pNormalBackgroundEffectBitmap);
+                                       }
+
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::SEGMENTED_ITEM_BG_DISABLED);
+                                       if (customTheme == false)
+                                       {
+                                               GET_BITMAP_CONFIG_N(HEADER::SEGMENTED_ITEM_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pDisabledBackgroundEffectBitmap);
+                                       }
+
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::SEGMENTED_ITEM_BG_PRESSED);
+                                       if (customTheme == false)
+                                       {
+                                               GET_BITMAP_CONFIG_N(HEADER::SEGMENTED_ITEM_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundEffectBitmap);
+                                       }
+
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::SEGMENTED_ITEM_BG_HIGHLIGHTED);
+                                       if (customTheme == false)
+                                       {
+                                               GET_BITMAP_CONFIG_N(HEADER::SEGMENTED_ITEM_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundEffectBitmap);
+                                       }
+
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::SEGMENTED_ITEM_BG_SELECTED);
                                        if (customTheme == false)
                                        {
-                                               GET_BITMAP_CONFIG_N(FOOTER::TAB_ITEM_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundEffectBitmap);
+                                               GET_BITMAP_CONFIG_N(HEADER::SEGMENTED_ITEM_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pSelectedBackgroundEffectBitmap);
                                        }
                                }
                        }
@@ -5846,10 +6141,34 @@ _Toolbar::ApplyUserGUI(ButtonType buttonType, _Button* pButton)
                                        GET_BITMAP_CONFIG_N(HEADER::TAB_ITEM_TRANSLUCENT_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundBitmap);
                                        GET_BITMAP_CONFIG_N(HEADER::TAB_ITEM_TRANSLUCENT_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, pSelectedBackgroundBitmap);
 
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::TAB_ITEM_TRANSLUCENT_BG_NORMAL);
+                                       if (customTheme == false)
+                                       {
+                                               GET_BITMAP_CONFIG_N(HEADER::TAB_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pNormalBackgroundEffectBitmap);
+                                       }
+
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::TAB_ITEM_TRANSLUCENT_BG_DISABLED);
+                                       if (customTheme == false)
+                                       {
+                                               GET_BITMAP_CONFIG_N(HEADER::TAB_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pDisabledBackgroundEffectBitmap);
+                                       }
+
                                        customTheme = IS_CUSTOM_BITMAP(HEADER::TAB_ITEM_TRANSLUCENT_BG_PRESSED);
                                        if (customTheme == false)
                                        {
-                                               GET_BITMAP_CONFIG_N(HEADER::TAB_ITEM_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundEffectBitmap);
+                                               GET_BITMAP_CONFIG_N(HEADER::TAB_ITEM_TRANSLUCENT_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundEffectBitmap);
+                                       }
+
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::TAB_ITEM_TRANSLUCENT_BG_HIGHLIGHTED);
+                                       if (customTheme == false)
+                                       {
+                                               GET_BITMAP_CONFIG_N(HEADER::TAB_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundEffectBitmap);
+                                       }
+
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::TAB_ITEM_TRANSLUCENT_BG_SELECTED);
+                                       if (customTheme == false)
+                                       {
+                                               GET_BITMAP_CONFIG_N(HEADER::TAB_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pSelectedBackgroundEffectBitmap);
                                        }
                                }
                                else
@@ -5860,11 +6179,35 @@ _Toolbar::ApplyUserGUI(ButtonType buttonType, _Button* pButton)
                                        GET_BITMAP_CONFIG_N(HEADER::TAB_ITEM_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundBitmap);
                                        GET_BITMAP_CONFIG_N(HEADER::TAB_ITEM_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, pSelectedBackgroundBitmap);
 
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::TAB_ITEM_BG_NORMAL);
+                                       if (customTheme == false)
+                                       {
+                                               GET_BITMAP_CONFIG_N(HEADER::TAB_ITEM_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pNormalBackgroundEffectBitmap);
+                                       }
+
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::TAB_ITEM_BG_DISABLED);
+                                       if (customTheme == false)
+                                       {
+                                               GET_BITMAP_CONFIG_N(HEADER::TAB_ITEM_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pDisabledBackgroundEffectBitmap);
+                                       }
+
                                        customTheme = IS_CUSTOM_BITMAP(HEADER::TAB_ITEM_BG_PRESSED);
                                        if (customTheme == false)
                                        {
                                                GET_BITMAP_CONFIG_N(HEADER::TAB_ITEM_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundEffectBitmap);
                                        }
+
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::TAB_ITEM_BG_HIGHLIGHTED);
+                                       if (customTheme == false)
+                                       {
+                                               GET_BITMAP_CONFIG_N(HEADER::TAB_ITEM_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundEffectBitmap);
+                                       }
+
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::TAB_ITEM_BG_SELECTED);
+                                       if (customTheme == false)
+                                       {
+                                               GET_BITMAP_CONFIG_N(HEADER::TAB_ITEM_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pSelectedBackgroundEffectBitmap);
+                                       }
                                }
                        }
                        else
@@ -5877,10 +6220,34 @@ _Toolbar::ApplyUserGUI(ButtonType buttonType, _Button* pButton)
                                        GET_BITMAP_CONFIG_N(FOOTER::TAB_ITEM_TRANSLUCENT_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundBitmap);
                                        GET_BITMAP_CONFIG_N(FOOTER::TAB_ITEM_TRANSLUCENT_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, pSelectedBackgroundBitmap);
 
-                                       customTheme = IS_CUSTOM_BITMAP(FOOTER::TAB_ITEM_TRANSLUCENT_BG_PRESSED);
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::TAB_ITEM_TRANSLUCENT_BG_NORMAL);
                                        if (customTheme == false)
                                        {
-                                               GET_BITMAP_CONFIG_N(FOOTER::TAB_ITEM_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundEffectBitmap);
+                                               GET_BITMAP_CONFIG_N(HEADER::TAB_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pNormalBackgroundEffectBitmap);
+                                       }
+
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::TAB_ITEM_TRANSLUCENT_BG_DISABLED);
+                                       if (customTheme == false)
+                                       {
+                                               GET_BITMAP_CONFIG_N(HEADER::TAB_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pDisabledBackgroundEffectBitmap);
+                                       }
+
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::TAB_ITEM_TRANSLUCENT_BG_PRESSED);
+                                       if (customTheme == false)
+                                       {
+                                               GET_BITMAP_CONFIG_N(HEADER::TAB_ITEM_TRANSLUCENT_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundEffectBitmap);
+                                       }
+
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::TAB_ITEM_TRANSLUCENT_BG_HIGHLIGHTED);
+                                       if (customTheme == false)
+                                       {
+                                               GET_BITMAP_CONFIG_N(HEADER::TAB_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundEffectBitmap);
+                                       }
+
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::TAB_ITEM_TRANSLUCENT_BG_SELECTED);
+                                       if (customTheme == false)
+                                       {
+                                               GET_BITMAP_CONFIG_N(HEADER::TAB_ITEM_TRANSLUCENT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pSelectedBackgroundEffectBitmap);
                                        }
                                }
                                else
@@ -5891,10 +6258,34 @@ _Toolbar::ApplyUserGUI(ButtonType buttonType, _Button* pButton)
                                        GET_BITMAP_CONFIG_N(FOOTER::TAB_ITEM_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundBitmap);
                                        GET_BITMAP_CONFIG_N(FOOTER::TAB_ITEM_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, pSelectedBackgroundBitmap);
 
-                                       customTheme = IS_CUSTOM_BITMAP(FOOTER::TAB_ITEM_BG_PRESSED);
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::TAB_ITEM_BG_NORMAL);
+                                       if (customTheme == false)
+                                       {
+                                               GET_BITMAP_CONFIG_N(HEADER::TAB_ITEM_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pNormalBackgroundEffectBitmap);
+                                       }
+
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::TAB_ITEM_BG_DISABLED);
                                        if (customTheme == false)
                                        {
-                                               GET_BITMAP_CONFIG_N(FOOTER::TAB_ITEM_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundEffectBitmap);
+                                               GET_BITMAP_CONFIG_N(HEADER::TAB_ITEM_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pDisabledBackgroundEffectBitmap);
+                                       }
+
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::TAB_ITEM_BG_PRESSED);
+                                       if (customTheme == false)
+                                       {
+                                               GET_BITMAP_CONFIG_N(HEADER::TAB_ITEM_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundEffectBitmap);
+                                       }
+
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::TAB_ITEM_BG_HIGHLIGHTED);
+                                       if (customTheme == false)
+                                       {
+                                               GET_BITMAP_CONFIG_N(HEADER::TAB_ITEM_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundEffectBitmap);
+                                       }
+
+                                       customTheme = IS_CUSTOM_BITMAP(HEADER::TAB_ITEM_BG_SELECTED);
+                                       if (customTheme == false)
+                                       {
+                                               GET_BITMAP_CONFIG_N(HEADER::TAB_ITEM_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pSelectedBackgroundEffectBitmap);
                                        }
                                }
                        }
@@ -6017,29 +6408,36 @@ _Toolbar::ApplyUserGUI(ButtonType buttonType, _Button* pButton)
                        }
                }
 
-               //if (__style == TOOLBAR_TEXT || __style == TOOLBAR_ICON || __style == TOOLBAR_ICON_TEXT || __style == TOOLBAR_COMMAND)
-               //{
-               //      if (pNormalBackgroundEffectBitmap)
-               //      {
-               //              pButton->SetBackgroundEffectBitmap(_BUTTON_STATUS_NORMAL, *pNormalBackgroundEffectBitmap);
-               //              delete pNormalBackgroundEffectBitmap;
-               //      }
-               //      if (pDisabledBackgroundEffectBitmap)
-               //      {
-               //              pButton->SetBackgroundEffectBitmap(_BUTTON_STATUS_DISABLED, *pDisabledBackgroundEffectBitmap);
-               //              delete pDisabledBackgroundEffectBitmap;
-               //      }
-               //      if (pPressedBackgroundEffectBitmap)
-               //      {
-               //              pButton->SetBackgroundEffectBitmap(_BUTTON_STATUS_PRESSED, *pPressedBackgroundEffectBitmap);
-               //              delete pPressedBackgroundEffectBitmap;
-               //      }
-               //      if (pHighlightedBackgroundEffectBitmap)
-               //      {
-               //              pButton->SetBackgroundEffectBitmap(_BUTTON_STATUS_HIGHLIGHTED, *pHighlightedBackgroundEffectBitmap);
-               //              delete pHighlightedBackgroundEffectBitmap;
-               //      }
-               //}
+               if (__style != TOOLBAR_SOFTKEY)
+               {
+                       //if (pNormalBackgroundEffectBitmap)
+                       //{
+                       //      pButton->SetBackgroundEffectBitmap(_BUTTON_STATUS_NORMAL, *pNormalBackgroundEffectBitmap);
+                       //      delete pNormalBackgroundEffectBitmap;
+                       //}
+                       //if (pDisabledBackgroundEffectBitmap)
+                       //{
+                       //      pButton->SetBackgroundEffectBitmap(_BUTTON_STATUS_DISABLED, *pDisabledBackgroundEffectBitmap);
+                       //      delete pDisabledBackgroundEffectBitmap;
+                       //}
+                       if (pPressedBackgroundEffectBitmap)
+                       {
+                               pButton->SetBackgroundEffectBitmap(_BUTTON_STATUS_PRESSED, *pPressedBackgroundEffectBitmap);
+                               delete pPressedBackgroundEffectBitmap;
+                       }
+                       //if (pHighlightedBackgroundEffectBitmap)
+                       //{
+                       //      pButton->SetBackgroundEffectBitmap(_BUTTON_STATUS_HIGHLIGHTED, *pHighlightedBackgroundEffectBitmap);
+                       //      delete pHighlightedBackgroundEffectBitmap;
+                       //}
+                       //if (pSelectedBackgroundEffectBitmap)
+                       //{
+                       //      pButton->SetBackgroundEffectBitmap(_BUTTON_STATUS_SELECTED, *pSelectedBackgroundEffectBitmap);
+                       //      delete pSelectedBackgroundEffectBitmap;
+                       //}
+               }
+
+#if 0
                if (__style != TOOLBAR_SOFTKEY)
                {
                        if (pPressedBackgroundEffectBitmap)
@@ -6052,6 +6450,7 @@ _Toolbar::ApplyUserGUI(ButtonType buttonType, _Button* pButton)
                                delete pPressedBackgroundEffectBitmap;
                        }
                }
+#endif
        }
 
        return E_SUCCESS;

diff --git a/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp b/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp
index e85a3a4..dcafd08 100644 (file)
--- a/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp
@@ -419,6 +419,7 @@ _ToolbarPresenter::DrawBackground(void)
 
        Bitmap* pReplacementColorBackgroundBitmap = null;
        Bitmap* pBackgroundBitmap = null;
+       //Bitmap* pBackgroundEffectBitmap = null;
 
        FloatRectangle bounds(0.0f, 0.0f, __pToolbar->GetBoundsF().width, __pToolbar->GetBoundsF().height);
 
@@ -441,6 +442,7 @@ _ToolbarPresenter::DrawBackground(void)
        }
 
        pBackgroundBitmap = __pToolbar->GetBackgroundBitmap();
+       //pBackgroundEffectBitmap = __pToolbar->GetBackgroundEffectBitmap();
 
        pReplacementColorBackgroundBitmap =
                                _BitmapImpl::GetColorReplacedBitmapN(*pBackgroundBitmap, Color::GetColor(COLOR_ID_MAGENTA), __pToolbar->GetColor());
@@ -480,6 +482,18 @@ _ToolbarPresenter::DrawBackground(void)
                {
                        pCanvas->FillRectangle(__pToolbar->GetColor(), bounds);
                }
+
+               //if (pBackgroundEffectBitmap)
+               //{
+               //      if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pBackgroundEffectBitmap))
+               //      {
+               //              pCanvas->DrawNinePatchedBitmap(bounds, *pBackgroundEffectBitmap);
+               //      }
+               //      else
+               //      {
+               //              pCanvas->DrawBitmap(bounds, *pBackgroundEffectBitmap, FloatRectangle(0.0f, 0.0f, pBackgroundEffectBitmap->GetWidthF(), pBackgroundEffectBitmap->GetHeightF()));
+               //      }
+               //}
        }
 
        delete pCanvas;

diff --git a/src/ui/inc/FUiCtrl_Toolbar.h b/src/ui/inc/FUiCtrl_Toolbar.h
index e72976a..67d7943 100644 (file)
--- a/src/ui/inc/FUiCtrl_Toolbar.h
+++ b/src/ui/inc/FUiCtrl_Toolbar.h
@@ -201,6 +201,8 @@ public:
 
        Tizen::Graphics::Bitmap* GetBackgroundBitmap(void) const;
 
+       Tizen::Graphics::Bitmap* GetBackgroundEffectBitmap(void) const;
+
        _Button* GetButton(ToolbarButton position) const;
 
        _Label* GetTitleBadgeIcon(void) const;
@@ -463,6 +465,8 @@ private:
 
        Tizen::Graphics::Bitmap* __pToolbarBackgroundBitmap;
 
+       Tizen::Graphics::Bitmap* __pToolbarBackgroundEffectBitmap;
+
        Tizen::Graphics::Bitmap* __pTitleIcon;
 
        Tizen::Graphics::Color __backgroundColor;

diff --git a/src/ui/resource/FUi_ResourceFooterConfig.cpp b/src/ui/resource/FUi_ResourceFooterConfig.cpp
index f118d93..f5bb451 100644 (file)
--- a/src/ui/resource/FUi_ResourceFooterConfig.cpp
+++ b/src/ui/resource/FUi_ResourceFooterConfig.cpp
@@ -28,14 +28,14 @@ START_UI_CONFIG(FOOTER);
        ADD_COLOR_CONFIG(TRANSLUCENT_BG_NORMAL, $B013);
 
        // $B0543 is 0x00000000, transparent
-       ADD_COLOR_CONFIG(BUTTON_BG_NORMAL, $B0543);
-       ADD_COLOR_CONFIG(BUTTON_BG_DISABLED, $B0543);
-       ADD_COLOR_CONFIG(BUTTON_BG_PRESSED, $B0543);
+       ADD_COLOR_CONFIG(BUTTON_BG_NORMAL, $B0515L1);
+       ADD_COLOR_CONFIG(BUTTON_BG_DISABLED, $B0515L1);
+       ADD_COLOR_CONFIG(BUTTON_BG_PRESSED, $B0511P);
        ADD_COLOR_CONFIG(BUTTON_BG_HIGHLIGHTED, $W161);
 
-       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_NORMAL, $B0543);
-       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_DISABLED, $B0543);
-       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_PRESSED, $B0543);
+       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_NORMAL, $B013);
+       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_DISABLED, $B013);
+       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_PRESSED, $B013P);
        ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_HIGHLIGHTED, $W161);
 
        ADD_COLOR_CONFIG(BUTTON_TEXT_NORMAL, $B052L4);

diff --git a/src/ui/resource/FUi_ResourceHeaderConfig.cpp b/src/ui/resource/FUi_ResourceHeaderConfig.cpp
index a7b3ad1..e872803 100644 (file)
--- a/src/ui/resource/FUi_ResourceHeaderConfig.cpp
+++ b/src/ui/resource/FUi_ResourceHeaderConfig.cpp
@@ -34,14 +34,14 @@ START_UI_CONFIG(HEADER);
        ADD_COLOR_CONFIG(TRANSLUCENT_DESCRIPTION_TEXT_NORMAL, $B052L8);
 
        // $B0543 is 0x00000000, transparent
-       ADD_COLOR_CONFIG(BUTTON_BG_NORMAL, $B0543);
-       ADD_COLOR_CONFIG(BUTTON_BG_DISABLED, $B0543);
-       ADD_COLOR_CONFIG(BUTTON_BG_PRESSED, $B0543);
+       ADD_COLOR_CONFIG(BUTTON_BG_NORMAL, $B0511);
+       ADD_COLOR_CONFIG(BUTTON_BG_DISABLED, $B0511);
+       ADD_COLOR_CONFIG(BUTTON_BG_PRESSED, $B0511P);
        ADD_COLOR_CONFIG(BUTTON_BG_HIGHLIGHTED, $W161);
 
-       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_NORMAL, $B0543);
-       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_DISABLED, $B0543);
-       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_PRESSED, $B0543);
+       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_NORMAL, $B013);
+       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_DISABLED, $B013);
+       ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_PRESSED, $B013P);
        ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_BG_HIGHLIGHTED, $W161);
 
        ADD_COLOR_CONFIG(BUTTON_TEXT_NORMAL, $B052L4);