fix jira defect titiebutton font size and tab slide

Change-Id: I1466928ab8102ccc710eb2ef85c50fc06ac87ba8

diff --git a/src/ui/controls/FUiCtrl_Toolbar.cpp b/src/ui/controls/FUiCtrl_Toolbar.cpp
index 5f8ed0d..1df57a6 100644 (file)
--- a/src/ui/controls/FUiCtrl_Toolbar.cpp
+++ b/src/ui/controls/FUiCtrl_Toolbar.cpp
@@ -8882,7 +8882,14 @@ _Toolbar::RearrangeButtonItems(void)
                }
        }
 
-       GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_FONT_SIZE, GetOrientation(), fontSize);//32
+       if (__style == TOOLBAR_TITLE) // item 1, HEADER_STYLE_TITLE_BUTTON
+       {
+               GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_FONT_SIZE, GetOrientation(), fontSize); // 30
+       }
+       else
+       {
+               GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_FONT_SIZE, GetOrientation(), fontSize); //32
+       }
 
        for (int i = 0; i < __itemCount; i++)
        {
@@ -8909,7 +8916,6 @@ _Toolbar::RearrangeButtonItems(void)
                        }
                }
 
-               //__pItems.at(i)->SetMargin(__pItems.at(i)->GetLeftMarginF(), 0.0f, __pItems.at(i)->GetRightMarginF(), 0.0f);
                __pItems.at(i)->SetTextSize(fontSize, FONT_STYLE_BOLD);
                __pItems.at(i)->SetMultilineTextSize(multilineFontSize);
        }

diff --git a/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp b/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp
index 6b6aede..e7b3a47 100644 (file)
--- a/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ToolbarPresenter.cpp
@@ -2264,7 +2264,7 @@ _ToolbarPresenter::AdjustItemPositionX(float distance)
                itemBounds = __pToolbar->GetItem(0)->GetBoundsF();
                if (itemBounds.x + distance > 0.0f)
                {
-                       distance = itemBounds.x - distance;
+                       distance = 0.0f;
                }
        }
        else
@@ -2272,7 +2272,7 @@ _ToolbarPresenter::AdjustItemPositionX(float distance)
                itemBounds = __pToolbar->GetItem(itemCount - 4)->GetBoundsF();
                if (itemBounds.x + distance < 0.0f)
                {
-                       distance = itemBounds.x - distance;
+                       distance = 0.0f;
                }
        }