fix jira defect

Change-Id: Ie58c56a0e14814223e57e6bddacf1052782ef572

diff --git a/src/ui/controls/FUiCtrl_Button.cpp b/src/ui/controls/FUiCtrl_Button.cpp
index 37fd71e..4ca33b7 100644 (file)
--- a/src/ui/controls/FUiCtrl_Button.cpp
+++ b/src/ui/controls/FUiCtrl_Button.cpp
@@ -1486,66 +1486,54 @@ _Button::GetContentSizeInternalF(bool horizontalMode, bool verticalMode) const
                }
        }
 
+       FloatDimension textSize(0.0f, 0.0f);
        FloatDimension dimension(0.0f, 0.0f);
        FloatRectangle contentRect(0.0f, 0.0f, 0.0f, 0.0f);
 
        TextObject* pTextObject = __pButtonPresenter->GetTextObject();
-       Font* pFont = __pButtonPresenter->GetFont();
 
-       TextObjectActionType previousActionType = pTextObject->GetAction();
-       TextObjectWrapType previousWrapType = pTextObject->GetWrap();
        FloatRectangle previousRect = pTextObject->GetBoundsF();
 
-       pTextObject->SetBounds(FloatRectangle(0.0f, 0.0f, GetBoundsF().width - __leftMargin * 2, GetBoundsF().height - __topMargin * 2));
-       pTextObject->SetAction(TEXT_OBJECT_ACTION_TYPE_NONE);
-       pTextObject->SetWrap(TEXT_OBJECT_WRAP_TYPE_WORD);
-       pTextObject->SetFont(pFont, 0, pTextObject->GetTextLength());
-       pTextObject->Compose();
+       dimension.width = GetBoundsF().width - __leftMargin * 2;
+       dimension.height = GetBoundsF().height - __topMargin * 2;
 
        _ControlOrientation orientation = GetOrientation();
        if (orientation == _CONTROL_ORIENTATION_PORTRAIT)
        {
                contentRect.width = _ControlManager::GetInstance()->GetScreenSizeF().width;
+               contentRect.height = _ControlManager::GetInstance()->GetScreenSizeF().height;
        }
        else
        {
                contentRect.width = _ControlManager::GetInstance()->GetScreenSizeF().height;
+               contentRect.height = _ControlManager::GetInstance()->GetScreenSizeF().width;
        }
 
        if (horizontalMode == true)
        {
-               dimension = pTextObject->GetTextExtentF(0, pTextObject->GetTextLength());
-
-               if (dimension.width > contentRect.width - GetBoundsF().x - __leftMargin * 2)
-               {
-                       dimension.width = contentRect.width - GetBoundsF().x - __leftMargin * 2;
+               FloatRectangle bounds(0.0f, 0.0f, contentRect.width - GetBoundsF().x - __leftMargin, dimension.height);
+               pTextObject->SetBounds(bounds);
+               pTextObject->SetAction(TEXT_OBJECT_ACTION_TYPE_NONE);
+               pTextObject->Compose();
 
-                       pTextObject->SetBounds(FloatRectangle(previousRect.x, previousRect.y, dimension.width, previousRect.height));
-                       pTextObject->Compose();
+               textSize = pTextObject->GetTextExtentF();
 
-                       dimension.height = pTextObject->GetTotalHeightF();
-               }
+               dimension.width = (textSize.width < bounds.width) ? textSize.width : bounds.width;
        }
 
        if (verticalMode == true)
        {
-               dimension = pTextObject->GetTextExtentF();
-
-               if (dimension.width > GetBoundsF().width - __leftMargin * 2)
-               {
-                       dimension.width = GetBoundsF().width - __leftMargin * 2;
+               FloatRectangle bounds(0.0f, 0.0f, dimension.width, dimension.height);
+               pTextObject->SetBounds(bounds);
+               pTextObject->SetAction(TEXT_OBJECT_ACTION_TYPE_NONE);
+               pTextObject->Compose();
 
-                       pTextObject->SetBounds(FloatRectangle(previousRect.x, previousRect.y, dimension.width, previousRect.height));
-                       pTextObject->Compose();
+               textSize = pTextObject->GetTextExtentF();
 
-                       dimension.height = pTextObject->GetTotalHeightF();
-               }
+               dimension.height = textSize.height;
        }
 
        pTextObject->SetBounds(previousRect);
-       pTextObject->SetAction(previousActionType);
-       pTextObject->SetWrap(previousWrapType);
-       pTextObject->Compose();
 
        dimension.width += __leftMargin * 4 - __leftTouchMargin - __rightTouchMargin;
        dimension.height += __topMargin * 4 - __topTouchMargin - __bottomTouchMargin;

diff --git a/src/ui/controls/FUiCtrl_ButtonPresenter.cpp b/src/ui/controls/FUiCtrl_ButtonPresenter.cpp
index 60e3f28..d5d7a63 100644 (file)
--- a/src/ui/controls/FUiCtrl_ButtonPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ButtonPresenter.cpp
@@ -484,6 +484,10 @@ _ButtonPresenter::DrawBackground(void)
        }
        else // nobody set bitmap (default bitmap draw) // if (__pButton->IsUserBackgroundBitmap(status))
        {
+               __pBase->SetImageSource(L"");
+
+               __lazyDecode = false;
+
                pCanvas = __pButton->GetCanvasN();
                if (pCanvas == null)
                {

diff --git a/src/ui/controls/FUiCtrl_FooterImpl.cpp b/src/ui/controls/FUiCtrl_FooterImpl.cpp
index 4f6f302..cddd5d6 100644 (file)
--- a/src/ui/controls/FUiCtrl_FooterImpl.cpp
+++ b/src/ui/controls/FUiCtrl_FooterImpl.cpp
@@ -811,7 +811,7 @@ _FooterImpl::ConvertButtonItem(const ButtonItem& buttonItem)
 
        float iconSize = 0.0f;
 
-       GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_ICON_SIZE, GetCore().GetOrientation(), iconSize);
+       GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_ICON_SIZE, GetCore().GetOrientation(), iconSize); //63
 
        Bitmap* pIconBitmap = null;
 
@@ -995,13 +995,13 @@ _FooterImpl::ConvertFooterItem(const FooterItem& footerItem)
        {
                r = GET_SHAPE_CONFIG(FOOTER::SEGMENTED_ITEM_FONT_SIZE, GetCore().GetOrientation(), fontSize);
 
-               if (footerItem.GetText() != L"")
+               if (footerItem.GetText() != L"" && __style != FOOTER_STYLE_TAB_LARGE)
                {
-                       GET_SHAPE_CONFIG(HEADER::TAB_ITEM_ICON_SIZE_WITH_TEXT, GetCore().GetOrientation(), iconSize);
+                       GET_SHAPE_CONFIG(HEADER::TAB_ITEM_ICON_SIZE_WITH_TEXT, GetCore().GetOrientation(), iconSize); //45
                }
                else
                {
-                       GET_SHAPE_CONFIG(HEADER::TAB_ITEM_ICON_SIZE, GetCore().GetOrientation(), iconSize);
+                       GET_SHAPE_CONFIG(HEADER::TAB_ITEM_ICON_SIZE, GetCore().GetOrientation(), iconSize); // 63
                }
 
                Bitmap* pSelectedBitmap = null;
@@ -1055,11 +1055,11 @@ _FooterImpl::ConvertFooterItem(const FooterItem& footerItem)
 
                if (footerItem.GetText() != L"")
                {
-                       GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE_WITH_TEXT, GetCore().GetOrientation(), iconSize);
+                       GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE_WITH_TEXT, GetCore().GetOrientation(), iconSize); //45
                }
                else
                {
-                       GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE, GetCore().GetOrientation(), iconSize);
+                       GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE, GetCore().GetOrientation(), iconSize); //63
                }
        }
 

diff --git a/src/ui/controls/FUiCtrl_HeaderImpl.cpp b/src/ui/controls/FUiCtrl_HeaderImpl.cpp
index 0b4cd2f..cfe7cd9 100644 (file)
--- a/src/ui/controls/FUiCtrl_HeaderImpl.cpp
+++ b/src/ui/controls/FUiCtrl_HeaderImpl.cpp
@@ -1167,17 +1167,17 @@ _HeaderImpl::ConvertButtonItem(const ButtonItem& buttonItem)
 
        if (__style == HEADER_STYLE_BUTTON)
        {
-               GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_ICON_SIZE, GetCore().GetOrientation(), iconSize);
+               GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_ICON_SIZE, GetCore().GetOrientation(), iconSize); // 63
        }
        else
        {
                if (__style == HEADER_STYLE_SEGMENTED_WITH_TITLE)
                {
-                       GET_SHAPE_CONFIG(HEADER::TAB_ITEM_ICON_SIZE, GetCore().GetOrientation(), iconSize);
+                       GET_SHAPE_CONFIG(HEADER::TAB_ITEM_ICON_SIZE, GetCore().GetOrientation(), iconSize); //63
                }
                else
                {
-                       GET_SHAPE_CONFIG(HEADER::BUTTON_ITEM_ICON_SIZE, GetCore().GetOrientation(), iconSize);
+                       GET_SHAPE_CONFIG(HEADER::BUTTON_ITEM_ICON_SIZE, GetCore().GetOrientation(), iconSize); //63
                }
        }
 
@@ -1379,13 +1379,13 @@ _HeaderImpl::ConvertHeaderItem(const HeaderItem& headerItem)
        if (__style == HEADER_STYLE_SEGMENTED || __style == HEADER_STYLE_SEGMENTED_WITH_TITLE
                        || __style == HEADER_STYLE_TAB_WITH_TITLE || __style == HEADER_STYLE_TAB || __style == HEADER_STYLE_TAB_LARGE)
        {
-               if (headerItem.GetText() != L"")
+               if (headerItem.GetText() != L"" && __style != HEADER_STYLE_TAB_LARGE)
                {
-                       GET_SHAPE_CONFIG(HEADER::TAB_ITEM_ICON_SIZE_WITH_TEXT, GetCore().GetOrientation(), iconSize);
+                       GET_SHAPE_CONFIG(HEADER::TAB_ITEM_ICON_SIZE_WITH_TEXT, GetCore().GetOrientation(), iconSize); // 45
                }
                else
                {
-                       GET_SHAPE_CONFIG(HEADER::TAB_ITEM_ICON_SIZE, GetCore().GetOrientation(), iconSize);
+                       GET_SHAPE_CONFIG(HEADER::TAB_ITEM_ICON_SIZE, GetCore().GetOrientation(), iconSize); // 63
                }
 
                Bitmap* pSelectedBitmap = null;
@@ -1444,11 +1444,11 @@ _HeaderImpl::ConvertHeaderItem(const HeaderItem& headerItem)
        {
                if (headerItem.GetText() != L"")
                {
-                       GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE_WITH_TEXT, GetCore().GetOrientation(), iconSize);
+                       GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE_WITH_TEXT, GetCore().GetOrientation(), iconSize); //45
                }
                else
                {
-                       GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE, GetCore().GetOrientation(), iconSize);
+                       GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE, GetCore().GetOrientation(), iconSize); // 63
                }
        }
 

diff --git a/src/ui/controls/FUiCtrl_Toolbar.cpp b/src/ui/controls/FUiCtrl_Toolbar.cpp
index c529e30..3474e90 100644 (file)
--- a/src/ui/controls/FUiCtrl_Toolbar.cpp
+++ b/src/ui/controls/FUiCtrl_Toolbar.cpp
@@ -3472,38 +3472,56 @@ _Toolbar::OnHeaderFocusGained(const _Control& source)
        {
                if (__pButtonItems[LEFT_BUTTON])
                {
-                       if(__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                       if (__pButtonItems[RIGHT_BUTTON])
                        {
-                               __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-
-                               __highlightedItemIndex = __itemCount;
-                               __lastHighlightedItemIndex = __highlightedItemIndex;
-                               __highlighted = true;
+                               if (__highlightedItemIndex == __itemCount)
+                               {
+                                       if(__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                       {
+                                               __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+                                               __lastHighlightedItemIndex = __highlightedItemIndex;
+                                               __highlighted = true;
+                                       }
+                               }
+                               else if (__highlightedItemIndex == __itemCount + 1)
+                               {
+                                       if (__pButtonItems[RIGHT_BUTTON])
+                                       {
+                                               if(__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                               {
+                                                       __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+                                                       __lastHighlightedItemIndex = __highlightedItemIndex;
+                                                       __highlighted = true;
+                                               }
+                                       }
+                               }
                        }
                        else
                        {
-                               if (__pButtonItems[RIGHT_BUTTON])
+                               if (__highlightedItemIndex == __itemCount)
                                {
-                                       if(__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                       if(__pButtonItems[LEFT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
                                        {
-                                               __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-
-                                               __highlightedItemIndex = __itemCount + 1;
+                                               __pButtonItems[LEFT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
                                                __lastHighlightedItemIndex = __highlightedItemIndex;
                                                __highlighted = true;
                                        }
                                }
                        }
                }
-               else if (__pButtonItems[RIGHT_BUTTON])
+               else
                {
-                       if(__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                       if (__pButtonItems[RIGHT_BUTTON])
                        {
-                               __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
-
-                               __highlightedItemIndex = __itemCount;
-                               __lastHighlightedItemIndex = __highlightedItemIndex;
-                               __highlighted = true;
+                               if (__highlightedItemIndex == __itemCount)
+                               {
+                                       if(__pButtonItems[RIGHT_BUTTON]->GetButtonStatus() != _BUTTON_STATUS_DISABLED)
+                                       {
+                                               __pButtonItems[RIGHT_BUTTON]->SetButtonStatus(_BUTTON_STATUS_HIGHLIGHTED, false);
+                                               __lastHighlightedItemIndex = __highlightedItemIndex;
+                                               __highlighted = true;
+                                       }
+                               }
                        }
                }
        }
@@ -7711,18 +7729,18 @@ _Toolbar::RearrangeFooterSegmentedItems(void)
                {
                        if (__pButtonItems[RIGHT_BUTTON])
                        {
-                               __pItems.at(0)->SetBounds(FloatRectangle(3 + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - 3, segmentedItemHeight));
+                               __pItems.at(0)->SetBounds(FloatRectangle(dividerWidth + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - dividerWidth * 2, segmentedItemHeight));
                        }
                        else
                        {
-                               __pItems.at(0)->SetBounds(FloatRectangle(3 + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - 3, segmentedItemHeight));
+                               __pItems.at(0)->SetBounds(FloatRectangle(dividerWidth + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - dividerWidth, segmentedItemHeight));
                        }
                }
                else
                {
                        if (__pButtonItems[RIGHT_BUTTON])
                        {
-                               __pItems.at(0)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - 1, segmentedItemHeight));
+                               __pItems.at(0)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - dividerWidth, segmentedItemHeight));
                        }
                        else
                        {
@@ -7784,13 +7802,13 @@ _Toolbar::RearrangeFooterSegmentedItems(void)
                {
                        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] - 1, segmentedItemHeight));
+                               __pItems.at(0)->SetBounds(FloatRectangle(dividerWidth + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - dividerWidth, segmentedItemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1] - dividerWidth, 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] + 1, segmentedItemHeight));
+                               __pItems.at(0)->SetBounds(FloatRectangle(dividerWidth + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - dividerWidth, segmentedItemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1], segmentedItemHeight));
                        }
                }
                else
@@ -7798,7 +7816,7 @@ _Toolbar::RearrangeFooterSegmentedItems(void)
                        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(1)->SetBounds(FloatRectangle(leftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[1] - dividerWidth, segmentedItemHeight));
                        }
                        else
                        {
@@ -7863,17 +7881,17 @@ _Toolbar::RearrangeFooterSegmentedItems(void)
                {
                        if (__pButtonItems[RIGHT_BUTTON])
                        {
-                               __pItems.at(0)->SetBounds(FloatRectangle(3 + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - 3, segmentedItemHeight));
+                               __pItems.at(0)->SetBounds(FloatRectangle(dividerWidth + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - dividerWidth, 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] - 1, segmentedItemHeight));
+                                               (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[2] - dividerWidth, segmentedItemHeight));
                        }
                        else
                        {
-                               __pItems.at(0)->SetBounds(FloatRectangle(3 + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - 3, segmentedItemHeight));
+                               __pItems.at(0)->SetBounds(FloatRectangle(dividerWidth + leftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[0] - dividerWidth, 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] + 1, segmentedItemHeight));
+                                               (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[2], segmentedItemHeight));
                        }
                }
                else
@@ -7883,7 +7901,7 @@ _Toolbar::RearrangeFooterSegmentedItems(void)
                                __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));
+                                               (GetSizeF().height - segmentedItemHeight) / 2, blockWidth[2] - dividerWidth, segmentedItemHeight));
                        }
                        else
                        {
@@ -8157,18 +8175,18 @@ _Toolbar::RearrangeButtonItems(void)
                        {
                                if (__pButtonItems[RIGHT_BUTTON])
                                {
-                                       __pItems.at(0)->SetBounds(FloatRectangle(3 + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - 4, itemHeight));
+                                       __pItems.at(0)->SetBounds(FloatRectangle(dividerWidth + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - dividerWidth, itemHeight));
                                }
                                else
                                {
-                                       __pItems.at(0)->SetBounds(FloatRectangle(3 + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - 3, itemHeight));
+                                       __pItems.at(0)->SetBounds(FloatRectangle(dividerWidth + tabLeftMargin + iconSize + itemButtonLeftGap, (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] - 1, itemHeight));
+                                       __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - dividerWidth, itemHeight));
                                }
                                else
                                {
@@ -8231,12 +8249,12 @@ _Toolbar::RearrangeButtonItems(void)
                {
                        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] - 1, itemHeight));
+                               __pItems.at(0)->SetBounds(FloatRectangle(dividerWidth + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - dividerWidth, itemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1] - dividerWidth, itemHeight));
                        }
                        else
                        {
-                               __pItems.at(0)->SetBounds(FloatRectangle(3 + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - 3, itemHeight));
+                               __pItems.at(0)->SetBounds(FloatRectangle(dividerWidth + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - dividerWidth, itemHeight));
                                __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
                        }
                }
@@ -8245,7 +8263,7 @@ _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] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1], itemHeight));
+                               __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + iconSize + itemButtonLeftGap + blockWidth[0] + dividerWidth, (GetSizeF().height - itemHeight) / 2, blockWidth[1] - dividerWidth, itemHeight));
                        }
                        else
                        {
@@ -8310,17 +8328,17 @@ _Toolbar::RearrangeButtonItems(void)
                {
                        if (__pButtonItems[RIGHT_BUTTON])
                        {
-                               __pItems.at(0)->SetBounds(FloatRectangle(3 + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - 3, itemHeight));
+                               __pItems.at(0)->SetBounds(FloatRectangle(dividerWidth + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - dividerWidth, 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] - 1, itemHeight));
+                                               (GetSizeF().height - itemHeight) / 2, blockWidth[2] - dividerWidth, itemHeight));
                        }
                        else
                        {
-                               __pItems.at(0)->SetBounds(FloatRectangle(3 + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - 3, itemHeight));
+                               __pItems.at(0)->SetBounds(FloatRectangle(dividerWidth + tabLeftMargin + iconSize + itemButtonLeftGap, (GetSizeF().height - itemHeight) / 2, blockWidth[0] - dividerWidth, 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] + 1, itemHeight));
+                                                       (GetSizeF().height - itemHeight) / 2, blockWidth[2], itemHeight));
                        }
                }
                else
@@ -8330,7 +8348,7 @@ _Toolbar::RearrangeButtonItems(void)
                                __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));
+                                               (GetSizeF().height - itemHeight) / 2, blockWidth[2] - dividerWidth, itemHeight));
                        }
                        else
                        {

diff --git a/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp b/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp
index bd547bd..d081770 100644 (file)
--- a/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp
@@ -637,7 +637,7 @@ _ToolbarPresenter::DrawDivider(const FloatPoint& point, Canvas* pCanvas)
        pCanvas->SetForegroundColor(dividerLeftColor);
        pCanvas->SetLineWidth(dividerWidth);
 
-       pCanvas->DrawLine(FloatPoint(point.x + dividerWidth, point.y), FloatPoint(point.x + dividerWidth, point.y + dividerHeight));
+       pCanvas->DrawLine(FloatPoint(point.x, point.y), FloatPoint(point.x, point.y + dividerHeight));
 
        //pCanvas->SetForegroundColor(dividerRightColor);
        //pCanvas->SetLineWidth(dividerWidth/2);

diff --git a/src/ui/resource/FUi_ResourceFooterConfig.cpp b/src/ui/resource/FUi_ResourceFooterConfig.cpp
index 1857f8e..b1317cc 100644 (file)
--- a/src/ui/resource/FUi_ResourceFooterConfig.cpp
+++ b/src/ui/resource/FUi_ResourceFooterConfig.cpp
@@ -40,7 +40,7 @@ START_UI_CONFIG(FOOTER);
 
        ADD_COLOR_CONFIG(BUTTON_TEXT_NORMAL, $B052L4);
        ADD_COLOR_CONFIG(BUTTON_TEXT_DISABLED, $B052L4D);
-       ADD_COLOR_CONFIG(BUTTON_TEXT_PRESSED, $B052L5);
+       ADD_COLOR_CONFIG(BUTTON_TEXT_PRESSED, $B052L4P);
        ADD_COLOR_CONFIG(BUTTON_TEXT_HIGHLIGHTED, $B052L4);
 
        ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_TEXT_NORMAL, $B052L8);
@@ -65,7 +65,7 @@ START_UI_CONFIG(FOOTER);
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_DISABLED, $B052L6);
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_PRESSED, $B052L6);
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_HIGHLIGHTED, $B052L6);
-       ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_SELECTED, $B052L6);
+       ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_SELECTED, $B052L6P);
 
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_NORMAL, $B052L8);
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_DISABLED, $B052L8);
@@ -89,7 +89,7 @@ START_UI_CONFIG(FOOTER);
        ADD_COLOR_CONFIG(TAB_ITEM_TEXT_DISABLED, $B052L6);
        ADD_COLOR_CONFIG(TAB_ITEM_TEXT_PRESSED, $B052L6);
        ADD_COLOR_CONFIG(TAB_ITEM_TEXT_HIGHLIGHTED, $B052L6);
-       ADD_COLOR_CONFIG(TAB_ITEM_TEXT_SELECTED, $B052L6);
+       ADD_COLOR_CONFIG(TAB_ITEM_TEXT_SELECTED, $B052L6P);
 
        ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_NORMAL, $B052L8);
        ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_DISABLED, $B052L8D);
@@ -337,8 +337,8 @@ START_UI_CONFIG(FOOTER);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_MULTILINE_FONT_SIZE, 20);
                ADD_SHAPE_CONFIG(FOOTER_ITEM_FONT_SIZE, 32);
                ADD_SHAPE_CONFIG(FOOTER_ITEM_ICON_SIZE, 63);
-               ADD_SHAPE_CONFIG(FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE, 48);
-               ADD_SHAPE_CONFIG(FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE_WITH_TEXT, 40);
+               ADD_SHAPE_CONFIG(FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE, 63);
+               ADD_SHAPE_CONFIG(FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE_WITH_TEXT, 45);
                ADD_SHAPE_CONFIG(FOOTER_ITEM_BUTTON_STYLE_SIDE_MARGIN, 28);
                ADD_SHAPE_CONFIG(FOOTER_ITEM_BUTTON_STYLE_ITEM_GAP, 8);
                ADD_SHAPE_CONFIG(FOOTER_ITEM_TEXT_TOP_MARGIN, 0);
@@ -389,8 +389,8 @@ START_UI_CONFIG(FOOTER);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_MULTILINE_FONT_SIZE, 20);
                ADD_SHAPE_CONFIG(FOOTER_ITEM_FONT_SIZE, 32);
                ADD_SHAPE_CONFIG(FOOTER_ITEM_ICON_SIZE, 63);
-               ADD_SHAPE_CONFIG(FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE, 48);
-               ADD_SHAPE_CONFIG(FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE_WITH_TEXT, 40);
+               ADD_SHAPE_CONFIG(FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE, 63);
+               ADD_SHAPE_CONFIG(FOOTER_ITEM_BUTTON_STYLE_ICON_SIZE_WITH_TEXT, 45);
                ADD_SHAPE_CONFIG(FOOTER_ITEM_BUTTON_STYLE_SIDE_MARGIN, 28);
                ADD_SHAPE_CONFIG(FOOTER_ITEM_BUTTON_STYLE_ITEM_GAP, 10);
                ADD_SHAPE_CONFIG(FOOTER_ITEM_TEXT_TOP_MARGIN, 0);//1280x720

diff --git a/src/ui/resource/FUi_ResourceHeaderConfig.cpp b/src/ui/resource/FUi_ResourceHeaderConfig.cpp
index 7399014..3b6b223 100644 (file)
--- a/src/ui/resource/FUi_ResourceHeaderConfig.cpp
+++ b/src/ui/resource/FUi_ResourceHeaderConfig.cpp
@@ -46,7 +46,7 @@ START_UI_CONFIG(HEADER);
 
        ADD_COLOR_CONFIG(BUTTON_TEXT_NORMAL, $B052L4);
        ADD_COLOR_CONFIG(BUTTON_TEXT_DISABLED, $B052L4D);
-       ADD_COLOR_CONFIG(BUTTON_TEXT_PRESSED, $B052L5);
+       ADD_COLOR_CONFIG(BUTTON_TEXT_PRESSED, $B052L4P);
        ADD_COLOR_CONFIG(BUTTON_TEXT_HIGHLIGHTED, $B052L4);
 
        ADD_COLOR_CONFIG(BUTTON_TRANSLUCENT_TEXT_NORMAL, $B052L8);
@@ -70,7 +70,7 @@ START_UI_CONFIG(HEADER);
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_DISABLED, $B052L6);
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_PRESSED, $B052L6);
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_HIGHLIGHTED, $B052L6);
-       ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_SELECTED, $B052L6);
+       ADD_COLOR_CONFIG(SEGMENTED_ITEM_TEXT_SELECTED, $B052L6P);
 
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_NORMAL, $B052L8);
        ADD_COLOR_CONFIG(SEGMENTED_ITEM_TRANSLUCENT_TEXT_DISABLED, $B052L8D);
@@ -94,7 +94,7 @@ START_UI_CONFIG(HEADER);
        ADD_COLOR_CONFIG(TAB_ITEM_TEXT_DISABLED, $B052L6);
        ADD_COLOR_CONFIG(TAB_ITEM_TEXT_PRESSED, $B052L6);
        ADD_COLOR_CONFIG(TAB_ITEM_TEXT_HIGHLIGHTED, $B052L6);
-       ADD_COLOR_CONFIG(TAB_ITEM_TEXT_SELECTED, $B052L6);
+       ADD_COLOR_CONFIG(TAB_ITEM_TEXT_SELECTED, $B052L6P);
 
        ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_NORMAL, $B052L8);
        ADD_COLOR_CONFIG(TAB_ITEM_TRANSLUCENT_TEXT_DISABLED, $B052L8D);