[multibuttonentry]reupload: changed TEXT part to TEXTBLOCK to support ellipsis

diff --git a/themes/groups/multibuttonentry.edc b/themes/groups/multibuttonentry.edc
index dbe7962..ffb38ba 100644 (file)
--- a/themes/groups/multibuttonentry.edc
+++ b/themes/groups/multibuttonentry.edc
@@ -236,22 +236,20 @@
          }
          part {
             name: "elm.btn.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 1;
             scale:1;
             description {
                state: "default" 0.0;
-               max: 180 50;
+               min: 10 10;
+               max: 500 50;
                align: 0.5 0.5;
                text {
-                  font: "SLP:style=Roman";
-                  size: MULTIBUTTONENTRY_BUTTON_TEXT_SIZE;
-                  min: 1 1;
-                  max: 1 1;
-                  elipsis: 0.0;
+                  style: "multibuttonentry_textblock_style";
+                  min: 0 1;
                }
-               rel1 { relative: 1.0 1.0; to_x:"left.inner.padding"; to_y:"top.padding"; }
-               rel2 { relative: 0.0 0.0; to_x:"right.inner.padding"; to_y:"bottom.padding";offset:0 -4;}
+               rel1 { relative: 1.0 1.0; to_x:"left.inner.padding";to_y:"top.padding";}
+               rel2 { relative: 0.0 0.0; to_x:"right.inner.padding";to_y:"bottom.padding";}
             }
          }
       }
@@ -277,6 +275,11 @@
          }
       }
    }
+   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";
+      }
+   }
 
 ///////////////////////////////////////////////////////////////////////////////////////
    group {

diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index da7e3e5..6831147 100644 (file)
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -551,10 +551,11 @@
 #define MULTIBUTTONENTRY_NORMAL_BUTTON_COLOR_INC 42 109 140 255
 #define MULTIBUTTONENTRY_PRESSED_BUTTON_COLOR_INC 64 182 237 255
 #define MULTIBUTTONENTRY_LABEL_TEXT_COLOR_INC 249 249 249 255
+#define MULTIBUTTONENTRY_BUTTON_TEXT_COLOR_INT "#FFFFFF"
 #define MULTIBUTTONENTRY_WIDTH_PAD 10
 #define MULTIBUTTONENTRY_HEIGHT_PAD 13
 #define MULTIBUTTONENTRY_BUTTON_MAX_SIZE 200
-#define MULTIBUTTONENTRY_BUTTON_BASE_SIZE 70
+#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

diff --git a/themes/inc/nbeat-hd-inc.edc b/themes/inc/nbeat-hd-inc.edc
index c3cca75..17ada79 100644 (file)
--- a/themes/inc/nbeat-hd-inc.edc
+++ b/themes/inc/nbeat-hd-inc.edc
@@ -582,6 +582,7 @@
 #define MULTIBUTTONENTRY_NORMAL_BUTTON_COLOR_INC 195 160 107 255
 #define MULTIBUTTONENTRY_PRESSED_BUTTON_COLOR_INC 103 79 43 255
 #define MULTIBUTTONENTRY_LABEL_TEXT_COLOR_INC 0 0 0 255
+#define MULTIBUTTONENTRY_BUTTON_TEXT_COLOR_INT "#FFFFFF"
 #define MULTIBUTTONENTRY_WIDTH_PAD 16
 #define MULTIBUTTONENTRY_HEIGHT_PAD 21
 #define MULTIBUTTONENTRY_BUTTON_MAX_SIZE 350

diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc
index d9b8056..df988b1 100644 (file)
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -575,6 +575,7 @@
 #define MULTIBUTTONENTRY_NORMAL_BUTTON_COLOR_INC 195 160 107 255
 #define MULTIBUTTONENTRY_PRESSED_BUTTON_COLOR_INC 103 79 43 255
 #define MULTIBUTTONENTRY_LABEL_TEXT_COLOR_INC 0 0 0 255
+#define MULTIBUTTONENTRY_BUTTON_TEXT_COLOR_INT "#FFFFFF"
 #define MULTIBUTTONENTRY_WIDTH_PAD 10
 #define MULTIBUTTONENTRY_HEIGHT_PAD 13
 #define MULTIBUTTONENTRY_BUTTON_MAX_SIZE 200