[button] change the button to use 2 line ellipsis textblock in controlbar

Change-Id: Id5fb7bbb36a75748cc373d6105a9d9019c6b672e

diff --git a/themes/groups/button.edc b/themes/groups/button.edc
index 5e156da..c900e6f 100644 (file)
--- a/themes/groups/button.edc
+++ b/themes/groups/button.edc
@@ -8989,6 +8989,16 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
       script {
          public button_state = BUTTON_STATE_ENABLED;
       }
+      styles{
+         style { name: "controlbar_style";
+            base: "font=SLP:style=Medium font_size=18 align=center color=BUTTON_CONTROLBAR_ITEM_BUTTON_TEXTBLOCK_COLOR_INC wrap=mixed ellipsis=1";
+            tag:  "br" "\n";
+            tag:  "ps" "ps";
+            tag:  "hilight" "+ font=SLP:style=Bold";
+            tag:  "b" "+ font=SLP:style=Bold";
+            tag:  "tab" "\t";
+         }
+      }
       parts {
          part { name: "button_image";
             type: RECT;
@@ -9025,7 +9035,7 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
                align: 1.0 1.0;
                rel1.relative: 1.0 1.0;
                rel2.relative: 1.0 1.0;
-               min: 10 8;
+               min: 10 5;
                fixed: 1 1;
                visible: 0;
             }
@@ -9131,22 +9141,21 @@ BUTTON_EDIT_STYLES("icon_expand/extended", "00_button_icon_expand.png", "00_butt
             }
          }
          part { name: "elm.text";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events:  0;
             scale: 1;
             clip_to: "disabler";
             description { state: "default" 0.0;
                visible: 0;
                rel1 { relative: 1.0 1.0; to_x: "padding_left_top"; to_y: "padding_after_icon"; }
-               rel2 { relative: 0.0 1.0; to_x: "padding_right_bottom"; }
+               rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
                align: 0.5 0.5;
                color: 255 255 255 255;
+               fixed: 1 1;
                text {
-                  font: "SLP:style=Medium";
-                  size: 18;
-                  min:  0 0;
-                  align: 0.5 0.5;
-                  max: 1 0;
+                  style: "controlbar_style";
+                  min: 0 0;
+                  max: 0 1;
                }
             }
             description { state: "visible" 0.0;

diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index 4303c1f..bdd5506 100755 (executable)
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -212,6 +212,8 @@
 
 #define BUTTON_NUMBERED_TEXT_NORMAL_COLOR_INC 249 249 249 255
 
+#define BUTTON_CONTROLBAR_ITEM_BUTTON_TEXTBLOCK_COLOR_INC "#ffffff"
+
 #define CHECK_DELETE_TEXT_DELETE_NORMAL_COLOR_INC 205 2 5 255
 #define CHECK_DELETE_TEXT_DELETE_PRESS_COLOR_INC 255 255 255 255
 

diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc
index 30408d0..760c781 100755 (executable)
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -235,6 +235,8 @@
 
 #define BUTTON_NUMBERED_TEXT_NORMAL_COLOR_INC 78 73 69 255
 
+#define BUTTON_CONTROLBAR_ITEM_BUTTON_TEXTBLOCK_COLOR_INC "#ffffff"
+
 #define CHECK_DELETE_TEXT_DELETE_NORMAL_COLOR_INC 207 41 41 255
 #define CHECK_DELETE_TEXT_DELETE_PRESS_COLOR_INC 255 255 255 255