fix jira defect for button,check,toolbar

Change-Id: I4f5dba273e6a83d373357a7f1abef6ddbddb757d

diff --git a/src/ui/controls/FUiCtrl_ButtonPresenter.cpp b/src/ui/controls/FUiCtrl_ButtonPresenter.cpp
index 393cc57..2a54959 100644 (file)
--- a/src/ui/controls/FUiCtrl_ButtonPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ButtonPresenter.cpp
@@ -53,7 +53,7 @@ _ButtonPresenter::_ButtonPresenter(void)
        , __fontSize(0.0f)
        , __pTextSlideTimer(null)
        , __textRect(FloatRectangle(0.0f, 0.0f, 0.0f, 0.0f))
-       , __pTabLargeSelectedBitmap(null)
+       , __pTextSlideClippedBitmap(null)
 {
 
 }
@@ -78,10 +78,10 @@ _ButtonPresenter::~_ButtonPresenter(void)
                __pTextSlideTimer = null;
        }
 
-       if (__pTabLargeSelectedBitmap)
+       if (__pTextSlideClippedBitmap)
        {
-               delete __pTabLargeSelectedBitmap;
-               __pTabLargeSelectedBitmap = null;
+               delete __pTextSlideClippedBitmap;
+               __pTextSlideClippedBitmap = null;
        }
 }
 
@@ -290,7 +290,11 @@ _ButtonPresenter::Draw(void)
                DrawBackground();
        }
 
-       DrawSubTitleEffectBitmap();
+       if (__pButton->GetSubTitleEffectBitmap() != null)
+       {
+               DrawSubTitleEffectBitmap();
+       }
+
        DrawBitmap();
 
        if (!__pButton->GetText().IsEmpty())
@@ -667,23 +671,6 @@ _ButtonPresenter::DrawToolbarItemBackground(void)
                }
        }
 
-       if (__pTabLargeSelectedBitmap)
-       {
-               delete __pTabLargeSelectedBitmap;
-               __pTabLargeSelectedBitmap = null;
-       }
-
-       __pTabLargeSelectedBitmap = new (std::nothrow) Bitmap();
-
-       if (__pButton->UserDefinedText())
-       {
-               __pTabLargeSelectedBitmap->Construct(*pCanvas, __pButton->GetUserDefinedTextAreaF());
-       }
-       else
-       {
-               __pTabLargeSelectedBitmap->Construct(*pCanvas, __textRect);
-       }
-
        delete pCanvas;
 
        return;
@@ -774,7 +761,7 @@ _ButtonPresenter::DrawBitmap(void)
 void
 _ButtonPresenter::DrawText(void)
 {
-       TimerForTitleSlideInit();
+       TimerForTextSlideInit();
        //TextSimple* pSimpleText = null;
        TextObjectAlignment horizontalAlign = TEXT_OBJECT_ALIGNMENT_CENTER;
        TextObjectAlignment verticalAlign = TEXT_OBJECT_ALIGNMENT_MIDDLE;
@@ -832,6 +819,23 @@ _ButtonPresenter::DrawText(void)
                __pTextObject->SetBounds(__textRect);
        }
 
+       if (__pTextSlideClippedBitmap)
+       {
+               delete __pTextSlideClippedBitmap;
+               __pTextSlideClippedBitmap = null;
+       }
+
+       __pTextSlideClippedBitmap = new (std::nothrow) Bitmap();
+
+       if (__pButton->UserDefinedText())
+       {
+               __pTextSlideClippedBitmap->Construct(*pCanvas, __pButton->GetUserDefinedTextAreaF());
+       }
+       else
+       {
+               __pTextSlideClippedBitmap->Construct(*pCanvas, __textRect);
+       }
+
        __pTextObject->SetAlignment(horizontalAlign | verticalAlign);
 
        if (__pButton->GetButtonStatus() == _BUTTON_STATUS_SELECTED && __pButton->IsTabTextSlide())
@@ -843,6 +847,7 @@ _ButtonPresenter::DrawText(void)
                __pTextObject->SetAction(TEXT_OBJECT_ACTION_TYPE_ABBREV);
        }
 
+       SetTextSize(__pButton->GetTextSizeF());
        __pTextObject->SetFont(__pFont, 0, __pTextObject->GetTextLength());
        __pTextObject->Compose();
 
@@ -865,7 +870,7 @@ _ButtonPresenter::DrawText(void)
 
                DrawTabTextDimBitmap();
 
-               TimerForTitleSlideStart();
+               TimerForTextSlideStart();
        }
        else
        {
@@ -1136,7 +1141,7 @@ _ButtonPresenter::OnKeyReleased(const _Control& source, const _KeyInfo& keyInfo)
 {
        _KeyCode keyCode = keyInfo.GetKeyCode();
 
-       if (__pButton->IsFocusModeStateEnabled() == true && keyCode == _KEY_ENTER)
+       if (__pButton->IsFocused() && __pButton->IsFocusModeStateEnabled() == true && keyCode == _KEY_ENTER)
        {
                if (__pButton->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                {
@@ -1309,14 +1314,14 @@ _ButtonPresenter::OnTimerExpired(Timer& timer)
 
        if (onTimer == __pTextSlideTimer)
        {
-               TimerForTitleSlideTimeout();
+               TimerForTextSlideTimeout();
        }
 
        return;
 }
 
 result
-_ButtonPresenter::TimerForTitleSlideInit(void)
+_ButtonPresenter::TimerForTextSlideInit(void)
 {
        result r = E_SUCCESS;
 
@@ -1330,7 +1335,7 @@ _ButtonPresenter::TimerForTitleSlideInit(void)
 }
 
 result
-_ButtonPresenter::TimerForTitleSlideStart(void)
+_ButtonPresenter::TimerForTextSlideStart(void)
 {
        result r = E_SUCCESS;
 
@@ -1364,7 +1369,7 @@ CATCH:
 }
 
 result
-_ButtonPresenter::TimerForTitleSlideTimeout(void)
+_ButtonPresenter::TimerForTextSlideTimeout(void)
 {
        Canvas* pCanvas = __pButton->GetCanvasN();
        SysTryReturnResult(NID_UI_CTRL, pCanvas, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] pCanvas is invalid!");
@@ -1375,18 +1380,18 @@ _ButtonPresenter::TimerForTitleSlideTimeout(void)
        {
                pCanvas->Clear(__pButton->GetUserDefinedTextAreaF());
 
-               if (__pTabLargeSelectedBitmap)
+               if (__pTextSlideClippedBitmap)
                {
-                       pCanvas->DrawBitmap(CoordinateSystem::AlignToDevice(__pButton->GetUserDefinedTextAreaF()), *__pTabLargeSelectedBitmap);
+                       pCanvas->DrawBitmap(CoordinateSystem::AlignToDevice(__pButton->GetUserDefinedTextAreaF()), *__pTextSlideClippedBitmap);
                }
        }
        else
        {
                pCanvas->Clear(__textRect);
 
-               if (__pTabLargeSelectedBitmap)
+               if (__pTextSlideClippedBitmap)
                {
-                       pCanvas->DrawBitmap(CoordinateSystem::AlignToDevice(__textRect), *__pTabLargeSelectedBitmap);
+                       pCanvas->DrawBitmap(CoordinateSystem::AlignToDevice(__textRect), *__pTextSlideClippedBitmap);
                }
        }
 
@@ -1406,7 +1411,7 @@ _ButtonPresenter::TimerForTitleSlideTimeout(void)
 
                if (__pTextObject->GetRepeatCount() < 3)
                {
-                       TimerForTitleSlideStart();
+                       TimerForTextSlideStart();
                }
        }
        else

diff --git a/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp b/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp
index f85b2a8..ddad176 100644 (file)
--- a/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp
@@ -2528,8 +2528,11 @@ _CheckButtonPresenter::OnKeyReleased(const _Control& source, const _KeyInfo& key
                if (checkStyle == CHECK_BUTTON_STYLE_MARK || checkStyle == CHECK_BUTTON_STYLE_MARK_WITH_DIVIDER || checkStyle == CHECK_BUTTON_STYLE_MARK_WITH_DETAILED_BUTTON
                                || checkStyle == CHECK_BUTTON_STYLE_RADIO || checkStyle == CHECK_BUTTON_STYLE_RADIO_WITH_DIVIDER || checkStyle == CHECK_BUTTON_STYLE_RADIO_WITH_DETAILED_BUTTON)
                {
-                       StartCheckAnimationTimer();
-                       __ratio = 0;
+                       if (__detailedPressed == false)
+                       {
+                               StartCheckAnimationTimer();
+                               __ratio = 0;
+                       }
                }
 
                __pCheckButton->SetCheckButtonStatus(_CHECK_BUTTON_STATUS_NORMAL);

diff --git a/src/ui/controls/FUiCtrl_Toolbar.cpp b/src/ui/controls/FUiCtrl_Toolbar.cpp
index 6f0651d..b01da91 100644 (file)
--- a/src/ui/controls/FUiCtrl_Toolbar.cpp
+++ b/src/ui/controls/FUiCtrl_Toolbar.cpp
@@ -3262,8 +3262,7 @@ _Toolbar::AddAccessibilityElement(ToolbarButton position, _Button* pButton)
                pButtonElement->SetName(name);
 
                pButtonElement->SetTraitWithStringId("IDS_TPLATFORM_BODY_BUTTON_T_TTS");
-               FloatRectangle floatRect = GetButtonBoundsF(position);
-               pButtonElement->SetBounds(FloatRectangle(0,floatRect.y, pButton->GetBoundsF().width, floatRect.height));
+               pButtonElement->SetBounds(FloatRectangle(0.0f, 0.0f, pButton->GetBoundsF().width, pButton->GetBoundsF().height));
        }
 }
 
@@ -6422,7 +6421,7 @@ _Toolbar::ApplyUserGUI(ButtonType buttonType, _Button* pButton)
                        }
                        if (pPressedBackgroundEffectBitmap)
                        {
-                               //pButton->SetBackgroundEffectBitmap(_BUTTON_STATUS_PRESSED, *pPressedBackgroundEffectBitmap);
+                               pButton->SetBackgroundEffectBitmap(_BUTTON_STATUS_PRESSED, *pPressedBackgroundEffectBitmap);
                                delete pPressedBackgroundEffectBitmap;
                        }
                        if (pHighlightedBackgroundEffectBitmap)
@@ -7693,22 +7692,20 @@ _Toolbar::RearrangeItems(void)
                float headerButtonItemHeight = 0.0f;
                float headerLeftMargin = 0.0f;
                float headerRightMargin = 0.0f;
-               float tabLeftMargin = 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);
                GET_SHAPE_CONFIG(HEADER::RIGHT_MARGIN, GetOrientation(), headerRightMargin);
-               GET_SHAPE_CONFIG(HEADER::TAB_LEFT_MARGIN, GetOrientation(), tabLeftMargin);
 
                if (__pButtonItems[LEFT_BUTTON])
                {
-                       headerLeftButtonWidth = __pButtonItems[LEFT_BUTTON]->GetSizeF().width;
+                       headerLeftButtonWidth = CoordinateSystem::AlignToDevice(__pButtonItems[LEFT_BUTTON]->GetSizeF()).width;
                }
 
                if (__pButtonItems[RIGHT_BUTTON])
                {
-                       headerRightButtonWidth = __pButtonItems[RIGHT_BUTTON]->GetSizeF().width;
+                       headerRightButtonWidth = CoordinateSystem::AlignToDevice(__pButtonItems[RIGHT_BUTTON]->GetSizeF()).width;
                }
 
                if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE)
@@ -7735,7 +7732,7 @@ _Toolbar::RearrangeItems(void)
                        if (__pButtonItems[LEFT_BUTTON])
                        {
                                __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth, vmargin,
-                                               headerRightButtonWidth + 1, headerButtonItemHeight));
+                                               headerRightButtonWidth, headerButtonItemHeight));
                                __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth - buttonItemGap - headerLeftButtonWidth , vmargin,
                                                headerLeftButtonWidth, headerButtonItemHeight));
 
@@ -7756,7 +7753,7 @@ _Toolbar::RearrangeItems(void)
                        else
                        {
                                __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerRightButtonWidth, vmargin,
-                                               headerRightButtonWidth + 1, headerButtonItemHeight));
+                                               headerRightButtonWidth, headerButtonItemHeight));
 
                                if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE)
                                {
@@ -7776,7 +7773,7 @@ _Toolbar::RearrangeItems(void)
                else if (__pButtonItems[LEFT_BUTTON])
                {
                        __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(__titleTextArea.width - headerLeftButtonWidth, vmargin,
-                                       headerLeftButtonWidth + 1, headerButtonItemHeight));
+                                       headerLeftButtonWidth, headerButtonItemHeight));
 
                        if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE)
                        {
@@ -8468,11 +8465,8 @@ _Toolbar::RearrangeTabItmes(void)
        float fontSize = 0.0f;
        float multilineFontSize = 0.0f;
        float segmentedItemHeight = 0.0f;
-       float tabLeftMargin = 0.0f;
        float vmargin = 0.0f;
 
-       GET_SHAPE_CONFIG(HEADER::TAB_LEFT_MARGIN, GetOrientation(), tabLeftMargin);
-
        if (__style == TOOLBAR_TAB || __style == TOOLBAR_TAB_LARGE)
        {
                segmentedItemHeight = __itemArea.height;
@@ -8485,8 +8479,8 @@ _Toolbar::RearrangeTabItmes(void)
 
        if (__itemCount == 1)
        {
-               itemWidth[0] = __itemArea.width - tabLeftMargin * 2;
-               __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin, vmargin, itemWidth[0], segmentedItemHeight));
+               itemWidth[0] = __itemArea.width;
+               __pItems.at(0)->SetBounds(FloatRectangle(0.0f, vmargin, itemWidth[0], segmentedItemHeight));
 
 
                GET_SHAPE_CONFIG(HEADER::TAB_ITEM_FONT_SIZE, GetOrientation(), fontSize); // 30
@@ -8502,10 +8496,10 @@ _Toolbar::RearrangeTabItmes(void)
        }
        else if (__itemCount == 2)
        {
-               itemWidth[0] = itemWidth[1] = (__itemArea.width - tabLeftMargin * 2) / 2;
+               itemWidth[0] = itemWidth[1] = __itemArea.width / 2;
 
-               __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin, vmargin, itemWidth[0], segmentedItemHeight));
-               __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + itemWidth[0], vmargin, itemWidth[1], segmentedItemHeight));
+               __pItems.at(0)->SetBounds(FloatRectangle(0.0f, vmargin, itemWidth[0], segmentedItemHeight));
+               __pItems.at(1)->SetBounds(FloatRectangle(itemWidth[0], vmargin, itemWidth[1], segmentedItemHeight));
 
                GET_SHAPE_CONFIG(HEADER::TAB_ITEM_FONT_SIZE, GetOrientation(), fontSize); // 30
 
@@ -8520,11 +8514,11 @@ _Toolbar::RearrangeTabItmes(void)
        }
        else if (__itemCount == 3)
        {
-               itemWidth[0] = itemWidth[1] = itemWidth[2] = (__itemArea.width - tabLeftMargin * 2) / 3;
+               itemWidth[0] = itemWidth[1] = itemWidth[2] = __itemArea.width / 3;
                itemWidth[1] += 1;
 
-               __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin, vmargin, itemWidth[0], segmentedItemHeight));
-               __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + itemWidth[0], vmargin, itemWidth[1], segmentedItemHeight));
+               __pItems.at(0)->SetBounds(FloatRectangle(0.0f, vmargin, itemWidth[0], segmentedItemHeight));
+               __pItems.at(1)->SetBounds(FloatRectangle(itemWidth[0], vmargin, itemWidth[1], segmentedItemHeight));
                __pItems.at(2)->SetBounds(FloatRectangle(__itemArea.width - itemWidth[2], vmargin, itemWidth[2] + 1, segmentedItemHeight));
 
                GET_SHAPE_CONFIG(HEADER::TAB_ITEM_FONT_SIZE_3_ITEM, GetOrientation(), fontSize); // 26
@@ -8540,14 +8534,12 @@ _Toolbar::RearrangeTabItmes(void)
        }
        else
        {
-               itemWidth[0] = itemWidth[1] = itemWidth[2] = itemWidth[3] = (__itemArea.width - tabLeftMargin * 2) / 4;
+               itemWidth[0] = itemWidth[1] = itemWidth[2] = itemWidth[3] = __itemArea.width / 4;
 
-               __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin, vmargin, itemWidth[0], segmentedItemHeight));
-               __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + itemWidth[0], vmargin, itemWidth[1], segmentedItemHeight));
-               __pItems.at(2)->SetBounds(FloatRectangle(tabLeftMargin + itemWidth[0] + itemWidth[1],
-                               vmargin, itemWidth[2], segmentedItemHeight));
-               __pItems.at(3)->SetBounds(FloatRectangle(tabLeftMargin + itemWidth[0] + itemWidth[1] + itemWidth[2],
-                               vmargin, itemWidth[3], segmentedItemHeight));
+               __pItems.at(0)->SetBounds(FloatRectangle(0.0f, vmargin, itemWidth[0], segmentedItemHeight));
+               __pItems.at(1)->SetBounds(FloatRectangle(itemWidth[0], vmargin, itemWidth[1], segmentedItemHeight));
+               __pItems.at(2)->SetBounds(FloatRectangle(itemWidth[0] + itemWidth[1], vmargin, itemWidth[2], segmentedItemHeight));
+               __pItems.at(3)->SetBounds(FloatRectangle(itemWidth[0] + itemWidth[1] + itemWidth[2], vmargin, itemWidth[3], segmentedItemHeight));
 
                GET_SHAPE_CONFIG(HEADER::TAB_ITEM_FONT_SIZE_4_ITEM, GetOrientation(), fontSize); // 24
                GET_SHAPE_CONFIG(HEADER::TAB_ITEM_FONT_SIZE_4_ITEM, GetOrientation(), multilineFontSize); // 24
@@ -8589,7 +8581,6 @@ _Toolbar::RearrangeButtonItems(void)
        float sideMargin = 0.0f;
        float itemButtonLeftGap = 0.0f;
        float itemButtonRightGap = 0.0f;
-       float tabLeftMargin = 0.0f;
        float iconSize = 0.0f;
        float footerLeftMargin = 0.0f;
        float segmentedItemHeight = 0.0f;
@@ -8601,15 +8592,11 @@ _Toolbar::RearrangeButtonItems(void)
 
        GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_ICON_SIZE, GetOrientation(), iconSize);
        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::SEGMENTED_ITEM_HEIGHT, GetOrientation(), segmentedItemHeight);
        GET_SHAPE_CONFIG(HEADER::LEFT_MARGIN, GetOrientation(), headerLeftMargin);
        GET_SHAPE_CONFIG(HEADER::DIVIDER_WIDTH, GetOrientation(), dividerWidth);
 
-
-       float tabRightMargin = tabLeftMargin;
-
        itemHeight = GetSizeF().height;
 
        if (__itemCount == 1)
@@ -8636,27 +8623,22 @@ _Toolbar::RearrangeButtonItems(void)
                        {
                                if (__pButtonItems[RIGHT_BUTTON])
                                {
-                                       tabLeftMargin = footerLeftMargin;
                                        itemButtonLeftGap = footerLeftMargin;
-                                       __itemArea.width -= ((tabLeftMargin + iconSize + itemButtonLeftGap) * 2);
+                                       __itemArea.width -= ((footerLeftMargin + iconSize + itemButtonLeftGap) * 2);
                                }
                                else
                                {
-                                       tabLeftMargin = footerLeftMargin;
                                        itemButtonLeftGap = footerLeftMargin;
-                                       __itemArea.width -= (tabLeftMargin + iconSize + itemButtonLeftGap + tabRightMargin);
+                                       __itemArea.width -= (footerLeftMargin + iconSize + itemButtonLeftGap);
                                }
                        }
                        else
                        {
                                if (__pButtonItems[RIGHT_BUTTON])
                                {
-                                       tabRightMargin = footerLeftMargin;
                                        itemButtonRightGap = footerLeftMargin;
-                                       __itemArea.width -= (tabLeftMargin + itemButtonRightGap + iconSize + tabRightMargin);
+                                       __itemArea.width -= (itemButtonRightGap + iconSize + footerLeftMargin);
                                }
-
-                               iconSize = 0;
                        }
 
                        blockWidth[0] = __itemArea.width;
@@ -8665,22 +8647,22 @@ _Toolbar::RearrangeButtonItems(void)
                        {
                                if (__pButtonItems[RIGHT_BUTTON])
                                {
-                                       __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - dividerWidth * 2, itemHeight));
+                                       __pItems.at(0)->SetBounds(FloatRectangle(footerLeftMargin + iconSize + itemButtonLeftGap + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - dividerWidth * 2, itemHeight));
                                }
                                else
                                {
-                                       __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - dividerWidth, itemHeight));
+                                       __pItems.at(0)->SetBounds(FloatRectangle(footerLeftMargin + iconSize + itemButtonLeftGap + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - dividerWidth, itemHeight));
                                }
                        }
                        else
                        {
                                if (__pButtonItems[RIGHT_BUTTON])
                                {
-                                       __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - dividerWidth, itemHeight));
+                                       __pItems.at(0)->SetBounds(FloatRectangle(0.0f, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - dividerWidth, itemHeight));
                                }
                                else
                                {
-                                       __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
+                                       __pItems.at(0)->SetBounds(FloatRectangle(0.0f, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
                                }
                        }
                }
@@ -8710,27 +8692,22 @@ _Toolbar::RearrangeButtonItems(void)
                {
                        if (__pButtonItems[RIGHT_BUTTON])
                        {
-                               tabLeftMargin = footerLeftMargin;
                                itemButtonLeftGap = footerLeftMargin;
-                               __itemArea.width -= ((tabLeftMargin + iconSize + itemButtonLeftGap) * 2);
+                               __itemArea.width -= ((footerLeftMargin + iconSize + itemButtonLeftGap) * 2);
                        }
                        else
                        {
-                               tabLeftMargin = footerLeftMargin;
                                itemButtonLeftGap = footerLeftMargin;
-                               __itemArea.width -= (tabLeftMargin + iconSize + itemButtonLeftGap + tabRightMargin);
+                               __itemArea.width -= (footerLeftMargin + iconSize + itemButtonLeftGap);
                        }
                }
                else
                {
                        if (__pButtonItems[RIGHT_BUTTON])
                        {
-                               tabRightMargin = footerLeftMargin;
                                itemButtonRightGap = footerLeftMargin;
-                               __itemArea.width -= (tabLeftMargin + itemButtonRightGap + iconSize + tabRightMargin);
+                               __itemArea.width -= (itemButtonRightGap + iconSize + footerLeftMargin);
                        }
-
-                       iconSize = 0;
                }
 
                blockWidth[0] = blockWidth[1] = __itemArea.width / 2;
@@ -8739,26 +8716,26 @@ _Toolbar::RearrangeButtonItems(void)
                {
                        if (__pButtonItems[RIGHT_BUTTON])
                        {
-                               __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - dividerWidth, itemHeight));
-                               __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0], (GetSizeF().height - itemHeight) / 2, blockWidth[1] - dividerWidth, itemHeight));
+                               __pItems.at(0)->SetBounds(FloatRectangle(footerLeftMargin + iconSize + itemButtonLeftGap + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - dividerWidth, itemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(footerLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0], (GetSizeF().height - itemHeight) / 2, blockWidth[1] - dividerWidth, itemHeight));
                        }
                        else
                        {
-                               __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - dividerWidth, itemHeight));
-                               __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0], (GetSizeF().height - itemHeight) / 2, blockWidth[1] + 1, itemHeight));
+                               __pItems.at(0)->SetBounds(FloatRectangle(footerLeftMargin + iconSize + itemButtonLeftGap + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - dividerWidth, itemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(footerLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0], (GetSizeF().height - itemHeight) / 2, blockWidth[1] + 1, itemHeight));
                        }
                }
                else
                {
                        if (__pButtonItems[RIGHT_BUTTON])
                        {
-                               __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], (GetSizeF().height - itemHeight) / 2, blockWidth[1] - dividerWidth, itemHeight));
+                               __pItems.at(0)->SetBounds(FloatRectangle(0.0f, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(blockWidth[0], (GetSizeF().height - itemHeight) / 2, blockWidth[1] - dividerWidth, itemHeight));
                        }
                        else
                        {
-                               __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], (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
+                               __pItems.at(0)->SetBounds(FloatRectangle(0.0f, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(blockWidth[0], (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
                        }
                }
 
@@ -8785,31 +8762,26 @@ _Toolbar::RearrangeButtonItems(void)
                {
                        if (__pButtonItems[RIGHT_BUTTON])
                        {
-                               tabLeftMargin = footerLeftMargin;
                                itemButtonLeftGap = footerLeftMargin;
-                               __itemArea.width -= ((tabLeftMargin + iconSize + itemButtonLeftGap) * 2);
+                               __itemArea.width -= ((footerLeftMargin + iconSize + itemButtonLeftGap) * 2);
                        }
                        else
                        {
-                               tabLeftMargin = footerLeftMargin;
                                itemButtonLeftGap = footerLeftMargin;
-                               __itemArea.width -= (tabLeftMargin + iconSize + itemButtonLeftGap + tabRightMargin);
+                               __itemArea.width -= (footerLeftMargin + iconSize + itemButtonLeftGap);
                        }
                }
                else
                {
                        if (__pButtonItems[RIGHT_BUTTON])
                        {
-                               tabRightMargin = footerLeftMargin;
                                itemButtonRightGap = footerLeftMargin;
-                               __itemArea.width -= (tabLeftMargin + itemButtonRightGap + iconSize + tabRightMargin);
+                               __itemArea.width -= (itemButtonRightGap + iconSize + footerLeftMargin);
                        }
                        else
                        {
-                               __itemArea.width -= tabLeftMargin * 2;
+                               ;//empty
                        }
-
-                       iconSize = 0;
                }
 
                blockWidth[0] = blockWidth[1] = blockWidth[2] = __itemArea.width / 3;
@@ -8819,15 +8791,15 @@ _Toolbar::RearrangeButtonItems(void)
                {
                        if (__pButtonItems[RIGHT_BUTTON])
                        {
-                               __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - dividerWidth, itemHeight));
-                               __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0], (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
-                               __pItems.at(2)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + blockWidth[1] - 1,
+                               __pItems.at(0)->SetBounds(FloatRectangle(footerLeftMargin + iconSize + itemButtonLeftGap + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - dividerWidth, itemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(footerLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0], (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
+                               __pItems.at(2)->SetBounds(FloatRectangle(footerLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + blockWidth[1] - 1,
                                                (GetSizeF().height - itemHeight) / 2, blockWidth[2] - dividerWidth + 1, itemHeight));
                        }
                        else
                        {
-                               __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - dividerWidth, itemHeight));
-                               __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0], (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
+                               __pItems.at(0)->SetBounds(FloatRectangle(footerLeftMargin + iconSize + itemButtonLeftGap + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - dividerWidth, itemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(footerLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0], (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
                                __pItems.at(2)->SetBounds(FloatRectangle(GetSizeF().width - blockWidth[2],
                                                        (GetSizeF().height - itemHeight) / 2, blockWidth[2] + 2, itemHeight));
                        }
@@ -8836,15 +8808,15 @@ _Toolbar::RearrangeButtonItems(void)
                {
                        if (__pButtonItems[RIGHT_BUTTON])
                        {
-                               __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], (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
+                               __pItems.at(0)->SetBounds(FloatRectangle(0.0f, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(blockWidth[0], (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
                                __pItems.at(2)->SetBounds(FloatRectangle(__itemArea.width - blockWidth[2],
                                                (GetSizeF().height - itemHeight) / 2, blockWidth[2] - dividerWidth + 1, itemHeight));
                        }
                        else
                        {
-                               __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], (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
+                               __pItems.at(0)->SetBounds(FloatRectangle(0.0f, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(blockWidth[0], (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
                                __pItems.at(2)->SetBounds(FloatRectangle(GetSizeF().width - blockWidth[2],
                                                (GetSizeF().height - itemHeight) / 2, blockWidth[2] + 1, itemHeight));
                        }
@@ -8868,15 +8840,13 @@ _Toolbar::RearrangeButtonItems(void)
        }
        else if (__itemCount == 4)
        {
-               __itemArea.width -= tabLeftMargin * 2;
-
                blockWidth[0] = blockWidth[1] = blockWidth[2] = blockWidth[3] = __itemArea.width / 4;
 
-               __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
-               __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + blockWidth[0], (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
-               __pItems.at(2)->SetBounds(FloatRectangle(tabLeftMargin + blockWidth[0] + blockWidth[1],
+               __pItems.at(0)->SetBounds(FloatRectangle(0.0f, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
+               __pItems.at(1)->SetBounds(FloatRectangle(blockWidth[0], (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
+               __pItems.at(2)->SetBounds(FloatRectangle(blockWidth[0] + blockWidth[1],
                                (GetSizeF().height - itemHeight) / 2, blockWidth[2], itemHeight));
-               __pItems.at(3)->SetBounds(FloatRectangle(tabLeftMargin + blockWidth[0] + blockWidth[1] + blockWidth[2],
+               __pItems.at(3)->SetBounds(FloatRectangle(blockWidth[0] + blockWidth[1] + blockWidth[2],
                                (GetSizeF().height - itemHeight) / 2, blockWidth[3], itemHeight));
 
                for (int i = 0; i < __itemCount; i++)
@@ -8897,17 +8867,15 @@ _Toolbar::RearrangeButtonItems(void)
        }
        else if (__itemCount == 5)
        {
-               __itemArea.width -= tabLeftMargin * 2;
-
                blockWidth[0] = blockWidth[1] = blockWidth[2] = blockWidth[3] = blockWidth[4] = __itemArea.width / 5;
 
-               __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
-               __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + blockWidth[0], (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
-               __pItems.at(2)->SetBounds(FloatRectangle(tabLeftMargin + blockWidth[0] + blockWidth[1],
+               __pItems.at(0)->SetBounds(FloatRectangle(0.0f, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
+               __pItems.at(1)->SetBounds(FloatRectangle(blockWidth[0], (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
+               __pItems.at(2)->SetBounds(FloatRectangle(blockWidth[0] + blockWidth[1],
                                (GetSizeF().height - itemHeight) / 2, blockWidth[2], itemHeight));
-               __pItems.at(3)->SetBounds(FloatRectangle(tabLeftMargin + blockWidth[0] + blockWidth[1] + blockWidth[2],
+               __pItems.at(3)->SetBounds(FloatRectangle(blockWidth[0] + blockWidth[1] + blockWidth[2],
                                (GetSizeF().height - itemHeight) / 2, blockWidth[3], itemHeight));
-               __pItems.at(4)->SetBounds(FloatRectangle(tabLeftMargin + blockWidth[0] + blockWidth[1] + blockWidth[2] + blockWidth[3],
+               __pItems.at(4)->SetBounds(FloatRectangle(blockWidth[0] + blockWidth[1] + blockWidth[2] + blockWidth[3],
                                (GetSizeF().height - itemHeight) / 2, blockWidth[4], 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 7c275dd..d596bdb 100644 (file)
--- a/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp
@@ -1393,9 +1393,6 @@ _ToolbarPresenter::OnTouchReleased(const _Control& source, const _TouchInfo& tou
        __touchInitiatedInToolbar = false;
 
        int releasedItemIndex = __pToolbar->GetItemIndexFromPosition(touchPoint);
-       float tabLeftMargin = 0.0f;
-
-       GET_SHAPE_CONFIG(HEADER::TAB_LEFT_MARGIN, __pToolbar->GetOrientation(), tabLeftMargin);
 
        if ((style == TOOLBAR_TAB || style == TOOLBAR_TAB_WITH_TITLE || style == TOOLBAR_TAB_LARGE) && __beingEdited == true)
        {
@@ -1420,7 +1417,7 @@ _ToolbarPresenter::OnTouchReleased(const _Control& source, const _TouchInfo& tou
                {
                        __pToolbar->MoveItem(__editItemIndex, releasedItemIndex);
 
-                       AdjustItemPositionX(-__pToolbar->GetItem(__firstLoadedItemIndex)->GetBoundsF().x + tabLeftMargin); // move auto focus
+                       AdjustItemPositionX(-__pToolbar->GetItem(__firstLoadedItemIndex)->GetBoundsF().x); // move auto focus
 
                        if (__pEditItem)
                        {
@@ -1682,9 +1679,6 @@ _ToolbarPresenter::OnTouchMoved(const _Control& source, const _TouchInfo& touchi
        if (__tabMoved)
        {
                float distance = (touchinfo.GetCurrentPosition()).x - __currentTouchPosition.x;
-               float sideMargin = 0.0f;
-
-               GET_SHAPE_CONFIG(HEADER::TAB_LEFT_MARGIN, __pToolbar->GetOrientation(), sideMargin);
 
                FloatRectangle clientBounds = __pToolbar->GetBoundsF();
 
@@ -1722,9 +1716,9 @@ _ToolbarPresenter::OnTouchMoved(const _Control& source, const _TouchInfo& touchi
 
                        itemBounds = pItem->GetBoundsF();
 
-                       if (itemBounds.x + distance >= sideMargin && !__beingEdited)
+                       if (itemBounds.x + distance >= 0.0f && !__beingEdited)
                        {
-                               distance = sideMargin - itemBounds.x;
+                               distance = 0.0f - itemBounds.x;
                        }
                }
                else if (distance < 0)
@@ -1738,17 +1732,14 @@ _ToolbarPresenter::OnTouchMoved(const _Control& source, const _TouchInfo& touchi
 
                        itemBounds = pItem->GetBoundsF();
 
-                       if (itemBounds.x + itemBounds.width + distance <= clientBounds.width - sideMargin && !__beingEdited)
+                       if (itemBounds.x + itemBounds.width + distance <= clientBounds.width && !__beingEdited)
                        {
-                               distance = (clientBounds.width - sideMargin) - (itemBounds.x + itemBounds.width);
+                               distance = clientBounds.width - (itemBounds.x + itemBounds.width);
                        }
                }
+
                if (__beingEdited)
                {
-                       float tabLeftMargin = 0.0f;
-
-                       GET_SHAPE_CONFIG(HEADER::TAB_LEFT_MARGIN, __pToolbar->GetOrientation(), tabLeftMargin);
-
                        if (distance > 0) // right move
                        {
                                __tabSlideRight = false;
@@ -1758,7 +1749,7 @@ _ToolbarPresenter::OnTouchMoved(const _Control& source, const _TouchInfo& touchi
                                        __tabSlideLeft = true;
                                }
 
-                               if (__tabSlideLeft && __pToolbar->GetItem(itemCount-1)->GetBoundsF().x + __pToolbar->GetItem(itemCount-1)->GetBoundsF().width > clientBounds.width - tabLeftMargin)
+                               if (__tabSlideLeft && __pToolbar->GetItem(itemCount-1)->GetBoundsF().x + __pToolbar->GetItem(itemCount-1)->GetBoundsF().width > clientBounds.width)
                                {
                                        AdjustItemPositionX(-distance * 5); // move auto focus
                                }
@@ -1772,7 +1763,7 @@ _ToolbarPresenter::OnTouchMoved(const _Control& source, const _TouchInfo& touchi
                                        __tabSlideRight = true;
                                }
 
-                               if (__tabSlideRight     && __pToolbar->GetItem(0)->GetBoundsF().x < tabLeftMargin)
+                               if (__tabSlideRight     && __pToolbar->GetItem(0)->GetBoundsF().x < 0.0f)
                                {
                                        AdjustItemPositionX(-distance * 5); // move auto focus
                                }
@@ -2262,6 +2253,25 @@ _ToolbarPresenter::AdjustItemPositionX(float distance)
        int itemCount = __pToolbar->GetItemCount();
        _Button* pItem = __pToolbar->GetItem(index);
 
+       FloatRectangle itemBounds(0.0f, 0.0f, 0.0f, 0.0f);
+
+       if (distance > 0)
+       {
+               itemBounds = __pToolbar->GetItem(0)->GetBoundsF();
+               if (itemBounds.x + distance > 0.0f)
+               {
+                       distance = itemBounds.x - distance;
+               }
+       }
+       else
+       {
+               itemBounds = __pToolbar->GetItem(itemCount - 4)->GetBoundsF();
+               if (itemBounds.x + distance < 0.0f)
+               {
+                       distance = itemBounds.x - distance;
+               }
+       }
+
        while (pItem != null)
        {
                FloatRectangle bounds = pItem->GetBoundsF();
@@ -2512,17 +2522,14 @@ _ToolbarPresenter::SetItemFit(int index)
        FloatRectangle bounds(0.0f, 0.0f, 0.0f, 0.0f);
 
        float fitDistance = 0.0f;
-       float tabLeftMargin = 0.0f;
        int itemCount = __pToolbar->GetItemCount();
 
-       GET_SHAPE_CONFIG(HEADER::TAB_LEFT_MARGIN, __pToolbar->GetOrientation(), tabLeftMargin);
-
        _Button* pItem = __pToolbar->GetItem(index);
        SysTryReturnVoidResult(NID_UI_CTRL, pItem, GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
 
        bounds = pItem->GetBoundsF();
 
-       fitDistance = -bounds.x + tabLeftMargin;
+       fitDistance = -bounds.x;
 
        for (int i = 0; i < itemCount; i++)
        {

diff --git a/src/ui/inc/FUiCtrl_ButtonPresenter.h b/src/ui/inc/FUiCtrl_ButtonPresenter.h
index 51cff52..0047e5e 100644 (file)
--- a/src/ui/inc/FUiCtrl_ButtonPresenter.h
+++ b/src/ui/inc/FUiCtrl_ButtonPresenter.h
@@ -111,9 +111,9 @@ private:
 
        bool IsEnabledStateChanged(void);
 
-       result TimerForTitleSlideInit(void);
-       result TimerForTitleSlideStart(void);
-       result TimerForTitleSlideTimeout(void);
+       result TimerForTextSlideInit(void);
+       result TimerForTextSlideStart(void);
+       result TimerForTextSlideTimeout(void);
 
 private:
        _Button* __pButton;
@@ -133,7 +133,7 @@ private:
 
        Tizen::Base::Runtime::Timer* __pTextSlideTimer;
        Tizen::Graphics::FloatRectangle __textRect;
-       Tizen::Graphics::Bitmap* __pTabLargeSelectedBitmap;
+       Tizen::Graphics::Bitmap* __pTextSlideClippedBitmap;
 }; // _ButtonPresenter
 
 }}} // Tizen::Ui::Controls

diff --git a/src/ui/inc/FUi_ResourceHeaderConfig.h b/src/ui/inc/FUi_ResourceHeaderConfig.h
index d008106..2da5abb 100644 (file)
--- a/src/ui/inc/FUi_ResourceHeaderConfig.h
+++ b/src/ui/inc/FUi_ResourceHeaderConfig.h
@@ -259,7 +259,7 @@ DECLARE_UI_CONFIG(HEADER);
        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);
-       DECLARE_SHAPE_CONFIG(TAB_LEFT_MARGIN, 44);
+       //DECLARE_SHAPE_CONFIG(TAB_LEFT_MARGIN, 44);
        DECLARE_SHAPE_CONFIG(SIP_BUTTON_ITEM_TOP_MARGIN, 45);
        DECLARE_SHAPE_CONFIG(SIP_FOOTER_ITEM_TOP_MARGIN, 46);
        DECLARE_SHAPE_CONFIG(ICON_WIDTH, 47);

diff --git a/src/ui/resource/FUi_ResourceHeaderConfig.cpp b/src/ui/resource/FUi_ResourceHeaderConfig.cpp
index 7589dfc..1ae5974 100644 (file)
--- a/src/ui/resource/FUi_ResourceHeaderConfig.cpp
+++ b/src/ui/resource/FUi_ResourceHeaderConfig.cpp
@@ -336,7 +336,7 @@ START_UI_CONFIG(HEADER);
 
                ADD_SHAPE_CONFIG(TAB_ITEM_ICON_SIZE, 63);
                ADD_SHAPE_CONFIG(TAB_ITEM_ICON_SIZE_WITH_TEXT, 45);
-               ADD_SHAPE_CONFIG(TAB_LEFT_MARGIN, 0);
+               //ADD_SHAPE_CONFIG(TAB_LEFT_MARGIN, 0);
 
                ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_TOP_MARGIN, 0);
                ADD_SHAPE_CONFIG(SIP_FOOTER_ITEM_TOP_MARGIN, 16.5);
@@ -440,7 +440,7 @@ START_UI_CONFIG(HEADER);
 
                ADD_SHAPE_CONFIG(TAB_ITEM_ICON_SIZE, 63);
                ADD_SHAPE_CONFIG(TAB_ITEM_ICON_SIZE_WITH_TEXT, 45);
-               ADD_SHAPE_CONFIG(TAB_LEFT_MARGIN, 0);
+               //ADD_SHAPE_CONFIG(TAB_LEFT_MARGIN, 0);
 
                ADD_SHAPE_CONFIG(SIP_BUTTON_ITEM_TOP_MARGIN, 0);//1280x720
                ADD_SHAPE_CONFIG(SIP_FOOTER_ITEM_TOP_MARGIN, 14);