remove button touchmargin

Change-Id: I5e67c152e8ef083459a5e9537370ed542840c24e

diff --git a/src/ui/controls/FUiCtrl_Button.cpp b/src/ui/controls/FUiCtrl_Button.cpp
index 8a278f6..790a484 100644 (file)
--- a/src/ui/controls/FUiCtrl_Button.cpp
+++ b/src/ui/controls/FUiCtrl_Button.cpp
@@ -62,10 +62,6 @@ _Button::_Button()
        , __topMargin(0.0f)
        , __rightMargin(0.0f)
        , __bottomMargin(0.0f)
-       , __leftTouchMargin(0.0f)
-       , __topTouchMargin(0.0f)
-       , __rightTouchMargin(0.0f)
-       , __bottomTouchMargin(0.0f)
        , __userDefinedTextArea(0.0f, 0.0f, 0.0f, 0.0f)
        , __pTextElement(null)
 {
@@ -865,7 +861,7 @@ _Button::GetBitmapPosition(_ButtonStatus status) const
 FloatPoint
 _Button::GetBitmapPositionF(_ButtonStatus status) const
 {
-       return FloatPoint(__bitmapPosition[status].x + __leftTouchMargin, __bitmapPosition[status].y + __topTouchMargin);
+       return FloatPoint(__bitmapPosition[status].x, __bitmapPosition[status].y);
 }
 
 result
@@ -915,7 +911,7 @@ _Button::GetEffectBitmapPosition(_ButtonStatus status) const
 FloatPoint
 _Button::GetEffectBitmapPositionF(_ButtonStatus status) const
 {
-       return FloatPoint(__effectBitmapPosition[status].x + __leftTouchMargin, __effectBitmapPosition[status].y + __topTouchMargin);
+       return FloatPoint(__effectBitmapPosition[status].x, __effectBitmapPosition[status].y);
 }
 
 result
@@ -1573,8 +1569,8 @@ _Button::GetContentSizeInternalF(bool horizontalMode, bool verticalMode) const
 
        pTextObject->SetBounds(previousRect);
 
-       dimension.width += __leftMargin * 4 - __leftTouchMargin - __rightTouchMargin;
-       dimension.height += __topMargin * 4 - __topTouchMargin - __bottomTouchMargin;
+       dimension.width += __leftMargin * 4;
+       dimension.height += __topMargin * 4;
 
        for (int i = 0; i < NUMBER_OF_BUTTON_STATUS; i++)
        {
@@ -1622,76 +1618,6 @@ _Button::GetTextExtentSizeF(void) const
 }
 
 result
-_Button::SetTouchMargin(int leftTouchMargin, int topTouchMargin, int rightTouchMargin, int bottomTouchMargin)
-{
-       float floatLeftTouchMargin = _CoordinateSystemUtils::ConvertToFloat(leftTouchMargin);
-       float floatTopTouchMargin = _CoordinateSystemUtils::ConvertToFloat(topTouchMargin);
-       float floatRightTouchMargin = _CoordinateSystemUtils::ConvertToFloat(rightTouchMargin);
-       float floatBottomTouchMargin = _CoordinateSystemUtils::ConvertToFloat(bottomTouchMargin);
-
-       return SetTouchMargin(floatLeftTouchMargin, floatTopTouchMargin, floatRightTouchMargin, floatBottomTouchMargin);
-}
-
-result
-_Button::SetTouchMargin(float leftTouchMargin, float topTouchMargin, float rightTouchMargin, float bottomTouchMargin)
-{
-       __leftTouchMargin = leftTouchMargin;
-       __topTouchMargin = topTouchMargin;
-       __rightTouchMargin = rightTouchMargin;
-       __bottomTouchMargin = bottomTouchMargin;
-
-       return E_SUCCESS;
-}
-
-int
-_Button::GetLeftTouchMargin(void) const
-{
-       return _CoordinateSystemUtils::ConvertToInteger(GetLeftTouchMarginF());
-}
-
-float
-_Button::GetLeftTouchMarginF(void) const
-{
-       return __leftTouchMargin;
-}
-
-int
-_Button::GetTopTouchMargin(void) const
-{
-       return _CoordinateSystemUtils::ConvertToInteger(GetTopTouchMarginF());
-}
-
-float
-_Button::GetTopTouchMarginF(void) const
-{
-       return __topTouchMargin;
-}
-
-int
-_Button::GetRightTouchMargin(void) const
-{
-       return _CoordinateSystemUtils::ConvertToInteger(GetRightTouchMarginF());
-}
-
-float
-_Button::GetRightTouchMarginF(void) const
-{
-       return __rightTouchMargin;
-}
-
-int
-_Button::GetBottomTouchMargin(void) const
-{
-       return _CoordinateSystemUtils::ConvertToInteger(GetBottomTouchMarginF());
-}
-
-float
-_Button::GetBottomTouchMarginF(void) const
-{
-       return __bottomTouchMargin;
-}
-
-result
 _Button::SetMultilineTextSize(const Variant& textSize)
 {
        result r = E_SUCCESS;

diff --git a/src/ui/controls/FUiCtrl_ButtonPresenter.cpp b/src/ui/controls/FUiCtrl_ButtonPresenter.cpp
index 7403616..393cc57 100644 (file)
--- a/src/ui/controls/FUiCtrl_ButtonPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ButtonPresenter.cpp
@@ -155,11 +155,6 @@ _ButtonPresenter::InitTextObject(void)
        float rightMargin = __pButton->GetRightMarginF();
        float bottomMargin = __pButton->GetBottomMarginF();
 
-       float leftTouchMargin = __pButton->GetLeftTouchMarginF();
-       float topTouchMargin = __pButton->GetTopTouchMarginF();
-       float rightTouchMargin = __pButton->GetRightTouchMarginF();
-       float bottomTouchMargin = __pButton->GetBottomTouchMarginF();
-
        __pTextObject->RemoveAll(true);
 
        pSimpleText = new (std::nothrow) TextSimple(const_cast<wchar_t*>(__pButton->GetText().GetPointer()), __pButton->GetText().GetLength());
@@ -171,9 +166,9 @@ _ButtonPresenter::InitTextObject(void)
        SetTextSize(__pButton->GetTextSizeF());
        __pTextObject->SetFont(__pFont, 0, __pTextObject->GetTextLength());
        __pTextObject->SetAlignment(TEXT_OBJECT_ALIGNMENT_CENTER | TEXT_OBJECT_ALIGNMENT_MIDDLE);
-       __pTextObject->SetBounds(FloatRectangle(leftMargin + leftTouchMargin, topMargin + topTouchMargin,
-                       __pButton->GetBoundsF().width - (leftMargin + rightMargin) - (leftTouchMargin + rightTouchMargin),
-                       __pButton->GetBoundsF().height - (topMargin + bottomMargin) - (topTouchMargin + bottomTouchMargin)));
+       __pTextObject->SetBounds(FloatRectangle(leftMargin, topMargin,
+                       __pButton->GetBoundsF().width - (leftMargin + rightMargin),
+                       __pButton->GetBoundsF().height - (topMargin + bottomMargin)));
        __pTextObject->Compose();
 
        return E_SUCCESS;
@@ -324,13 +319,8 @@ _ButtonPresenter::DrawBackground(void)
        Color bgColor = __pButton->GetBackgroundColor();
        String imagePath = L"";
 
-       float leftTouchMargin = __pButton->GetLeftTouchMarginF();
-       float topTouchMargin = __pButton->GetTopTouchMarginF();
-       float rightTouchMargin = __pButton->GetRightTouchMarginF();
-       float bottomTouchMargin = __pButton->GetBottomTouchMarginF();
-
-       FloatRectangle bounds(leftTouchMargin, topTouchMargin, __pButton->GetBoundsF().width - (leftTouchMargin + rightTouchMargin)
-                       , __pButton->GetBoundsF().height - (topTouchMargin + bottomTouchMargin));
+       FloatRectangle bounds(0, 0, __pButton->GetBoundsF().width,
+                       __pButton->GetBoundsF().height);
 
        _ButtonStatus status = __pButton->GetButtonStatus();
 
@@ -659,18 +649,12 @@ _ButtonPresenter::DrawToolbarItemBackground(void)
        pCanvas->SetBackgroundColor(Color(0, 0, 0, 0));
        pCanvas->Clear();
 
-       float leftTouchMargin = __pButton->GetLeftTouchMarginF();
-       float topTouchMargin = __pButton->GetTopTouchMarginF();
-       float rightTouchMargin = __pButton->GetRightTouchMarginF();
-       float bottomTouchMargin = __pButton->GetBottomTouchMarginF();
-
        _ButtonStatus status = __pButton->GetButtonStatus();
        Bitmap* pToolbarItemBackgroundBitmap = __pButton->GetToolbarItemBackgroundBitmap(status);
 
        if (pToolbarItemBackgroundBitmap)
        {
-               FloatRectangle bounds(leftTouchMargin, topTouchMargin, __pButton->GetBoundsF().width - (leftTouchMargin + rightTouchMargin),
-                               __pButton->GetBoundsF().height - (topTouchMargin + bottomTouchMargin));
+               FloatRectangle bounds(0, 0, __pButton->GetBoundsF().width, __pButton->GetBoundsF().height);
 
                if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pToolbarItemBackgroundBitmap))
                {
@@ -718,13 +702,7 @@ _ButtonPresenter::DrawBitmap(void)
        Bitmap* pEffectBitmap = __pButton->GetEffectBitmap(status);
        Bitmap* pNormalEffectBitmap = __pButton->GetEffectBitmap(_BUTTON_STATUS_NORMAL);
 
-       float leftTouchMargin = __pButton->GetLeftTouchMarginF();
-       float topTouchMargin = __pButton->GetTopTouchMarginF();
-       float rightTouchMargin = __pButton->GetRightTouchMarginF();
-       float bottomTouchMargin = __pButton->GetBottomTouchMarginF();
-
-       FloatRectangle bounds(leftTouchMargin, topTouchMargin, __pButton->GetBoundsF().width - (leftTouchMargin + rightTouchMargin),
-                       __pButton->GetBoundsF().height - (topTouchMargin + bottomTouchMargin));
+       FloatRectangle bounds(0, 0, __pButton->GetBoundsF().width, __pButton->GetBoundsF().height);
 
        if (pBitmap)
        {
@@ -736,8 +714,8 @@ _ButtonPresenter::DrawBitmap(void)
                        return;
                }
 
-               if (__pButton->GetSizeF().width - __pButton->GetBitmapPositionF(status).x - rightTouchMargin < pBitmap->GetWidthF()
-                               || __pButton->GetSizeF().height - __pButton->GetBitmapPositionF(status).y - bottomTouchMargin < pBitmap->GetHeightF())
+               if (__pButton->GetSizeF().width - __pButton->GetBitmapPositionF(status).x < pBitmap->GetWidthF()
+                               || __pButton->GetSizeF().height - __pButton->GetBitmapPositionF(status).y < pBitmap->GetHeightF())
                {
                        pCanvas->DrawBitmap(bounds, *pBitmap, FloatRectangle(0.0f, 0.0f, pBitmap->GetWidthF(), pBitmap->GetHeightF()));
 
@@ -767,8 +745,8 @@ _ButtonPresenter::DrawBitmap(void)
                        return;
                }
 
-               if (__pButton->GetSizeF().width - __pButton->GetBitmapPositionF(_BUTTON_STATUS_NORMAL).x - rightTouchMargin < pNormalBitmap->GetWidthF()
-                               || __pButton->GetSizeF().height - __pButton->GetBitmapPositionF(_BUTTON_STATUS_NORMAL).y - bottomTouchMargin < pNormalBitmap->GetHeightF())
+               if (__pButton->GetSizeF().width - __pButton->GetBitmapPositionF(_BUTTON_STATUS_NORMAL).x < pNormalBitmap->GetWidthF()
+                               || __pButton->GetSizeF().height - __pButton->GetBitmapPositionF(_BUTTON_STATUS_NORMAL).y < pNormalBitmap->GetHeightF())
                {
                        pCanvas->DrawBitmap(bounds, *pNormalBitmap, FloatRectangle(0.0f, 0.0f, pNormalBitmap->GetWidthF(), pNormalBitmap->GetHeightF()));
 
@@ -806,11 +784,6 @@ _ButtonPresenter::DrawText(void)
        float rightMargin = __pButton->GetRightMarginF();
        float bottomMargin = __pButton->GetBottomMarginF();
 
-       float leftTouchMargin = __pButton->GetLeftTouchMarginF();
-       float topTouchMargin = __pButton->GetTopTouchMarginF();
-       float rightTouchMargin = __pButton->GetRightTouchMarginF();
-       float bottomTouchMargin = __pButton->GetBottomTouchMarginF();
-
        Canvas* pCanvas = __pButton->GetCanvasN();
        if (pCanvas == null)
        {
@@ -846,9 +819,9 @@ _ButtonPresenter::DrawText(void)
        //pSimpleText = new (std::nothrow) TextSimple(const_cast<wchar_t*>(__pButton->GetText().GetPointer()), __pButton->GetText().GetLength());
        //__pTextObject->AppendElement(*pSimpleText);
 
-       __textRect = FloatRectangle(leftMargin + leftTouchMargin, topMargin + topTouchMargin,
-                       __pButton->GetBoundsF().width - (leftMargin + rightMargin) - (leftTouchMargin + rightTouchMargin),
-                       __pButton->GetBoundsF().height - (topMargin + bottomMargin) - (topTouchMargin + bottomTouchMargin));
+       __textRect = FloatRectangle(leftMargin, topMargin,
+                       __pButton->GetBoundsF().width - (leftMargin + rightMargin),
+                       __pButton->GetBoundsF().height - (topMargin + bottomMargin));
 
        if (__pButton->UserDefinedText())
        {
@@ -912,10 +885,6 @@ _ButtonPresenter::DrawUnderlineBitmap(void)
        float selectedBitmapHeight = 0.0f;
        float segmentedHeight = 0.0f;
 
-       float leftTouchMargin = __pButton->GetLeftTouchMarginF();
-       float rightTouchMargin = __pButton->GetRightTouchMarginF();
-       float bottomTouchMargin = __pButton->GetBottomTouchMarginF();
-
        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);
@@ -932,9 +901,9 @@ _ButtonPresenter::DrawUnderlineBitmap(void)
                        return;
                }
 
-               FloatRectangle bounds(selectedBitmapMargin + leftTouchMargin,
-                               __pButton->GetBoundsF().height -  bottomTouchMargin - selectedBitmapHeight,
-                               __pButton->GetBoundsF().width - selectedBitmapMargin * 2 - (leftTouchMargin + rightTouchMargin), selectedBitmapHeight + 1);
+               FloatRectangle bounds(selectedBitmapMargin,
+                               __pButton->GetBoundsF().height - selectedBitmapHeight,
+                               __pButton->GetBoundsF().width - selectedBitmapMargin * 2, selectedBitmapHeight + 1);
 
                if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pUnderlineBitmap))
                {
@@ -955,11 +924,6 @@ _ButtonPresenter::DrawUnderlineBitmap(void)
 void
 _ButtonPresenter::DrawSubTitleEffectBitmap(void)
 {
-       float leftTouchMargin = __pButton->GetLeftTouchMarginF();
-       float topTouchMargin = __pButton->GetTopTouchMarginF();
-       float rightTouchMargin = __pButton->GetRightTouchMarginF();
-       float bottomTouchMargin = __pButton->GetBottomTouchMarginF();
-
        Bitmap* pSubTitleEffectBitmap = __pButton->GetSubTitleEffectBitmap();
 
        if (pSubTitleEffectBitmap)
@@ -972,8 +936,7 @@ _ButtonPresenter::DrawSubTitleEffectBitmap(void)
                        return;
                }
 
-               FloatRectangle bounds(leftTouchMargin, topTouchMargin,
-                               __pButton->GetBoundsF().width - (leftTouchMargin + rightTouchMargin), __pButton->GetBoundsF().height - (topTouchMargin + bottomTouchMargin));
+               FloatRectangle bounds(0, 0, __pButton->GetBoundsF().width, __pButton->GetBoundsF().height);
 
                if (_BitmapImpl::CheckNinePatchedBitmapStrictly(*pSubTitleEffectBitmap))
                {

diff --git a/src/ui/controls/FUiCtrl_SearchBar.cpp b/src/ui/controls/FUiCtrl_SearchBar.cpp
index f6b48fb..ce980b9 100644 (file)
--- a/src/ui/controls/FUiCtrl_SearchBar.cpp
+++ b/src/ui/controls/FUiCtrl_SearchBar.cpp
@@ -2797,7 +2797,7 @@ _SearchBar::RecalculateButtonBounds(void)
        cancelButtonBounds.height = buttonHeight;
 
        float searchFieldMinHeight = searchBarMinHeight - (verticalMargin * 2.0f);
-       cancelButtonWidth = __pCancelButton->GetTextExtentSizeF() + __pCancelButton->GetRightTouchMarginF() + __pCancelButton->GetLeftTouchMarginF() + __pCancelButton->GetRightMarginF() + __pCancelButton->GetLeftMarginF();
+       cancelButtonWidth = __pCancelButton->GetTextExtentSizeF() + __pCancelButton->GetRightMarginF() + __pCancelButton->GetLeftMarginF();
        editBounds.x = horizontalMargin;
 
        if (searchBarBounds.height < searchBarMinHeight)

diff --git a/src/ui/controls/FUiCtrl_SearchBarPresenter.cpp b/src/ui/controls/FUiCtrl_SearchBarPresenter.cpp
index a6b9500..95b97f4 100644 (file)
--- a/src/ui/controls/FUiCtrl_SearchBarPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_SearchBarPresenter.cpp
@@ -593,7 +593,7 @@ _SearchBarPresenter::ChangeMode(SearchBarMode mode)
                        GET_SHAPE_CONFIG(SEARCHBAR::BUTTON_WIDTH, orientation, buttonWidth);
 
                        float cancelButtonWidth = 0.0f;
-                       cancelButtonWidth = __pCancelButton->GetTextExtentSizeF() + __pCancelButton->GetRightTouchMarginF() + __pCancelButton->GetLeftTouchMarginF() + __pCancelButton->GetRightMarginF() + __pCancelButton->GetLeftMarginF();
+                       cancelButtonWidth = __pCancelButton->GetTextExtentSizeF() + __pCancelButton->GetRightMarginF() + __pCancelButton->GetLeftMarginF();
 
                        if (cancelButtonWidth <= buttonWidth)
                        {
@@ -655,7 +655,7 @@ _SearchBarPresenter::InitializeInputModeLayout(void)
        __searchFieldBounds.width = (__pSearchBar->GetBoundsF().width > searchFieldMinWidth) ? __searchFieldBounds.width : searchFieldMinWidth;
 
        float cancelButtonWidth = 0.0f;
-       cancelButtonWidth = __pCancelButton->GetTextExtentSizeF() + __pCancelButton->GetRightTouchMarginF() + __pCancelButton->GetLeftTouchMarginF() + __pCancelButton->GetRightMarginF() + __pCancelButton->GetLeftMarginF();
+       cancelButtonWidth = __pCancelButton->GetTextExtentSizeF() + __pCancelButton->GetRightMarginF() + __pCancelButton->GetLeftMarginF();
 
        if (cancelButtonWidth > buttonWidth)
        {
@@ -727,7 +727,7 @@ _SearchBarPresenter::OnBoundsChanged(void)
                r = __pSearchBar->ResizeCancelButton();
                SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.",GetErrorMessage(r));
 
-               cancelButtonWidth = __pCancelButton->GetTextExtentSizeF() + __pCancelButton->GetRightTouchMarginF() + __pCancelButton->GetLeftTouchMarginF() + __pCancelButton->GetRightMarginF() + __pCancelButton->GetLeftMarginF();
+               cancelButtonWidth = __pCancelButton->GetTextExtentSizeF() + __pCancelButton->GetRightMarginF() + __pCancelButton->GetLeftMarginF();
        }
 
        r = __pEdit->SetBounds(__searchFieldBounds);

diff --git a/src/ui/controls/FUiCtrl_Toolbar.cpp b/src/ui/controls/FUiCtrl_Toolbar.cpp
index 04fdf2b..6f0651d 100644 (file)
--- a/src/ui/controls/FUiCtrl_Toolbar.cpp
+++ b/src/ui/controls/FUiCtrl_Toolbar.cpp
@@ -1837,11 +1837,6 @@ _Toolbar::SetButtonBadgeIcon(ToolbarButton position, const Bitmap* pBadgeIcon)
 
        FloatRectangle bounds = __pButtonItems[position]->GetBoundsF();
 
-       float topTouchMargin = __pButtonItems[position]->GetTopTouchMarginF();
-       float rightTouchMargin = __pButtonItems[position]->GetRightTouchMarginF();
-
-       bounds.width = bounds.width - rightTouchMargin;
-
        float height = 0.0f;
 
        GET_SHAPE_CONFIG(HEADER::BADGE_HEIGHT_WITH_BUTTON, GetOrientation(), height);
@@ -1850,7 +1845,7 @@ _Toolbar::SetButtonBadgeIcon(ToolbarButton position, const Bitmap* pBadgeIcon)
 
        if (pBadgeIconLabel)
        {
-               pBadgeIconLabel->SetBounds(FloatRectangle(bounds.width - height, topTouchMargin, height, height));
+               pBadgeIconLabel->SetBounds(FloatRectangle(bounds.width - height, 0, height, height));
                pBadgeIconLabel->SetBackgroundBitmap(*pBadgeIcon);
 
                __pButtonItems[position]->AttachChild(*pBadgeIconLabel);
@@ -1977,11 +1972,6 @@ _Toolbar::SetButtonNumberedBadgeIcon(ToolbarButton position, int number)
 
                FloatRectangle bounds = __pButtonItems[position]->GetBoundsF();
 
-               float topTouchMargin = __pButtonItems[position]->GetTopTouchMarginF();
-               float rightTouchMargin = __pButtonItems[position]->GetRightTouchMarginF();
-
-               bounds.width = bounds.width - rightTouchMargin;
-
                if (existingBadgeIcon)
                {
                        float fontSize = 0.0f;
@@ -2016,7 +2006,7 @@ _Toolbar::SetButtonNumberedBadgeIcon(ToolbarButton position, int number)
                                GET_SHAPE_CONFIG(HEADER::BADGE_WIDTH_2DIGIT, GetOrientation(), width);
                        }
 
-                       existingBadgeIcon->SetBounds(FloatRectangle(bounds.width - width, topTouchMargin, width, height));
+                       existingBadgeIcon->SetBounds(FloatRectangle(bounds.width - width, 0, width, height));
                        existingBadgeIcon->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
 
                        Integer tempNumber(number);
@@ -7357,11 +7347,6 @@ _Toolbar::RealignItem(_Button* pButton, float textExtentSize)
        float largeTabTopMargin = 0.0f;
        float largeTabTextHeight = 0.0f;
 
-       float leftTouchMargin = pButton->GetLeftTouchMarginF();
-       float topTouchMargin = pButton->GetTopTouchMarginF();
-       float rightTouchMargin = pButton->GetRightTouchMarginF();
-       float bottomTouchMargin = pButton->GetBottomTouchMarginF();
-
        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);
@@ -7545,36 +7530,36 @@ _Toolbar::RealignItem(_Button* pButton, float textExtentSize)
                if (pButton->GetBitmap(_BUTTON_STATUS_NORMAL) != null)
                {
                        pButton->SetBitmap(_BUTTON_STATUS_NORMAL,
-                                       FloatPoint((buttonItemWidth - (leftTouchMargin + rightTouchMargin) - (pButton->GetBitmap(_BUTTON_STATUS_NORMAL))->GetWidthF()) / 2,
-                                                       (buttonItemHeight - (topTouchMargin + bottomTouchMargin) - (pButton->GetBitmap(_BUTTON_STATUS_NORMAL))->GetHeightF()) / 2),
+                                       FloatPoint((buttonItemWidth - (pButton->GetBitmap(_BUTTON_STATUS_NORMAL))->GetWidthF()) / 2,
+                                                       (buttonItemHeight - (pButton->GetBitmap(_BUTTON_STATUS_NORMAL))->GetHeightF()) / 2),
                                                        *(pButton->GetBitmap(_BUTTON_STATUS_NORMAL)));
                }
                if (pButton->GetBitmap(_BUTTON_STATUS_PRESSED) != null)
                {
                        pButton->SetBitmap(_BUTTON_STATUS_PRESSED,
-                                       FloatPoint((buttonItemWidth - (leftTouchMargin + rightTouchMargin) - (pButton->GetBitmap(_BUTTON_STATUS_PRESSED))->GetWidthF()) / 2,
-                                                       (buttonItemHeight - (topTouchMargin + bottomTouchMargin) - (pButton->GetBitmap(_BUTTON_STATUS_PRESSED))->GetHeightF()) / 2),
+                                       FloatPoint((buttonItemWidth - (pButton->GetBitmap(_BUTTON_STATUS_PRESSED))->GetWidthF()) / 2,
+                                                       (buttonItemHeight - (pButton->GetBitmap(_BUTTON_STATUS_PRESSED))->GetHeightF()) / 2),
                                                        *(pButton->GetBitmap(_BUTTON_STATUS_PRESSED)));
                }
                if (pButton->GetBitmap(_BUTTON_STATUS_HIGHLIGHTED) != null)
                {
                        pButton->SetBitmap(_BUTTON_STATUS_HIGHLIGHTED,
-                                       FloatPoint((buttonItemWidth - (leftTouchMargin + rightTouchMargin) - (pButton->GetBitmap(_BUTTON_STATUS_HIGHLIGHTED))->GetWidthF()) / 2,
-                                                       (buttonItemHeight - (topTouchMargin + bottomTouchMargin) - (pButton->GetBitmap(_BUTTON_STATUS_HIGHLIGHTED))->GetHeightF()) / 2),
+                                       FloatPoint((buttonItemWidth - (pButton->GetBitmap(_BUTTON_STATUS_HIGHLIGHTED))->GetWidthF()) / 2,
+                                                       (buttonItemHeight - (pButton->GetBitmap(_BUTTON_STATUS_HIGHLIGHTED))->GetHeightF()) / 2),
                                                        *(pButton->GetBitmap(_BUTTON_STATUS_HIGHLIGHTED)));
                }
                if (pButton->GetBitmap(_BUTTON_STATUS_DISABLED) != null)
                {
                        pButton->SetBitmap(_BUTTON_STATUS_DISABLED,
-                                       FloatPoint((buttonItemWidth - (leftTouchMargin + rightTouchMargin) - (pButton->GetBitmap(_BUTTON_STATUS_DISABLED))->GetWidthF()) / 2,
-                                                       (buttonItemHeight - (topTouchMargin + bottomTouchMargin) - (pButton->GetBitmap(_BUTTON_STATUS_DISABLED))->GetHeightF()) / 2),
+                                       FloatPoint((buttonItemWidth - (pButton->GetBitmap(_BUTTON_STATUS_DISABLED))->GetWidthF()) / 2,
+                                                       (buttonItemHeight - (pButton->GetBitmap(_BUTTON_STATUS_DISABLED))->GetHeightF()) / 2),
                                                        *(pButton->GetBitmap(_BUTTON_STATUS_DISABLED)));
                }
                if (pButton->GetBitmap(_BUTTON_STATUS_SELECTED) != null)
                {
                        pButton->SetBitmap(_BUTTON_STATUS_SELECTED,
-                                       FloatPoint((buttonItemWidth - (leftTouchMargin + rightTouchMargin) - (pButton->GetBitmap(_BUTTON_STATUS_SELECTED))->GetWidthF()) / 2,
-                                                       (buttonItemHeight - (topTouchMargin + bottomTouchMargin) - (pButton->GetBitmap(_BUTTON_STATUS_SELECTED))->GetHeightF()) / 2),
+                                       FloatPoint((buttonItemWidth - (pButton->GetBitmap(_BUTTON_STATUS_SELECTED))->GetWidthF()) / 2,
+                                                       (buttonItemHeight - (pButton->GetBitmap(_BUTTON_STATUS_SELECTED))->GetHeightF()) / 2),
                                                        *(pButton->GetBitmap(_BUTTON_STATUS_SELECTED)));
                }
 
@@ -7592,81 +7577,76 @@ _Toolbar::RealignButtonItem(_Button* pButton)
        float buttonItemWidth = pButton->GetSizeF().width;
        float buttonItemHeight = pButton->GetSizeF().height;
 
-       float leftTouchMargin = pButton->GetLeftTouchMarginF();
-       float topTouchMargin = pButton->GetTopTouchMarginF();
-       float rightTouchMargin = pButton->GetRightTouchMarginF();
-       float bottomTouchMargin = pButton->GetBottomTouchMarginF();
-
        if (pButton->GetBitmap(_BUTTON_STATUS_NORMAL) != null)
        {
                pButton->SetBitmap(_BUTTON_STATUS_NORMAL,
-                               FloatPoint((buttonItemWidth - (leftTouchMargin + rightTouchMargin) - (pButton->GetBitmap(_BUTTON_STATUS_NORMAL))->GetWidthF()) / 2,
-                                               (buttonItemHeight - (topTouchMargin + bottomTouchMargin) - (pButton->GetBitmap(_BUTTON_STATUS_NORMAL))->GetHeightF()) / 2),
+                               FloatPoint((buttonItemWidth - (pButton->GetBitmap(_BUTTON_STATUS_NORMAL))->GetWidthF()) / 2,
+                                               (buttonItemHeight - (pButton->GetBitmap(_BUTTON_STATUS_NORMAL))->GetHeightF()) / 2),
                                                *(pButton->GetBitmap(_BUTTON_STATUS_NORMAL)));
        }
        if (pButton->GetBitmap(_BUTTON_STATUS_PRESSED) != null)
        {
                pButton->SetBitmap(_BUTTON_STATUS_PRESSED,
-                               FloatPoint((buttonItemWidth - (leftTouchMargin + rightTouchMargin) - (pButton->GetBitmap(_BUTTON_STATUS_PRESSED))->GetWidthF()) / 2,
-                                               (buttonItemHeight - (topTouchMargin + bottomTouchMargin) - (pButton->GetBitmap(_BUTTON_STATUS_PRESSED))->GetHeightF()) / 2),
+                               FloatPoint((buttonItemWidth - (pButton->GetBitmap(_BUTTON_STATUS_PRESSED))->GetWidthF()) / 2,
+                                               (buttonItemHeight - (pButton->GetBitmap(_BUTTON_STATUS_PRESSED))->GetHeightF()) / 2),
                                                *(pButton->GetBitmap(_BUTTON_STATUS_PRESSED)));
        }
        if (pButton->GetBitmap(_BUTTON_STATUS_HIGHLIGHTED) != null)
        {
                pButton->SetBitmap(_BUTTON_STATUS_HIGHLIGHTED,
-                               FloatPoint((buttonItemWidth - (leftTouchMargin + rightTouchMargin) - (pButton->GetBitmap(_BUTTON_STATUS_HIGHLIGHTED))->GetWidthF()) / 2,
-                                               (buttonItemHeight - (topTouchMargin + bottomTouchMargin) - (pButton->GetBitmap(_BUTTON_STATUS_HIGHLIGHTED))->GetHeightF()) / 2),
+                               FloatPoint((buttonItemWidth - (pButton->GetBitmap(_BUTTON_STATUS_HIGHLIGHTED))->GetWidthF()) / 2,
+                                               (buttonItemHeight - (pButton->GetBitmap(_BUTTON_STATUS_HIGHLIGHTED))->GetHeightF()) / 2),
                                                *(pButton->GetBitmap(_BUTTON_STATUS_HIGHLIGHTED)));
        }
        if (pButton->GetBitmap(_BUTTON_STATUS_DISABLED) != null)
        {
                pButton->SetBitmap(_BUTTON_STATUS_DISABLED,
-                               FloatPoint((buttonItemWidth - (leftTouchMargin + rightTouchMargin) - (pButton->GetBitmap(_BUTTON_STATUS_DISABLED))->GetWidthF()) / 2,
-                                               (buttonItemHeight - (topTouchMargin + bottomTouchMargin) - (pButton->GetBitmap(_BUTTON_STATUS_DISABLED))->GetHeightF()) / 2),
+                               FloatPoint((buttonItemWidth - (pButton->GetBitmap(_BUTTON_STATUS_DISABLED))->GetWidthF()) / 2,
+                                               (buttonItemHeight - (pButton->GetBitmap(_BUTTON_STATUS_DISABLED))->GetHeightF()) / 2),
                                                *(pButton->GetBitmap(_BUTTON_STATUS_DISABLED)));
        }
        if (pButton->GetBitmap(_BUTTON_STATUS_SELECTED) != null)
        {
                pButton->SetBitmap(_BUTTON_STATUS_SELECTED,
-                               FloatPoint((buttonItemWidth - (leftTouchMargin + rightTouchMargin) - (pButton->GetBitmap(_BUTTON_STATUS_SELECTED))->GetWidthF()) / 2,
-                                               (buttonItemHeight - (topTouchMargin + bottomTouchMargin) - (pButton->GetBitmap(_BUTTON_STATUS_SELECTED))->GetHeightF()) / 2),
+                               FloatPoint((buttonItemWidth - (pButton->GetBitmap(_BUTTON_STATUS_SELECTED))->GetWidthF()) / 2,
+                                               (buttonItemHeight - (pButton->GetBitmap(_BUTTON_STATUS_SELECTED))->GetHeightF()) / 2),
                                                *(pButton->GetBitmap(_BUTTON_STATUS_SELECTED)));
        }
 
        if (pButton->GetEffectBitmap(_BUTTON_STATUS_NORMAL) != null)
        {
                pButton->SetEffectBitmap(_BUTTON_STATUS_NORMAL,
-                               FloatPoint((buttonItemWidth - (leftTouchMargin + rightTouchMargin) - (pButton->GetEffectBitmap(_BUTTON_STATUS_NORMAL))->GetWidthF()) / 2,
-                                               (buttonItemHeight - (topTouchMargin + bottomTouchMargin) - (pButton->GetEffectBitmap(_BUTTON_STATUS_NORMAL))->GetHeightF()) / 2),
+                               FloatPoint((buttonItemWidth - (pButton->GetEffectBitmap(_BUTTON_STATUS_NORMAL))->GetWidthF()) / 2,
+                                               (buttonItemHeight - (pButton->GetEffectBitmap(_BUTTON_STATUS_NORMAL))->GetHeightF()) / 2),
                                                *(pButton->GetEffectBitmap(_BUTTON_STATUS_NORMAL)));
        }
 
        if (pButton->GetEffectBitmap(_BUTTON_STATUS_PRESSED) != null)
        {
                pButton->SetEffectBitmap(_BUTTON_STATUS_PRESSED,
-                               FloatPoint((buttonItemWidth - (leftTouchMargin + rightTouchMargin) - (pButton->GetEffectBitmap(_BUTTON_STATUS_PRESSED))->GetWidthF()) / 2,
-                                               (buttonItemHeight - (topTouchMargin + bottomTouchMargin) - (pButton->GetEffectBitmap(_BUTTON_STATUS_PRESSED))->GetHeightF()) / 2),
+                               FloatPoint((buttonItemWidth - (pButton->GetEffectBitmap(_BUTTON_STATUS_PRESSED))->GetWidthF()) / 2,
+                                               (buttonItemHeight - (pButton->GetEffectBitmap(_BUTTON_STATUS_PRESSED))->GetHeightF()) / 2),
                                                *(pButton->GetEffectBitmap(_BUTTON_STATUS_PRESSED)));
        }
        if (pButton->GetEffectBitmap(_BUTTON_STATUS_HIGHLIGHTED) != null)
        {
                pButton->SetEffectBitmap(_BUTTON_STATUS_HIGHLIGHTED,
-                               FloatPoint((buttonItemWidth - (leftTouchMargin + rightTouchMargin) - (pButton->GetEffectBitmap(_BUTTON_STATUS_HIGHLIGHTED))->GetWidthF()) / 2,
-                                               (buttonItemHeight - (topTouchMargin + bottomTouchMargin) - (pButton->GetEffectBitmap(_BUTTON_STATUS_HIGHLIGHTED))->GetHeightF()) / 2),
+                               FloatPoint((buttonItemWidth - (pButton->GetEffectBitmap(_BUTTON_STATUS_HIGHLIGHTED))->GetWidthF()) / 2,
+                                               (buttonItemHeight - (pButton->GetEffectBitmap(_BUTTON_STATUS_HIGHLIGHTED))->GetHeightF()) / 2),
                                                *(pButton->GetEffectBitmap(_BUTTON_STATUS_HIGHLIGHTED)));
        }
        if (pButton->GetEffectBitmap(_BUTTON_STATUS_DISABLED) != null)
        {
                pButton->SetEffectBitmap(_BUTTON_STATUS_DISABLED,
-                               FloatPoint((buttonItemWidth - (leftTouchMargin + rightTouchMargin) - (pButton->GetEffectBitmap(_BUTTON_STATUS_DISABLED))->GetWidthF()) / 2,
-                                               (buttonItemHeight - (topTouchMargin + bottomTouchMargin) - (pButton->GetEffectBitmap(_BUTTON_STATUS_DISABLED))->GetHeightF()) / 2),
+                               FloatPoint((buttonItemWidth - (pButton->GetEffectBitmap(_BUTTON_STATUS_DISABLED))->GetWidthF()) / 2,
+                                               (buttonItemHeight - (pButton->GetEffectBitmap(_BUTTON_STATUS_DISABLED))->GetHeightF()) / 2),
                                                *(pButton->GetEffectBitmap(_BUTTON_STATUS_DISABLED)));
        }
        if (pButton->GetEffectBitmap(_BUTTON_STATUS_SELECTED) != null)
        {
                pButton->SetEffectBitmap(_BUTTON_STATUS_SELECTED,
-                               FloatPoint((buttonItemWidth - (leftTouchMargin + rightTouchMargin) - (pButton->GetEffectBitmap(_BUTTON_STATUS_SELECTED))->GetWidthF()) / 2,
-                                               (buttonItemHeight - (topTouchMargin + bottomTouchMargin) - (pButton->GetEffectBitmap(_BUTTON_STATUS_SELECTED))->GetHeightF()) / 2),
+                               FloatPoint((buttonItemWidth - (pButton->GetEffectBitmap(_BUTTON_STATUS_SELECTED))->GetWidthF()) / 2,
+                                               (buttonItemHeight - (pButton->GetEffectBitmap(_BUTTON_STATUS_SELECTED))->GetHeightF()) / 2),
                                                *(pButton->GetEffectBitmap(_BUTTON_STATUS_SELECTED)));
        }
 
@@ -7715,11 +7695,6 @@ _Toolbar::RearrangeItems(void)
                float headerRightMargin = 0.0f;
                float tabLeftMargin = 0.0f;
 
-               float leftTouchMargin = 0.0f;
-               float topTouchMargin = 0.0f;
-               float rightTouchMargin = 0.0f;
-               float bottomTouchMargin = 0.0f;
-
                GET_SHAPE_CONFIG(HEADER::TOP_MARGIN, GetOrientation(), headerTopMargin);
                GET_SHAPE_CONFIG(HEADER::BUTTON_ITEM_GAP, GetOrientation(), buttonItemGap);
                GET_SHAPE_CONFIG(HEADER::LEFT_MARGIN, GetOrientation(), headerLeftMargin);
@@ -7740,31 +7715,16 @@ _Toolbar::RearrangeItems(void)
                {
                        GET_SHAPE_CONFIG(HEADER::TITLE_HEIGHT_WITH_SEGMENTED_ITEM, GetOrientation(), vmargin);
                        GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_HEIGHT, GetOrientation(), headerButtonItemHeight);
-
-                       GET_SHAPE_CONFIG(HEADER::BUTTON_ITEM_LEFT_TOUCH_MARGIN, GetOrientation(), leftTouchMargin);
-                       GET_SHAPE_CONFIG(HEADER::BUTTON_ITEM_TOP_TOUCH_MARGIN, GetOrientation(), topTouchMargin);
-                       GET_SHAPE_CONFIG(HEADER::BUTTON_ITEM_RIGHT_TOUCH_MARGIN, GetOrientation(), rightTouchMargin);
-                       GET_SHAPE_CONFIG(HEADER::BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, GetOrientation(), bottomTouchMargin);
                }
                else if (__style == TOOLBAR_TAB_WITH_TITLE)
                {
                        GET_SHAPE_CONFIG(HEADER::BUTTON_ITEM_TOP_MARGIN, GetOrientation(), vmargin);
                        GET_SHAPE_CONFIG(HEADER::TITLE_HEIGHT_WITH_SEGMENTED_ITEM, GetOrientation(), headerButtonItemHeight);
-
-                       GET_SHAPE_CONFIG(HEADER::TAB_BUTTON_ITEM_LEFT_TOUCH_MARGIN, GetOrientation(), leftTouchMargin);
-                       GET_SHAPE_CONFIG(HEADER::TAB_BUTTON_ITEM_TOP_TOUCH_MARGIN, GetOrientation(), topTouchMargin);
-                       GET_SHAPE_CONFIG(HEADER::TAB_BUTTON_ITEM_RIGHT_TOUCH_MARGIN, GetOrientation(), rightTouchMargin);
-                       GET_SHAPE_CONFIG(HEADER::TAB_BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, GetOrientation(), bottomTouchMargin);
                }
                else
                {
                        GET_SHAPE_CONFIG(HEADER::BUTTON_ITEM_TOP_MARGIN, GetOrientation(), vmargin);
                        GET_SHAPE_CONFIG(HEADER::BUTTON_ITEM_HEIGHT, GetOrientation(), headerButtonItemHeight);
-
-                       GET_SHAPE_CONFIG(HEADER::BUTTON_ITEM_LEFT_TOUCH_MARGIN, GetOrientation(), leftTouchMargin);
-                       GET_SHAPE_CONFIG(HEADER::BUTTON_ITEM_TOP_TOUCH_MARGIN, GetOrientation(), topTouchMargin);
-                       GET_SHAPE_CONFIG(HEADER::BUTTON_ITEM_RIGHT_TOUCH_MARGIN, GetOrientation(), rightTouchMargin);
-                       GET_SHAPE_CONFIG(HEADER::BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, GetOrientation(), bottomTouchMargin);
                }
 
                __titleTextArea.x = headerLeftMargin;
@@ -7774,218 +7734,62 @@ _Toolbar::RearrangeItems(void)
                {
                        if (__pButtonItems[LEFT_BUTTON])
                        {
-                               if (__pButtonItems[LEFT_BUTTON]->GetText() == L"")
-                               {
-                                       if (__pButtonItems[RIGHT_BUTTON]->GetText() == L"")
-                                       {
-                                               __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth, vmargin,
-                                                               headerRightButtonWidth, headerButtonItemHeight));
-                                               __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth - buttonItemGap - headerLeftButtonWidth, vmargin,
-                                                               headerLeftButtonWidth, headerButtonItemHeight));
-
-                                               if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE)
-                                               {
-                                                       __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);
-                                               }
-                                               else
-                                               {
-                                                       __pButtonItems[RIGHT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
-                                                       __pButtonItems[LEFT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
-
-                                                       __titleTextArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth);
-
-                                                       if (__style != TOOLBAR_TAB_WITH_TITLE)
-                                                       {
-                                                               __itemArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth);
-                                                       }
-                                               }
-                                       }
-                                       else
-                                       {
-                                               __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth, vmargin,
-                                                               headerRightButtonWidth, headerButtonItemHeight));
-                                               __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth - buttonItemGap - headerLeftButtonWidth , vmargin,
-                                                               headerLeftButtonWidth, headerButtonItemHeight));
-
-                                               if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE)
-                                               {
-                                                       //__pButtonItems[RIGHT_BUTTON]->SetTouchMargin(0, 0, 0, 0);
-                                                       __pButtonItems[LEFT_BUTTON]->SetTouchMargin(leftTouchMargin, 0.0f, rightTouchMargin, 0.0f);
-
-                                                       __itemArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth);
-                                               }
-                                               else
-                                               {
-                                                       //__pButtonItems[RIGHT_BUTTON]->SetTouchMargin(0.0f, topTouchMargin, 0.0f, bottomTouchMargin);
-                                                       __pButtonItems[LEFT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
-
-                                                       __titleTextArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth);
+                               __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth, vmargin,
+                                               headerRightButtonWidth + 1, headerButtonItemHeight));
+                               __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth - buttonItemGap - headerLeftButtonWidth , vmargin,
+                                               headerLeftButtonWidth, headerButtonItemHeight));
 
-                                                       if (__style != TOOLBAR_TAB_WITH_TITLE)
-                                                       {
-                                                               __itemArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth);
-                                                       }
-                                               }
-                                       }
+                               if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE)
+                               {
+                                       __itemArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth);
                                }
                                else
                                {
-                                       if (__pButtonItems[RIGHT_BUTTON]->GetText() == L"")
-                                       {
-                                               __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth, vmargin,
-                                                               headerRightButtonWidth, headerButtonItemHeight));
-                                               __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth - buttonItemGap - headerLeftButtonWidth, vmargin,
-                                                               headerLeftButtonWidth, headerButtonItemHeight));
-
-                                               if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE)
-                                               {
-                                                       //__pButtonItems[LEFT_BUTTON]->SetTouchMargin(0, 0, 0, 0);
-                                                       __pButtonItems[RIGHT_BUTTON]->SetTouchMargin(leftTouchMargin, 0.0f, rightTouchMargin, 0.0f);
-
-                                                       __itemArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth);
-                                               }
-                                               else
-                                               {
-                                                       //__pButtonItems[LEFT_BUTTON]->SetTouchMargin(0.0f, topTouchMargin, 0.0f, bottomTouchMargin);
-                                                       __pButtonItems[RIGHT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
-
-                                                       __titleTextArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth);
+                                       __titleTextArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth);
 
-                                                       if (__style != TOOLBAR_TAB_WITH_TITLE)
-                                                       {
-                                                               __itemArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth);
-                                                       }
-                                               }
-                                       }
-                                       else
+                                       if (__style != TOOLBAR_TAB_WITH_TITLE)
                                        {
-                                               __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth, vmargin,
-                                                               headerRightButtonWidth, headerButtonItemHeight));
-                                               __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth - buttonItemGap - headerLeftButtonWidth , vmargin,
-                                                               headerLeftButtonWidth, headerButtonItemHeight));
-
-                                               if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE)
-                                               {
-                                                       //__pButtonItems[LEFT_BUTTON]->SetTouchMargin(0, 0, 0, 0);
-                                                       //__pButtonItems[RIGHT_BUTTON]->SetTouchMargin(0, 0, 0, 0);
-
-                                                       __itemArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth);
-                                               }
-                                               else
-                                               {
-                                                       //__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);
-
-                                                       if (__style != TOOLBAR_TAB_WITH_TITLE)
-                                                       {
-                                                               __itemArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth);
-                                                       }
-                                               }
+                                               __itemArea.width -= (headerLeftButtonWidth + buttonItemGap + headerRightButtonWidth);
                                        }
                                }
                        }
                        else
                        {
-                               if (__pButtonItems[RIGHT_BUTTON]->GetText() == L"")
-                               {
-                                       __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth, vmargin,
-                                                       headerRightButtonWidth, headerButtonItemHeight));
-
-                                       if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE)
-                                       {
-                                               __pButtonItems[RIGHT_BUTTON]->SetTouchMargin(leftTouchMargin, 0.0f, rightTouchMargin, 0.0f);
-
-                                               __itemArea.width -= (headerRightButtonWidth);
-                                       }
-                                       else
-                                       {
-                                               __pButtonItems[RIGHT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
+                               __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth, vmargin,
+                                               headerRightButtonWidth + 1, headerButtonItemHeight));
 
-                                               __titleTextArea.width -= (headerRightButtonWidth);
-
-                                               if (__style != TOOLBAR_TAB_WITH_TITLE)
-                                               {
-                                                       __itemArea.width -= (headerRightButtonWidth);
-                                               }
-                                       }
+                               if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE)
+                               {
+                                       __itemArea.width -= (headerRightButtonWidth);
                                }
                                else
                                {
-                                       __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth, vmargin,
-                                                       headerRightButtonWidth, headerButtonItemHeight));
+                                       __titleTextArea.width -= (headerRightButtonWidth);
 
-                                       if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE)
+                                       if (__style != TOOLBAR_TAB_WITH_TITLE)
                                        {
-                                               //__pButtonItems[RIGHT_BUTTON]->SetTouchMargin(0, 0, 0, 0);
-
                                                __itemArea.width -= (headerRightButtonWidth);
                                        }
-                                       else
-                                       {
-                                               //__pButtonItems[RIGHT_BUTTON]->SetTouchMargin(0.0f, topTouchMargin, 0.0f, bottomTouchMargin);
-
-                                               __titleTextArea.width -= (headerRightButtonWidth);
-
-                                               if (__style != TOOLBAR_TAB_WITH_TITLE)
-                                               {
-                                                       __itemArea.width -= (headerRightButtonWidth);
-                                               }
-                                       }
                                }
                        }
                }
                else if (__pButtonItems[LEFT_BUTTON])
                {
-                       if (__pButtonItems[LEFT_BUTTON]->GetText() == L"")
-                       {
-                               __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerLeftButtonWidth, vmargin,
-                                               headerLeftButtonWidth, headerButtonItemHeight));
-
-                               if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE)
-                               {
-                                       __pButtonItems[LEFT_BUTTON]->SetTouchMargin(leftTouchMargin, 0.0f, rightTouchMargin, 0.0f);
-
-                                       __itemArea.width -= (headerLeftButtonWidth);
-                               }
-                               else
-                               {
-                                       __pButtonItems[LEFT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
+                       __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerLeftButtonWidth, vmargin,
+                                       headerLeftButtonWidth + 1, headerButtonItemHeight));
 
-                                       __titleTextArea.width -= (headerLeftButtonWidth);
-
-                                       if (__style != TOOLBAR_TAB_WITH_TITLE)
-                                       {
-                                               __itemArea.width -= (headerLeftButtonWidth);
-                                       }
-                               }
+                       if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE)
+                       {
+                               __itemArea.width -= (headerLeftButtonWidth);
                        }
                        else
                        {
-                               __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerLeftButtonWidth, vmargin,
-                                               headerLeftButtonWidth, headerButtonItemHeight));
+                               __titleTextArea.width -= (headerLeftButtonWidth);
 
-                               if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE)
+                               if (__style != TOOLBAR_TAB_WITH_TITLE)
                                {
-                                       //__pButtonItems[LEFT_BUTTON]->SetTouchMargin(0, 0, 0, 0);
-
                                        __itemArea.width -= (headerLeftButtonWidth);
                                }
-                               else
-                               {
-                                       //__pButtonItems[LEFT_BUTTON]->SetTouchMargin(0.0f, topTouchMargin, 0.0f, bottomTouchMargin);
-
-                                       __titleTextArea.width -= (headerLeftButtonWidth);
-
-                                       if (__style != TOOLBAR_TAB_WITH_TITLE)
-                                       {
-                                               __itemArea.width -= (headerLeftButtonWidth);
-                                       }
-                               }
                        }
                }
 
@@ -8015,14 +7819,14 @@ _Toolbar::RearrangeItems(void)
                {
                        SetWaitingAnimationPosition(TOOLBAR_ANIMATION_POSITION_BUTTON_LEFT,
                                        (__pButtonItems[LEFT_BUTTON]->GetSizeF().width - processingAnimationIconSize) / 2,
-                                       topTouchMargin + (__pButtonItems[LEFT_BUTTON]->GetSizeF().height - topTouchMargin - bottomTouchMargin - processingAnimationIconSize) / 2);
+                                       (__pButtonItems[LEFT_BUTTON]->GetSizeF().height - processingAnimationIconSize) / 2);
                }
 
                if (__pButtonItems[RIGHT_BUTTON] && GetWaitingAnimationStatus(TOOLBAR_ANIMATION_POSITION_BUTTON_RIGHT) != ANIMATION_STOPPED)
                {
                        SetWaitingAnimationPosition(TOOLBAR_ANIMATION_POSITION_BUTTON_RIGHT,
                                        (__pButtonItems[RIGHT_BUTTON]->GetSizeF().width - processingAnimationIconSize) / 2,
-                                       topTouchMargin + (__pButtonItems[RIGHT_BUTTON]->GetSizeF().height - topTouchMargin - bottomTouchMargin - processingAnimationIconSize) / 2);
+                                       (__pButtonItems[RIGHT_BUTTON]->GetSizeF().height - processingAnimationIconSize) / 2);
                }
        }
        else  // footer or edit or HEADER_STYLE_BUTTON // side align
@@ -8033,26 +7837,6 @@ _Toolbar::RearrangeItems(void)
                float footerLeftMargin = 0.0f;
                FloatDimension softkeyDimension(0.0f, 0.0f);
 
-               float leftTouchMargin = 0.0f;
-               float topTouchMargin = 0.0f;
-               float rightTouchMargin = 0.0f;
-               float bottomTouchMargin = 0.0f;
-
-               if (__header == true && __style == TOOLBAR_TEXT) // sip
-               {
-                       GET_SHAPE_CONFIG(HEADER::SIP_BUTTON_ITEM_LEFT_TOUCH_MARGIN, GetOrientation(), leftTouchMargin);
-                       GET_SHAPE_CONFIG(HEADER::SIP_BUTTON_ITEM_TOP_TOUCH_MARGIN, GetOrientation(), topTouchMargin);
-                       GET_SHAPE_CONFIG(HEADER::SIP_BUTTON_ITEM_RIGHT_TOUCH_MARGIN, GetOrientation(), rightTouchMargin);
-                       GET_SHAPE_CONFIG(HEADER::SIP_BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, GetOrientation(), bottomTouchMargin);
-               }
-               else
-               {
-                       GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_LEFT_TOUCH_MARGIN, GetOrientation(), leftTouchMargin);
-                       GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_TOP_TOUCH_MARGIN, GetOrientation(), topTouchMargin);
-                       GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_RIGHT_TOUCH_MARGIN, GetOrientation(), rightTouchMargin);
-                       GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, GetOrientation(), bottomTouchMargin);
-               }
-
                if (__header == true && __style == TOOLBAR_TEXT)
                {
                        GET_SHAPE_CONFIG(HEADER::BUTTON_ITEM_WIDTH, GetOrientation(), footerButtonItemWidth);
@@ -8089,14 +7873,11 @@ _Toolbar::RearrangeItems(void)
                        {
                                if (__style != TOOLBAR_SOFTKEY)
                                {
-                                       __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__itemArea.width - footerButtonItemWidth - footerLeftMargin + rightTouchMargin,
-                                                       (__itemArea.height - footerButtonItemHeight) / 2, footerButtonItemWidth, footerButtonItemHeight));
+                                       __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__itemArea.width - footerButtonItemWidth,
+                                                       0.0f, footerButtonItemWidth + 1, footerButtonItemHeight));
 
-                                       __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(0.0f, (__itemArea.height - footerButtonItemHeight) / 2,
+                                       __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(0.0f, 0.0f,
                                                        footerButtonItemWidth, footerButtonItemHeight));
-
-                                       __pButtonItems[RIGHT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
-                                       __pButtonItems[LEFT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
                                }
                                else
                                {
@@ -8108,7 +7889,7 @@ _Toolbar::RearrangeItems(void)
                                        else
                                        {
                                                __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__itemArea.width - softkeyDimension.width, __itemArea.height - softkeyDimension.height,
-                                                               softkeyDimension.width, softkeyDimension.height));
+                                                               softkeyDimension.width + 1, softkeyDimension.height));
                                        }
 
                                        if (__pButtonItems[LEFT_BUTTON]->GetText() == L"")
@@ -8126,10 +7907,8 @@ _Toolbar::RearrangeItems(void)
                        {
                                if (__style != TOOLBAR_SOFTKEY)
                                {
-                                       __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__itemArea.width - footerButtonItemWidth - footerLeftMargin + rightTouchMargin,
-                                                       (__itemArea.height - footerButtonItemHeight) / 2, footerButtonItemWidth, footerButtonItemHeight));
-
-                                       __pButtonItems[RIGHT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
+                                       __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__itemArea.width - footerButtonItemWidth,
+                                                       0.0f, footerButtonItemWidth + 1, footerButtonItemHeight));
                                }
                                else
                                {
@@ -8141,7 +7920,7 @@ _Toolbar::RearrangeItems(void)
                                        else
                                        {
                                                __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__itemArea.width - softkeyDimension.width, __itemArea.height - softkeyDimension.height,
-                                                               softkeyDimension.width, softkeyDimension.height));
+                                                               softkeyDimension.width + 1, softkeyDimension.height));
                                        }
                                }
                        }
@@ -8150,10 +7929,8 @@ _Toolbar::RearrangeItems(void)
                {
                        if (__style != TOOLBAR_SOFTKEY)
                        {
-                               __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(0.0f, (__itemArea.height - footerButtonItemHeight) / 2,
+                               __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(0.0f, 0.0f,
                                                footerButtonItemWidth, footerButtonItemHeight));
-
-                               __pButtonItems[LEFT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
                        }
                        else
                        {
@@ -9239,23 +9016,17 @@ _Toolbar::SetAnimation(ToolbarAnimationPosition animationPos)
                {
                        __pButtonItems[LEFT_BUTTON]->AttachChild(*__pAnimation[animationPos]);
 
-                       float topTouchMargin = __pButtonItems[LEFT_BUTTON]->GetTopTouchMarginF();
-                       float bottomTouchMargin = __pButtonItems[LEFT_BUTTON]->GetBottomTouchMarginF();
-
                        SetWaitingAnimationPosition(TOOLBAR_ANIMATION_POSITION_BUTTON_LEFT,
                                        (__pButtonItems[LEFT_BUTTON]->GetSizeF().width - processingAnimationIconSize) / 2,
-                                       topTouchMargin + (__pButtonItems[LEFT_BUTTON]->GetSizeF().height - topTouchMargin - bottomTouchMargin - processingAnimationIconSize) / 2);
+                                       (__pButtonItems[LEFT_BUTTON]->GetSizeF().height - processingAnimationIconSize) / 2);
                }
                else if (animationPos == TOOLBAR_ANIMATION_POSITION_BUTTON_RIGHT)
                {
                        __pButtonItems[RIGHT_BUTTON]->AttachChild(*__pAnimation[animationPos]);
 
-                       float topTouchMargin = __pButtonItems[RIGHT_BUTTON]->GetTopTouchMarginF();
-                       float bottomTouchMargin = __pButtonItems[RIGHT_BUTTON]->GetBottomTouchMarginF();
-
                        SetWaitingAnimationPosition(TOOLBAR_ANIMATION_POSITION_BUTTON_RIGHT,
                                        (__pButtonItems[RIGHT_BUTTON]->GetSizeF().width - processingAnimationIconSize) / 2,
-                                       topTouchMargin + (__pButtonItems[RIGHT_BUTTON]->GetSizeF().height - topTouchMargin - bottomTouchMargin - processingAnimationIconSize) / 2);
+                                       (__pButtonItems[RIGHT_BUTTON]->GetSizeF().height - processingAnimationIconSize) / 2);
                }
                _AccessibilityContainer* pContainer = __pAnimation[animationPos]->GetAccessibilityContainer();
                if (pContainer)
@@ -10327,16 +10098,6 @@ _Toolbar::GetButtonBoundsF(ToolbarButton position) const
 {
        FloatRectangle bounds = __pButtonItems[position]->GetBoundsF();
 
-       float leftTouchMargin = __pButtonItems[position]->GetLeftTouchMarginF();
-       float topTouchMargin = __pButtonItems[position]->GetTopTouchMarginF();
-       float rightTouchMargin = __pButtonItems[position]->GetRightTouchMarginF();
-       float bottomTouchMargin = __pButtonItems[position]->GetBottomTouchMarginF();
-
-       bounds.x = bounds.x + leftTouchMargin;
-       bounds.y = bounds.y + topTouchMargin;
-       bounds.width = bounds.width - (leftTouchMargin + rightTouchMargin);
-       bounds.height = bounds.height - (topTouchMargin + bottomTouchMargin);
-
        return bounds;
 }
 

diff --git a/src/ui/inc/FUiCtrl_Button.h b/src/ui/inc/FUiCtrl_Button.h
index ad0232d..5ec08ce 100644 (file)
--- a/src/ui/inc/FUiCtrl_Button.h
+++ b/src/ui/inc/FUiCtrl_Button.h
@@ -240,24 +240,12 @@ public:
        int GetRightMargin(void) const;
        int GetBottomMargin(void) const;
 
-       result SetTouchMargin(int leftTouchMargin, int topTouchMargin, int rightTouchMargin, int bottomTouchMargin);
-       int GetLeftTouchMargin(void) const;
-       int GetTopTouchMargin(void) const;
-       int GetRightTouchMargin(void) const;
-       int GetBottomTouchMargin(void) const;
-
        result SetMargin(float leftMargin, float topMargin, float rightMargin, float bottomMargin);
        float GetLeftMarginF(void) const;
        float GetTopMarginF(void) const;
        float GetRightMarginF(void) const;
        float GetBottomMarginF(void) const;
 
-       result SetTouchMargin(float leftTouchMargin, float topTouchMargin, float rightTouchMargin, float bottomTouchMargin);
-       float GetLeftTouchMarginF(void) const;
-       float GetTopTouchMarginF(void) const;
-       float GetRightTouchMarginF(void) const;
-       float GetBottomTouchMarginF(void) const;
-
        Tizen::Graphics::FloatDimension GetContentSizeInternalF(bool horizontalMode, bool verticalMode) const;
        int GetTextExtentSize(void) const;
        float GetTextExtentSizeF(void) const;
@@ -338,11 +326,6 @@ private:
        float __rightMargin;
        float __bottomMargin;
 
-       float __leftTouchMargin;
-       float __topTouchMargin;
-       float __rightTouchMargin;
-       float __bottomTouchMargin;
-
        Tizen::Graphics::FloatRectangle __userDefinedTextArea;
 
        Tizen::Ui::_AccessibilityElement* __pTextElement;

diff --git a/src/ui/inc/FUi_ResourceFooterConfig.h b/src/ui/inc/FUi_ResourceFooterConfig.h
index 30a37e8..d2c85e0 100644 (file)
--- a/src/ui/inc/FUi_ResourceFooterConfig.h
+++ b/src/ui/inc/FUi_ResourceFooterConfig.h
@@ -304,10 +304,10 @@ DECLARE_UI_CONFIG(FOOTER);
        DECLARE_SHAPE_CONFIG(BUTTON_ITEM_WIDTH, 31);
        DECLARE_SHAPE_CONFIG(BUTTON_ITEM_HEIGHT, 32);
        DECLARE_SHAPE_CONFIG(BUTTON_ITEM_ICON_SIZE, 33);
-       DECLARE_SHAPE_CONFIG(BUTTON_ITEM_LEFT_TOUCH_MARGIN, 34);
-       DECLARE_SHAPE_CONFIG(BUTTON_ITEM_TOP_TOUCH_MARGIN, 35);
-       DECLARE_SHAPE_CONFIG(BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 36);
-       DECLARE_SHAPE_CONFIG(BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 37);
+       //DECLARE_SHAPE_CONFIG(BUTTON_ITEM_LEFT_TOUCH_MARGIN, 34);
+       //DECLARE_SHAPE_CONFIG(BUTTON_ITEM_TOP_TOUCH_MARGIN, 35);
+       //DECLARE_SHAPE_CONFIG(BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 36);
+       //DECLARE_SHAPE_CONFIG(BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 37);
        DECLARE_SHAPE_CONFIG(SOFTKEY_HEIGHT, 38);
        DECLARE_SHAPE_CONFIG(SOFTKEY_TEXT_SIZE, 39);
        DECLARE_SHAPE_CONFIG(SOFTKEY_0_LEFT_MARGIN, 40);

diff --git a/src/ui/inc/FUi_ResourceHeaderConfig.h b/src/ui/inc/FUi_ResourceHeaderConfig.h
index 7ee7112..d008106 100644 (file)
--- a/src/ui/inc/FUi_ResourceHeaderConfig.h
+++ b/src/ui/inc/FUi_ResourceHeaderConfig.h
@@ -248,14 +248,14 @@ DECLARE_UI_CONFIG(HEADER);
        DECLARE_SHAPE_CONFIG(BUTTON_ITEM_TOP_MARGIN, 30);
        //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);
-       DECLARE_SHAPE_CONFIG(BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 35);
-       DECLARE_SHAPE_CONFIG(BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 36);
-       DECLARE_SHAPE_CONFIG(SIP_BUTTON_ITEM_LEFT_TOUCH_MARGIN, 37);
-       DECLARE_SHAPE_CONFIG(SIP_BUTTON_ITEM_TOP_TOUCH_MARGIN, 38);
-       DECLARE_SHAPE_CONFIG(SIP_BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 39);
-       DECLARE_SHAPE_CONFIG(SIP_BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 40);
+       //DECLARE_SHAPE_CONFIG(BUTTON_ITEM_LEFT_TOUCH_MARGIN, 33);
+       //DECLARE_SHAPE_CONFIG(BUTTON_ITEM_TOP_TOUCH_MARGIN, 34);
+       //DECLARE_SHAPE_CONFIG(BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 35);
+       //DECLARE_SHAPE_CONFIG(BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 36);
+       //DECLARE_SHAPE_CONFIG(SIP_BUTTON_ITEM_LEFT_TOUCH_MARGIN, 37);
+       //DECLARE_SHAPE_CONFIG(SIP_BUTTON_ITEM_TOP_TOUCH_MARGIN, 38);
+       //DECLARE_SHAPE_CONFIG(SIP_BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 39);
+       //DECLARE_SHAPE_CONFIG(SIP_BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 40);
        DECLARE_SHAPE_CONFIG(SEGMENTED_ITEM_HEIGHT, 41);
        DECLARE_SHAPE_CONFIG(TAB_ITEM_ICON_SIZE, 42);
        DECLARE_SHAPE_CONFIG(TAB_ITEM_ICON_SIZE_WITH_TEXT, 43);
@@ -295,10 +295,10 @@ DECLARE_UI_CONFIG(HEADER);
        DECLARE_SHAPE_CONFIG(TAB_TEXT_DIM_WIDTH, 77);
        DECLARE_SHAPE_CONFIG(TITLE_TEXT_DIM_WIDTH, 78);
        DECLARE_SHAPE_CONFIG(ICON_RIGHT_MARGIN, 79);
-       DECLARE_SHAPE_CONFIG(TAB_BUTTON_ITEM_LEFT_TOUCH_MARGIN, 80);
-       DECLARE_SHAPE_CONFIG(TAB_BUTTON_ITEM_TOP_TOUCH_MARGIN, 81);
-       DECLARE_SHAPE_CONFIG(TAB_BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 82);
-       DECLARE_SHAPE_CONFIG(TAB_BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 83);
+       //DECLARE_SHAPE_CONFIG(TAB_BUTTON_ITEM_LEFT_TOUCH_MARGIN, 80);
+       //DECLARE_SHAPE_CONFIG(TAB_BUTTON_ITEM_TOP_TOUCH_MARGIN, 81);
+       //DECLARE_SHAPE_CONFIG(TAB_BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 82);
+       //DECLARE_SHAPE_CONFIG(TAB_BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 83);
 
 
 DECLARE_END_UI_CONFIG(HEADER);

diff --git a/src/ui/resource/FUi_ResourceFooterConfig.cpp b/src/ui/resource/FUi_ResourceFooterConfig.cpp
index 00d6fdd..dcefd9c 100644 (file)
--- a/src/ui/resource/FUi_ResourceFooterConfig.cpp
+++ b/src/ui/resource/FUi_ResourceFooterConfig.cpp
@@ -362,10 +362,10 @@ START_UI_CONFIG(FOOTER);
                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, 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(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);
@@ -414,10 +414,10 @@ START_UI_CONFIG(FOOTER);
                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, 26);
-               ADD_SHAPE_CONFIG(BUTTON_ITEM_TOP_TOUCH_MARGIN, 11);
-               ADD_SHAPE_CONFIG(BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 26);
-               ADD_SHAPE_CONFIG(BUTTON_ITEM_BOTTOM_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, 26);
+               //ADD_SHAPE_CONFIG(BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 11);
                ADD_SHAPE_CONFIG(SOFTKEY_HEIGHT, 117);
                ADD_SHAPE_CONFIG(SOFTKEY_TEXT_SIZE, 42);
                ADD_SHAPE_CONFIG(SOFTKEY_MULTILINE_TEXT_SIZE, 38);

diff --git a/src/ui/resource/FUi_ResourceHeaderConfig.cpp b/src/ui/resource/FUi_ResourceHeaderConfig.cpp
index d772cef..7589dfc 100644 (file)
--- a/src/ui/resource/FUi_ResourceHeaderConfig.cpp
+++ b/src/ui/resource/FUi_ResourceHeaderConfig.cpp
@@ -317,20 +317,20 @@ START_UI_CONFIG(HEADER);
                //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, 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(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(TAB_BUTTON_ITEM_LEFT_TOUCH_MARGIN, 26);
-               ADD_SHAPE_CONFIG(TAB_BUTTON_ITEM_TOP_TOUCH_MARGIN, 13.5);
-               ADD_SHAPE_CONFIG(TAB_BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 26);
-               ADD_SHAPE_CONFIG(TAB_BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 13.5);
+               //ADD_SHAPE_CONFIG(TAB_BUTTON_ITEM_LEFT_TOUCH_MARGIN, 26);
+               //ADD_SHAPE_CONFIG(TAB_BUTTON_ITEM_TOP_TOUCH_MARGIN, 13.5);
+               //ADD_SHAPE_CONFIG(TAB_BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 26);
+               //ADD_SHAPE_CONFIG(TAB_BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 13.5);
 
-               ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_LEFT_TOUCH_MARGIN, 26);
-               ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_TOP_TOUCH_MARGIN, 16.5);
-               ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 26);
-               ADD_SHAPE_CONFIG(SIP_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);
+               //ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 26);
+               //ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 16.5);
 
                ADD_SHAPE_CONFIG(SEGMENTED_ITEM_HEIGHT, 75);
 
@@ -421,20 +421,20 @@ START_UI_CONFIG(HEADER);
                //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, 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(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(TAB_BUTTON_ITEM_LEFT_TOUCH_MARGIN, 26);
-               ADD_SHAPE_CONFIG(TAB_BUTTON_ITEM_TOP_TOUCH_MARGIN, 3.5);
-               ADD_SHAPE_CONFIG(TAB_BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 26);
-               ADD_SHAPE_CONFIG(TAB_BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 3.5);
+               //ADD_SHAPE_CONFIG(TAB_BUTTON_ITEM_LEFT_TOUCH_MARGIN, 26);
+               //ADD_SHAPE_CONFIG(TAB_BUTTON_ITEM_TOP_TOUCH_MARGIN, 3.5);
+               //ADD_SHAPE_CONFIG(TAB_BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 26);
+               //ADD_SHAPE_CONFIG(TAB_BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 3.5);
 
-               ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_LEFT_TOUCH_MARGIN, 26);
-               ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_TOP_TOUCH_MARGIN, 14);
-               ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 26);
-               ADD_SHAPE_CONFIG(SIP_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);
+               //ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 26);
+               //ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 14);
 
                ADD_SHAPE_CONFIG(SEGMENTED_ITEM_HEIGHT, 75);