apply v4.5 gui

Change-Id: I30b760c171cbe8b53614702789fe42bea3c1f1b5

diff --git a/inc/FUiCtrlFooter.h b/inc/FUiCtrlFooter.h
index 9f6931e..a6c9527 100644 (file)
--- a/inc/FUiCtrlFooter.h
+++ b/inc/FUiCtrlFooter.h
@@ -805,12 +805,6 @@ public:
         */
        Tizen::Graphics::FloatRectangle GetButtonBoundsF(ButtonPosition position) const;
 
-       bool IsMenuButtonSet(void) const;
-       ButtonItemStatus GetMenuButtonStatus(void) const;
-       result RemoveMenuButton(void);
-       result SetMenuButtonEnabled(bool enable);
-       result SetMenuButton(void);
-
 protected:
        //
        //This method is for internal use only. Using this method can cause behavioral, security-related,

diff --git a/src/ui/controls/FUiCtrlFooter.cpp b/src/ui/controls/FUiCtrlFooter.cpp
index 1aef4b0..2eff980 100644 (file)
--- a/src/ui/controls/FUiCtrlFooter.cpp
+++ b/src/ui/controls/FUiCtrlFooter.cpp
@@ -571,30 +571,4 @@ Footer::SetButtonNumberedBadgeIcon(ButtonPosition position, int number)
        return pFooterImpl->SetButtonNumberedBadgeIcon(position, number);
 }
 
-bool
-Footer::IsMenuButtonSet(void) const
-{
-       return true;
-}
-ButtonItemStatus
-Footer::GetMenuButtonStatus(void) const
-{
-       return BUTTON_ITEM_STATUS_NORMAL;
-}
-result
-Footer::RemoveMenuButton(void)
-{
-       return E_SUCCESS;
-}
-result
-Footer::SetMenuButtonEnabled(bool enable)
-{
-       return E_SUCCESS;
-}
-result
-Footer::SetMenuButton(void)
-{
-       return E_SUCCESS;
-}
-
 }}} // Tizen::Ui::Controls

diff --git a/src/ui/controls/FUiCtrl_ButtonPresenter.cpp b/src/ui/controls/FUiCtrl_ButtonPresenter.cpp
index 15456c0..9631b9f 100644 (file)
--- a/src/ui/controls/FUiCtrl_ButtonPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ButtonPresenter.cpp
@@ -78,7 +78,7 @@ _ButtonPresenter::Construct(const _Button& button)
        __pButton = const_cast <_Button*>(&button);
        __fontStyle = FONT_STYLE_PLAIN;
 
-       GET_SHAPE_CONFIG(BUTTON::DEFAULT_FONT_SIZE, _CONTROL_ORIENTATION_PORTRAIT, __fontSize);
+       GET_SHAPE_CONFIG(BUTTON::DEFAULT_FONT_SIZE, __pButton->GetOrientation(), __fontSize);
 
        __pFont = __pButton->GetFallbackFont();
        r = GetLastResult();
@@ -848,9 +848,9 @@ _ButtonPresenter::DrawUnderlineBitmap(void)
        float rightTouchMargin = __pButton->GetRightTouchMarginF();
        float bottomTouchMargin = __pButton->GetBottomTouchMarginF();
 
-       GET_SHAPE_CONFIG(HEADER::HEADER_ITEM_SELECTED_BITMAP_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, selectedBitmapMargin);
-       GET_SHAPE_CONFIG(HEADER::HEADER_ITEM_SELECTED_BITMAP_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, selectedBitmapHeight);
-       GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, segmentedHeight);
+       GET_SHAPE_CONFIG(HEADER::HEADER_ITEM_SELECTED_BITMAP_MARGIN, __pButton->GetOrientation(), selectedBitmapMargin);
+       GET_SHAPE_CONFIG(HEADER::HEADER_ITEM_SELECTED_BITMAP_HEIGHT, __pButton->GetOrientation(), selectedBitmapHeight);
+       GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_HEIGHT, __pButton->GetOrientation(), segmentedHeight);
 
        Bitmap* pUnderlineBitmap = __pButton->GetUnderlineBitmap();
 

diff --git a/src/ui/controls/FUiCtrl_FooterImpl.cpp b/src/ui/controls/FUiCtrl_FooterImpl.cpp
index 3eda1bb..f40dbc6 100644 (file)
--- a/src/ui/controls/FUiCtrl_FooterImpl.cpp
+++ b/src/ui/controls/FUiCtrl_FooterImpl.cpp
@@ -1009,7 +1009,7 @@ _FooterImpl::ConvertFooterItem(const FooterItem& footerItem)
                Color selectedBitmapColor;
 
                GET_BITMAP_CONFIG_N(FOOTER::TAB_ITEM_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, pSelectedBitmap);
-               GET_COLOR_CONFIG(FOOTER::SEGMENTED_ITEM_TEXT_SELECTED, selectedBitmapColor);
+               GET_COLOR_CONFIG(FOOTER::SELECTED_BAR_BG_NORMAL, selectedBitmapColor);
 
                pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pSelectedBitmap, Color::GetColor(COLOR_ID_MAGENTA), selectedBitmapColor);
 

diff --git a/src/ui/controls/FUiCtrl_HeaderImpl.cpp b/src/ui/controls/FUiCtrl_HeaderImpl.cpp
index 3dbce3e..031a398 100644 (file)
--- a/src/ui/controls/FUiCtrl_HeaderImpl.cpp
+++ b/src/ui/controls/FUiCtrl_HeaderImpl.cpp
@@ -1371,7 +1371,7 @@ _HeaderImpl::ConvertHeaderItem(const HeaderItem& headerItem)
                Color selectedBitmapColor;
 
                GET_BITMAP_CONFIG_N(HEADER::TAB_ITEM_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, pSelectedBitmap);
-               GET_COLOR_CONFIG(HEADER::SEGMENTED_ITEM_TEXT_SELECTED, selectedBitmapColor);
+               GET_COLOR_CONFIG(HEADER::SELECTED_BAR_BG_NORMAL, selectedBitmapColor);
 
                pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pSelectedBitmap, Color::GetColor(COLOR_ID_MAGENTA), selectedBitmapColor);
 

diff --git a/src/ui/controls/FUiCtrl_Toolbar.cpp b/src/ui/controls/FUiCtrl_Toolbar.cpp
index 01a27e1..5b33600 100644 (file)
--- a/src/ui/controls/FUiCtrl_Toolbar.cpp
+++ b/src/ui/controls/FUiCtrl_Toolbar.cpp
@@ -5912,32 +5912,14 @@ _Toolbar::ApplyUserGUI(ButtonType buttonType, _Button* pButton)
                                delete pDisabledBackgroundBitmap;
                        }
 
-                       if (__style == TOOLBAR_TEXT || __style == TOOLBAR_ICON || __style == TOOLBAR_ICON_TEXT || __style == TOOLBAR_COMMAND)
-                       {
-                               if (pPressedBackgroundBitmap)
-                               {
-                                       pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pPressedBackgroundBitmap,
-                                                       Color::GetColor(COLOR_ID_MAGENTA), __itemBackgroundColor[_BUTTON_STATUS_PRESSED]);
-                                       pButton->SetBackgroundBitmap(_BUTTON_STATUS_PRESSED, *pColorReplacedBitmap);
-
-                                       delete pColorReplacedBitmap;
-                                       delete pPressedBackgroundBitmap;
-                               }
-                       }
-                       else
+                       if (pPressedBackgroundBitmap)
                        {
-                               Color pressedColor;
-                               GET_COLOR_CONFIG(HEADER::TAB_ITEM_BG_NORMAL, pressedColor);
-
-                               if (pPressedBackgroundBitmap)
-                               {
-                                       pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pPressedBackgroundBitmap,
-                                                       Color::GetColor(COLOR_ID_MAGENTA), pressedColor);
-                                       pButton->SetBackgroundBitmap(_BUTTON_STATUS_PRESSED, *pColorReplacedBitmap);
+                               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pPressedBackgroundBitmap,
+                                               Color::GetColor(COLOR_ID_MAGENTA), __itemBackgroundColor[_BUTTON_STATUS_PRESSED]);
+                               pButton->SetBackgroundBitmap(_BUTTON_STATUS_PRESSED, *pColorReplacedBitmap);
 
-                                       delete pColorReplacedBitmap;
-                                       delete pPressedBackgroundBitmap;
-                               }
+                               delete pColorReplacedBitmap;
+                               delete pPressedBackgroundBitmap;
                        }
 
                        if (pHighlightedBackgroundBitmap)
@@ -5961,31 +5943,30 @@ _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;
-                       }
-               }
-               else if (__style == TOOLBAR_HEADER_SEGMENTED || __style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE
-                               || __style == TOOLBAR_SEGMENTED || __style == TOOLBAR_TITLE || __style == TOOLBAR_TAB || __style == TOOLBAR_TAB_WITH_TITLE || __style == TOOLBAR_TAB_LARGE)
+               //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 (pPressedBackgroundEffectBitmap)
                        {
@@ -6185,6 +6166,8 @@ _Toolbar::RealignItem(_Button* pButton, float textExtentSize)
        float contentLength = 0.0f;
        float segmentedTextAreaHeight = 0.0f;
        float revisedTopMargin = 5.0f;
+       float largeTabTopMargin = 0.0f;
+       float largeTabTextHeight = 0.0f;
 
        float leftTouchMargin = pButton->GetLeftTouchMarginF();
        float topTouchMargin = pButton->GetTopTouchMarginF();
@@ -6194,6 +6177,8 @@ _Toolbar::RealignItem(_Button* pButton, float textExtentSize)
        GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_TEXT_LEFT_MARGIN, GetOrientation(), sideMargin);
        GET_SHAPE_CONFIG(HEADER::ICON_TEXT_GAP, GetOrientation(), iconTextGap);
        GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_HEIGHT, GetOrientation(), segmentedTextAreaHeight);
+       GET_SHAPE_CONFIG(HEADER::TAB_LARGE_TOP_MARGIN, GetOrientation(), largeTabTopMargin);
+       GET_SHAPE_CONFIG(HEADER::TAB_LARGE_TEXT_HEIGHT, GetOrientation(), largeTabTextHeight);
 
        if (__style == TOOLBAR_TEXT || __style == TOOLBAR_ICON || __style == TOOLBAR_ICON_TEXT || __style == TOOLBAR_COMMAND)
        {
@@ -6227,9 +6212,18 @@ _Toolbar::RealignItem(_Button* pButton, float textExtentSize)
                                contentLength = buttonItemWidth - sideMargin * 2;
                        }
 
-                       pButton->SetBitmap(_BUTTON_STATUS_NORMAL,
-                                       FloatPoint((buttonItemWidth - contentLength) / 2, (buttonItemHeight - (pButton->GetBitmap(_BUTTON_STATUS_NORMAL))->GetHeightF()) / 2),
-                                                       *(pButton->GetBitmap(_BUTTON_STATUS_NORMAL)));
+                       if (__style == TOOLBAR_TAB_LARGE)
+                       {
+                               pButton->SetBitmap(_BUTTON_STATUS_NORMAL,
+                                               FloatPoint((buttonItemWidth - iconAreaWidth) / 2, largeTabTopMargin),
+                                               *(pButton->GetBitmap(_BUTTON_STATUS_NORMAL)));
+                       }
+                       else
+                       {
+                               pButton->SetBitmap(_BUTTON_STATUS_NORMAL,
+                                               FloatPoint((buttonItemWidth - contentLength) / 2, (buttonItemHeight - (pButton->GetBitmap(_BUTTON_STATUS_NORMAL))->GetHeightF()) / 2),
+                                               *(pButton->GetBitmap(_BUTTON_STATUS_NORMAL)));
+                       }
                }
                if (pButton->GetBitmap(_BUTTON_STATUS_PRESSED) != null)
                {
@@ -6241,9 +6235,18 @@ _Toolbar::RealignItem(_Button* pButton, float textExtentSize)
                                contentLength = buttonItemWidth - sideMargin * 2;
                        }
 
-                       pButton->SetBitmap(_BUTTON_STATUS_PRESSED,
-                                       FloatPoint((buttonItemWidth - contentLength) / 2, (buttonItemHeight - (pButton->GetBitmap(_BUTTON_STATUS_PRESSED))->GetHeightF()) / 2),
-                                                       *(pButton->GetBitmap(_BUTTON_STATUS_PRESSED)));
+                       if (__style == TOOLBAR_TAB_LARGE)
+                       {
+                               pButton->SetBitmap(_BUTTON_STATUS_PRESSED,
+                                               FloatPoint((buttonItemWidth - iconAreaWidth) / 2, largeTabTopMargin),
+                                               *(pButton->GetBitmap(_BUTTON_STATUS_PRESSED)));
+                       }
+                       else
+                       {
+                               pButton->SetBitmap(_BUTTON_STATUS_PRESSED,
+                                               FloatPoint((buttonItemWidth - contentLength) / 2, (buttonItemHeight - (pButton->GetBitmap(_BUTTON_STATUS_PRESSED))->GetHeightF()) / 2),
+                                               *(pButton->GetBitmap(_BUTTON_STATUS_PRESSED)));
+                       }
                }
                if (pButton->GetBitmap(_BUTTON_STATUS_SELECTED) != null)
                {
@@ -6255,9 +6258,18 @@ _Toolbar::RealignItem(_Button* pButton, float textExtentSize)
                                contentLength = buttonItemWidth - sideMargin * 2;
                        }
 
-                       pButton->SetBitmap(_BUTTON_STATUS_SELECTED,
-                                       FloatPoint((buttonItemWidth - contentLength) / 2, (buttonItemHeight - (pButton->GetBitmap(_BUTTON_STATUS_SELECTED))->GetHeightF()) / 2),
-                                                       *(pButton->GetBitmap(_BUTTON_STATUS_SELECTED)));
+                       if (__style == TOOLBAR_TAB_LARGE)
+                       {
+                               pButton->SetBitmap(_BUTTON_STATUS_SELECTED,
+                                               FloatPoint((buttonItemWidth - iconAreaWidth) / 2, largeTabTopMargin),
+                                               *(pButton->GetBitmap(_BUTTON_STATUS_SELECTED)));
+                       }
+                       else
+                       {
+                               pButton->SetBitmap(_BUTTON_STATUS_SELECTED,
+                                               FloatPoint((buttonItemWidth - contentLength) / 2, (buttonItemHeight - (pButton->GetBitmap(_BUTTON_STATUS_SELECTED))->GetHeightF()) / 2),
+                                               *(pButton->GetBitmap(_BUTTON_STATUS_SELECTED)));
+                       }
                }
                if (pButton->GetBitmap(_BUTTON_STATUS_HIGHLIGHTED) != null)
                {
@@ -6269,9 +6281,18 @@ _Toolbar::RealignItem(_Button* pButton, float textExtentSize)
                                contentLength = buttonItemWidth - sideMargin * 2;
                        }
 
-                       pButton->SetBitmap(_BUTTON_STATUS_HIGHLIGHTED,
-                                       FloatPoint((buttonItemWidth - contentLength) / 2, (buttonItemHeight - (pButton->GetBitmap(_BUTTON_STATUS_HIGHLIGHTED))->GetHeightF()) / 2),
-                                                       *(pButton->GetBitmap(_BUTTON_STATUS_HIGHLIGHTED)));
+                       if (__style == TOOLBAR_TAB_LARGE)
+                       {
+                               pButton->SetBitmap(_BUTTON_STATUS_HIGHLIGHTED,
+                                               FloatPoint((buttonItemWidth - iconAreaWidth) / 2, largeTabTopMargin),
+                                               *(pButton->GetBitmap(_BUTTON_STATUS_HIGHLIGHTED)));
+                       }
+                       else
+                       {
+                               pButton->SetBitmap(_BUTTON_STATUS_HIGHLIGHTED,
+                                               FloatPoint((buttonItemWidth - contentLength) / 2, (buttonItemHeight - (pButton->GetBitmap(_BUTTON_STATUS_HIGHLIGHTED))->GetHeightF()) / 2),
+                                               *(pButton->GetBitmap(_BUTTON_STATUS_HIGHLIGHTED)));
+                       }
                }
                if (pButton->GetBitmap(_BUTTON_STATUS_DISABLED) != null)
                {
@@ -6283,15 +6304,34 @@ _Toolbar::RealignItem(_Button* pButton, float textExtentSize)
                                contentLength = buttonItemWidth - sideMargin * 2;
                        }
 
-                       pButton->SetBitmap(_BUTTON_STATUS_DISABLED,
-                                       FloatPoint((buttonItemWidth - contentLength) / 2, (buttonItemHeight - (pButton->GetBitmap(_BUTTON_STATUS_DISABLED))->GetHeightF()) / 2),
-                                                       *(pButton->GetBitmap(_BUTTON_STATUS_DISABLED)));
+                       if (__style == TOOLBAR_TAB_LARGE)
+                       {
+                               pButton->SetBitmap(_BUTTON_STATUS_DISABLED,
+                                               FloatPoint((buttonItemWidth - iconAreaWidth) / 2, largeTabTopMargin),
+                                               *(pButton->GetBitmap(_BUTTON_STATUS_DISABLED)));
+                       }
+                       else
+                       {
+                               pButton->SetBitmap(_BUTTON_STATUS_DISABLED,
+                                               FloatPoint((buttonItemWidth - contentLength) / 2, (buttonItemHeight - (pButton->GetBitmap(_BUTTON_STATUS_DISABLED))->GetHeightF()) / 2),
+                                               *(pButton->GetBitmap(_BUTTON_STATUS_DISABLED)));
+                       }
                }
 
                if (iconAreaWidth != 0)
                {
-                       pButton->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
-                       pButton->SetUserDefinedTextArea(FloatRectangle((buttonItemWidth - contentLength) / 2 + iconAreaWidth + iconTextGap, buttonTextTopMargin, buttonItemWidth - iconAreaWidth - iconTextGap - sideMargin * 2, buttonItemHeight - buttonTextTopMargin * 2));
+                       if (__style == TOOLBAR_TAB_LARGE)
+                       {
+                               pButton->SetTextHorizontalAlignment(ALIGNMENT_CENTER);
+                               pButton->SetUserDefinedTextArea(FloatRectangle(sideMargin, largeTabTopMargin + iconAreaWidth,
+                                               buttonItemWidth - sideMargin * 2, largeTabTextHeight));
+                       }
+                       else
+                       {
+                               pButton->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
+                               pButton->SetUserDefinedTextArea(FloatRectangle((buttonItemWidth - contentLength) / 2 + iconAreaWidth + iconTextGap,
+                                               buttonTextTopMargin, buttonItemWidth - iconAreaWidth - iconTextGap - sideMargin * 2, buttonItemHeight - buttonTextTopMargin * 2));
+                       }
                }
                else
                {
@@ -6521,9 +6561,9 @@ _Toolbar::RearrangeItems(void)
                                {
                                        if (__pButtonItems[RIGHT_BUTTON]->GetText() == L"")
                                        {
-                                               __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth  + rightTouchMargin, vmargin,
+                                               __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth, vmargin,
                                                                headerRightButtonWidth, headerButtonItemHeight));
-                                               __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth - buttonItemGap - headerLeftButtonWidth  + rightTouchMargin, vmargin,
+                                               __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth - buttonItemGap - headerLeftButtonWidth, vmargin,
                                                                headerLeftButtonWidth, headerButtonItemHeight));
 
                                                if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || __style == TOOLBAR_TAB_WITH_TITLE)
@@ -6531,15 +6571,15 @@ _Toolbar::RearrangeItems(void)
                                                        __pButtonItems[RIGHT_BUTTON]->SetTouchMargin(leftTouchMargin, 0.0f, rightTouchMargin, 0.0f);
                                                        __pButtonItems[LEFT_BUTTON]->SetTouchMargin(leftTouchMargin, 0.0f, rightTouchMargin, 0.0f);
 
-                                                       __itemArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth - leftTouchMargin * 2);
+                                                       __itemArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth);
                                                }
                                                else
                                                {
                                                        __pButtonItems[RIGHT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
                                                        __pButtonItems[LEFT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
 
-                                                       __titleTextArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth - leftTouchMargin * 2);
-                                                       __itemArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth - leftTouchMargin * 2);
+                                                       __titleTextArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth);
+                                                       __itemArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth);
                                                }
                                        }
                                        else
@@ -6554,15 +6594,15 @@ _Toolbar::RearrangeItems(void)
                                                        //__pButtonItems[RIGHT_BUTTON]->SetTouchMargin(0, 0, 0, 0);
                                                        __pButtonItems[LEFT_BUTTON]->SetTouchMargin(leftTouchMargin, 0.0f, rightTouchMargin, 0.0f);
 
-                                                       __itemArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth - leftTouchMargin);
+                                                       __itemArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth);
                                                }
                                                else
                                                {
-                                                       __pButtonItems[RIGHT_BUTTON]->SetTouchMargin(0.0f, topTouchMargin, 0.0f, bottomTouchMargin);
+                                                       //__pButtonItems[RIGHT_BUTTON]->SetTouchMargin(0.0f, topTouchMargin, 0.0f, bottomTouchMargin);
                                                        __pButtonItems[LEFT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
 
-                                                       __titleTextArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth - leftTouchMargin);
-                                                       __itemArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth - leftTouchMargin);
+                                                       __titleTextArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth);
+                                                       __itemArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth);
                                                }
                                        }
                                }
@@ -6570,9 +6610,9 @@ _Toolbar::RearrangeItems(void)
                                {
                                        if (__pButtonItems[RIGHT_BUTTON]->GetText() == L"")
                                        {
-                                               __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth  + rightTouchMargin, vmargin,
+                                               __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth, vmargin,
                                                                headerRightButtonWidth, headerButtonItemHeight));
-                                               __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth - buttonItemGap - headerLeftButtonWidth  + rightTouchMargin, vmargin,
+                                               __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth - buttonItemGap - headerLeftButtonWidth, vmargin,
                                                                headerLeftButtonWidth, headerButtonItemHeight));
 
                                                if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || __style == TOOLBAR_TAB_WITH_TITLE)
@@ -6580,15 +6620,15 @@ _Toolbar::RearrangeItems(void)
                                                        //__pButtonItems[LEFT_BUTTON]->SetTouchMargin(0, 0, 0, 0);
                                                        __pButtonItems[RIGHT_BUTTON]->SetTouchMargin(leftTouchMargin, 0.0f, rightTouchMargin, 0.0f);
 
-                                                       __itemArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth - leftTouchMargin);
+                                                       __itemArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth);
                                                }
                                                else
                                                {
-                                                       __pButtonItems[LEFT_BUTTON]->SetTouchMargin(0.0f, topTouchMargin, 0.0f, bottomTouchMargin);
+                                                       //__pButtonItems[LEFT_BUTTON]->SetTouchMargin(0.0f, topTouchMargin, 0.0f, bottomTouchMargin);
                                                        __pButtonItems[RIGHT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
 
-                                                       __titleTextArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth - leftTouchMargin);
-                                                       __itemArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth - leftTouchMargin);
+                                                       __titleTextArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth);
+                                                       __itemArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth);
                                                }
                                        }
                                        else
@@ -6607,8 +6647,8 @@ _Toolbar::RearrangeItems(void)
                                                }
                                                else
                                                {
-                                                       __pButtonItems[LEFT_BUTTON]->SetTouchMargin(0.0f, topTouchMargin, 0.0f, bottomTouchMargin);
-                                                       __pButtonItems[RIGHT_BUTTON]->SetTouchMargin(0.0f, topTouchMargin, 0.0f, bottomTouchMargin);
+                                                       //__pButtonItems[LEFT_BUTTON]->SetTouchMargin(0.0f, topTouchMargin, 0.0f, bottomTouchMargin);
+                                                       //__pButtonItems[RIGHT_BUTTON]->SetTouchMargin(0.0f, topTouchMargin, 0.0f, bottomTouchMargin);
 
                                                        __titleTextArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth);
                                                        __itemArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth);
@@ -6620,21 +6660,21 @@ _Toolbar::RearrangeItems(void)
                        {
                                if (__pButtonItems[RIGHT_BUTTON]->GetText() == L"")
                                {
-                                       __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth  + rightTouchMargin, vmargin,
+                                       __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth, vmargin,
                                                        headerRightButtonWidth, headerButtonItemHeight));
 
                                        if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || __style == TOOLBAR_TAB_WITH_TITLE)
                                        {
                                                __pButtonItems[RIGHT_BUTTON]->SetTouchMargin(leftTouchMargin, 0.0f, rightTouchMargin, 0.0f);
 
-                                               __itemArea.width -= (headerRightButtonWidth - leftTouchMargin - rightTouchMargin);
+                                               __itemArea.width -= (headerRightButtonWidth);
                                        }
                                        else
                                        {
                                                __pButtonItems[RIGHT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
 
-                                               __titleTextArea.width -= (headerRightButtonWidth - leftTouchMargin - rightTouchMargin);
-                                               __itemArea.width -= (headerRightButtonWidth - leftTouchMargin - rightTouchMargin);
+                                               __titleTextArea.width -= (headerRightButtonWidth);
+                                               __itemArea.width -= (headerRightButtonWidth);
                                        }
                                }
                                else
@@ -6650,7 +6690,7 @@ _Toolbar::RearrangeItems(void)
                                        }
                                        else
                                        {
-                                               __pButtonItems[RIGHT_BUTTON]->SetTouchMargin(0.0f, topTouchMargin, 0.0f, bottomTouchMargin);
+                                               //__pButtonItems[RIGHT_BUTTON]->SetTouchMargin(0.0f, topTouchMargin, 0.0f, bottomTouchMargin);
 
                                                __titleTextArea.width -= (headerRightButtonWidth);
                                                __itemArea.width -= (headerRightButtonWidth);
@@ -6662,21 +6702,21 @@ _Toolbar::RearrangeItems(void)
                {
                        if (__pButtonItems[LEFT_BUTTON]->GetText() == L"")
                        {
-                               __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerLeftButtonWidth  + rightTouchMargin, vmargin,
+                               __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerLeftButtonWidth, vmargin,
                                                headerLeftButtonWidth, headerButtonItemHeight));
 
                                if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || __style == TOOLBAR_TAB_WITH_TITLE)
                                {
                                        __pButtonItems[LEFT_BUTTON]->SetTouchMargin(leftTouchMargin, 0.0f, rightTouchMargin, 0.0f);
 
-                                       __itemArea.width -= (headerLeftButtonWidth - leftTouchMargin - rightTouchMargin);
+                                       __itemArea.width -= (headerLeftButtonWidth);
                                }
                                else
                                {
                                        __pButtonItems[LEFT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
 
-                                       __titleTextArea.width -= (headerLeftButtonWidth - leftTouchMargin - rightTouchMargin);
-                                       __itemArea.width -= (headerLeftButtonWidth - leftTouchMargin - rightTouchMargin);
+                                       __titleTextArea.width -= (headerLeftButtonWidth);
+                                       __itemArea.width -= (headerLeftButtonWidth);
                                }
                        }
                        else
@@ -6692,7 +6732,7 @@ _Toolbar::RearrangeItems(void)
                                }
                                else
                                {
-                                       __pButtonItems[LEFT_BUTTON]->SetTouchMargin(0.0f, topTouchMargin, 0.0f, bottomTouchMargin);
+                                       //__pButtonItems[LEFT_BUTTON]->SetTouchMargin(0.0f, topTouchMargin, 0.0f, bottomTouchMargin);
 
                                        __titleTextArea.width -= (headerLeftButtonWidth);
                                        __itemArea.width -= (headerLeftButtonWidth);
@@ -7113,19 +7153,43 @@ _Toolbar::RearrangeFooterSegmentedItems(void)
 
        rightMargin = leftMargin;
 
-       if (__itemCount == 1 || __itemCount == 2)
+       if (__itemCount == 1)
        {
-               leftMargin = footerLeftMargin;
-               itemButtonLeftGap = footerLeftMargin;
-               __itemArea.width -= ((leftMargin + iconSize + itemButtonLeftGap) * 2);
+               if (__pButtonItems[LEFT_BUTTON])
+               {
+                       if (__pButtonItems[RIGHT_BUTTON])
+                       {
+                               leftMargin = footerLeftMargin;
+                               itemButtonLeftGap = footerLeftMargin;
+                               __itemArea.width -= ((leftMargin + iconSize + itemButtonLeftGap) * 2);
+                       }
+                       else
+                       {
+                               leftMargin = footerLeftMargin;
+                               itemButtonLeftGap = footerLeftMargin;
+                               __itemArea.width -= (iconSize + itemButtonLeftGap + rightMargin);
+                       }
+               }
+               else
+               {
+                       if (__pButtonItems[RIGHT_BUTTON])
+                       {
+                               rightMargin = footerLeftMargin;
+                               itemButtonRightGap = footerLeftMargin;
+                               __itemArea.width -= (itemButtonRightGap + iconSize + rightMargin);
+                       }
 
-               blockWidth[0] = blockWidth[1] = (__itemArea.width - dividerWidth) / 2;
+                       iconSize = 0;
+                       leftMargin = 0;
+                       itemButtonLeftGap = 0;
+               }
+
+               blockWidth[0] = __itemArea.width;
+
+               __pItems.at(0)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0], segmentedItemHeight));
 
                for (int i = 0; i < __itemCount ; i++)
                {
-                       __pItems.at(i)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] * i + dividerWidth * i,
-                                       (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[i], segmentedItemHeight));
-
                        if (__pItems.at(i)->GetChildCount() != 0)
                        {
                                _Label* existingBadgeIcon = dynamic_cast<_Label*>(__pItems.at(i)->GetChild(0));
@@ -7141,7 +7205,7 @@ _Toolbar::RearrangeFooterSegmentedItems(void)
                GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_FONT_SIZE, GetOrientation(), fontSize);
                GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_MULTILINE_FONT_SIZE, GetOrientation(), multilineFontSize);
        }
-       else if (__itemCount == 3)
+       else if ( __itemCount == 2)
        {
                if (__pButtonItems[LEFT_BUTTON])
                {
@@ -7155,7 +7219,7 @@ _Toolbar::RearrangeFooterSegmentedItems(void)
                        {
                                leftMargin = footerLeftMargin;
                                itemButtonLeftGap = footerLeftMargin;
-                               __itemArea.width -= (leftMargin + iconSize + itemButtonLeftGap + rightMargin);
+                               __itemArea.width -= (iconSize + itemButtonLeftGap + rightMargin);
                        }
                }
                else
@@ -7164,14 +7228,66 @@ _Toolbar::RearrangeFooterSegmentedItems(void)
                        {
                                rightMargin = footerLeftMargin;
                                itemButtonRightGap = footerLeftMargin;
-                               __itemArea.width -= (leftMargin + itemButtonRightGap + iconSize + rightMargin);
+                               __itemArea.width -= (itemButtonRightGap + iconSize + rightMargin);
+                       }
+
+                       iconSize = 0;
+                       leftMargin = 0;
+                       itemButtonLeftGap = 0;
+               }
+
+               blockWidth[0] = blockWidth[1] = (__itemArea.width - dividerWidth) / 2;
+
+               __pItems.at(0)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0], segmentedItemHeight));
+               __pItems.at(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1], segmentedItemHeight));
+
+               for (int i = 0; i < __itemCount ; i++)
+               {
+                       if (__pItems.at(i)->GetChildCount() != 0)
+                       {
+                               _Label* existingBadgeIcon = dynamic_cast<_Label*>(__pItems.at(i)->GetChild(0));
+
+                               if (existingBadgeIcon)
+                               {
+                                       existingBadgeIcon->SetPosition(FloatPoint(blockWidth[i] - existingBadgeIcon->GetSizeF().width, 0));
+                                       existingBadgeIcon = null;
+                               }
+                       }
+               }
+
+               GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_FONT_SIZE, GetOrientation(), fontSize);
+               GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_MULTILINE_FONT_SIZE, GetOrientation(), multilineFontSize);
+       }
+       else if (__itemCount == 3)
+       {
+               if (__pButtonItems[LEFT_BUTTON])
+               {
+                       if (__pButtonItems[RIGHT_BUTTON])
+                       {
+                               leftMargin = footerLeftMargin;
+                               itemButtonLeftGap = footerLeftMargin;
+                               __itemArea.width -= ((leftMargin + iconSize + itemButtonLeftGap) * 2);
                        }
                        else
                        {
-                               __itemArea.width -= leftMargin * 2;
+                               leftMargin = footerLeftMargin;
+                               itemButtonLeftGap = footerLeftMargin;
+                               __itemArea.width -= (iconSize + itemButtonLeftGap + rightMargin);
+                       }
+               }
+               else
+               {
+                       if (__pButtonItems[RIGHT_BUTTON])
+                       {
+                               rightMargin = footerLeftMargin;
+                               itemButtonRightGap = footerLeftMargin;
+                               __itemArea.width -= (itemButtonRightGap + iconSize + rightMargin);
                        }
 
+
                        iconSize = 0;
+                       leftMargin = 0;
+                       itemButtonLeftGap = 0;
                }
 
                blockWidth[0] = blockWidth[1] = blockWidth[2] = (__itemArea.width - dividerWidth * 2) / 3;
@@ -7200,7 +7316,7 @@ _Toolbar::RearrangeFooterSegmentedItems(void)
        }
        else if (__itemCount == 4)
        {
-               __itemArea.width -= leftMargin * 2;
+               leftMargin = 0;
 
                blockWidth[0] = blockWidth[1] = blockWidth[2] = blockWidth[3] = (__itemArea.width - dividerWidth * 3) / 4;
 
@@ -7366,11 +7482,7 @@ result
 _Toolbar::RearrangeButtonItems(void)
 {
        float itemHeight = 0.0f;
-       float maxItemLength = 0.0f;
-       float minItemLength = 0.0f;
-       float iconSizeWithText = 0.0f;
        float sideMargin = 0.0f;
-       float topMargin = 0.0f;
        float itemButtonLeftGap = 0.0f;
        float itemButtonRightGap = 0.0f;
        float tabLeftMargin = 0.0f;
@@ -7388,20 +7500,12 @@ _Toolbar::RearrangeButtonItems(void)
        GET_SHAPE_CONFIG(FOOTER::LEFT_MARGIN, GetOrientation(), footerLeftMargin);
        GET_SHAPE_CONFIG(HEADER::TAB_LEFT_MARGIN, GetOrientation(), tabLeftMargin);
        GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_BUTTON_STYLE_SIDE_MARGIN, GetOrientation(), sideMargin);
-       GET_SHAPE_CONFIG(HEADER::BUTTON_ITEM_ICON_TOP_MARGIN, GetOrientation(), topMargin);
        GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_HEIGHT, GetOrientation(), segmentedItemHeight);
        GET_SHAPE_CONFIG(HEADER::LEFT_MARGIN, GetOrientation(), headerLeftMargin);
 
        float tabRightMargin = tabLeftMargin;
 
-       if (__style == TOOLBAR_TEXT || __style == TOOLBAR_ICON || __style == TOOLBAR_ICON_TEXT || __style == TOOLBAR_COMMAND)
-       {
-               GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_TEXT_HEIGHT, GetOrientation(), itemHeight);
-       }
-       else
-       {
-               itemHeight = GetSizeF().height;
-       }
+       itemHeight = GetSizeF().height;
 
        if (__itemCount == 1)
        {
@@ -7409,49 +7513,50 @@ _Toolbar::RearrangeButtonItems(void)
 
                if (__style == TOOLBAR_TITLE) // item 1, HEADER_STYLE_TITLE_BUTTON
                {
-                       blockWidth[0] = __titleTextArea.width;
-                       itemHeight = segmentedItemHeight;
-                       __pItems.at(0)->SetBounds(FloatRectangle(headerLeftMargin, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
-                       __pItems.at(0)->SetMargin(0.0f, 0.0f, 0.0f, 0.0f);
-               }
-               else
-               {
-                       GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_WIDTH_1_MAX, GetOrientation(), maxItemLength);
-                       GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_WIDTH_1_MIN, GetOrientation(), minItemLength);
-                       GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE_WITH_TEXT, GetOrientation(), iconSizeWithText);
-
-                       if (!(__pItems.at(0)->GetBitmap(_BUTTON_STATUS_NORMAL) == null
-                                       && __pItems.at(0)->GetBitmap(_BUTTON_STATUS_DISABLED) == null
-                                       && __pItems.at(0)->GetBitmap(_BUTTON_STATUS_PRESSED) == null
-                                       && __pItems.at(0)->GetBitmap(_BUTTON_STATUS_SELECTED) == null
-                                       && __pItems.at(0)->GetBitmap(_BUTTON_STATUS_HIGHLIGHTED) == null)) // at least 1 bitmap
+                       if (__pButtonItems[LEFT_BUTTON] || __pButtonItems[RIGHT_BUTTON])
                        {
-                               blockWidth[0] = textExtentSize_0 + iconSizeWithText + sideMargin * 3;
+                               blockWidth[0] = __itemArea.width + headerLeftMargin;
                        }
                        else
                        {
-                               blockWidth[0] = textExtentSize_0 + sideMargin * 2;
+                               blockWidth[0] = GetSizeF().width;
                        }
 
-                       if (blockWidth[0] > maxItemLength)
+                       __pItems.at(0)->SetBounds(FloatRectangle(0, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
+                       __pItems.at(0)->SetMargin(0.0f, 0.0f, 0.0f, 0.0f);
+               }
+               else
+               {
+                       if (__pButtonItems[LEFT_BUTTON])
                        {
-                               blockWidth[0] = maxItemLength;
+                               if (__pButtonItems[RIGHT_BUTTON])
+                               {
+                                       tabLeftMargin = footerLeftMargin;
+                                       itemButtonLeftGap = footerLeftMargin;
+                                       __itemArea.width -= ((tabLeftMargin + iconSize + itemButtonLeftGap) * 2);
+                               }
+                               else
+                               {
+                                       tabLeftMargin = footerLeftMargin;
+                                       itemButtonLeftGap = footerLeftMargin;
+                                       __itemArea.width -= (tabLeftMargin + iconSize + itemButtonLeftGap + tabRightMargin);
+                               }
                        }
-                       if (blockWidth[0] < minItemLength)
+                       else
                        {
-                               blockWidth[0] = minItemLength;
-                       }
-
-                       tabLeftMargin = footerLeftMargin;
-                       itemButtonLeftGap = footerLeftMargin;
-                       __itemArea.width -= ((tabLeftMargin + iconSize + itemButtonLeftGap) * 2);
+                               if (__pButtonItems[RIGHT_BUTTON])
+                               {
+                                       tabRightMargin = footerLeftMargin;
+                                       itemButtonRightGap = footerLeftMargin;
+                                       __itemArea.width -= (tabLeftMargin + itemButtonRightGap + iconSize + tabRightMargin);
+                               }
 
-                       if (blockWidth[0] > __itemArea.width)
-                       {
-                               blockWidth[0] = __itemArea.width;
+                               iconSize = 0;
                        }
 
-                       __pItems.at(0)->SetBounds(FloatRectangle((GetSizeF().width - blockWidth[0]) / 2, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
+                       blockWidth[0] = __itemArea.width;
+
+                       __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
                }
 
                for (int i = 0; i < __itemCount; i++)
@@ -7472,85 +7577,40 @@ _Toolbar::RearrangeButtonItems(void)
        }
        else if(__itemCount == 2)
        {
-               float itemGap = 0.0f;
-
                float textExtentSize_0 = __pItems.at(0)->GetTextExtentSizeF();
                float textExtentSize_1 = __pItems.at(1)->GetTextExtentSizeF();
 
-               GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_WIDTH_2_MAX, GetOrientation(), maxItemLength);
-               GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_WIDTH_2_MIN, GetOrientation(), minItemLength);
-               GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE_WITH_TEXT, GetOrientation(), iconSizeWithText);
-               GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_BUTTON_STYLE_ITEM_GAP, GetOrientation(), itemGap);
-
-               if (!(__pItems.at(0)->GetBitmap(_BUTTON_STATUS_NORMAL) == null
-                               && __pItems.at(0)->GetBitmap(_BUTTON_STATUS_DISABLED) == null
-                               && __pItems.at(0)->GetBitmap(_BUTTON_STATUS_PRESSED) == null
-                               && __pItems.at(0)->GetBitmap(_BUTTON_STATUS_SELECTED) == null
-                               && __pItems.at(0)->GetBitmap(_BUTTON_STATUS_HIGHLIGHTED) == null)) // at least 1 bitmap
-               {
-                       blockWidth[0] = textExtentSize_0 + iconSizeWithText + sideMargin * 3;
-               }
-               else
-               {
-                       blockWidth[0] = textExtentSize_0 + sideMargin * 2;
-               }
-
-               if (blockWidth[0] > maxItemLength)
-               {
-                       blockWidth[0] = maxItemLength;
-               }
-               if (blockWidth[0] < minItemLength)
-               {
-                       blockWidth[0] = minItemLength;
-               }
-
-               if (!(__pItems.at(1)->GetBitmap(_BUTTON_STATUS_NORMAL) == null
-                               && __pItems.at(1)->GetBitmap(_BUTTON_STATUS_DISABLED) == null
-                               && __pItems.at(1)->GetBitmap(_BUTTON_STATUS_PRESSED) == null
-                               && __pItems.at(1)->GetBitmap(_BUTTON_STATUS_SELECTED) == null
-                               && __pItems.at(1)->GetBitmap(_BUTTON_STATUS_HIGHLIGHTED) == null)) // at least 1 bitmap
+               if (__pButtonItems[LEFT_BUTTON])
                {
-                       blockWidth[1] = textExtentSize_1 + iconSizeWithText + sideMargin * 3;
+                       if (__pButtonItems[RIGHT_BUTTON])
+                       {
+                               tabLeftMargin = footerLeftMargin;
+                               itemButtonLeftGap = footerLeftMargin;
+                               __itemArea.width -= ((tabLeftMargin + iconSize + itemButtonLeftGap) * 2);
+                       }
+                       else
+                       {
+                               tabLeftMargin = footerLeftMargin;
+                               itemButtonLeftGap = footerLeftMargin;
+                               __itemArea.width -= (tabLeftMargin + iconSize + itemButtonLeftGap + tabRightMargin);
+                       }
                }
                else
                {
-                       blockWidth[1] = textExtentSize_1 + sideMargin * 2;
-               }
-
-               if (blockWidth[1] > maxItemLength)
-               {
-                       blockWidth[1] = maxItemLength;
-               }
-               if (blockWidth[1] < minItemLength)
-               {
-                       blockWidth[1] = minItemLength;
-               }
-
-               tabLeftMargin = footerLeftMargin;
-               itemButtonLeftGap = footerLeftMargin;
-               __itemArea.width -= ((tabLeftMargin + iconSize + itemButtonLeftGap) * 2);
-
-               if (blockWidth[0] > (__itemArea.width - itemGap * 2) / 2)
-               {
-                       blockWidth[0] = (__itemArea.width - itemGap * 2) / 2;
-               }
+                       if (__pButtonItems[RIGHT_BUTTON])
+                       {
+                               tabRightMargin = footerLeftMargin;
+                               itemButtonRightGap = footerLeftMargin;
+                               __itemArea.width -= (tabLeftMargin + itemButtonRightGap + iconSize + tabRightMargin);
+                       }
 
-               if (blockWidth[1] > (__itemArea.width - itemGap * 2) / 2)
-               {
-                       blockWidth[1] = (__itemArea.width - itemGap * 2) / 2;
+                       iconSize = 0;
                }
 
-               if (blockWidth[0] < blockWidth[1])
-               {
-                       blockWidth[0] = blockWidth[1];
-               }
-               else
-               {
-                       blockWidth[1] = blockWidth[0];
-               }
+               blockWidth[0] = blockWidth[1] = (__itemArea.width - dividerWidth * 1) / 2;
 
-               __pItems.at(0)->SetBounds(FloatRectangle(GetSizeF().width / 2 - itemGap - blockWidth[0], (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
-               __pItems.at(1)->SetBounds(FloatRectangle(GetSizeF().width / 2 + itemGap, (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
+               __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
+               __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
 
                for (int i = 0; i < __itemCount; i++)
                {

diff --git a/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp b/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp
index 32cbf83..763510b 100644 (file)
--- a/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp
@@ -227,17 +227,6 @@ _ToolbarPresenter::Draw(void)
                }
        }
 
-       if (style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || style == TOOLBAR_TAB_WITH_TITLE)
-       {
-               GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_HEIGHT, __pToolbar->GetOrientation(), dividerBaseHeight);
-               GET_SHAPE_CONFIG(HEADER::TITLE_HEIGHT_WITH_SEGMENTED_ITEM, __pToolbar->GetOrientation(), dividerTopMargin);
-       }
-       else
-       {
-               GET_SHAPE_CONFIG(HEADER::BUTTON_ITEM_ICON_SIZE, __pToolbar->GetOrientation(), dividerBaseHeight);
-               GET_SHAPE_CONFIG(HEADER::BUTTON_ITEM_ICON_TOP_MARGIN, __pToolbar->GetOrientation(), dividerTopMargin);
-       }
-
        GET_SHAPE_CONFIG(HEADER::DIVIDER_WIDTH, __pToolbar->GetOrientation(), buttonItemGap);
        GET_SHAPE_CONFIG(HEADER::DIVIDER_HEIGHT, __pToolbar->GetOrientation(), dividerHeight);
        GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_HEIGHT, __pToolbar->GetOrientation(), segmentedItemHeight);
@@ -295,6 +284,16 @@ _ToolbarPresenter::Draw(void)
                DrawTitleText(pCanvas);
        }
 
+       if (style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || style == TOOLBAR_TAB_WITH_TITLE)
+       {
+               GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_HEIGHT, __pToolbar->GetOrientation(), dividerBaseHeight);
+               GET_SHAPE_CONFIG(HEADER::TITLE_HEIGHT_WITH_SEGMENTED_ITEM, __pToolbar->GetOrientation(), dividerTopMargin);
+       }
+       else
+       {
+               GET_SHAPE_CONFIG(HEADER::HEIGHT, __pToolbar->GetOrientation(), dividerBaseHeight);
+       }
+
        if (style == TOOLBAR_TITLE || style == TOOLBAR_HEADER_SEGMENTED || style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE)
        {
                if (__pToolbar->GetButton(RIGHT_BUTTON))
@@ -323,6 +322,21 @@ _ToolbarPresenter::Draw(void)
                        }
                }
        }
+       else if (style == TOOLBAR_SEGMENTED || style == TOOLBAR_TEXT || style == TOOLBAR_ICON || style == TOOLBAR_ICON_TEXT || style == TOOLBAR_COMMAND)
+       {
+               if (__pToolbar->GetButton(RIGHT_BUTTON))
+               {
+                       //DrawDivider(FloatPoint(bounds.width - __pToolbar->GetButton(RIGHT_BUTTON)->GetBoundsF().width - buttonItemGap,
+                       //              dividerTopMargin + (dividerBaseHeight - dividerHeight) / 2), pCanvas);
+               }
+
+               if (__pToolbar->GetButton(LEFT_BUTTON))
+               {
+                       //DrawDivider(FloatPoint(__pToolbar->GetButton(LEFT_BUTTON)->GetBoundsF().width + buttonItemGap,
+                       //              dividerTopMargin + (dividerBaseHeight - dividerHeight) / 2), pCanvas);
+               }
+       }
+
 
        if (itemCount == 1)
        {
@@ -342,11 +356,8 @@ _ToolbarPresenter::Draw(void)
                {
                        for (int i = 0; i < itemCount - 1 ; i++)
                        {
-                               if (!(style == TOOLBAR_TEXT || style == TOOLBAR_ICON || style == TOOLBAR_ICON_TEXT || style == TOOLBAR_COMMAND))
-                               {
-                                       DrawDivider(FloatPoint(__pToolbar->GetItem(i)->GetBoundsF().x + __pToolbar->GetItem(i)->GetBoundsF().width,
-                                                       (__pToolbar->GetBoundsF().height - dividerHeight) / 2), pCanvas);
-                               }
+                               DrawDivider(FloatPoint(__pToolbar->GetItem(i)->GetBoundsF().x + __pToolbar->GetItem(i)->GetBoundsF().width,
+                                               (__pToolbar->GetBoundsF().height - dividerHeight) / 2), pCanvas);
                        }
                }
        }

diff --git a/src/ui/inc/FUi_ResourceFooterConfig.h b/src/ui/inc/FUi_ResourceFooterConfig.h
index 23be580..2a92723 100644 (file)
--- a/src/ui/inc/FUi_ResourceFooterConfig.h
+++ b/src/ui/inc/FUi_ResourceFooterConfig.h
@@ -123,6 +123,9 @@ DECLARE_UI_CONFIG(FOOTER);
        DECLARE_COLOR_CONFIG(MORE_ICON_DISABLED, 96);
        DECLARE_COLOR_CONFIG(MORE_ICON_PRESSED, 97);
        DECLARE_COLOR_CONFIG(MORE_ICON_HIGHLIGHTED, 98);
+       DECLARE_COLOR_CONFIG(SELECTED_BAR_BG_NORMAL, 99);
+       DECLARE_COLOR_CONFIG(SELECTED_BAR_TRANSLUCENT_BG_NORMAL, 100);
+
        // BITMAP
        DECLARE_IMAGE_CONFIG(BG_NORMAL, 1);
        DECLARE_IMAGE_CONFIG(TRANSLUCENT_BG_NORMAL, 2);

diff --git a/src/ui/inc/FUi_ResourceHeaderConfig.h b/src/ui/inc/FUi_ResourceHeaderConfig.h
index b566093..ab4b161 100644 (file)
--- a/src/ui/inc/FUi_ResourceHeaderConfig.h
+++ b/src/ui/inc/FUi_ResourceHeaderConfig.h
@@ -115,6 +115,8 @@ DECLARE_UI_CONFIG(HEADER);
        DECLARE_COLOR_CONFIG(BUTTON_ITEM_TRANSLUCENT_TEXT_DISABLED, 88);
        DECLARE_COLOR_CONFIG(BUTTON_ITEM_TRANSLUCENT_TEXT_PRESSED, 89);
        DECLARE_COLOR_CONFIG(BUTTON_ITEM_TRANSLUCENT_TEXT_HIGHLIGHTED, 90);
+       DECLARE_COLOR_CONFIG(SELECTED_BAR_BG_NORMAL, 91);
+       DECLARE_COLOR_CONFIG(SELECTED_BAR_TRANSLUCENT_BG_NORMAL, 92);
 
        // BITMAP
        DECLARE_IMAGE_CONFIG(BG_NORMAL, 1);
@@ -226,7 +228,7 @@ DECLARE_UI_CONFIG(HEADER);
        DECLARE_SHAPE_CONFIG(BUTTON_ITEM_HEIGHT, 28);
        DECLARE_SHAPE_CONFIG(BUTTON_ITEM_GAP, 29);
        DECLARE_SHAPE_CONFIG(BUTTON_ITEM_TOP_MARGIN, 30);
-       DECLARE_SHAPE_CONFIG(BUTTON_ITEM_ICON_TOP_MARGIN, 31);
+       //DECLARE_SHAPE_CONFIG(BUTTON_ITEM_ICON_TOP_MARGIN, 31);
        DECLARE_SHAPE_CONFIG(BUTTON_ITEM_ICON_SIZE, 32);
        DECLARE_SHAPE_CONFIG(BUTTON_ITEM_LEFT_TOUCH_MARGIN, 33);
        DECLARE_SHAPE_CONFIG(BUTTON_ITEM_TOP_TOUCH_MARGIN, 34);
@@ -268,6 +270,8 @@ DECLARE_UI_CONFIG(HEADER);
        DECLARE_SHAPE_CONFIG(SEGMENTED_ITEM_MULTILINE_FONT_SIZE, 70);
        DECLARE_SHAPE_CONFIG(TAB_ITEM_MULTILINE_FONT_SIZE, 71);
        DECLARE_SHAPE_CONFIG(TAB_LARGE_HEIGHT, 72);
+       DECLARE_SHAPE_CONFIG(TAB_LARGE_TOP_MARGIN, 73);
+       DECLARE_SHAPE_CONFIG(TAB_LARGE_TEXT_HEIGHT, 74);
 
 DECLARE_END_UI_CONFIG(HEADER);
 

diff --git a/src/ui/resource/FUi_ResourceFooterConfig.cpp b/src/ui/resource/FUi_ResourceFooterConfig.cpp
index ccca844..f118d93 100644 (file)
--- a/src/ui/resource/FUi_ResourceFooterConfig.cpp
+++ b/src/ui/resource/FUi_ResourceFooterConfig.cpp
@@ -63,15 +63,15 @@ START_UI_CONFIG(FOOTER);
 
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_NORMAL, $B052L6);
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_DISABLED, $B052L6);
-       ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_PRESSED, $B052L6P);
+       ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_PRESSED, $B052L6);
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_HIGHLIGHTED, $B052L6);
-       ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_SELECTED, $B052L6P);
+       ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_SELECTED, $B052L6);
 
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_NORMAL, $B052L8);
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_DISABLED, $B052L8);
-       ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_PRESSED, $B052L8P);
+       ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_PRESSED, $B052L8);
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_HIGHLIGHTED, $B052L8);
-       ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_SELECTED, $B052L8P);
+       ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_SELECTED, $B052L8);
 
        ADD_COLOR_CONFIG(TAB_ITEM_BG_NORMAL, $B0515L1);
        ADD_COLOR_CONFIG(TAB_ITEM_BG_DISABLED, $B0515L1);
@@ -87,19 +87,19 @@ START_UI_CONFIG(FOOTER);
 
        ADD_COLOR_CONFIG(TAB_ITEM_TEXT_NORMAL, $B052L6);
        ADD_COLOR_CONFIG(TAB_ITEM_TEXT_DISABLED, $B052L6);
-       ADD_COLOR_CONFIG(TAB_ITEM_TEXT_PRESSED, $B052L6P);
+       ADD_COLOR_CONFIG(TAB_ITEM_TEXT_PRESSED, $B052L6);
        ADD_COLOR_CONFIG(TAB_ITEM_TEXT_HIGHLIGHTED, $B052L6);
-       ADD_COLOR_CONFIG(TAB_ITEM_TEXT_SELECTED, $B052L6P);
+       ADD_COLOR_CONFIG(TAB_ITEM_TEXT_SELECTED, $B052L6);
 
        ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_NORMAL, $B052L8);
        ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_DISABLED, $B052L8D);
-       ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_PRESSED, $B052L8P);
+       ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_PRESSED, $B052L8);
        ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_HIGHLIGHTED, $B052L8);
-       ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_SELECTED, $B052L8P);
+       ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_SELECTED, $B052L8);
 
-       ADD_COLOR_CONFIG(BUTTON_ITEM_BG_NORMAL, $W011);
-       ADD_COLOR_CONFIG(BUTTON_ITEM_BG_DISABLED, $W011);
-       ADD_COLOR_CONFIG(BUTTON_ITEM_BG_PRESSED, $B042);
+       ADD_COLOR_CONFIG(BUTTON_ITEM_BG_NORMAL, $B0515L1);
+       ADD_COLOR_CONFIG(BUTTON_ITEM_BG_DISABLED, $B0515L1);
+       ADD_COLOR_CONFIG(BUTTON_ITEM_BG_PRESSED, $B0511P);
        ADD_COLOR_CONFIG(BUTTON_ITEM_BG_HIGHLIGHTED, $W161);
 
        ADD_COLOR_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_NORMAL, $B013);
@@ -150,6 +150,9 @@ START_UI_CONFIG(FOOTER);
        ADD_COLOR_CONFIG(MORE_ICON_PRESSED, $B052L1P);
        ADD_COLOR_CONFIG(MORE_ICON_HIGHLIGHTED, $B052L1);
 
+       ADD_COLOR_CONFIG(SELECTED_BAR_BG_NORMAL, $B052L6P);
+       ADD_COLOR_CONFIG(SELECTED_BAR_TRANSLUCENT_BG_NORMAL, $B052L6P);
+
        // BITMAP
        ADD_IMAGE_CONFIG(BG_NORMAL, #00_toolbar_bg.#.png);
        ADD_IMAGE_CONFIG(TRANSLUCENT_BG_NORMAL, #00_toolbar_bg.#.png);
@@ -350,13 +353,13 @@ START_UI_CONFIG(FOOTER);
                ADD_SHAPE_CONFIG(FOOTER_ITEM_WIDTH_1_MIN, 182);
                ADD_SHAPE_CONFIG(FOOTER_ITEM_WIDTH_2_MAX, 240);
                ADD_SHAPE_CONFIG(FOOTER_ITEM_WIDTH_2_MIN, 182);
-               ADD_SHAPE_CONFIG(BUTTON_ITEM_WIDTH, 85);
+               ADD_SHAPE_CONFIG(BUTTON_ITEM_WIDTH, 115);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_HEIGHT, 98);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_ICON_SIZE, 63);
-               ADD_SHAPE_CONFIG(BUTTON_ITEM_LEFT_TOUCH_MARGIN, 11);
-               ADD_SHAPE_CONFIG(BUTTON_ITEM_TOP_TOUCH_MARGIN, 18);
-               ADD_SHAPE_CONFIG(BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 11);
-               ADD_SHAPE_CONFIG(BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 17);
+               ADD_SHAPE_CONFIG(BUTTON_ITEM_LEFT_TOUCH_MARGIN, 26);
+               ADD_SHAPE_CONFIG(BUTTON_ITEM_TOP_TOUCH_MARGIN, 17.5);
+               ADD_SHAPE_CONFIG(BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 26);
+               ADD_SHAPE_CONFIG(BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 17.5);
                ADD_SHAPE_CONFIG(SOFTKEY_HEIGHT, 117);//720x1280
                ADD_SHAPE_CONFIG(SOFTKEY_TEXT_SIZE, 42);
                ADD_SHAPE_CONFIG(SOFTKEY_MULTILINE_TEXT_SIZE, 38);
@@ -402,12 +405,12 @@ START_UI_CONFIG(FOOTER);
                ADD_SHAPE_CONFIG(FOOTER_ITEM_WIDTH_1_MIN, 330);//1280x720
                ADD_SHAPE_CONFIG(FOOTER_ITEM_WIDTH_2_MAX, 496);
                ADD_SHAPE_CONFIG(FOOTER_ITEM_WIDTH_2_MIN, 330);
-               ADD_SHAPE_CONFIG(BUTTON_ITEM_WIDTH, 85);
+               ADD_SHAPE_CONFIG(BUTTON_ITEM_WIDTH, 115);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_HEIGHT, 85);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_ICON_SIZE, 63);
-               ADD_SHAPE_CONFIG(BUTTON_ITEM_LEFT_TOUCH_MARGIN, 11);
+               ADD_SHAPE_CONFIG(BUTTON_ITEM_LEFT_TOUCH_MARGIN, 26);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_TOP_TOUCH_MARGIN, 11);
-               ADD_SHAPE_CONFIG(BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 11);
+               ADD_SHAPE_CONFIG(BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 26);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 11);
                ADD_SHAPE_CONFIG(SOFTKEY_HEIGHT, 117);
                ADD_SHAPE_CONFIG(SOFTKEY_TEXT_SIZE, 42);

diff --git a/src/ui/resource/FUi_ResourceHeaderConfig.cpp b/src/ui/resource/FUi_ResourceHeaderConfig.cpp
index 8ee481a..ce1c022 100644 (file)
--- a/src/ui/resource/FUi_ResourceHeaderConfig.cpp
+++ b/src/ui/resource/FUi_ResourceHeaderConfig.cpp
@@ -68,15 +68,15 @@ START_UI_CONFIG(HEADER);
 
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_NORMAL, $B052L6);
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_DISABLED, $B052L6);
-       ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_PRESSED, $B052L6P);
+       ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_PRESSED, $B052L6);
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_HIGHLIGHTED, $B052L6);
-       ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_SELECTED, $B052L6P);
+       ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_SELECTED, $B052L6);
 
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_NORMAL, $B052L8);
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_DISABLED, $B052L8D);
-       ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_PRESSED, $B052L8P);
+       ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_PRESSED, $B052L8);
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_HIGHLIGHTED, $B052L8);
-       ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_SELECTED, $B052L8P);
+       ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_SELECTED, $B052L8);
 
        ADD_COLOR_CONFIG(TAB_ITEM_BG_NORMAL, $B0511);
        ADD_COLOR_CONFIG(TAB_ITEM_BG_DISABLED, $B0511);
@@ -92,19 +92,19 @@ START_UI_CONFIG(HEADER);
 
        ADD_COLOR_CONFIG(TAB_ITEM_TEXT_NORMAL, $B052L6);
        ADD_COLOR_CONFIG(TAB_ITEM_TEXT_DISABLED, $B052L6);
-       ADD_COLOR_CONFIG(TAB_ITEM_TEXT_PRESSED, $B052L6P);
+       ADD_COLOR_CONFIG(TAB_ITEM_TEXT_PRESSED, $B052L6);
        ADD_COLOR_CONFIG(TAB_ITEM_TEXT_HIGHLIGHTED, $B052L6);
-       ADD_COLOR_CONFIG(TAB_ITEM_TEXT_SELECTED, $B052L6P);
+       ADD_COLOR_CONFIG(TAB_ITEM_TEXT_SELECTED, $B052L6);
 
        ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_NORMAL, $B052L8);
        ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_DISABLED, $B052L8D);
-       ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_PRESSED, $B052L8P);
+       ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_PRESSED, $B052L8);
        ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_HIGHLIGHTED, $B052L8);
-       ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_SELECTED, $B052L8P);
+       ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_SELECTED, $B052L8);
 
-       ADD_COLOR_CONFIG(BUTTON_ITEM_BG_NORMAL, $W011);
-       ADD_COLOR_CONFIG(BUTTON_ITEM_BG_DISABLED, $W011);
-       ADD_COLOR_CONFIG(BUTTON_ITEM_BG_PRESSED, $B042);
+       ADD_COLOR_CONFIG(BUTTON_ITEM_BG_NORMAL, $B0511);
+       ADD_COLOR_CONFIG(BUTTON_ITEM_BG_DISABLED, $B0511);
+       ADD_COLOR_CONFIG(BUTTON_ITEM_BG_PRESSED, $B0514P1);
        ADD_COLOR_CONFIG(BUTTON_ITEM_BG_HIGHLIGHTED, $W161);
 
        ADD_COLOR_CONFIG(BUTTON_ITEM_TRANSLUCENT_BG_NORMAL, $B013);
@@ -131,6 +131,9 @@ START_UI_CONFIG(HEADER);
        ADD_COLOR_CONFIG(DIVIDER_LINE_LEFT_TRANSLUCENT_NORMAL, $B0227);
        ADD_COLOR_CONFIG(DIVIDER_LINE_RIGHT_TRANSLUCENT_NORMAL, $B0228);
 
+       ADD_COLOR_CONFIG(SELECTED_BAR_BG_NORMAL, $B052L6P);
+       ADD_COLOR_CONFIG(SELECTED_BAR_TRANSLUCENT_BG_NORMAL, $B052L6P);
+
        // BITMAP
        ADD_IMAGE_CONFIG(BG_NORMAL, #00_title_bg.#.png);
        ADD_IMAGE_CONFIG(TRANSLUCENT_BG_NORMAL, #00_title_bg.#.png);
@@ -291,13 +294,13 @@ START_UI_CONFIG(HEADER);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_HEIGHT, 96);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_GAP, 2);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_TOP_MARGIN, 0);
-               ADD_SHAPE_CONFIG(BUTTON_ITEM_ICON_TOP_MARGIN, 10.5);
+               //ADD_SHAPE_CONFIG(BUTTON_ITEM_ICON_TOP_MARGIN, 0);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_ICON_SIZE, 63);
 
-               ADD_SHAPE_CONFIG(BUTTON_ITEM_LEFT_TOUCH_MARGIN, 0);
-               ADD_SHAPE_CONFIG(BUTTON_ITEM_TOP_TOUCH_MARGIN, 0);
-               ADD_SHAPE_CONFIG(BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 0);
-               ADD_SHAPE_CONFIG(BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 0);
+               ADD_SHAPE_CONFIG(BUTTON_ITEM_LEFT_TOUCH_MARGIN, 26);
+               ADD_SHAPE_CONFIG(BUTTON_ITEM_TOP_TOUCH_MARGIN, 16.5);
+               ADD_SHAPE_CONFIG(BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 26);
+               ADD_SHAPE_CONFIG(BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 16.5);
 
                ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_LEFT_TOUCH_MARGIN, 26);
                ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_TOP_TOUCH_MARGIN, 16.5);
@@ -341,6 +344,8 @@ START_UI_CONFIG(HEADER);
                ADD_SHAPE_CONFIG(COMMON_MINIMUM_MARGIN, 8);
 
                ADD_SHAPE_CONFIG(TAB_LARGE_HEIGHT, 126);
+               ADD_SHAPE_CONFIG(TAB_LARGE_TOP_MARGIN, 15);
+               ADD_SHAPE_CONFIG(TAB_LARGE_TEXT_HEIGHT, 34);
 
        END_UI_CONFIG_MODE(720x1280);
 
@@ -382,13 +387,13 @@ START_UI_CONFIG(HEADER);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_HEIGHT, 91);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_GAP, 2);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_TOP_MARGIN, 0);
-               ADD_SHAPE_CONFIG(BUTTON_ITEM_ICON_TOP_MARGIN, 8);
+               //ADD_SHAPE_CONFIG(BUTTON_ITEM_ICON_TOP_MARGIN, 0);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_ICON_SIZE, 63);
 
-               ADD_SHAPE_CONFIG(BUTTON_ITEM_LEFT_TOUCH_MARGIN, 0);
-               ADD_SHAPE_CONFIG(BUTTON_ITEM_TOP_TOUCH_MARGIN, 0);
-               ADD_SHAPE_CONFIG(BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 0);
-               ADD_SHAPE_CONFIG(BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 0);
+               ADD_SHAPE_CONFIG(BUTTON_ITEM_LEFT_TOUCH_MARGIN, 26);
+               ADD_SHAPE_CONFIG(BUTTON_ITEM_TOP_TOUCH_MARGIN, 14);
+               ADD_SHAPE_CONFIG(BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 26);
+               ADD_SHAPE_CONFIG(BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 14);
 
                ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_LEFT_TOUCH_MARGIN, 26);
                ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_TOP_TOUCH_MARGIN, 14);
@@ -432,6 +437,8 @@ START_UI_CONFIG(HEADER);
                ADD_SHAPE_CONFIG(COMMON_MINIMUM_MARGIN, 8);
 
                ADD_SHAPE_CONFIG(TAB_LARGE_HEIGHT, 126);
+               ADD_SHAPE_CONFIG(TAB_LARGE_TOP_MARGIN, 15);
+               ADD_SHAPE_CONFIG(TAB_LARGE_TEXT_HEIGHT, 34);
 
        END_UI_CONFIG_MODE(1280x720);
 }