[multibuttonentry]applied gui v1.5 changed button style from edje rect to image

diff --git a/themes/images/tizen-black-hd/00_contacts_button_bg.png b/themes/images/tizen-black-hd/00_contacts_button_bg.png
new file mode 100755 (executable)
index 0000000..2cac510
Binary files /dev/null and b/themes/images/tizen-black-hd/00_contacts_button_bg.png differ

diff --git a/themes/images/tizen-black-hd/00_contacts_button_bg_press.png b/themes/images/tizen-black-hd/00_contacts_button_bg_press.png
new file mode 100755 (executable)
index 0000000..a6a5d71
Binary files /dev/null and b/themes/images/tizen-black-hd/00_contacts_button_bg_press.png differ

diff --git a/themes/images/tizen-black/00_contacts_button_bg.png b/themes/images/tizen-black/00_contacts_button_bg.png
new file mode 100755 (executable)
index 0000000..2cac510
Binary files /dev/null and b/themes/images/tizen-black/00_contacts_button_bg.png differ

diff --git a/themes/images/tizen-black/00_contacts_button_bg_press.png b/themes/images/tizen-black/00_contacts_button_bg_press.png
new file mode 100755 (executable)
index 0000000..a6a5d71
Binary files /dev/null and b/themes/images/tizen-black/00_contacts_button_bg_press.png differ

diff --git a/themes/images/tizen-hd/00_contacts_button_bg.png b/themes/images/tizen-hd/00_contacts_button_bg.png
new file mode 100755 (executable)
index 0000000..2cac510
Binary files /dev/null and b/themes/images/tizen-hd/00_contacts_button_bg.png differ

diff --git a/themes/images/tizen-hd/00_contacts_button_bg_press.png b/themes/images/tizen-hd/00_contacts_button_bg_press.png
new file mode 100755 (executable)
index 0000000..a6a5d71
Binary files /dev/null and b/themes/images/tizen-hd/00_contacts_button_bg_press.png differ

diff --git a/themes/images/tizen/00_contacts_button_bg.png b/themes/images/tizen/00_contacts_button_bg.png
new file mode 100755 (executable)
index 0000000..2cac510
Binary files /dev/null and b/themes/images/tizen/00_contacts_button_bg.png differ

diff --git a/themes/images/tizen/00_contacts_button_bg_press.png b/themes/images/tizen/00_contacts_button_bg_press.png
new file mode 100755 (executable)
index 0000000..a6a5d71
Binary files /dev/null and b/themes/images/tizen/00_contacts_button_bg_press.png differ

diff --git a/themes/inc/tizen-black-hd-inc.edc b/themes/inc/tizen-black-hd-inc.edc
index 83dac77..2df7fc0 100644 (file)
--- a/themes/inc/tizen-black-hd-inc.edc
+++ b/themes/inc/tizen-black-hd-inc.edc
@@ -842,21 +842,22 @@
 #define MULTIBUTTONENTRY_LABEL_TEXT_COLOR_INC 249 249 249 255
 #define MULTIBUTTONENTRY_GUIDETEXT_COLOR_INC 70 70 70 255
 #define MULTIBUTTONENTRY_BUTTON_TEXT_COLOR_INC "#FFFFFF"
-#define MULTIBUTTONENTRY_WIDTH_PAD 15
-#define MULTIBUTTONENTRY_HEIGHT_PAD 20
-#define MULTIBUTTONENTRY_BUTTON_MAX_SIZE 300
-#define MULTIBUTTONENTRY_BUTTON_BASE_SIZE 66
-#define MULTIBUTTONENTRY_BUTTON_TOP_BUTTOM_PAD 12
-#define MULTIBUTTONENTRY_BUTTON_LEFT_INNER_PAD 15
-#define MULTIBUTTONENTRY_BUTTON_RIGHT_INNER_PAD 15
-#define MULTIBUTTONENTRY_BUTTON_RIGHT_PAD 15
-#define MULTIBUTTONENTRY_BUTTON_TEXT_SIZE 38
-#define MULTIBUTTONENTRY_GUIDETEXT_SIZE 44
-#define MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE 60
-#define MULTIBUTTONENTRY_CLOSEDBUTTON_AREA_HEIGHT 60
-#define MULTIBUTTONENTRY_LABEL_RIGHT_PAD 27
-#define MULTIBUTTONENTRY_LABEL_TEXT_SIZE 42
-#define MULTIBUTTONENTRY_LABEL_MIN_HEIGHT 75
+#define MULTIBUTTONENTRY_WIDTH_PAD_INC 15
+#define MULTIBUTTONENTRY_HEIGHT_PAD_INC 20
+#define MULTIBUTTONENTRY_BUTTON_MAX_SIZE_INC 300
+#define MULTIBUTTONENTRY_BUTTON_BASE_SIZE_INC 66
+#define MULTIBUTTONENTRY_BUTTON_NINEPATCH_INC 5 5 0 0
+#define MULTIBUTTONENTRY_BUTTON_TOP_BUTTOM_PAD_INC 12
+#define MULTIBUTTONENTRY_BUTTON_LEFT_INNER_PAD_INC 15
+#define MULTIBUTTONENTRY_BUTTON_RIGHT_INNER_PAD_INC 15
+#define MULTIBUTTONENTRY_BUTTON_RIGHT_PAD_INC 15
+#define MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC 38
+#define MULTIBUTTONENTRY_GUIDETEXT_SIZE_INC 44
+#define MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE_INC 60
+#define MULTIBUTTONENTRY_CLOSEDBUTTON_AREA_HEIGHT_INC 60
+#define MULTIBUTTONENTRY_LABEL_RIGHT_PAD_INC 27
+#define MULTIBUTTONENTRY_LABEL_TEXT_SIZE_INC 42
+#define MULTIBUTTONENTRY_LABEL_MIN_HEIGHT_INC 75
 
 #define SEARCHBAR_BACKGROUND_COLOR_INC          36 36 36 255
 #define SEARCHBAR_CANCEL_BUTTON_W_INC 134

diff --git a/themes/inc/tizen-black-inc.edc b/themes/inc/tizen-black-inc.edc
index 3f2ca5e..a06c7a5 100644 (file)
--- a/themes/inc/tizen-black-inc.edc
+++ b/themes/inc/tizen-black-inc.edc
@@ -826,21 +826,22 @@
 #define MULTIBUTTONENTRY_LABEL_TEXT_COLOR_INC 249 249 249 255
 #define MULTIBUTTONENTRY_GUIDETEXT_COLOR_INC 70 70 70 255
 #define MULTIBUTTONENTRY_BUTTON_TEXT_COLOR_INC "#FFFFFF"
-#define MULTIBUTTONENTRY_WIDTH_PAD 10
-#define MULTIBUTTONENTRY_HEIGHT_PAD 13
-#define MULTIBUTTONENTRY_BUTTON_MAX_SIZE 200
-#define MULTIBUTTONENTRY_BUTTON_BASE_SIZE 44
-#define MULTIBUTTONENTRY_BUTTON_TOP_BUTTOM_PAD 8
-#define MULTIBUTTONENTRY_BUTTON_LEFT_INNER_PAD 10
-#define MULTIBUTTONENTRY_BUTTON_RIGHT_INNER_PAD 10
-#define MULTIBUTTONENTRY_BUTTON_RIGHT_PAD 10
-#define MULTIBUTTONENTRY_BUTTON_TEXT_SIZE 24
-#define MULTIBUTTONENTRY_GUIDETEXT_SIZE 28
-#define MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE 40
-#define MULTIBUTTONENTRY_CLOSEDBUTTON_AREA_HEIGHT 40
-#define MULTIBUTTONENTRY_LABEL_RIGHT_PAD 18
-#define MULTIBUTTONENTRY_LABEL_TEXT_SIZE 28
-#define MULTIBUTTONENTRY_LABEL_MIN_HEIGHT 50
+#define MULTIBUTTONENTRY_WIDTH_PAD_INC 10
+#define MULTIBUTTONENTRY_HEIGHT_PAD_INC 13
+#define MULTIBUTTONENTRY_BUTTON_MAX_SIZE_INC 200
+#define MULTIBUTTONENTRY_BUTTON_BASE_SIZE_INC 44
+#define MULTIBUTTONENTRY_BUTTON_NINEPATCH_INC 1 1 0 0
+#define MULTIBUTTONENTRY_BUTTON_TOP_BUTTOM_PAD_INC 8
+#define MULTIBUTTONENTRY_BUTTON_LEFT_INNER_PAD_INC 10
+#define MULTIBUTTONENTRY_BUTTON_RIGHT_INNER_PAD_INC 10
+#define MULTIBUTTONENTRY_BUTTON_RIGHT_PAD_INC 10
+#define MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC 24
+#define MULTIBUTTONENTRY_GUIDETEXT_SIZE_INC 28
+#define MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE_INC 40
+#define MULTIBUTTONENTRY_CLOSEDBUTTON_AREA_HEIGHT_INC 40
+#define MULTIBUTTONENTRY_LABEL_RIGHT_PAD_INC 18
+#define MULTIBUTTONENTRY_LABEL_TEXT_SIZE_INC 28
+#define MULTIBUTTONENTRY_LABEL_MIN_HEIGHT_INC 50
 
 #define SEARCHBAR_BACKGROUND_COLOR_INC          36 36 36 255
 #define SEARCHBAR_CANCEL_BUTTON_W_INC 100

diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc
index 8fe284d..e566f14 100644 (file)
--- a/themes/inc/tizen-hd-inc.edc
+++ b/themes/inc/tizen-hd-inc.edc
@@ -847,21 +847,22 @@
 #define MULTIBUTTONENTRY_LABEL_TEXT_COLOR_INC 0 0 0 255
 #define MULTIBUTTONENTRY_GUIDETEXT_COLOR_INC 189 189 189 255
 #define MULTIBUTTONENTRY_BUTTON_TEXT_COLOR_INC "#FFFFFF"
-#define MULTIBUTTONENTRY_WIDTH_PAD 15
-#define MULTIBUTTONENTRY_HEIGHT_PAD 20
-#define MULTIBUTTONENTRY_BUTTON_MAX_SIZE 300
-#define MULTIBUTTONENTRY_BUTTON_BASE_SIZE 66
-#define MULTIBUTTONENTRY_BUTTON_TOP_BUTTOM_PAD 12
-#define MULTIBUTTONENTRY_BUTTON_LEFT_INNER_PAD 15
-#define MULTIBUTTONENTRY_BUTTON_RIGHT_INNER_PAD 15
-#define MULTIBUTTONENTRY_BUTTON_RIGHT_PAD 15
-#define MULTIBUTTONENTRY_BUTTON_TEXT_SIZE 38
-#define MULTIBUTTONENTRY_GUIDETEXT_SIZE 44
-#define MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE 60
-#define MULTIBUTTONENTRY_CLOSEDBUTTON_AREA_HEIGHT 60
-#define MULTIBUTTONENTRY_LABEL_RIGHT_PAD 27
-#define MULTIBUTTONENTRY_LABEL_TEXT_SIZE 42
-#define MULTIBUTTONENTRY_LABEL_MIN_HEIGHT 75
+#define MULTIBUTTONENTRY_WIDTH_PAD_INC 15
+#define MULTIBUTTONENTRY_HEIGHT_PAD_INC 20
+#define MULTIBUTTONENTRY_BUTTON_MAX_SIZE_INC 300
+#define MULTIBUTTONENTRY_BUTTON_BASE_SIZE_INC 66
+#define MULTIBUTTONENTRY_BUTTON_NINEPATCH_INC 5 5 0 0
+#define MULTIBUTTONENTRY_BUTTON_TOP_BUTTOM_PAD_INC 12
+#define MULTIBUTTONENTRY_BUTTON_LEFT_INNER_PAD_INC 15
+#define MULTIBUTTONENTRY_BUTTON_RIGHT_INNER_PAD_INC 15
+#define MULTIBUTTONENTRY_BUTTON_RIGHT_PAD_INC 15
+#define MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC 38
+#define MULTIBUTTONENTRY_GUIDETEXT_SIZE_INC 44
+#define MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE_INC 60
+#define MULTIBUTTONENTRY_CLOSEDBUTTON_AREA_HEIGHT_INC 60
+#define MULTIBUTTONENTRY_LABEL_RIGHT_PAD_INC 27
+#define MULTIBUTTONENTRY_LABEL_TEXT_SIZE_INC 42
+#define MULTIBUTTONENTRY_LABEL_MIN_HEIGHT_INC 75
 
 #define SEARCHBAR_BACKGROUND_COLOR_INC          242 238 233 255
 #define SEARCHBAR_CANCEL_BUTTON_W_INC 134

diff --git a/themes/inc/tizen-inc.edc b/themes/inc/tizen-inc.edc
index 76f58f7..adcbb61 100644 (file)
--- a/themes/inc/tizen-inc.edc
+++ b/themes/inc/tizen-inc.edc
@@ -839,21 +839,22 @@
 #define MULTIBUTTONENTRY_LABEL_TEXT_COLOR_INC 0 0 0 255
 #define MULTIBUTTONENTRY_GUIDETEXT_COLOR_INC 189 189 189 255
 #define MULTIBUTTONENTRY_BUTTON_TEXT_COLOR_INC "#FFFFFF"
-#define MULTIBUTTONENTRY_WIDTH_PAD 10
-#define MULTIBUTTONENTRY_HEIGHT_PAD 13
-#define MULTIBUTTONENTRY_BUTTON_MAX_SIZE 200
-#define MULTIBUTTONENTRY_BUTTON_BASE_SIZE 44
-#define MULTIBUTTONENTRY_BUTTON_TOP_BUTTOM_PAD 8
-#define MULTIBUTTONENTRY_BUTTON_LEFT_INNER_PAD 10
-#define MULTIBUTTONENTRY_BUTTON_RIGHT_INNER_PAD 10
-#define MULTIBUTTONENTRY_BUTTON_RIGHT_PAD 10
-#define MULTIBUTTONENTRY_BUTTON_TEXT_SIZE 24
-#define MULTIBUTTONENTRY_GUIDETEXT_SIZE 28
-#define MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE 40
-#define MULTIBUTTONENTRY_CLOSEDBUTTON_AREA_HEIGHT 40
-#define MULTIBUTTONENTRY_LABEL_RIGHT_PAD 18
-#define MULTIBUTTONENTRY_LABEL_TEXT_SIZE 28
-#define MULTIBUTTONENTRY_LABEL_MIN_HEIGHT 50
+#define MULTIBUTTONENTRY_WIDTH_PAD_INC 10
+#define MULTIBUTTONENTRY_HEIGHT_PAD_INC 13
+#define MULTIBUTTONENTRY_BUTTON_MAX_SIZE_INC 200
+#define MULTIBUTTONENTRY_BUTTON_BASE_SIZE_INC 44
+#define MULTIBUTTONENTRY_BUTTON_NINEPATCH_INC 1 1 0 0
+#define MULTIBUTTONENTRY_BUTTON_TOP_BUTTOM_PAD_INC 8
+#define MULTIBUTTONENTRY_BUTTON_LEFT_INNER_PAD_INC 10
+#define MULTIBUTTONENTRY_BUTTON_RIGHT_INNER_PAD_INC 10
+#define MULTIBUTTONENTRY_BUTTON_RIGHT_PAD_INC 10
+#define MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC 24
+#define MULTIBUTTONENTRY_GUIDETEXT_SIZE_INC 28
+#define MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE_INC 40
+#define MULTIBUTTONENTRY_CLOSEDBUTTON_AREA_HEIGHT_INC 40
+#define MULTIBUTTONENTRY_LABEL_RIGHT_PAD_INC 18
+#define MULTIBUTTONENTRY_LABEL_TEXT_SIZE_INC 28
+#define MULTIBUTTONENTRY_LABEL_MIN_HEIGHT_INC 50
 
 #define SEARCHBAR_BACKGROUND_COLOR_INC          242 238 233 255
 #define SEARCHBAR_CANCEL_BUTTON_W_INC 100

diff --git a/themes/widgets/multibuttonentry.edc b/themes/widgets/multibuttonentry.edc
index 6b92894..35bf7ff 100644 (file)
--- a/themes/widgets/multibuttonentry.edc
+++ b/themes/widgets/multibuttonentry.edc
@@ -20,7 +20,7 @@
    group {
       name: "elm/multibuttonentry/base/default";
       data.item: "closed_button_type" "image"; /* image, label, default : label */
-      data.item: "closed_height" MULTIBUTTONENTRY_CLOSEDBUTTON_AREA_HEIGHT;
+      data.item: "closed_height" MULTIBUTTONENTRY_CLOSEDBUTTON_AREA_HEIGHT_INC;
 
       parts {
          part {
@@ -39,7 +39,7 @@
             scale: 1;
             description {
                state: "default" 0.0;
-               min : MULTIBUTTONENTRY_WIDTH_PAD MULTIBUTTONENTRY_HEIGHT_PAD;
+               min : MULTIBUTTONENTRY_WIDTH_PAD_INC MULTIBUTTONENTRY_HEIGHT_PAD_INC;
                fixed: 1 1;
                rel1 { relative: 0.0 0.0;to:elm.base; }
                rel2 { relative: 0.0 0.0;to:elm.base; }
@@ -53,7 +53,7 @@
             scale: 1;
             description {
                state: "default" 0.0;
-               min : MULTIBUTTONENTRY_WIDTH_PAD MULTIBUTTONENTRY_HEIGHT_PAD;
+               min : MULTIBUTTONENTRY_WIDTH_PAD_INC MULTIBUTTONENTRY_HEIGHT_PAD_INC;
                fixed: 1 1;
                rel1 { relative: 1.0 1.0;to:elm.base; }
                rel2 { relative: 1.0 1.0;to:elm.base; }
@@ -101,7 +101,7 @@
                color: MULTIBUTTONENTRY_GUIDETEXT_COLOR_INC;
                text {
                   font: "SLP:style=Roman";
-                  size: MULTIBUTTONENTRY_GUIDETEXT_SIZE;
+                  size: MULTIBUTTONENTRY_GUIDETEXT_SIZE_INC;
                   min: 0 1;
                   align: 0.0 0.5;
                }
@@ -113,11 +113,14 @@
 ///////////////////////////////////////////////////////////////////////////////////////
    group {
       name: "elm/multibuttonentry/btn/default";
-      data.item: "button_max_size" MULTIBUTTONENTRY_BUTTON_MAX_SIZE;
-
+      images {
+         image: "00_contacts_button_bg.png" COMP;
+         image: "00_contacts_button_bg_press.png" COMP;
+      }
+      data.item: "button_max_size" MULTIBUTTONENTRY_BUTTON_MAX_SIZE_INC;
       styles {
          style { name: "multibuttonentry_textblock_style";
-                     base: "font=SLP:style=Medium align=0.5 font_size="MULTIBUTTONENTRY_BUTTON_TEXT_SIZE" color="MULTIBUTTONENTRY_BUTTON_TEXT_COLOR_INC" text_class=label ellipsis=1.0";
+                     base: "font=SLP:style=Medium align=0.5 font_size="MULTIBUTTONENTRY_BUTTON_TEXT_SIZE_INC" color="MULTIBUTTONENTRY_BUTTON_TEXT_COLOR_INC" text_class=label ellipsis=1.0";
                           tag: "br" "\n";
                      tag:  "ps" "ps";
                      tag:  "hilight" "+ font=SLP:style=Bold";
@@ -133,8 +136,8 @@
             scale: 1;
             description {
                state: "default" 0.0;
-               min: 0 MULTIBUTTONENTRY_BUTTON_BASE_SIZE;
-               max: 5000 MULTIBUTTONENTRY_BUTTON_BASE_SIZE;
+               min: 0 MULTIBUTTONENTRY_BUTTON_BASE_SIZE_INC;
+               max: 5000 MULTIBUTTONENTRY_BUTTON_BASE_SIZE_INC;
                fixed: 1 1;
                color: 0 0 0 0;
             }
@@ -146,7 +149,7 @@
             scale: 1;
             description {
                state: "default" 0.0;
-               min : 0 MULTIBUTTONENTRY_BUTTON_TOP_BUTTOM_PAD;
+               min : 0 MULTIBUTTONENTRY_BUTTON_TOP_BUTTOM_PAD_INC;
                fixed: 1 1;
                rel1 { relative: 0.0 0.0;to:elm.base; }
                rel2 { relative: 1.0 0.0;to:elm.base; }
@@ -160,7 +163,7 @@
            scale: 1;
            description {
               state: "default" 0.0;
-              min : 0 MULTIBUTTONENTRY_BUTTON_TOP_BUTTOM_PAD;
+              min : 0 MULTIBUTTONENTRY_BUTTON_TOP_BUTTOM_PAD_INC;
               fixed: 1 1;
               rel1 { relative: 0.0 1.0;to:elm.base; }
               rel2 { relative: 1.0 1.0;to:elm.base; }
@@ -188,7 +191,7 @@
             scale: 1;
             description {
                state: "default" 0.0;
-               min : MULTIBUTTONENTRY_BUTTON_RIGHT_PAD 0;
+               min : MULTIBUTTONENTRY_BUTTON_RIGHT_PAD_INC 0;
                fixed: 0 0;
                rel1 { relative: 1.0 0.0; to: "elm.base"; }
                rel2 { relative: 1.0 1.0; to: "elm.base"; }
@@ -199,7 +202,7 @@
 //---------------------------------------------------- contents
          part {
             name: "elm.btn.bg";
-            type: RECT;
+            type: IMAGE;
             mouse_events: 1;
             scale: 1;
             description {
@@ -209,12 +212,20 @@
                fixed: 0 0;
                rel1 { relative: 1.0 1.0; to_x:"left.padding";to_y:"top.padding";}
                rel2 { relative: 0.0 0.0; to_x:"right.padding";to_y:"bottom.padding";}
-               color: MULTIBUTTONENTRY_NORMAL_BUTTON_COLOR_INC;
+               image {
+                  normal:"00_contacts_button_bg.png";
+                  border: MULTIBUTTONENTRY_BUTTON_NINEPATCH_INC;
+                  border_scale: 1;
+               }
             }
             description {
                state: "focused" 0.0;
                inherit: "default" 0.0;
-               color: MULTIBUTTONENTRY_PRESSED_BUTTON_COLOR_INC;
+               image {
+                  normal:"00_contacts_button_bg_press.png";
+                  border: MULTIBUTTONENTRY_BUTTON_NINEPATCH_INC;
+                  border_scale: 1;
+               }
             }
          }
          part {
@@ -316,8 +327,8 @@
          image: "00_mbe_btn_expand_closed.png" COMP;
          image: "00_mbe_btn_expand_closed_press.png" COMP;
       }
-      data.item: "closed_button_height" MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE;
-      data.item: "closed_button_width" MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE;
+      data.item: "closed_button_height" MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE_INC;
+      data.item: "closed_button_width" MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE_INC;
 
       parts {
          part {
@@ -328,8 +339,8 @@
             description {
                state: "default" 0.0;
                align: 0.5 0.5;
-               min: MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE;
-               max: MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE;
+               min: MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE_INC MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE_INC;
+               max: MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE_INC MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE_INC;
                visible: 1;
                image.normal: "00_mbe_btn_circle_bg_normal.png";
                rel1 { relative: 0.0 0.0; }
@@ -349,8 +360,8 @@
             description {
                state: "default" 0.0;
                align: 0.5 0.5;
-               min: MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE;
-               max: MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE;
+               min: MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE_INC MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE_INC;
+               max: MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE_INC MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE_INC;
                visible: 1;
                image.normal: "00_mbe_btn_expand_closed.png";
                rel1 { relative: 0.0 0.0; }
@@ -435,7 +446,7 @@
             description {
                state: "default" 0.0;
                color: 0 0 0 0;
-               min: MULTIBUTTONENTRY_LABEL_RIGHT_PAD 0;
+               min: MULTIBUTTONENTRY_LABEL_RIGHT_PAD_INC 0;
                fixed: 1 1;
                rel1 {
                   to: "mbe.label.bg";
@@ -458,11 +469,11 @@
             description {
                state: "default" 0.0;
                color: MULTIBUTTONENTRY_LABEL_TEXT_COLOR_INC;
-               min: 0 MULTIBUTTONENTRY_LABEL_MIN_HEIGHT;
+               min: 0 MULTIBUTTONENTRY_LABEL_MIN_HEIGHT_INC;
                fixed: 1 1;
                text {
                   font: "SLP:style=Roman";
-                  size: MULTIBUTTONENTRY_LABEL_TEXT_SIZE;
+                  size: MULTIBUTTONENTRY_LABEL_TEXT_SIZE_INC;
                   min: 1 1;
                   align: 0.0 0.428;
                }