apply v4.6 gui for button divider

Change-Id: I3e6ee946bef7bc835e2b056217a2f49d9f139fd2

diff --git a/src/ui/controls/FUiCtrl_HeaderImpl.cpp b/src/ui/controls/FUiCtrl_HeaderImpl.cpp
index 0ea81fd..cc18a3b 100644 (file)
--- a/src/ui/controls/FUiCtrl_HeaderImpl.cpp
+++ b/src/ui/controls/FUiCtrl_HeaderImpl.cpp
@@ -168,7 +168,7 @@ _HeaderImpl::AddItem(const HeaderItem& item)
        {
                pButton->SetButtonStyle(_BUTTON_STYLE_SEGMENT);
 
-               if (__style == HEADER_STYLE_TAB_LARGE)
+               if (__style == HEADER_STYLE_TAB_LARGE || __style == HEADER_STYLE_SEGMENTED_WITH_TITLE || __style == HEADER_STYLE_TAB_WITH_TITLE)
                {
                        pButton->SetTabTextSlide(true);
                }

diff --git a/src/ui/controls/FUiCtrl_Toolbar.cpp b/src/ui/controls/FUiCtrl_Toolbar.cpp
index e6283b6..f959135 100644 (file)
--- a/src/ui/controls/FUiCtrl_Toolbar.cpp
+++ b/src/ui/controls/FUiCtrl_Toolbar.cpp
@@ -6337,6 +6337,12 @@ _Toolbar::RealignItem(_Button* pButton, float textExtentSize)
                                pButton->SetUserDefinedTextArea(FloatRectangle(sideMargin, largeTabTopMargin + iconAreaWidth,
                                                buttonItemWidth - sideMargin * 2, largeTabTextHeight));
                        }
+                       else if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE || __style == TOOLBAR_TAB_WITH_TITLE)
+                       {
+                               pButton->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
+                               pButton->SetUserDefinedTextArea(FloatRectangle((buttonItemWidth - contentLength) / 2 + iconAreaWidth + iconTextGap, (buttonItemHeight - largeTabTextHeight) / 2,
+                                               buttonItemWidth - iconAreaWidth - iconTextGap - sideMargin * 2, largeTabTextHeight));
+                       }
                        else
                        {
                                pButton->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
@@ -6854,7 +6860,7 @@ _Toolbar::RearrangeItems(void)
                                        __pButtonItems[RIGHT_BUTTON]->SetBounds(FloatRectangle(__itemArea.width - footerButtonItemWidth - footerLeftMargin + rightTouchMargin,
                                                        (__itemArea.height - footerButtonItemHeight) / 2, footerButtonItemWidth, footerButtonItemHeight));
 
-                                       __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(footerLeftMargin - leftTouchMargin, (__itemArea.height - footerButtonItemHeight) / 2,
+                                       __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(0.0f, (__itemArea.height - footerButtonItemHeight) / 2,
                                                        footerButtonItemWidth, footerButtonItemHeight));
 
                                        __pButtonItems[RIGHT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
@@ -6912,7 +6918,7 @@ _Toolbar::RearrangeItems(void)
                {
                        if (__style != TOOLBAR_SOFTKEY)
                        {
-                               __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(footerLeftMargin - leftTouchMargin, (__itemArea.height - footerButtonItemHeight) / 2,
+                               __pButtonItems[LEFT_BUTTON]->SetBounds(FloatRectangle(0.0f, (__itemArea.height - footerButtonItemHeight) / 2,
                                                footerButtonItemWidth, footerButtonItemHeight));
 
                                __pButtonItems[LEFT_BUTTON]->SetTouchMargin(leftTouchMargin, topTouchMargin, rightTouchMargin, bottomTouchMargin);
@@ -7197,7 +7203,28 @@ _Toolbar::RearrangeFooterSegmentedItems(void)
 
                blockWidth[0] = __itemArea.width;
 
-               __pItems.at(0)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0], segmentedItemHeight));
+               if (__pButtonItems[LEFT_BUTTON])
+               {
+                       if (__pButtonItems[RIGHT_BUTTON])
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(3 + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - 6, segmentedItemHeight));
+                       }
+                       else
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(3 + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - 3, segmentedItemHeight));
+                       }
+               }
+               else
+               {
+                       if (__pButtonItems[RIGHT_BUTTON])
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - 3, segmentedItemHeight));
+                       }
+                       else
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0], segmentedItemHeight));
+                       }
+               }
 
                for (int i = 0; i < __itemCount ; i++)
                {
@@ -7249,8 +7276,33 @@ _Toolbar::RearrangeFooterSegmentedItems(void)
 
                blockWidth[0] = blockWidth[1] = (__itemArea.width - dividerWidth) / 2;
 
-               __pItems.at(0)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0], segmentedItemHeight));
-               __pItems.at(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1], segmentedItemHeight));
+               if (__pButtonItems[LEFT_BUTTON])
+               {
+                       if (__pButtonItems[RIGHT_BUTTON])
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(3 + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - 3, segmentedItemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1] - 3, segmentedItemHeight));
+                       }
+                       else
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(3 + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - 3, segmentedItemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1], segmentedItemHeight));
+                       }
+               }
+               else
+               {
+                       if (__pButtonItems[RIGHT_BUTTON])
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0], segmentedItemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1] - 3, segmentedItemHeight));
+                       }
+                       else
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0], segmentedItemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1], segmentedItemHeight));
+                       }
+               }
+
 
                for (int i = 0; i < __itemCount ; i++)
                {
@@ -7303,10 +7355,40 @@ _Toolbar::RearrangeFooterSegmentedItems(void)
 
                blockWidth[0] = blockWidth[1] = blockWidth[2] = (__itemArea.width - dividerWidth * 2) / 3;
 
-               __pItems.at(0)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0], segmentedItemHeight));
-               __pItems.at(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1], segmentedItemHeight));
-               __pItems.at(2)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
-                               (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[2], segmentedItemHeight));
+               if (__pButtonItems[LEFT_BUTTON])
+               {
+                       if (__pButtonItems[RIGHT_BUTTON])
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(3 + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - 3, segmentedItemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1], segmentedItemHeight));
+                               __pItems.at(2)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
+                                               (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[2] - 3, segmentedItemHeight));
+                       }
+                       else
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(3 + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - 3, segmentedItemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1], segmentedItemHeight));
+                               __pItems.at(2)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
+                                               (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[2] - 3, segmentedItemHeight));
+                       }
+               }
+               else
+               {
+                       if (__pButtonItems[RIGHT_BUTTON])
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0], segmentedItemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1], segmentedItemHeight));
+                               __pItems.at(2)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
+                                               (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[2] - 3, segmentedItemHeight));
+                       }
+                       else
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0], segmentedItemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1], segmentedItemHeight));
+                               __pItems.at(2)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
+                                               (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[2], segmentedItemHeight));
+                       }
+               }
 
                for (int i = 0; i < __itemCount ; i++)
                {
@@ -7567,7 +7649,28 @@ _Toolbar::RearrangeButtonItems(void)
 
                        blockWidth[0] = __itemArea.width;
 
-                       __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
+                       if (__pButtonItems[LEFT_BUTTON])
+                       {
+                               if (__pButtonItems[RIGHT_BUTTON])
+                               {
+                                       __pItems.at(0)->SetBounds(FloatRectangle(3 + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - 6, itemHeight));
+                               }
+                               else
+                               {
+                                       __pItems.at(0)->SetBounds(FloatRectangle(3 + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - 3, itemHeight));
+                               }
+                       }
+                       else
+                       {
+                               if (__pButtonItems[RIGHT_BUTTON])
+                               {
+                                       __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - 3, itemHeight));
+                               }
+                               else
+                               {
+                                       __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
+                               }
+                       }
                }
 
                for (int i = 0; i < __itemCount; i++)
@@ -7620,8 +7723,32 @@ _Toolbar::RearrangeButtonItems(void)
 
                blockWidth[0] = blockWidth[1] = (__itemArea.width - dividerWidth * 1) / 2;
 
-               __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
-               __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
+               if (__pButtonItems[LEFT_BUTTON])
+               {
+                       if (__pButtonItems[RIGHT_BUTTON])
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(3 + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - 3, itemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1] - 3, itemHeight));
+                       }
+                       else
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(3 + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - 3, itemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[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] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1] - 3, 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] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
+                       }
+               }
 
                for (int i = 0; i < __itemCount; i++)
                {
@@ -7675,10 +7802,40 @@ _Toolbar::RearrangeButtonItems(void)
 
                blockWidth[0] = blockWidth[1] = blockWidth[2] = (__itemArea.width - dividerWidth * 2) / 3;
 
-               __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0], itemHeight));
-               __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
-               __pItems.at(2)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
-                               (GetSizeF().height - itemHeight) / 2, blockWidth[2], itemHeight));
+               if (__pButtonItems[LEFT_BUTTON])
+               {
+                       if (__pButtonItems[RIGHT_BUTTON])
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(3 + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - 3, itemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
+                               __pItems.at(2)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
+                                               (GetSizeF().height - itemHeight) / 2, blockWidth[2] - 3, itemHeight));
+                       }
+                       else
+                       {
+                               __pItems.at(0)->SetBounds(FloatRectangle(3 + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - 3, itemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
+                               __pItems.at(2)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
+                                                       (GetSizeF().height - itemHeight) / 2, blockWidth[2], 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] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
+                               __pItems.at(2)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
+                                               (GetSizeF().height - itemHeight) / 2, blockWidth[2] - 3, 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] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
+                               __pItems.at(2)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + blockWidth[1] + dividerWidth * 2,
+                                               (GetSizeF().height - itemHeight) / 2, blockWidth[2], 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 763510b..43ec2e1 100644 (file)
--- a/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp
@@ -228,7 +228,16 @@ _ToolbarPresenter::Draw(void)
        }
 
        GET_SHAPE_CONFIG(HEADER::DIVIDER_WIDTH, __pToolbar->GetOrientation(), buttonItemGap);
-       GET_SHAPE_CONFIG(HEADER::DIVIDER_HEIGHT, __pToolbar->GetOrientation(), dividerHeight);
+
+       if (style == TOOLBAR_TAB_LARGE)
+       {
+               GET_SHAPE_CONFIG(HEADER::TAB_LARGE_DIVIDER_HEIGHT, __pToolbar->GetOrientation(), dividerHeight);
+       }
+       else
+       {
+               GET_SHAPE_CONFIG(HEADER::DIVIDER_HEIGHT, __pToolbar->GetOrientation(), dividerHeight);
+       }
+
        GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_HEIGHT, __pToolbar->GetOrientation(), segmentedItemHeight);
 
        GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_WIDTH, __pToolbar->GetOrientation(), footerButtonItemWidth);
@@ -326,14 +335,14 @@ _ToolbarPresenter::Draw(void)
        {
                if (__pToolbar->GetButton(RIGHT_BUTTON))
                {
-                       //DrawDivider(FloatPoint(bounds.width - __pToolbar->GetButton(RIGHT_BUTTON)->GetBoundsF().width - buttonItemGap,
-                       //              dividerTopMargin + (dividerBaseHeight - dividerHeight) / 2), pCanvas);
+                       DrawDivider(FloatPoint(bounds.width - __pToolbar->GetButton(RIGHT_BUTTON)->GetBoundsF().width - buttonItemGap,
+                                       dividerTopMargin + (dividerBaseHeight - dividerHeight) / 2), pCanvas);
                }
 
                if (__pToolbar->GetButton(LEFT_BUTTON))
                {
-                       //DrawDivider(FloatPoint(__pToolbar->GetButton(LEFT_BUTTON)->GetBoundsF().width + buttonItemGap,
-                       //              dividerTopMargin + (dividerBaseHeight - dividerHeight) / 2), pCanvas);
+                       DrawDivider(FloatPoint(__pToolbar->GetButton(LEFT_BUTTON)->GetBoundsF().width + buttonItemGap,
+                                       dividerTopMargin + (dividerBaseHeight - dividerHeight) / 2), pCanvas);
                }
        }
 
@@ -573,8 +582,14 @@ _ToolbarPresenter::DrawDivider(const FloatPoint& point, Canvas* pCanvas)
        Color dividerLeftColor;
        Color dividerRightColor;
 
-       GET_SHAPE_CONFIG(HEADER::DIVIDER_WIDTH, __pToolbar->GetOrientation(), dividerWidth);
-       GET_SHAPE_CONFIG(HEADER::DIVIDER_HEIGHT, __pToolbar->GetOrientation(), dividerHeight);
+       if (style == TOOLBAR_TAB_LARGE)
+       {
+               GET_SHAPE_CONFIG(HEADER::TAB_LARGE_DIVIDER_HEIGHT, __pToolbar->GetOrientation(), dividerHeight);
+       }
+       else
+       {
+               GET_SHAPE_CONFIG(HEADER::DIVIDER_HEIGHT, __pToolbar->GetOrientation(), dividerHeight);
+       }
 
        if (__pToolbar->IsHeader() == true)
        {

diff --git a/src/ui/inc/FUi_ResourceHeaderConfig.h b/src/ui/inc/FUi_ResourceHeaderConfig.h
index ab4b161..a71506a 100644 (file)
--- a/src/ui/inc/FUi_ResourceHeaderConfig.h
+++ b/src/ui/inc/FUi_ResourceHeaderConfig.h
@@ -272,6 +272,7 @@ DECLARE_UI_CONFIG(HEADER);
        DECLARE_SHAPE_CONFIG(TAB_LARGE_HEIGHT, 72);
        DECLARE_SHAPE_CONFIG(TAB_LARGE_TOP_MARGIN, 73);
        DECLARE_SHAPE_CONFIG(TAB_LARGE_TEXT_HEIGHT, 74);
+       DECLARE_SHAPE_CONFIG(TAB_LARGE_DIVIDER_HEIGHT, 75);
 
 DECLARE_END_UI_CONFIG(HEADER);
 

diff --git a/src/ui/resource/FUi_ResourceHeaderConfig.cpp b/src/ui/resource/FUi_ResourceHeaderConfig.cpp
index ce1c022..a64d57b 100644 (file)
--- a/src/ui/resource/FUi_ResourceHeaderConfig.cpp
+++ b/src/ui/resource/FUi_ResourceHeaderConfig.cpp
@@ -346,6 +346,7 @@ START_UI_CONFIG(HEADER);
                ADD_SHAPE_CONFIG(TAB_LARGE_HEIGHT, 126);
                ADD_SHAPE_CONFIG(TAB_LARGE_TOP_MARGIN, 15);
                ADD_SHAPE_CONFIG(TAB_LARGE_TEXT_HEIGHT, 34);
+               ADD_SHAPE_CONFIG(TAB_LARGE_DIVIDER_HEIGHT, 88);
 
        END_UI_CONFIG_MODE(720x1280);
 
@@ -439,6 +440,7 @@ START_UI_CONFIG(HEADER);
                ADD_SHAPE_CONFIG(TAB_LARGE_HEIGHT, 126);
                ADD_SHAPE_CONFIG(TAB_LARGE_TOP_MARGIN, 15);
                ADD_SHAPE_CONFIG(TAB_LARGE_TEXT_HEIGHT, 34);
+               ADD_SHAPE_CONFIG(TAB_LARGE_DIVIDER_HEIGHT, 88);
 
        END_UI_CONFIG_MODE(1280x720);
 }