fix badge align and wvga buttonItem width

Change-Id: Ib4af046a3f1f11682899349e3f4a3343818edd17

diff --git a/src/ui/controls/FUiCtrl_HeaderImpl.cpp b/src/ui/controls/FUiCtrl_HeaderImpl.cpp
index 5c9db8c..3e3bdd4 100644 (file)
--- a/src/ui/controls/FUiCtrl_HeaderImpl.cpp
+++ b/src/ui/controls/FUiCtrl_HeaderImpl.cpp
@@ -1151,7 +1151,7 @@ _HeaderImpl::ConvertButtonItem(const ButtonItem& buttonItem)
                        extentSize = extentSizeMin;
                }
 
-               pButton->SetMargin(textMargin, 0.0f, textMargin, 0.0f);
+               pButton->SetMargin(textMargin, 0.0f, textMargin - 1, 0.0f);
                pButton->SetBounds(FloatRectangle(0.0f, 0.0f, extentSize, buttonItemHeight));
        }
        else

diff --git a/src/ui/controls/FUiCtrl_Label.cpp b/src/ui/controls/FUiCtrl_Label.cpp
index e8ba7f9..52c0adf 100644 (file)
--- a/src/ui/controls/FUiCtrl_Label.cpp
+++ b/src/ui/controls/FUiCtrl_Label.cpp
@@ -645,5 +645,38 @@ _Label::GetContentSizeInternalF(bool horizontalMode, bool verticalMode) const
        return dimension;
 }
 
+int
+_Label::GetTextExtentSize(void) const
+{
+       return _CoordinateSystemUtils::ConvertToInteger(GetTextExtentSizeF());
+}
+
+float
+_Label::GetTextExtentSizeF(void) const
+{
+       float textExtentSize = 0.0f;
+
+       TextObject* pTextObject = __pLabelPresenter->GetTextObject();
+       Font* pFont = __pLabelPresenter->GetFont();
+
+       TextObjectActionType previousActionType = pTextObject->GetAction();
+       TextObjectWrapType previousWrapType = pTextObject->GetWrap();
+       FloatRectangle previousRect = pTextObject->GetBoundsF();
+
+       pTextObject->SetAction(TEXT_OBJECT_ACTION_TYPE_NONE);
+       pTextObject->SetWrap(TEXT_OBJECT_WRAP_TYPE_WORD);
+       pTextObject->SetFont(pFont, 0, pTextObject->GetTextLength());
+       pTextObject->Compose();
+
+       textExtentSize = pTextObject->GetTextExtentF(0, pTextObject->GetTextLength()).width;
+
+       pTextObject->SetBounds(previousRect);
+       pTextObject->SetAction(previousActionType);
+       pTextObject->SetWrap(previousWrapType);
+       pTextObject->Compose();
+
+       return textExtentSize;
+}
+
 }}} // Tizen::Ui::Controls
 

diff --git a/src/ui/controls/FUiCtrl_Toolbar.cpp b/src/ui/controls/FUiCtrl_Toolbar.cpp
index b01da91..5f8ed0d 100644 (file)
--- a/src/ui/controls/FUiCtrl_Toolbar.cpp
+++ b/src/ui/controls/FUiCtrl_Toolbar.cpp
@@ -1839,7 +1839,7 @@ _Toolbar::SetButtonBadgeIcon(ToolbarButton position, const Bitmap* pBadgeIcon)
 
        float height = 0.0f;
 
-       GET_SHAPE_CONFIG(HEADER::BADGE_HEIGHT_WITH_BUTTON, GetOrientation(), height);
+       GET_SHAPE_CONFIG(HEADER::BADGE_HEIGHT, GetOrientation(), height);
 
        _Label* pBadgeIconLabel = _Label::CreateLabelN();
 
@@ -1889,6 +1889,9 @@ _Toolbar::SetButtonNumberedBadgeIcon(ToolbarButton position, int number)
        else
        {
                bool needToCreateNewIcon = true;
+               float sideMargin = 0.0f;
+
+               GET_SHAPE_CONFIG(HEADER::BADGE_SIDE_MARGIN, GetOrientation(), sideMargin);
 
                if (childCount != 0)
                {
@@ -1960,7 +1963,7 @@ _Toolbar::SetButtonNumberedBadgeIcon(ToolbarButton position, int number)
                        pLabel->SetTextHorizontalAlignment(ALIGNMENT_CENTER);
                        pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
                        pLabel->SetTextColor(badgeIconTextNormalColor);
-                       pLabel->SetMargin(10, 0, 5, 0);
+                       pLabel->SetMargin(sideMargin, 0.0f, sideMargin, 0.0f);
 
                        __pButtonItems[position]->AttachChild(*pLabel);
                        __pButtonItems[position]->SetChildAlwaysOnTop(*pLabel);
@@ -1977,40 +1980,28 @@ _Toolbar::SetButtonNumberedBadgeIcon(ToolbarButton position, int number)
                        float fontSize = 0.0f;
                        float height = 0.0f;
                        float width = 0.0f;
+                       float minWidth = 0.0f;
 
-                       GET_SHAPE_CONFIG(HEADER::BADGE_HEIGHT_WITH_BUTTON, GetOrientation(), height);
+                       GET_SHAPE_CONFIG(HEADER::BADGE_FONT_SIZE, GetOrientation(), fontSize);
+                       GET_SHAPE_CONFIG(HEADER::BADGE_HEIGHT, GetOrientation(), height);
+                       GET_SHAPE_CONFIG(HEADER::BADGE_MIN_WIDTH, GetOrientation(), minWidth);
 
-                       if (number < 10)
-                       {
-                               GET_SHAPE_CONFIG(HEADER::BADGE_FONT_SIZE_WITH_BUTTON, GetOrientation(), fontSize);
-                               GET_SHAPE_CONFIG(HEADER::BADGE_WIDTH_1DIGIT, GetOrientation(), width);
-                       }
-                       else if (number < 100)
-                       {
-                               GET_SHAPE_CONFIG(HEADER::BADGE_FONT_SIZE_WITH_BUTTON, GetOrientation(), fontSize);
-                               GET_SHAPE_CONFIG(HEADER::BADGE_WIDTH_1DIGIT, GetOrientation(), width);
-                       }
-                       else if (number < 1000)
-                       {
-                               GET_SHAPE_CONFIG(HEADER::BADGE_FONT_SIZE_WITH_BUTTON, GetOrientation(), fontSize);
-                               GET_SHAPE_CONFIG(HEADER::BADGE_WIDTH_2DIGIT, GetOrientation(), width);
-                       }
-                       else if (number < 10000)
-                       {
-                               GET_SHAPE_CONFIG(HEADER::BADGE_FONT_SIZE_WITH_BUTTON, GetOrientation(), fontSize);
-                               GET_SHAPE_CONFIG(HEADER::BADGE_WIDTH_2DIGIT, GetOrientation(), width);
-                       }
-                       else
-                       {
-                               GET_SHAPE_CONFIG(HEADER::BADGE_FONT_SIZE_WITH_BUTTON_2, GetOrientation(), fontSize);
-                               GET_SHAPE_CONFIG(HEADER::BADGE_WIDTH_2DIGIT, GetOrientation(), width);
-                       }
 
-                       existingBadgeIcon->SetBounds(FloatRectangle(bounds.width - width, 0, width, height));
                        existingBadgeIcon->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
 
                        Integer tempNumber(number);
                        existingBadgeIcon->SetText(tempNumber.ToString());
+
+                       width = existingBadgeIcon->GetTextExtentSizeF();
+
+                       if (width < minWidth)
+                       {
+                               width = minWidth;
+                       }
+
+                       width += sideMargin * 2;
+
+                       existingBadgeIcon->SetBounds(FloatRectangle(bounds.width - width, 0.0f, width, height));
                }
        }
 
@@ -2269,6 +2260,10 @@ _Toolbar::SetItemNumberedBadgeIcon(int itemIndex, int number)
        }
        else
        {
+               float sideMargin = 0.0f;
+
+               GET_SHAPE_CONFIG(HEADER::BADGE_SIDE_MARGIN, GetOrientation(), sideMargin);
+
                if (__pItems.at(itemIndex)->GetChildCount() == 0)
                {
                        _Label* pLabel = _Label::CreateLabelN();
@@ -2311,10 +2306,10 @@ _Toolbar::SetItemNumberedBadgeIcon(int itemIndex, int number)
                                delete pNumberedBadgeIconEffectBitmap;
                        }
 
-                       pLabel->SetTextHorizontalAlignment(ALIGNMENT_RIGHT);
+                       pLabel->SetTextHorizontalAlignment(ALIGNMENT_CENTER);
                        pLabel->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
                        pLabel->SetTextColor(badgeIconTextNormalColor);
-                       pLabel->SetMargin(0, 10);
+                       pLabel->SetMargin(sideMargin, 0.0f, sideMargin, 0.0f);
 
                        __pItems.at(itemIndex)->AttachChild(*pLabel);
                        __pItems.at(itemIndex)->SetChildAlwaysOnTop(*pLabel);
@@ -2331,36 +2326,28 @@ _Toolbar::SetItemNumberedBadgeIcon(int itemIndex, int number)
                        float fontSize = 0.0f;
                        float height = 0.0f;
                        float width = 0.0f;
+                       float minWidth = 0.0f;
 
                        GET_SHAPE_CONFIG(HEADER::BADGE_FONT_SIZE, GetOrientation(), fontSize);
                        GET_SHAPE_CONFIG(HEADER::BADGE_HEIGHT, GetOrientation(), height);
+                       GET_SHAPE_CONFIG(HEADER::BADGE_MIN_WIDTH, GetOrientation(), minWidth);
 
-                       if (number < 10)
-                       {
-                               GET_SHAPE_CONFIG(HEADER::BADGE_WIDTH_1DIGIT, GetOrientation(), width);
-                       }
-                       else if (number < 100)
-                       {
-                               GET_SHAPE_CONFIG(HEADER::BADGE_WIDTH_2DIGIT, GetOrientation(), width);
-                       }
-                       else if (number < 1000)
-                       {
-                               GET_SHAPE_CONFIG(HEADER::BADGE_WIDTH_3DIGIT, GetOrientation(), width);
-                       }
-                       else if (number < 10000)
-                       {
-                               GET_SHAPE_CONFIG(HEADER::BADGE_WIDTH_4DIGIT, GetOrientation(), width);
-                       }
-                       else
+                       existingBadgeIcon->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
+
+                       Integer tempNumber(number);
+                       existingBadgeIcon->SetText(tempNumber.ToString());
+
+                       width = existingBadgeIcon->GetTextExtentSizeF();
+
+                       if (width < minWidth)
                        {
-                               GET_SHAPE_CONFIG(HEADER::BADGE_WIDTH_5DIGIT, GetOrientation(), width);
+                               width = minWidth;
                        }
 
+                       width += sideMargin * 2;
+
                        existingBadgeIcon->SetBounds(FloatRectangle(bounds.width - width, 0.0f, width, height));
-                       existingBadgeIcon->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
 
-                       Integer tempNumber(number);
-                       existingBadgeIcon->SetText(tempNumber.ToString());
                }
        }
 
@@ -10127,8 +10114,10 @@ _Toolbar::SetTitleNumberedBadgeIcon(int number)
                Bitmap* pColorReplacedBitmap = null;
                Color badgeIconBgNormalColor;
                Color badgeIconTextNormalColor;
+               float sideMargin = 0.0f;
 
                GET_BITMAP_CONFIG_N(HEADER::BADGE_ICON_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pNumberedBadgeIconBitmap);
+               GET_SHAPE_CONFIG(HEADER::BADGE_SIDE_MARGIN, GetOrientation(), sideMargin);
 
                bool customTheme = IS_CUSTOM_BITMAP(HEADER::BADGE_ICON_BG_NORMAL);
                if (customTheme == false)
@@ -10157,45 +10146,36 @@ _Toolbar::SetTitleNumberedBadgeIcon(int number)
                        delete pNumberedBadgeIconEffectBitmap;
                }
 
-               __pTitleBadgeIcon->SetTextHorizontalAlignment(ALIGNMENT_RIGHT);
+               __pTitleBadgeIcon->SetTextHorizontalAlignment(ALIGNMENT_CENTER);
                __pTitleBadgeIcon->SetTextVerticalAlignment(ALIGNMENT_MIDDLE);
                __pTitleBadgeIcon->SetTextColor(badgeIconTextNormalColor);
-               __pTitleBadgeIcon->SetMargin(0, 10);
+               __pTitleBadgeIcon->SetMargin(sideMargin, 0.0f, sideMargin, 0.0f);
 
                float fontSize = 0.0f;
                float height = 0.0f;
                float width = 0.0f;
+               float minWidth = 0.0f;
 
                GET_SHAPE_CONFIG(HEADER::BADGE_FONT_SIZE, GetOrientation(), fontSize);
                GET_SHAPE_CONFIG(HEADER::BADGE_HEIGHT, GetOrientation(), height);
+               GET_SHAPE_CONFIG(HEADER::BADGE_MIN_WIDTH, GetOrientation(), minWidth);
 
-               if (number < 10)
-               {
-                       GET_SHAPE_CONFIG(HEADER::BADGE_WIDTH_1DIGIT, GetOrientation(), width);
-               }
-               else if (number < 100)
-               {
-                       GET_SHAPE_CONFIG(HEADER::BADGE_WIDTH_2DIGIT, GetOrientation(), width);
-               }
-               else if (number < 1000)
-               {
-                       GET_SHAPE_CONFIG(HEADER::BADGE_WIDTH_3DIGIT, GetOrientation(), width);
-               }
-               else if (number < 10000)
-               {
-                       GET_SHAPE_CONFIG(HEADER::BADGE_WIDTH_4DIGIT, GetOrientation(), width);
-               }
-               else
-               {
-                       GET_SHAPE_CONFIG(HEADER::BADGE_WIDTH_5DIGIT, GetOrientation(), width);
-               }
-
-               __pTitleBadgeIcon->SetBounds(FloatRectangle(0.0f, 0.0f, width, height));
                __pTitleBadgeIcon->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
 
                Integer tempNumber(number);
                __pTitleBadgeIcon->SetText(tempNumber.ToString());
 
+               width = __pTitleBadgeIcon->GetTextExtentSizeF();
+
+               if (width < minWidth)
+               {
+                       width = minWidth;
+               }
+
+               width += sideMargin * 2;
+
+               __pTitleBadgeIcon->SetBounds(FloatRectangle(0.0f, 0.0f, width, height));
+
                AttachChild(*__pTitleBadgeIcon);
                SetChildAlwaysOnTop(*__pTitleBadgeIcon);
        }

diff --git a/src/ui/inc/FUiCtrl_Label.h b/src/ui/inc/FUiCtrl_Label.h
index f737138..f623b09 100644 (file)
--- a/src/ui/inc/FUiCtrl_Label.h
+++ b/src/ui/inc/FUiCtrl_Label.h
@@ -123,6 +123,9 @@ public:
        float GetRightMarginF(void) const;
        float GetBottomMarginF(void) const;
 
+       int GetTextExtentSize(void) const;
+       float GetTextExtentSizeF(void) const;
+
        Tizen::Graphics::FloatDimension GetContentSizeInternalF(bool horizontalMode, bool verticalMode) const;
 
 protected:

diff --git a/src/ui/inc/FUi_ResourceHeaderConfig.h b/src/ui/inc/FUi_ResourceHeaderConfig.h
index 2da5abb..0b2b501 100644 (file)
--- a/src/ui/inc/FUi_ResourceHeaderConfig.h
+++ b/src/ui/inc/FUi_ResourceHeaderConfig.h
@@ -231,8 +231,8 @@ DECLARE_UI_CONFIG(HEADER);
        DECLARE_SHAPE_CONFIG(TAB_ITEM_FONT_SIZE_3_ITEM, 13);
        DECLARE_SHAPE_CONFIG(TAB_ITEM_FONT_SIZE_4_ITEM, 14);
        DECLARE_SHAPE_CONFIG(BADGE_FONT_SIZE, 15);
-       DECLARE_SHAPE_CONFIG(BADGE_FONT_SIZE_WITH_BUTTON, 16);
-       DECLARE_SHAPE_CONFIG(BADGE_FONT_SIZE_WITH_BUTTON_2, 17);
+       //DECLARE_SHAPE_CONFIG(BADGE_FONT_SIZE_WITH_BUTTON, 16);
+       //DECLARE_SHAPE_CONFIG(BADGE_FONT_SIZE_WITH_BUTTON_2, 17);
        DECLARE_SHAPE_CONFIG(TITLE_DISPLAY_HEIGHT, 18);
        DECLARE_SHAPE_CONFIG(TITLE_TOP_MARGIN_WITH_DESCRIPTION, 19);
        DECLARE_SHAPE_CONFIG(TITLE_DISPLAY_HEIGHT_WITH_DESCRIPTION, 20);
@@ -267,12 +267,12 @@ DECLARE_UI_CONFIG(HEADER);
        DECLARE_SHAPE_CONFIG(DIVIDER_WIDTH, 49);
        DECLARE_SHAPE_CONFIG(DIVIDER_HEIGHT, 50);
        DECLARE_SHAPE_CONFIG(BADGE_HEIGHT, 51);
-       DECLARE_SHAPE_CONFIG(BADGE_HEIGHT_WITH_BUTTON, 52);
-       DECLARE_SHAPE_CONFIG(BADGE_WIDTH_1DIGIT, 53);
-       DECLARE_SHAPE_CONFIG(BADGE_WIDTH_2DIGIT, 54);
-       DECLARE_SHAPE_CONFIG(BADGE_WIDTH_3DIGIT, 55);
-       DECLARE_SHAPE_CONFIG(BADGE_WIDTH_4DIGIT, 56);
-       DECLARE_SHAPE_CONFIG(BADGE_WIDTH_5DIGIT, 57);
+       //DECLARE_SHAPE_CONFIG(BADGE_HEIGHT_WITH_BUTTON, 52);
+       //DECLARE_SHAPE_CONFIG(BADGE_WIDTH_1DIGIT, 53);
+       //DECLARE_SHAPE_CONFIG(BADGE_WIDTH_2DIGIT, 54);
+       //DECLARE_SHAPE_CONFIG(BADGE_WIDTH_3DIGIT, 55);
+       //DECLARE_SHAPE_CONFIG(BADGE_WIDTH_4DIGIT, 56);
+       //DECLARE_SHAPE_CONFIG(BADGE_WIDTH_5DIGIT, 57);
        DECLARE_SHAPE_CONFIG(TITLE_BADGE_ICON_GAP, 58);
        DECLARE_SHAPE_CONFIG(TITLE_BADGE_TOP_MARGIN, 59);
        DECLARE_SHAPE_CONFIG(HEADER_ITEM_SELECTED_BITMAP_MARGIN, 60);
@@ -299,7 +299,8 @@ DECLARE_UI_CONFIG(HEADER);
        //DECLARE_SHAPE_CONFIG(TAB_BUTTON_ITEM_TOP_TOUCH_MARGIN, 81);
        //DECLARE_SHAPE_CONFIG(TAB_BUTTON_ITEM_RIGHT_TOUCH_MARGIN, 82);
        //DECLARE_SHAPE_CONFIG(TAB_BUTTON_ITEM_BOTTOM_TOUCH_MARGIN, 83);
-
+       DECLARE_SHAPE_CONFIG(BADGE_MIN_WIDTH, 84);
+       DECLARE_SHAPE_CONFIG(BADGE_SIDE_MARGIN, 85);
 
 DECLARE_END_UI_CONFIG(HEADER);
 

diff --git a/src/ui/resource/FUi_ResourceHeaderConfig.cpp b/src/ui/resource/FUi_ResourceHeaderConfig.cpp
index 1ae5974..e45d144 100644 (file)
--- a/src/ui/resource/FUi_ResourceHeaderConfig.cpp
+++ b/src/ui/resource/FUi_ResourceHeaderConfig.cpp
@@ -297,8 +297,8 @@ START_UI_CONFIG(HEADER);
                ADD_SHAPE_CONFIG(TAB_ITEM_FONT_SIZE_3_ITEM, 30);//720x1280
                ADD_SHAPE_CONFIG(TAB_ITEM_FONT_SIZE_4_ITEM, 30);
                ADD_SHAPE_CONFIG(BADGE_FONT_SIZE, 26);
-               ADD_SHAPE_CONFIG(BADGE_FONT_SIZE_WITH_BUTTON, 20);
-               ADD_SHAPE_CONFIG(BADGE_FONT_SIZE_WITH_BUTTON_2, 16);
+               //ADD_SHAPE_CONFIG(BADGE_FONT_SIZE_WITH_BUTTON, 20);
+               //ADD_SHAPE_CONFIG(BADGE_FONT_SIZE_WITH_BUTTON_2, 16);
 
                ADD_SHAPE_CONFIG(TITLE_DISPLAY_HEIGHT, 96);
                ADD_SHAPE_CONFIG(TITLE_TOP_MARGIN_WITH_DESCRIPTION, 4);
@@ -349,12 +349,14 @@ START_UI_CONFIG(HEADER);
                ADD_SHAPE_CONFIG(DIVIDER_HEIGHT, 48);
 
                ADD_SHAPE_CONFIG(BADGE_HEIGHT, 54);
-               ADD_SHAPE_CONFIG(BADGE_HEIGHT_WITH_BUTTON, 45);
-               ADD_SHAPE_CONFIG(BADGE_WIDTH_1DIGIT, 50);
-               ADD_SHAPE_CONFIG(BADGE_WIDTH_2DIGIT, 64);
-               ADD_SHAPE_CONFIG(BADGE_WIDTH_3DIGIT, 78);
-               ADD_SHAPE_CONFIG(BADGE_WIDTH_4DIGIT, 92);
-               ADD_SHAPE_CONFIG(BADGE_WIDTH_5DIGIT, 106);
+               //ADD_SHAPE_CONFIG(BADGE_HEIGHT_WITH_BUTTON, 45);
+               //ADD_SHAPE_CONFIG(BADGE_WIDTH_1DIGIT, 50);
+               //ADD_SHAPE_CONFIG(BADGE_WIDTH_2DIGIT, 64);
+               //ADD_SHAPE_CONFIG(BADGE_WIDTH_3DIGIT, 78);
+               //ADD_SHAPE_CONFIG(BADGE_WIDTH_4DIGIT, 92);
+               //ADD_SHAPE_CONFIG(BADGE_WIDTH_5DIGIT, 106);
+               ADD_SHAPE_CONFIG(BADGE_MIN_WIDTH, 30);
+               ADD_SHAPE_CONFIG(BADGE_SIDE_MARGIN, 12);
 
                ADD_SHAPE_CONFIG(TITLE_BADGE_ICON_GAP, 2);
                ADD_SHAPE_CONFIG(TITLE_BADGE_TOP_MARGIN, 3);
@@ -401,8 +403,8 @@ START_UI_CONFIG(HEADER);
                ADD_SHAPE_CONFIG(TAB_ITEM_FONT_SIZE_3_ITEM, 30);
                ADD_SHAPE_CONFIG(TAB_ITEM_FONT_SIZE_4_ITEM, 30);
                ADD_SHAPE_CONFIG(BADGE_FONT_SIZE, 26);
-               ADD_SHAPE_CONFIG(BADGE_FONT_SIZE_WITH_BUTTON, 20);
-               ADD_SHAPE_CONFIG(BADGE_FONT_SIZE_WITH_BUTTON_2, 16);
+               //ADD_SHAPE_CONFIG(BADGE_FONT_SIZE_WITH_BUTTON, 20);
+               //ADD_SHAPE_CONFIG(BADGE_FONT_SIZE_WITH_BUTTON_2, 16);
 
                ADD_SHAPE_CONFIG(TITLE_DISPLAY_HEIGHT, 91);
                ADD_SHAPE_CONFIG(TITLE_TOP_MARGIN_WITH_DESCRIPTION, 7.5);
@@ -453,12 +455,14 @@ START_UI_CONFIG(HEADER);
                ADD_SHAPE_CONFIG(DIVIDER_HEIGHT, 48);
 
                ADD_SHAPE_CONFIG(BADGE_HEIGHT, 54);
-               ADD_SHAPE_CONFIG(BADGE_HEIGHT_WITH_BUTTON, 45);
-               ADD_SHAPE_CONFIG(BADGE_WIDTH_1DIGIT, 50);
-               ADD_SHAPE_CONFIG(BADGE_WIDTH_2DIGIT, 64);
-               ADD_SHAPE_CONFIG(BADGE_WIDTH_3DIGIT, 78);
-               ADD_SHAPE_CONFIG(BADGE_WIDTH_4DIGIT, 92);
-               ADD_SHAPE_CONFIG(BADGE_WIDTH_5DIGIT, 106);
+               //ADD_SHAPE_CONFIG(BADGE_HEIGHT_WITH_BUTTON, 45);
+               //ADD_SHAPE_CONFIG(BADGE_WIDTH_1DIGIT, 50);
+               //ADD_SHAPE_CONFIG(BADGE_WIDTH_2DIGIT, 64);
+               //ADD_SHAPE_CONFIG(BADGE_WIDTH_3DIGIT, 78);
+               //ADD_SHAPE_CONFIG(BADGE_WIDTH_4DIGIT, 92);
+               //ADD_SHAPE_CONFIG(BADGE_WIDTH_5DIGIT, 106);
+               ADD_SHAPE_CONFIG(BADGE_MIN_WIDTH, 30);
+               ADD_SHAPE_CONFIG(BADGE_SIDE_MARGIN, 12);
 
                ADD_SHAPE_CONFIG(TITLE_BADGE_ICON_GAP, 2);
                ADD_SHAPE_CONFIG(TITLE_BADGE_TOP_MARGIN, 3);