[griffin.display] theme: make buttons like the old UM

Also use a textblock rather then text for the elm.text part, this allows
us to use multiline text on buttons

Signed-off-by: Olliver Schinagl <o.schinagl@ultimaker.com>

1 files changed, 37 insertions, 14 deletions

diff --git a/data/themes/default/edc/elm/button.edc b/data/themes/default/edc/elm/button.edc
index 4645f9e..8de9641 100644
--- a/data/themes/default/edc/elm/button.edc
+++ b/data/themes/default/edc/elm/button.edc
@@ -69,11 +69,25 @@ group { name: "elm/button/base/default";
          }
       }
    }
+   styles {
+      style { name: "button_style_default";
+         base: "font="FN" font_size=8 text_class=tb_plain color=#ffffffff align=center";
+	 FN_TAG_BR;
+      }
+      style { name: "button_style_focused";
+         base: "font="FN" font_size=8 text_class=tb_plain color=#000000ff align=center";
+	 FN_TAG_BR;
+      }
+      style { name: "button_style_disabled";
+         base: "font="FN" font_size=8 text_class=tb_plain color=#000000ff align=center";
+	 FN_TAG_BR;
+      }
+   }
    parts {
       part { name: "base"; mouse_events: 0;
          description { state: "default" 0.0;
             image.normal: "button_outline.png";
-            image.border: 13 13 13 13;
+            image.border: 3 3 3 3;
             image.middle: SOLID;
             rel1.offset: 0 0;
             rel2.offset: -1 -1;
@@ -128,7 +142,7 @@ group { name: "elm/button/base/default";
          description { state: "default" 0.0;
 //            fixed: 1 1;
             visible: 0;
-            text { font: FN; size: 8;
+            text { font: FN; size: 7;
                min: 0 0;
                text_class: "button_text";
             }
@@ -154,8 +168,7 @@ group { name: "elm/button/base/default";
             }
          }
       }
-      part { name: "elm.text"; type: TEXT; mouse_events: 0;
-         scale: 1;
+      part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 0;
          description { state: "default" 0.0;
             rel1.offset: 0 5;
             rel1.relative: 1.0 0.0;
@@ -163,12 +176,10 @@ group { name: "elm/button/base/default";
             rel1.to_y: "base";
             rel2.offset: -8 -8;
             rel2.to: "base";
-            color_class: "button_text";
-            text { font: FN; size: 8;
-               align: 0.5 0.5;
-               min: 0 0;
-               text_class: "button";
-            }
+	    text {
+	       style: "button_style_default";
+	       min: 0 1;
+	    }
             visible: 0;
          }
 	 description { state: "unfocus" 0.0;
@@ -177,12 +188,18 @@ group { name: "elm/button/base/default";
 	 }
 	 description { state: "focus" 0.0;
 	    inherit: "default" 0.0;
-            color_class: "button_text_focus";
+	    text {
+	       style: "button_style_focused";
+	       min: 0 1;
+	    }
             visible: 1;
 	 }
 	 description { state: "clicked" 0.0;
 	    inherit: "default" 0.0;
-            color_class: "button_text_focus";
+	    text {
+	       style: "button_style_focused";
+	       min: 0 1;
+	    }
             visible: 1;
 	 }
 	 description { state: "unclicked" 0.0;
@@ -205,16 +222,22 @@ group { name: "elm/button/base/default";
          description { state: "disabled_visible" 0.0;
             inherit: "default" 0.0;
             rel1.offset: 2 5;
-            color_class: "button_text_disabled";
             text.min: 1 1;
             text.ellipsis: -1;
+	    text {
+	       style: "button_style_disabled";
+	       min: 0 1;
+	    }
             visible: 1;
          }
          description { state: "disabled_textonly" 0.0;
             inherit: "default" 0.0;
-            color_class: "button_text_disabled";
             text.min: 1 1;
             text.ellipsis: -1;
+	    text {
+	       style: "button_style_disabled";
+	       min: 0 1;
+	    }
             visible: 1;
          }
       }