fix fittocontent bug

Change-Id: I56fd91c4dd4c93266232d19ffad270d7ca33429b

diff --git a/src/ui/controls/FUiCtrl_Button.cpp b/src/ui/controls/FUiCtrl_Button.cpp
index 8788d9a..b9f9f79 100644 (file)
--- a/src/ui/controls/FUiCtrl_Button.cpp
+++ b/src/ui/controls/FUiCtrl_Button.cpp
@@ -1527,8 +1527,8 @@ _Button::GetContentSizeInternalF(bool horizontalMode, bool verticalMode) const
        FloatRectangle previousRect = pTextObject->GetBoundsF();
        TextObjectActionType previousActionType = pTextObject->GetAction();
 
-       dimension.width = GetBoundsF().width - __leftMargin * 2;
-       dimension.height = GetBoundsF().height - __topMargin * 2;
+       dimension.width = GetBoundsF().width - (__leftMargin + __rightMargin);
+       dimension.height = GetBoundsF().height - (__topMargin + __bottomMargin);
 
        _ControlOrientation orientation = GetOrientation();
        if (orientation == _CONTROL_ORIENTATION_PORTRAIT)
@@ -1544,7 +1544,7 @@ _Button::GetContentSizeInternalF(bool horizontalMode, bool verticalMode) const
 
        if (horizontalMode == true)
        {
-               FloatRectangle bounds(0.0f, 0.0f, contentRect.width - GetBoundsF().x - __leftMargin, dimension.height);
+               FloatRectangle bounds(0.0f, 0.0f, contentRect.width - GetBoundsF().x - (__leftMargin + __rightMargin), dimension.height);
                pTextObject->SetBounds(bounds);
                pTextObject->SetAction(TEXT_OBJECT_ACTION_TYPE_NONE);
                pTextObject->SetFont(pFont, 0, pTextObject->GetTextLength());
@@ -1581,8 +1581,8 @@ _Button::GetContentSizeInternalF(bool horizontalMode, bool verticalMode) const
        pTextObject->SetBounds(previousRect);
        pTextObject->SetAction(previousActionType);
 
-       dimension.width += __leftMargin * 2;
-       dimension.height += __topMargin * 2;
+       dimension.width += (__leftMargin + __rightMargin);
+       dimension.height += (__topMargin + __bottomMargin);
 
        for (int i = 0; i < NUMBER_OF_BUTTON_STATUS; i++)
        {

diff --git a/src/ui/controls/FUiCtrl_Label.cpp b/src/ui/controls/FUiCtrl_Label.cpp
index 53064d8..5928d6c 100644 (file)
--- a/src/ui/controls/FUiCtrl_Label.cpp
+++ b/src/ui/controls/FUiCtrl_Label.cpp
@@ -588,8 +588,8 @@ _Label::GetContentSizeInternalF(bool horizontalMode, bool verticalMode) const
        FloatRectangle previousRect = pTextObject->GetBoundsF();
        TextObjectActionType previousActionType = pTextObject->GetAction();
 
-       dimension.width = GetBoundsF().width - __leftMargin * 2;
-       dimension.height = GetBoundsF().height - __topMargin * 2;
+       dimension.width = GetBoundsF().width - (__leftMargin + __rightMargin);
+       dimension.height = GetBoundsF().height - (__topMargin + __bottomMargin);
 
        _ControlOrientation orientation = GetOrientation();
        if (orientation == _CONTROL_ORIENTATION_PORTRAIT)
@@ -605,7 +605,7 @@ _Label::GetContentSizeInternalF(bool horizontalMode, bool verticalMode) const
 
        if (horizontalMode == true)
        {
-               FloatRectangle bounds(0.0f, 0.0f, contentRect.width - GetBoundsF().x - __leftMargin, dimension.height);
+               FloatRectangle bounds(0.0f, 0.0f, contentRect.width - GetBoundsF().x - (__leftMargin + __rightMargin), dimension.height);
                pTextObject->SetBounds(bounds);
                pTextObject->SetAction(TEXT_OBJECT_ACTION_TYPE_NONE);
                pTextObject->Compose();
@@ -640,8 +640,8 @@ _Label::GetContentSizeInternalF(bool horizontalMode, bool verticalMode) const
        pTextObject->SetBounds(previousRect);
        pTextObject->SetAction(previousActionType);
 
-       dimension.width += __leftMargin * 2;
-       dimension.height += __topMargin * 2;
+       dimension.width += (__leftMargin + __rightMargin);
+       dimension.height += (__topMargin + __bottomMargin);
 
        if (__pBackgroundBitmap != null)
        {

diff --git a/src/ui/resource/FUi_ResourceHeaderConfig.cpp b/src/ui/resource/FUi_ResourceHeaderConfig.cpp
index e45d144..1a5336d 100644 (file)
--- a/src/ui/resource/FUi_ResourceHeaderConfig.cpp
+++ b/src/ui/resource/FUi_ResourceHeaderConfig.cpp
@@ -283,9 +283,9 @@ START_UI_CONFIG(HEADER);
                ADD_SHAPE_CONFIG(RIGHT_MARGIN, 26);
 
                ADD_SHAPE_CONFIG(TITLE_FONT_SIZE, 50);
-               ADD_SHAPE_CONFIG(TITLE_FONT_SIZE_WITH_DESCRIPTION, 44);
-               ADD_SHAPE_CONFIG(TITLE_FONT_SIZE_WITH_SEGMENTED, 44);
-               ADD_SHAPE_CONFIG(DESCRIPTION_TEXT_FONT_SIZE, 32);
+               ADD_SHAPE_CONFIG(TITLE_FONT_SIZE_WITH_DESCRIPTION, 42);
+               ADD_SHAPE_CONFIG(TITLE_FONT_SIZE_WITH_SEGMENTED, 42);
+               ADD_SHAPE_CONFIG(DESCRIPTION_TEXT_FONT_SIZE, 30);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_FONT_SIZE, 32);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_MULTILINE_FONT_SIZE, 32);
                ADD_SHAPE_CONFIG(SEGMENTED_ITEM_FONT_SIZE, 30);
@@ -412,7 +412,7 @@ START_UI_CONFIG(HEADER);
                ADD_SHAPE_CONFIG(TITLE_TOP_MARGIN_WITH_SEGMENTED_ITEM, 0);
                ADD_SHAPE_CONFIG(TITLE_HEIGHT_WITH_SEGMENTED_ITEM, 70);
                ADD_SHAPE_CONFIG(TITLE_DISPLAY_HEIGHT_WITH_SEGMENTED_ITEM, 70);
-               ADD_SHAPE_CONFIG(DESCRIPTION_TEXT_HEIGHT, 30);
+               ADD_SHAPE_CONFIG(DESCRIPTION_TEXT_HEIGHT, 34);
 
                ADD_SHAPE_CONFIG(BUTTON_ITEM_WIDTH, 115);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_WIDTH_WITH_TEXT, 183);