[multibuttonentry]reupload: Recalculate nbeat-HD theme size

diff --git a/themes/groups/multibuttonentry.edc b/themes/groups/multibuttonentry.edc
index 4c78326..ea7762e 100644 (file)
--- a/themes/groups/multibuttonentry.edc
+++ b/themes/groups/multibuttonentry.edc
@@ -279,7 +279,7 @@
    }
    styles {
       style { name: "multibuttonentry_textblock_style";
-         base: "font=SLP:style=Medium align=center font_size="MULTIBUTTONENTRY_BUTTON_TEXT_SIZE" color="MULTIBUTTONENTRY_BUTTON_TEXT_COLOR_INT" text_class=label";
+         base: "font=SLP:style=Medium align=center font_size="MULTIBUTTONENTRY_BUTTON_TEXT_SIZE" color="MULTIBUTTONENTRY_BUTTON_TEXT_COLOR_INC" text_class=label";
       }
    }
 
@@ -348,6 +348,7 @@
                state: "default" 0.0;
                align: 0.5 0.5;
                min: MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE;
+               max: MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE;
                visible: 1;
                image.normal: "00_mbe_btn_circle_bg_normal.png";
                rel1 { relative: 0.0 0.0; }
@@ -368,6 +369,7 @@
                state: "default" 0.0;
                align: 0.5 0.5;
                min: MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE;
+               max: MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE;
                visible: 1;
                image.normal: "00_mbe_btn_expand_closed.png";
                rel1 { relative: 0.0 0.0; }

diff --git a/themes/inc/nbeat-black-hd-inc.edc b/themes/inc/nbeat-black-hd-inc.edc
index ed2264a..d533199 100644 (file)
--- a/themes/inc/nbeat-black-hd-inc.edc
+++ b/themes/inc/nbeat-black-hd-inc.edc
@@ -687,22 +687,22 @@
 #define MULTIBUTTONENTRY_PRESSED_BUTTON_COLOR_INC 64 182 237 255
 #define MULTIBUTTONENTRY_LABEL_TEXT_COLOR_INC 249 249 249 255
 #define MULTIBUTTONENTRY_GUIDETEXT_COLOR_INC 70 70 70 255
-#define MULTIBUTTONENTRY_BUTTON_TEXT_COLOR_INT "#FFFFFF"
-#define MULTIBUTTONENTRY_WIDTH_PAD 16
-#define MULTIBUTTONENTRY_HEIGHT_PAD 21
-#define MULTIBUTTONENTRY_BUTTON_MAX_SIZE 350
-#define MULTIBUTTONENTRY_BUTTON_BASE_SIZE 70
-#define MULTIBUTTONENTRY_BUTTON_TOP_BUTTOM_PAD 13
-#define MULTIBUTTONENTRY_BUTTON_LEFT_INNER_PAD 20
-#define MULTIBUTTONENTRY_BUTTON_RIGHT_INNER_PAD 20
-#define MULTIBUTTONENTRY_BUTTON_RIGHT_PAD 16
-#define MULTIBUTTONENTRY_BUTTON_TEXT_SIZE 38
-#define MULTIBUTTONENTRY_GUIDETEXT_SIZE 44
-#define MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE 64
-#define MULTIBUTTONENTRY_CLOSEDBUTTON_AREA_HEIGHT 112
-#define MULTIBUTTONENTRY_LABEL_RIGHT_PAD 28
-#define MULTIBUTTONENTRY_LABEL_TEXT_SIZE 44
-#define MULTIBUTTONENTRY_LABEL_MIN_HEIGHT 60
+#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 36
+#define MULTIBUTTONENTRY_GUIDETEXT_SIZE 42
+#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 SEARCHBAR_BACKGROUND_COLOR_INC          36 36 36 255
 #define SEARCHBAR_CANCEL_BUTTON_W_INC 134

diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index 2c2fa52..35111bf 100644 (file)
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -672,7 +672,7 @@
 #define MULTIBUTTONENTRY_PRESSED_BUTTON_COLOR_INC 64 182 237 255
 #define MULTIBUTTONENTRY_LABEL_TEXT_COLOR_INC 249 249 249 255
 #define MULTIBUTTONENTRY_GUIDETEXT_COLOR_INC 70 70 70 255
-#define MULTIBUTTONENTRY_BUTTON_TEXT_COLOR_INT "#FFFFFF"
+#define MULTIBUTTONENTRY_BUTTON_TEXT_COLOR_INC "#FFFFFF"
 #define MULTIBUTTONENTRY_WIDTH_PAD 10
 #define MULTIBUTTONENTRY_HEIGHT_PAD 13
 #define MULTIBUTTONENTRY_BUTTON_MAX_SIZE 200
@@ -684,7 +684,7 @@
 #define MULTIBUTTONENTRY_BUTTON_TEXT_SIZE 24
 #define MULTIBUTTONENTRY_GUIDETEXT_SIZE 28
 #define MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE 40
-#define MULTIBUTTONENTRY_CLOSEDBUTTON_AREA_HEIGHT 70
+#define MULTIBUTTONENTRY_CLOSEDBUTTON_AREA_HEIGHT 40
 #define MULTIBUTTONENTRY_LABEL_RIGHT_PAD 18
 #define MULTIBUTTONENTRY_LABEL_TEXT_SIZE 28
 #define MULTIBUTTONENTRY_LABEL_MIN_HEIGHT 50

diff --git a/themes/inc/nbeat-hd-inc.edc b/themes/inc/nbeat-hd-inc.edc
index 9cc60a5..dfb69d3 100644 (file)
--- a/themes/inc/nbeat-hd-inc.edc
+++ b/themes/inc/nbeat-hd-inc.edc
@@ -701,22 +701,22 @@
 #define MULTIBUTTONENTRY_PRESSED_BUTTON_COLOR_INC 103 79 43 255
 #define MULTIBUTTONENTRY_LABEL_TEXT_COLOR_INC 0 0 0 255
 #define MULTIBUTTONENTRY_GUIDETEXT_COLOR_INC 189 189 189 255
-#define MULTIBUTTONENTRY_BUTTON_TEXT_COLOR_INT "#FFFFFF"
-#define MULTIBUTTONENTRY_WIDTH_PAD 16
-#define MULTIBUTTONENTRY_HEIGHT_PAD 21
-#define MULTIBUTTONENTRY_BUTTON_MAX_SIZE 350
-#define MULTIBUTTONENTRY_BUTTON_BASE_SIZE 70
-#define MULTIBUTTONENTRY_BUTTON_TOP_BUTTOM_PAD 13
-#define MULTIBUTTONENTRY_BUTTON_LEFT_INNER_PAD 20
-#define MULTIBUTTONENTRY_BUTTON_RIGHT_INNER_PAD 20
-#define MULTIBUTTONENTRY_BUTTON_RIGHT_PAD 16
-#define MULTIBUTTONENTRY_BUTTON_TEXT_SIZE 38
-#define MULTIBUTTONENTRY_GUIDETEXT_SIZE 44
-#define MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE 64
-#define MULTIBUTTONENTRY_CLOSEDBUTTON_AREA_HEIGHT 112
-#define MULTIBUTTONENTRY_LABEL_RIGHT_PAD 28
-#define MULTIBUTTONENTRY_LABEL_TEXT_SIZE 44
-#define MULTIBUTTONENTRY_LABEL_MIN_HEIGHT 60
+#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 36
+#define MULTIBUTTONENTRY_GUIDETEXT_SIZE 42
+#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 SEARCHBAR_BACKGROUND_COLOR_INC          242 238 233 255
 #define SEARCHBAR_CANCEL_BUTTON_W_INC 134

diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc
index a865c05..c71827f 100644 (file)
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -696,7 +696,7 @@
 #define MULTIBUTTONENTRY_PRESSED_BUTTON_COLOR_INC 103 79 43 255
 #define MULTIBUTTONENTRY_LABEL_TEXT_COLOR_INC 0 0 0 255
 #define MULTIBUTTONENTRY_GUIDETEXT_COLOR_INC 189 189 189 255
-#define MULTIBUTTONENTRY_BUTTON_TEXT_COLOR_INT "#FFFFFF"
+#define MULTIBUTTONENTRY_BUTTON_TEXT_COLOR_INC "#FFFFFF"
 #define MULTIBUTTONENTRY_WIDTH_PAD 10
 #define MULTIBUTTONENTRY_HEIGHT_PAD 13
 #define MULTIBUTTONENTRY_BUTTON_MAX_SIZE 200
@@ -708,7 +708,7 @@
 #define MULTIBUTTONENTRY_BUTTON_TEXT_SIZE 24
 #define MULTIBUTTONENTRY_GUIDETEXT_SIZE 28
 #define MULTIBUTTONENTRY_CLOSEDBUTTON_SIZE 40
-#define MULTIBUTTONENTRY_CLOSEDBUTTON_AREA_HEIGHT 70
+#define MULTIBUTTONENTRY_CLOSEDBUTTON_AREA_HEIGHT 40
 #define MULTIBUTTONENTRY_LABEL_RIGHT_PAD 18
 #define MULTIBUTTONENTRY_LABEL_TEXT_SIZE 28
 #define MULTIBUTTONENTRY_LABEL_MIN_HEIGHT 50