apply v3_3 gui

Change-Id: I608d9a693e78383eab9cf2c78a02fdb2b76dbced

diff --git a/src/ui/controls/FUiCtrl_Form.cpp b/src/ui/controls/FUiCtrl_Form.cpp
index d52f878..8182eed 100644 (file)
--- a/src/ui/controls/FUiCtrl_Form.cpp
+++ b/src/ui/controls/FUiCtrl_Form.cpp
@@ -589,7 +589,8 @@ _Form::CreateSoftkey(unsigned long formStyle)
        FloatDimension softkeyDimension(0.0f, 0.0f);
        FloatDimension softkeyDisplayDimension(0.0f, 0.0f);
        FloatDimension optionkeyDimension(0.0f, 0.0f);
-       float softkeyTextSize = 0.0;
+       float fontSize = 0.0f;
+       float multilineFontSize = 0.0f;
        float leftSoftkeyLeftMargin = 0.0f;
        float rightSoftkeyLeftMargin = 0.0f;
        float softkeyTopMargin = 0.0f;
@@ -603,7 +604,8 @@ _Form::CreateSoftkey(unsigned long formStyle)
        GET_DIMENSION_CONFIG(FOOTER::SOFTKEY_RECT, GetOrientation(), softkeyDimension);
        GET_DIMENSION_CONFIG(FOOTER::SOFTKEY_DISPLAY_RECT_WITH_TEXT, GetOrientation(), softkeyDisplayDimension);
        GET_DIMENSION_CONFIG(FOOTER::OPTIONKEY_RECT, GetOrientation(), optionkeyDimension);
-       GET_SHAPE_CONFIG(FOOTER::SOFTKEY_TEXT_SIZE, GetOrientation(), softkeyTextSize);
+       GET_SHAPE_CONFIG(FOOTER::SOFTKEY_TEXT_SIZE, GetOrientation(), fontSize);
+       GET_SHAPE_CONFIG(FOOTER::SOFTKEY_MULTILINE_TEXT_SIZE, GetOrientation(), multilineFontSize);
        GET_SHAPE_CONFIG(FOOTER::SOFTKEY_0_LEFT_MARGIN, GetOrientation(), leftSoftkeyLeftMargin);
        GET_SHAPE_CONFIG(FOOTER::SOFTKEY_1_LEFT_MARGIN, GetOrientation(), rightSoftkeyLeftMargin);
        GET_SHAPE_CONFIG(FOOTER::SOFTKEY_TOP_MARGIN, GetOrientation(), softkeyTopMargin);
@@ -623,7 +625,7 @@ _Form::CreateSoftkey(unsigned long formStyle)
 
        if (formStyle & FORM_STYLE_SOFTKEY_0)
        {
-               r = GET_BITMAP_CONFIG_N(FOOTER::SOFTKEY_LEFT_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pTempBitmap);
+               r = GET_BITMAP_CONFIG_N(FOOTER::SOFTKEY_LEFT_TEXT_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pTempBitmap);
                SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
                if (__pSoftkeyNormalBitmap[_SOFTKEY_0])
                {
@@ -633,7 +635,7 @@ _Form::CreateSoftkey(unsigned long formStyle)
                __pSoftkeyNormalBitmap[_SOFTKEY_0] = _BitmapImpl::GetColorReplacedBitmapN(*pTempBitmap, Color::GetColor(COLOR_ID_MAGENTA), softkeyNormalBackgroundColor);
                delete pTempBitmap;
 
-               r = GET_BITMAP_CONFIG_N(FOOTER::SOFTKEY_LEFT_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pTempBitmap);
+               r = GET_BITMAP_CONFIG_N(FOOTER::SOFTKEY_LEFT_TEXT_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pTempBitmap);
                SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
                if (__pSoftkeyPressedBitmap[_SOFTKEY_0])
                {
@@ -643,7 +645,7 @@ _Form::CreateSoftkey(unsigned long formStyle)
                __pSoftkeyPressedBitmap[_SOFTKEY_0] = _BitmapImpl::GetColorReplacedBitmapN(*pTempBitmap, Color::GetColor(COLOR_ID_MAGENTA), softkeyPressedBackgroundColor);
                delete pTempBitmap;
 
-               r = GET_BITMAP_CONFIG_N(FOOTER::SOFTKEY_LEFT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pTempBitmap);
+               r = GET_BITMAP_CONFIG_N(FOOTER::SOFTKEY_LEFT_TEXT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pTempBitmap);
                SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
                if (__pSoftkeyNormalEffectBitmap[_SOFTKEY_0])
                {
@@ -653,7 +655,7 @@ _Form::CreateSoftkey(unsigned long formStyle)
                __pSoftkeyNormalEffectBitmap[_SOFTKEY_0] = _BitmapImpl::GetColorReplacedBitmapN(*pTempBitmap, Color::GetColor(COLOR_ID_MAGENTA), softkeyNormalBackgroundColor);
                delete pTempBitmap;
 
-               r = GET_BITMAP_CONFIG_N(FOOTER::SOFTKEY_LEFT_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pTempBitmap);
+               r = GET_BITMAP_CONFIG_N(FOOTER::SOFTKEY_LEFT_TEXT_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pTempBitmap);
                SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
                if (__pSoftkeyPressedEffectBitmap[_SOFTKEY_0])
                {
@@ -687,7 +689,8 @@ _Form::CreateSoftkey(unsigned long formStyle)
                if (pButton)
                {
                        pButton->SetSize(softkeyDimension);
-                       pButton->SetTextSize(softkeyTextSize);
+                       pButton->SetTextSize(fontSize);
+                       pButton->SetMultilineTextSize(multilineFontSize);
                        pButton->SetUserDefinedTextArea(FloatRectangle(leftSoftkeyLeftMargin, softkeyTopMargin, softkeyDisplayDimension.width, softkeyDisplayDimension.height));
                        pButton->SetTextColor(_BUTTON_STATUS_NORMAL, softkeyNormalTextColor);
                        pButton->SetTextColor(_BUTTON_STATUS_PRESSED, softkeyPressedTextColor);
@@ -697,7 +700,7 @@ _Form::CreateSoftkey(unsigned long formStyle)
 
        if (formStyle & FORM_STYLE_SOFTKEY_1)
        {
-               r = GET_BITMAP_CONFIG_N(FOOTER::SOFTKEY_RIGHT_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pTempBitmap);
+               r = GET_BITMAP_CONFIG_N(FOOTER::SOFTKEY_RIGHT_TEXT_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pTempBitmap);
                SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
                if (__pSoftkeyNormalBitmap[_SOFTKEY_1])
                {
@@ -707,7 +710,7 @@ _Form::CreateSoftkey(unsigned long formStyle)
                __pSoftkeyNormalBitmap[_SOFTKEY_1] = _BitmapImpl::GetColorReplacedBitmapN(*pTempBitmap, Color::GetColor(COLOR_ID_MAGENTA), softkeyNormalBackgroundColor);
                delete pTempBitmap;
 
-               r = GET_BITMAP_CONFIG_N(FOOTER::SOFTKEY_RIGHT_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pTempBitmap);
+               r = GET_BITMAP_CONFIG_N(FOOTER::SOFTKEY_RIGHT_TEXT_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pTempBitmap);
                SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
                if (__pSoftkeyPressedBitmap[_SOFTKEY_1])
                {
@@ -717,7 +720,7 @@ _Form::CreateSoftkey(unsigned long formStyle)
                __pSoftkeyPressedBitmap[_SOFTKEY_1] = _BitmapImpl::GetColorReplacedBitmapN(*pTempBitmap, Color::GetColor(COLOR_ID_MAGENTA), softkeyPressedBackgroundColor);
                delete pTempBitmap;
 
-               r = GET_BITMAP_CONFIG_N(FOOTER::SOFTKEY_RIGHT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pTempBitmap);
+               r = GET_BITMAP_CONFIG_N(FOOTER::SOFTKEY_RIGHT_TEXT_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pTempBitmap);
                SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
                if (__pSoftkeyNormalEffectBitmap[_SOFTKEY_1])
                {
@@ -727,7 +730,7 @@ _Form::CreateSoftkey(unsigned long formStyle)
                __pSoftkeyNormalEffectBitmap[_SOFTKEY_1] = _BitmapImpl::GetColorReplacedBitmapN(*pTempBitmap, Color::GetColor(COLOR_ID_MAGENTA), softkeyNormalBackgroundColor);
                delete pTempBitmap;
 
-               r = GET_BITMAP_CONFIG_N(FOOTER::SOFTKEY_RIGHT_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pTempBitmap);
+               r = GET_BITMAP_CONFIG_N(FOOTER::SOFTKEY_RIGHT_TEXT_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pTempBitmap);
                SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
                if (__pSoftkeyPressedEffectBitmap[_SOFTKEY_1])
                {
@@ -760,7 +763,8 @@ _Form::CreateSoftkey(unsigned long formStyle)
                if (pButton)
                {
                        pButton->SetSize(softkeyDimension);
-                       pButton->SetTextSize(softkeyTextSize);
+                       pButton->SetTextSize(fontSize);
+                       pButton->SetMultilineTextSize(multilineFontSize);
                        pButton->SetUserDefinedTextArea(FloatRectangle(rightSoftkeyLeftMargin, softkeyTopMargin, softkeyDisplayDimension.width, softkeyDisplayDimension.height));
                        pButton->SetTextColor(_BUTTON_STATUS_NORMAL, softkeyNormalTextColor);
                        pButton->SetTextColor(_BUTTON_STATUS_PRESSED, softkeyPressedTextColor);

diff --git a/src/ui/controls/FUiCtrl_Toolbar.cpp b/src/ui/controls/FUiCtrl_Toolbar.cpp
index 6a06bd3..4118b1e 100644 (file)
--- a/src/ui/controls/FUiCtrl_Toolbar.cpp
+++ b/src/ui/controls/FUiCtrl_Toolbar.cpp
@@ -2634,6 +2634,8 @@ _Toolbar::SetTransparent(bool transparent)
                                ApplyUserGUI(TOOLBAR_BUTTON, __pButtonItems[i]);
                        }
                }
+
+               SetTransBackButton(true);
        }
        else // not transparent
        {
@@ -2658,6 +2660,8 @@ _Toolbar::SetTransparent(bool transparent)
                                ApplyUserGUI(TOOLBAR_BUTTON, __pButtonItems[i]);
                        }
                }
+
+               SetTransBackButton(false);
        }
 
        delete pMagentaBackgroundBitmap;
@@ -4328,6 +4332,7 @@ _Toolbar::RearrangeHeaderSegmentedItems(void)
        float vmargin = 0.0f;
        float blockWidth[__itemCount];
        float fontSize = 0.0f;
+       float multilineFontSize = 0.0f;
 
        GET_SHAPE_CONFIG(HEADER::LEFT_MARGIN, GetOrientation(), leftMargin);
        GET_SHAPE_CONFIG(HEADER::DIVIDER_WIDTH, GetOrientation(), dividerWidth);
@@ -4336,13 +4341,11 @@ _Toolbar::RearrangeHeaderSegmentedItems(void)
        {
                segmentedItemHeight = __itemArea.height;
                GET_SHAPE_CONFIG(HEADER::BUTTON_ITEM_TOP_MARGIN, GetOrientation(), vmargin);
-               GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_FONT_SIZE, GetOrientation(), fontSize);
        }
        else if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE)
        {
                GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_HEIGHT, GetOrientation(), segmentedItemHeight);
                GET_SHAPE_CONFIG(HEADER::TITLE_HEIGHT_WITH_SEGMENTED_ITEM, GetOrientation(), vmargin);
-               GET_SHAPE_CONFIG(HEADER::TAB_ITEM_FONT_SIZE_4_ITEM, GetOrientation(), fontSize);
        }
 
        if (__itemCount == 1 || __itemCount == 2)
@@ -4364,6 +4367,17 @@ _Toolbar::RearrangeHeaderSegmentedItems(void)
                                }
                        }
                }
+
+               GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_FONT_SIZE, GetOrientation(), fontSize); // 30
+
+               if (__style == TOOLBAR_HEADER_SEGMENTED)
+               {
+                       GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_MULTILINE_FONT_SIZE, GetOrientation(), multilineFontSize); // 28
+               }
+               else if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE)
+               {
+                       GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_FONT_SIZE_4_ITEM, GetOrientation(), multilineFontSize); // 24
+               }
        }
        else if (__itemCount == 3)
        {
@@ -4387,6 +4401,17 @@ _Toolbar::RearrangeHeaderSegmentedItems(void)
                                }
                        }
                }
+
+               GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_FONT_SIZE_3_ITEM, GetOrientation(), fontSize); // 26
+
+               if (__style == TOOLBAR_HEADER_SEGMENTED)
+               {
+                       GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_FONT_SIZE_3_ITEM, GetOrientation(), multilineFontSize); // 26
+               }
+               else if (__style == TOOLBAR_HEADER_SEGMENTED_WITH_TITLE)
+               {
+                       GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_FONT_SIZE_4_ITEM, GetOrientation(), multilineFontSize); //24
+               }
        }
        else if (__itemCount == 4)
        {
@@ -4412,11 +4437,15 @@ _Toolbar::RearrangeHeaderSegmentedItems(void)
                                }
                        }
                }
+
+               GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_FONT_SIZE_4_ITEM, GetOrientation(), fontSize);
+               GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_FONT_SIZE_4_ITEM, GetOrientation(), multilineFontSize);
        }
 
        for (int i = 0; i < __itemCount; i++)
        {
                __pItems.at(i)->SetTextSize(fontSize, FONT_STYLE_BOLD);
+               __pItems.at(i)->SetMultilineTextSize(multilineFontSize);
 
                RealignItem(__pItems.at(i));
        }
@@ -4436,6 +4465,7 @@ _Toolbar::RearrangeFooterSegmentedItems(void)
        float dividerWidth = 0.0f;
        float blockWidth[__itemCount];
        float fontSize = 0.0f;
+       float multilineFontSize = 0.0f;
 
        float itemButtonLeftGap = 0.0f;
        float itemButtonRightGap = 0.0f;
@@ -4472,7 +4502,8 @@ _Toolbar::RearrangeFooterSegmentedItems(void)
                        }
                }
 
-               GET_SHAPE_CONFIG(HEADER::TAB_ITEM_FONT_SIZE_3_ITEM, GetOrientation(), fontSize);
+               GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_FONT_SIZE, GetOrientation(), fontSize);
+               GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_MULTILINE_FONT_SIZE, GetOrientation(), multilineFontSize);
        }
        else if (__itemCount == 3)
        {
@@ -4528,7 +4559,8 @@ _Toolbar::RearrangeFooterSegmentedItems(void)
                        }
                }
 
-               GET_SHAPE_CONFIG(HEADER::TAB_ITEM_FONT_SIZE_3_ITEM, GetOrientation(), fontSize);
+               GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_FONT_SIZE_3_ITEM, GetOrientation(), fontSize);
+               GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_FONT_SIZE_3_ITEM, GetOrientation(), multilineFontSize);
        }
        else if (__itemCount == 4)
        {
@@ -4566,12 +4598,14 @@ _Toolbar::RearrangeFooterSegmentedItems(void)
                        }
                }
 
-               GET_SHAPE_CONFIG(HEADER::TAB_ITEM_FONT_SIZE_4_ITEM, GetOrientation(), fontSize);
+               GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_FONT_SIZE_4_ITEM, GetOrientation(), fontSize);
+               GET_SHAPE_CONFIG(HEADER::SEGMENTED_ITEM_FONT_SIZE_4_ITEM, GetOrientation(), multilineFontSize);
        }
 
        for (int i = 0; i < __itemCount ; i++)
        {
                __pItems.at(i)->SetTextSize(fontSize, FONT_STYLE_BOLD);
+               __pItems.at(i)->SetMultilineTextSize(multilineFontSize);
 
                RealignItem(__pItems.at(i));
        }
@@ -4584,6 +4618,7 @@ _Toolbar::RearrangeTabItmes(void)
 {
        float itemWidth[__itemCount];
        float fontSize = 0.0f;
+       float multilineFontSize = 0.0f;
        float segmentedItemHeight = 0.0f;
        float tabLeftMargin = 0.0f;
        float vmargin = 0.0f;
@@ -4607,13 +4642,16 @@ _Toolbar::RearrangeTabItmes(void)
                itemWidth[0] = __itemArea.width - tabLeftMargin * 2;
                __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin, vmargin, itemWidth[0], segmentedItemHeight));
 
+
+               GET_SHAPE_CONFIG(HEADER::TAB_ITEM_FONT_SIZE, GetOrientation(), fontSize); // 30
+
                if (__style == TOOLBAR_TAB)
                {
-                       GET_SHAPE_CONFIG(HEADER::TAB_ITEM_FONT_SIZE_3_ITEM, GetOrientation(), fontSize);
+                       GET_SHAPE_CONFIG(HEADER::TAB_ITEM_MULTILINE_FONT_SIZE, GetOrientation(), multilineFontSize); // 28
                }
                else if (__style == TOOLBAR_TAB_WITH_TITLE)
                {
-                       GET_SHAPE_CONFIG(HEADER::TAB_ITEM_FONT_SIZE_4_ITEM, GetOrientation(), fontSize);
+                       GET_SHAPE_CONFIG(HEADER::TAB_ITEM_FONT_SIZE_4_ITEM, GetOrientation(), multilineFontSize); // 24
                }
        }
        else if (__itemCount == 2)
@@ -4623,13 +4661,15 @@ _Toolbar::RearrangeTabItmes(void)
                __pItems.at(0)->SetBounds(FloatRectangle(tabLeftMargin, vmargin, itemWidth[0], segmentedItemHeight));
                __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + itemWidth[0] + dividerWidth, vmargin, itemWidth[1], segmentedItemHeight));
 
+               GET_SHAPE_CONFIG(HEADER::TAB_ITEM_FONT_SIZE, GetOrientation(), fontSize); // 30
+
                if (__style == TOOLBAR_TAB)
                {
-                       GET_SHAPE_CONFIG(HEADER::TAB_ITEM_FONT_SIZE_3_ITEM, GetOrientation(), fontSize);
+                       GET_SHAPE_CONFIG(HEADER::TAB_ITEM_MULTILINE_FONT_SIZE, GetOrientation(), multilineFontSize); // 28
                }
                else if (__style == TOOLBAR_TAB_WITH_TITLE)
                {
-                       GET_SHAPE_CONFIG(HEADER::TAB_ITEM_FONT_SIZE_4_ITEM, GetOrientation(), fontSize);
+                       GET_SHAPE_CONFIG(HEADER::TAB_ITEM_FONT_SIZE_4_ITEM, GetOrientation(), multilineFontSize); // 24
                }
        }
        else if (__itemCount == 3)
@@ -4640,13 +4680,15 @@ _Toolbar::RearrangeTabItmes(void)
                __pItems.at(1)->SetBounds(FloatRectangle(tabLeftMargin + itemWidth[0] + dividerWidth, vmargin, itemWidth[1], segmentedItemHeight));
                __pItems.at(2)->SetBounds(FloatRectangle(tabLeftMargin + itemWidth[0] + itemWidth[1] + dividerWidth * 2, vmargin, itemWidth[2], segmentedItemHeight));
 
+               GET_SHAPE_CONFIG(HEADER::TAB_ITEM_FONT_SIZE_3_ITEM, GetOrientation(), fontSize); // 26
+
                if (__style == TOOLBAR_TAB)
                {
-                       GET_SHAPE_CONFIG(HEADER::TAB_ITEM_FONT_SIZE_3_ITEM, GetOrientation(), fontSize);
+                       GET_SHAPE_CONFIG(HEADER::TAB_ITEM_FONT_SIZE_3_ITEM, GetOrientation(), multilineFontSize); // 26
                }
                else if (__style == TOOLBAR_TAB_WITH_TITLE)
                {
-                       GET_SHAPE_CONFIG(HEADER::TAB_ITEM_FONT_SIZE_4_ITEM, GetOrientation(), fontSize);
+                       GET_SHAPE_CONFIG(HEADER::TAB_ITEM_FONT_SIZE_4_ITEM, GetOrientation(), multilineFontSize); // 24
                }
        }
        else
@@ -4660,7 +4702,8 @@ _Toolbar::RearrangeTabItmes(void)
                __pItems.at(3)->SetBounds(FloatRectangle(tabLeftMargin + itemWidth[0] + itemWidth[1] + itemWidth[2] + dividerWidth * 3,
                                vmargin, itemWidth[3], segmentedItemHeight));
 
-               GET_SHAPE_CONFIG(HEADER::TAB_ITEM_FONT_SIZE_4_ITEM, GetOrientation(), fontSize);
+               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
        }
 
        for (int i = 4; i < __itemCount ; i++)
@@ -4673,6 +4716,7 @@ _Toolbar::RearrangeTabItmes(void)
        for (int i = 0; i < __itemCount ; i++)
        {
                __pItems.at(i)->SetTextSize(fontSize, FONT_STYLE_BOLD);
+               __pItems.at(i)->SetMultilineTextSize(multilineFontSize);
 
                if (__pItems.at(i)->GetChildCount() != 0)
                {
@@ -4710,6 +4754,8 @@ _Toolbar::RearrangeButtonItems(void)
        float segmentedItemHeight = 0.0f;
        float headerLeftMargin = 0.0f;
        float blockWidth[__itemCount];
+       float fontSize = 0.0f;
+       float multilineFontSize = 0.0f;
 
        GET_SHAPE_CONFIG(HEADER::SIP_FOOTER_ITEM_TOP_MARGIN, GetOrientation(), sipFooterItemTopMargin);
        GET_SHAPE_CONFIG(HEADER::DIVIDER_WIDTH, GetOrientation(), dividerWidth);
@@ -5059,50 +5105,35 @@ _Toolbar::RearrangeButtonItems(void)
                }
        }
 
-       float buttonTextFontSize = 0.0f;
+       GET_SHAPE_CONFIG(FOOTER::FOOTER_ITEM_FONT_SIZE, GetOrientation(), fontSize);//32
 
        for (int i = 0; i < __itemCount; i++)
        {
                if (__style == TOOLBAR_ICON_TEXT && (__pItems.at(i)->GetBitmap(_BUTTON_STATUS_NORMAL) || __pItems.at(i)->GetBitmap(_BUTTON_STATUS_PRESSED)))
                {
-                       if (__itemCount == 1 || __itemCount == 2)
+                       if (__itemCount == 5)
                        {
-                               GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_TEXT_FONT_SIZE_ITEM_3_WITH_ICON, GetOrientation(), buttonTextFontSize);
+                               GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_TEXT_FONT_SIZE_ITEM_5_WITH_ICON, GetOrientation(), multilineFontSize);//18
                        }
-                       else if (__itemCount == 3)
-                       {
-                               GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_TEXT_FONT_SIZE_ITEM_3_WITH_ICON, GetOrientation(), buttonTextFontSize);
-                       }
-                       else if (__itemCount == 4)
-                       {
-                               GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_TEXT_FONT_SIZE_ITEM_4_WITH_ICON, GetOrientation(), buttonTextFontSize);
-                       }
-                       else if (__itemCount == 5)
+                       else
                        {
-                               GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_TEXT_FONT_SIZE_ITEM_5_WITH_ICON, GetOrientation(), buttonTextFontSize);
+                               GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_TEXT_FONT_SIZE_ITEM_3_WITH_ICON, GetOrientation(), multilineFontSize);//22
                        }
                }
                else
                {
-                       if (__itemCount == 1 || __itemCount == 2)
+                       if (__itemCount == 5)
                        {
-                               GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_TEXT_FONT_SIZE_ITEM_3, GetOrientation(), buttonTextFontSize);
+                               GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_TEXT_FONT_SIZE_ITEM_5, GetOrientation(), multilineFontSize);//22
                        }
-                       else if (__itemCount == 3)
-                       {
-                               GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_TEXT_FONT_SIZE_ITEM_3, GetOrientation(), buttonTextFontSize);
-                       }
-                       else if (__itemCount == 4)
-                       {
-                               GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_TEXT_FONT_SIZE_ITEM_4, GetOrientation(), buttonTextFontSize);
-                       }
-                       else if (__itemCount == 5)
+                       else
                        {
-                               GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_TEXT_FONT_SIZE_ITEM_5, GetOrientation(), buttonTextFontSize);
+                               GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_TEXT_FONT_SIZE_ITEM_3, GetOrientation(), multilineFontSize);//24
                        }
                }
 
-               __pItems.at(i)->SetTextSize(buttonTextFontSize, FONT_STYLE_BOLD);
+               __pItems.at(i)->SetTextSize(fontSize, FONT_STYLE_BOLD);
+               __pItems.at(i)->SetMultilineTextSize(multilineFontSize);
 
                RealignItem(__pItems.at(i));
        }
@@ -6003,6 +6034,11 @@ _Toolbar::SetHideButton(bool hideButton)
        float buttonHeight = __pButtonItems[BACK_BUTTON]->GetSizeF().height;
        bool themeBackNormalBitmap = IS_CUSTOM_BITMAP(FOOTER::BACK_ICON_NORMAL);
 
+       float leftTouchMargin = __pButtonItems[BACK_BUTTON]->GetLeftTouchMarginF();
+       float topTouchMargin = __pButtonItems[BACK_BUTTON]->GetTopTouchMarginF();
+       float rightTouchMargin = __pButtonItems[BACK_BUTTON]->GetRightTouchMarginF();
+       float bottomTouchMargin = __pButtonItems[BACK_BUTTON]->GetBottomTouchMarginF();
+
        GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_ICON_SIZE, GetOrientation(), iconSize);
 
        _AccessibilityElement* pBackButtonElement = __pButtonItems[BACK_BUTTON]->GetAccessibilityContainer()->GetChildElement(0);
@@ -6053,25 +6089,41 @@ _Toolbar::SetHideButton(bool hideButton)
                pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pIconNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), normalColor);
                if (pColorReplacedBitmap)
                {
-                       __pButtonItems[BACK_BUTTON]->SetBitmap(_BUTTON_STATUS_NORMAL,
-                                       FloatPoint((buttonWidth - iconSize) / 2,        (buttonHeight - iconSize) / 2), *pColorReplacedBitmap);
+                       __pButtonItems[BACK_BUTTON]->SetBitmap(_BUTTON_STATUS_NORMAL, FloatPoint((buttonWidth - (leftTouchMargin + rightTouchMargin) - iconSize) / 2,
+                                       (buttonHeight - (topTouchMargin + bottomTouchMargin) - iconSize) / 2), *pColorReplacedBitmap);
 
                        delete pColorReplacedBitmap;
                }
 
+               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pIconNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), disabledColor);
+               if (pColorReplacedBitmap)
+               {
+                       __pButtonItems[BACK_BUTTON]->SetBitmap(_BUTTON_STATUS_DISABLED, FloatPoint((buttonWidth - (leftTouchMargin + rightTouchMargin) - iconSize) / 2,
+                                       (buttonHeight - (topTouchMargin + bottomTouchMargin) - iconSize) / 2), *pColorReplacedBitmap);
+                       delete pColorReplacedBitmap;
+               }
+
                pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pIconNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), pressedColor);
                if (pColorReplacedBitmap)
                {
-                       __pButtonItems[BACK_BUTTON]->SetBitmap(_BUTTON_STATUS_PRESSED,
-                                       FloatPoint((buttonWidth - iconSize) / 2,        (buttonHeight - iconSize) / 2), *pColorReplacedBitmap);
+                       __pButtonItems[BACK_BUTTON]->SetBitmap(_BUTTON_STATUS_PRESSED, FloatPoint((buttonWidth - (leftTouchMargin + rightTouchMargin) - iconSize) / 2,
+                                       (buttonHeight - (topTouchMargin + bottomTouchMargin) - iconSize) / 2), *pColorReplacedBitmap);
                        delete pColorReplacedBitmap;
                }
 
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pIconNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), disabledColor);
+               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pIconNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), normalColor);
                if (pColorReplacedBitmap)
                {
-                       __pButtonItems[BACK_BUTTON]->SetBitmap(_BUTTON_STATUS_DISABLED,
-                                       FloatPoint((buttonWidth - iconSize) / 2,        (buttonHeight - iconSize) / 2), *pColorReplacedBitmap);
+                       __pButtonItems[BACK_BUTTON]->SetBitmap(_BUTTON_STATUS_HIGHLIGHTED, FloatPoint((buttonWidth - (leftTouchMargin + rightTouchMargin) - iconSize) / 2,
+                                       (buttonHeight - (topTouchMargin + bottomTouchMargin) - iconSize) / 2), *pColorReplacedBitmap);
+                       delete pColorReplacedBitmap;
+               }
+
+               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pIconNormalBitmap, Color::GetColor(COLOR_ID_MAGENTA), normalColor);
+               if (pColorReplacedBitmap)
+               {
+                       __pButtonItems[BACK_BUTTON]->SetBitmap(_BUTTON_STATUS_SELECTED, FloatPoint((buttonWidth - (leftTouchMargin + rightTouchMargin) - iconSize) / 2,
+                                       (buttonHeight - (topTouchMargin + bottomTouchMargin) - iconSize) / 2), *pColorReplacedBitmap);
                        delete pColorReplacedBitmap;
                }
 
@@ -6080,11 +6132,70 @@ _Toolbar::SetHideButton(bool hideButton)
 
        if (pIconNormalEffectBitmap)
        {
-               __pButtonItems[BACK_BUTTON]->SetEffectBitmap(_BUTTON_STATUS_NORMAL, FloatPoint((buttonWidth - iconSize) / 2, (buttonHeight - iconSize) / 2), *pIconNormalEffectBitmap);
-               __pButtonItems[BACK_BUTTON]->SetEffectBitmap(_BUTTON_STATUS_PRESSED, FloatPoint((buttonWidth - iconSize) / 2, (buttonHeight - iconSize) / 2), *pIconNormalEffectBitmap);
-               __pButtonItems[BACK_BUTTON]->SetEffectBitmap(_BUTTON_STATUS_SELECTED, FloatPoint((buttonWidth - iconSize) / 2, (buttonHeight - iconSize) / 2), *pIconNormalEffectBitmap);
-               __pButtonItems[BACK_BUTTON]->SetEffectBitmap(_BUTTON_STATUS_HIGHLIGHTED, FloatPoint((buttonWidth - iconSize) / 2, (buttonHeight - iconSize) / 2), *pIconNormalEffectBitmap);
-               __pButtonItems[BACK_BUTTON]->SetEffectBitmap(_BUTTON_STATUS_DISABLED, FloatPoint((buttonWidth - iconSize) / 2, (buttonHeight - iconSize) / 2), *pIconNormalEffectBitmap);
+               __pButtonItems[BACK_BUTTON]->SetEffectBitmap(_BUTTON_STATUS_NORMAL, FloatPoint((buttonWidth - (leftTouchMargin + rightTouchMargin) - iconSize) / 2,
+                               (buttonHeight - (topTouchMargin + bottomTouchMargin) - iconSize) / 2), *pIconNormalEffectBitmap);
+               __pButtonItems[BACK_BUTTON]->SetEffectBitmap(_BUTTON_STATUS_DISABLED, FloatPoint((buttonWidth - (leftTouchMargin + rightTouchMargin) - iconSize) / 2,
+                               (buttonHeight - (topTouchMargin + bottomTouchMargin) - iconSize) / 2), *pIconNormalEffectBitmap);
+               __pButtonItems[BACK_BUTTON]->SetEffectBitmap(_BUTTON_STATUS_PRESSED, FloatPoint((buttonWidth - (leftTouchMargin + rightTouchMargin) - iconSize) / 2,
+                               (buttonHeight - (topTouchMargin + bottomTouchMargin) - iconSize) / 2), *pIconNormalEffectBitmap);
+               __pButtonItems[BACK_BUTTON]->SetEffectBitmap(_BUTTON_STATUS_HIGHLIGHTED, FloatPoint((buttonWidth - (leftTouchMargin + rightTouchMargin) - iconSize) / 2,
+                               (buttonHeight - (topTouchMargin + bottomTouchMargin) - iconSize) / 2), *pIconNormalEffectBitmap);
+               __pButtonItems[BACK_BUTTON]->SetEffectBitmap(_BUTTON_STATUS_SELECTED, FloatPoint((buttonWidth - (leftTouchMargin + rightTouchMargin) - iconSize) / 2,
+                               (buttonHeight - (topTouchMargin + bottomTouchMargin) - iconSize) / 2), *pIconNormalEffectBitmap);
+
+               delete pIconNormalEffectBitmap;
+       }
+
+       return E_SUCCESS;
+}
+
+result
+_Toolbar::SetTransBackButton(bool transparent)
+{
+       SysTryReturnResult(NID_UI_CTRL, __pButtonItems[BACK_BUTTON], E_INVALID_OPERATION,
+                       "[E_INVALID_OPERATION] BackButton is not exist.");
+
+       Bitmap* pIconNormalEffectBitmap = null;
+
+       float iconSize = 0.0f;
+       float buttonWidth = __pButtonItems[BACK_BUTTON]->GetSizeF().width;
+       float buttonHeight = __pButtonItems[BACK_BUTTON]->GetSizeF().height;
+       bool themeBackNormalBitmap = IS_CUSTOM_BITMAP(FOOTER::BACK_ICON_NORMAL);
+
+       float leftTouchMargin = __pButtonItems[BACK_BUTTON]->GetLeftTouchMarginF();
+       float topTouchMargin = __pButtonItems[BACK_BUTTON]->GetTopTouchMarginF();
+       float rightTouchMargin = __pButtonItems[BACK_BUTTON]->GetRightTouchMarginF();
+       float bottomTouchMargin = __pButtonItems[BACK_BUTTON]->GetBottomTouchMarginF();
+
+       GET_SHAPE_CONFIG(FOOTER::BUTTON_ITEM_ICON_SIZE, GetOrientation(), iconSize);
+
+       if (transparent)
+       {
+               if (!themeBackNormalBitmap)
+               {
+                       GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_TRANSLUCENT_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pIconNormalEffectBitmap);
+               }
+       }
+       else
+       {
+               if (!themeBackNormalBitmap)
+               {
+                       GET_BITMAP_CONFIG_N(FOOTER::BACK_ICON_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pIconNormalEffectBitmap);
+               }
+       }
+
+       if (pIconNormalEffectBitmap)
+       {
+               __pButtonItems[BACK_BUTTON]->SetEffectBitmap(_BUTTON_STATUS_NORMAL, FloatPoint((buttonWidth - (leftTouchMargin + rightTouchMargin) - iconSize) / 2,
+                               (buttonHeight - (topTouchMargin + bottomTouchMargin) - iconSize) / 2), *pIconNormalEffectBitmap);
+               __pButtonItems[BACK_BUTTON]->SetEffectBitmap(_BUTTON_STATUS_DISABLED, FloatPoint((buttonWidth - (leftTouchMargin + rightTouchMargin) - iconSize) / 2,
+                               (buttonHeight - (topTouchMargin + bottomTouchMargin) - iconSize) / 2), *pIconNormalEffectBitmap);
+               __pButtonItems[BACK_BUTTON]->SetEffectBitmap(_BUTTON_STATUS_PRESSED, FloatPoint((buttonWidth - (leftTouchMargin + rightTouchMargin) - iconSize) / 2,
+                               (buttonHeight - (topTouchMargin + bottomTouchMargin) - iconSize) / 2), *pIconNormalEffectBitmap);
+               __pButtonItems[BACK_BUTTON]->SetEffectBitmap(_BUTTON_STATUS_HIGHLIGHTED, FloatPoint((buttonWidth - (leftTouchMargin + rightTouchMargin) - iconSize) / 2,
+                               (buttonHeight - (topTouchMargin + bottomTouchMargin) - iconSize) / 2), *pIconNormalEffectBitmap);
+               __pButtonItems[BACK_BUTTON]->SetEffectBitmap(_BUTTON_STATUS_SELECTED, FloatPoint((buttonWidth - (leftTouchMargin + rightTouchMargin) - iconSize) / 2,
+                               (buttonHeight - (topTouchMargin + bottomTouchMargin) - iconSize) / 2), *pIconNormalEffectBitmap);
 
                delete pIconNormalEffectBitmap;
        }

diff --git a/src/ui/inc/FUiCtrl_Toolbar.h b/src/ui/inc/FUiCtrl_Toolbar.h
index b6a3215..81d70e5 100644 (file)
--- a/src/ui/inc/FUiCtrl_Toolbar.h
+++ b/src/ui/inc/FUiCtrl_Toolbar.h
@@ -379,6 +379,8 @@ public:
 
        result SetHideButton(bool hideButton);
 
+       result SetTransBackButton(bool transparent);
+
 protected:
        result SetPresenter(const _ToolbarPresenter& toolbarPresenter);
 

diff --git a/src/ui/inc/FUi_ResourceFooterConfig.h b/src/ui/inc/FUi_ResourceFooterConfig.h
index e614376..8619545 100755 (executable)
--- a/src/ui/inc/FUi_ResourceFooterConfig.h
+++ b/src/ui/inc/FUi_ResourceFooterConfig.h
@@ -255,10 +255,11 @@ DECLARE_UI_CONFIG(FOOTER);
        DECLARE_SHAPE_CONFIG(SOFTKEY_1_LEFT_MARGIN, 42);
        DECLARE_SHAPE_CONFIG(SOFTKEY_ICON_SIZE, 43);
        DECLARE_SHAPE_CONFIG(BUTTON_ITEM_MULTILINE_FONT_SIZE, 44);
+       DECLARE_SHAPE_CONFIG(SOFTKEY_MULTILINE_TEXT_SIZE, 45);
        DECLARE_DIMENSION_CONFIG(SOFTKEY_RECT, 1);
        DECLARE_DIMENSION_CONFIG(SOFTKEY_RECT_WITH_TEXT, 2);
        DECLARE_DIMENSION_CONFIG(SOFTKEY_DISPLAY_RECT_WITH_TEXT, 3);
        DECLARE_DIMENSION_CONFIG(OPTIONKEY_RECT, 4);
 DECLARE_END_UI_CONFIG(FOOTER);
 
-#endif //_FUI_RESOURCE_FOOTER_CONFIG_H_
\ No newline at end of file
+#endif //_FUI_RESOURCE_FOOTER_CONFIG_H_

diff --git a/src/ui/inc/FUi_ResourceHeaderConfig.h b/src/ui/inc/FUi_ResourceHeaderConfig.h
index 95116c9..38e7ec4 100755 (executable)
--- a/src/ui/inc/FUi_ResourceHeaderConfig.h
+++ b/src/ui/inc/FUi_ResourceHeaderConfig.h
@@ -189,6 +189,11 @@ DECLARE_UI_CONFIG(HEADER);
        DECLARE_SHAPE_CONFIG(ITEM_MINIMUM_WIDTH, 65);
        DECLARE_SHAPE_CONFIG(COMMON_MINIMUM_MARGIN, 66);
        DECLARE_SHAPE_CONFIG(BUTTON_ITEM_MULTILINE_FONT_SIZE, 67);
+       DECLARE_SHAPE_CONFIG(SEGMENTED_ITEM_FONT_SIZE_3_ITEM, 68);
+       DECLARE_SHAPE_CONFIG(SEGMENTED_ITEM_FONT_SIZE_4_ITEM, 69);
+       DECLARE_SHAPE_CONFIG(SEGMENTED_ITEM_MULTILINE_FONT_SIZE, 70);
+       DECLARE_SHAPE_CONFIG(TAB_ITEM_MULTILINE_FONT_SIZE, 71);
+
 DECLARE_END_UI_CONFIG(HEADER);
 
-#endif //_FUI_RESOURCE_HEADER_CONFIG_H_
\ No newline at end of file
+#endif //_FUI_RESOURCE_HEADER_CONFIG_H_

diff --git a/src/ui/resource/FUi_ResourceFooterConfig.cpp b/src/ui/resource/FUi_ResourceFooterConfig.cpp
index ed85c90..f8c73a6 100755 (executable)
--- a/src/ui/resource/FUi_ResourceFooterConfig.cpp
+++ b/src/ui/resource/FUi_ResourceFooterConfig.cpp
@@ -280,8 +280,8 @@ START_UI_CONFIG(FOOTER);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_TEXT_HEIGHT, 72);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_TEXT_LEFT_MARGIN, 6);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_TEXT_TOP_MARGIN, 6);
-               ADD_SHAPE_CONFIG(BUTTON_ITEM_TEXT_FONT_SIZE_ITEM_3, 25);
-               ADD_SHAPE_CONFIG(BUTTON_ITEM_TEXT_FONT_SIZE_ITEM_4, 25);
+               ADD_SHAPE_CONFIG(BUTTON_ITEM_TEXT_FONT_SIZE_ITEM_3, 24);
+               ADD_SHAPE_CONFIG(BUTTON_ITEM_TEXT_FONT_SIZE_ITEM_4, 24);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_TEXT_FONT_SIZE_ITEM_5, 22);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_TEXT_FONT_SIZE_ITEM_3_WITH_ICON, 22);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_TEXT_FONT_SIZE_ITEM_4_WITH_ICON, 22);
@@ -300,9 +300,10 @@ START_UI_CONFIG(FOOTER);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 11);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 17);
                ADD_SHAPE_CONFIG(SOFTKEY_HEIGHT, 118);//720x1280
-               ADD_SHAPE_CONFIG(SOFTKEY_TEXT_SIZE, 40);
+               ADD_SHAPE_CONFIG(SOFTKEY_TEXT_SIZE, 42);
+               ADD_SHAPE_CONFIG(SOFTKEY_MULTILINE_TEXT_SIZE, 38);
                ADD_SHAPE_CONFIG(SOFTKEY_0_LEFT_MARGIN, 3);
-               ADD_SHAPE_CONFIG(SOFTKEY_TOP_MARGIN, 20);
+               ADD_SHAPE_CONFIG(SOFTKEY_TOP_MARGIN, 19);
                ADD_SHAPE_CONFIG(SOFTKEY_1_LEFT_MARGIN, 8);
                ADD_SHAPE_CONFIG(SOFTKEY_ICON_SIZE, 92);
                ADD_DIMENSION_CONFIG(SOFTKEY_RECT, 144, 117);
@@ -330,8 +331,8 @@ START_UI_CONFIG(FOOTER);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_TEXT_HEIGHT, 72);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_TEXT_LEFT_MARGIN, 6);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_TEXT_TOP_MARGIN, 6);
-               ADD_SHAPE_CONFIG(BUTTON_ITEM_TEXT_FONT_SIZE_ITEM_3, 25);
-               ADD_SHAPE_CONFIG(BUTTON_ITEM_TEXT_FONT_SIZE_ITEM_4, 25);
+               ADD_SHAPE_CONFIG(BUTTON_ITEM_TEXT_FONT_SIZE_ITEM_3, 24);
+               ADD_SHAPE_CONFIG(BUTTON_ITEM_TEXT_FONT_SIZE_ITEM_4, 24);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_TEXT_FONT_SIZE_ITEM_5, 22);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_TEXT_FONT_SIZE_ITEM_3_WITH_ICON, 22);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_TEXT_FONT_SIZE_ITEM_4_WITH_ICON, 22);
@@ -350,9 +351,10 @@ START_UI_CONFIG(FOOTER);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 11);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 11);
                ADD_SHAPE_CONFIG(SOFTKEY_HEIGHT, 118);
-               ADD_SHAPE_CONFIG(SOFTKEY_TEXT_SIZE, 40);
+               ADD_SHAPE_CONFIG(SOFTKEY_TEXT_SIZE, 42);
+               ADD_SHAPE_CONFIG(SOFTKEY_MULTILINE_TEXT_SIZE, 38);
                ADD_SHAPE_CONFIG(SOFTKEY_0_LEFT_MARGIN, 3);
-               ADD_SHAPE_CONFIG(SOFTKEY_TOP_MARGIN, 20);
+               ADD_SHAPE_CONFIG(SOFTKEY_TOP_MARGIN, 19);
                ADD_SHAPE_CONFIG(SOFTKEY_1_LEFT_MARGIN, 8);
                ADD_SHAPE_CONFIG(SOFTKEY_ICON_SIZE, 92);
                ADD_DIMENSION_CONFIG(SOFTKEY_RECT, 144, 117);

diff --git a/src/ui/resource/FUi_ResourceHeaderConfig.cpp b/src/ui/resource/FUi_ResourceHeaderConfig.cpp
index 37f27ea..5564055 100755 (executable)
--- a/src/ui/resource/FUi_ResourceHeaderConfig.cpp
+++ b/src/ui/resource/FUi_ResourceHeaderConfig.cpp
@@ -192,8 +192,12 @@ START_UI_CONFIG(HEADER);
                ADD_SHAPE_CONFIG(DESCRIPTION_TEXT_FONT_SIZE, 32);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_FONT_SIZE, 32);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_MULTILINE_FONT_SIZE, 27);
-               ADD_SHAPE_CONFIG(SEGMENTED_ITEM_FONT_SIZE, 28)
+               ADD_SHAPE_CONFIG(SEGMENTED_ITEM_FONT_SIZE, 30);
+               ADD_SHAPE_CONFIG(SEGMENTED_ITEM_MULTILINE_FONT_SIZE, 28);
+               ADD_SHAPE_CONFIG(SEGMENTED_ITEM_FONT_SIZE_3_ITEM, 26);
+               ADD_SHAPE_CONFIG(SEGMENTED_ITEM_FONT_SIZE_4_ITEM, 24);
                ADD_SHAPE_CONFIG(TAB_ITEM_FONT_SIZE, 30);
+               ADD_SHAPE_CONFIG(TAB_ITEM_MULTILINE_FONT_SIZE, 28);
                ADD_SHAPE_CONFIG(TAB_ITEM_FONT_SIZE_3_ITEM, 26);//720x1280
                ADD_SHAPE_CONFIG(TAB_ITEM_FONT_SIZE_4_ITEM, 24);
                ADD_SHAPE_CONFIG(BADGE_FONT_SIZE, 26);
@@ -277,8 +281,12 @@ START_UI_CONFIG(HEADER);
                ADD_SHAPE_CONFIG(DESCRIPTION_TEXT_FONT_SIZE, 28);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_FONT_SIZE, 32);
                ADD_SHAPE_CONFIG(BUTTON_ITEM_MULTILINE_FONT_SIZE, 27);
-               ADD_SHAPE_CONFIG(SEGMENTED_ITEM_FONT_SIZE, 28);
+               ADD_SHAPE_CONFIG(SEGMENTED_ITEM_FONT_SIZE, 30);
+               ADD_SHAPE_CONFIG(SEGMENTED_ITEM_MULTILINE_FONT_SIZE, 28);
+               ADD_SHAPE_CONFIG(SEGMENTED_ITEM_FONT_SIZE_3_ITEM, 26);
+               ADD_SHAPE_CONFIG(SEGMENTED_ITEM_FONT_SIZE_4_ITEM, 24);
                ADD_SHAPE_CONFIG(TAB_ITEM_FONT_SIZE, 30);//1280x720
+               ADD_SHAPE_CONFIG(TAB_ITEM_MULTILINE_FONT_SIZE, 28);
                ADD_SHAPE_CONFIG(TAB_ITEM_FONT_SIZE_3_ITEM, 26);
                ADD_SHAPE_CONFIG(TAB_ITEM_FONT_SIZE_4_ITEM, 24);
                ADD_SHAPE_CONFIG(BADGE_FONT_SIZE, 26);