[griffin.hmi] update check style, WIP

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

3 files changed, 115 insertions, 68 deletions

diff --git a/data/themes/default/colorclasses.edc b/data/themes/default/colorclasses.edc
index 222da48..f1cdfd4 100644
--- a/data/themes/default/colorclasses.edc
+++ b/data/themes/default/colorclasses.edc
@@ -2,8 +2,13 @@
 #define WIN_COL_HIGHLIGHT 14 169 226 255
 
 color_classes {
-	color_class {
-		name: "separator";
+	color_class { name: "separator";
+		color: WIN_COL_HIGHLIGHT;
+	}
+	color_class { name: "button_list";
+		color: FN_COL_DEFAULT_BASIC;
+	}
+	color_class { name: "button_list_focus";
 		color: WIN_COL_HIGHLIGHT;
 	}
 
diff --git a/data/themes/default/edc/elm/check.edc b/data/themes/default/edc/elm/check.edc
index 7ef5a9b..69ef2cf 100644
--- a/data/themes/default/edc/elm/check.edc
+++ b/data/themes/default/edc/elm/check.edc
@@ -1,5 +1,4 @@
 group { name: "elm/check/base/default";
-   images.image: "inset_shadow_tiny.png" COMP;
    images.image: "bevel_in.png" COMP;
    images.image: "sym_check_alum.png" COMP;
 #define ICON     1
@@ -16,7 +15,6 @@ group { name: "elm/check/base/default";
                set_state(PART:"elm.swallow.content", "visible", 0.0);
                set_state(PART:"sizer.content", "visible", 0.0);
                set_state(PART:"elm.text", "visible", 0.0);
-               set_state(PART:"shadow", "default", 0.0);
                set_state(PART:"base", "default", 0.0);
                set_state(PART:"clip", "default", 0.0);
                set_state(PART:"event", "default", 0.0);
@@ -24,7 +22,6 @@ group { name: "elm/check/base/default";
                set_state(PART:"elm.swallow.content", "visible", 0.0);
                set_state(PART:"sizer.content", "visible", 0.0);
                set_state(PART:"elm.text", "disabled_visible", 0.0);
-               set_state(PART:"shadow", "disabled", 0.0);
                set_state(PART:"base", "disabled", 0.0);
                set_state(PART:"clip", "disabled", 0.0);
                set_state(PART:"event", "disabled", 0.0);
@@ -34,7 +31,6 @@ group { name: "elm/check/base/default";
                set_state(PART:"elm.swallow.content", "visible", 0.0);
                set_state(PART:"sizer.content", "icononly", 0.0);
                set_state(PART:"elm.text", "default", 0.0);
-               set_state(PART:"shadow", "default", 0.0);
                set_state(PART:"base", "default", 0.0);
                set_state(PART:"clip", "default", 0.0);
                set_state(PART:"event", "default", 0.0);
@@ -42,7 +38,6 @@ group { name: "elm/check/base/default";
                set_state(PART:"elm.swallow.content", "visible", 0.0);
                set_state(PART:"sizer.content", "icononly", 0.0);
                set_state(PART:"elm.text", "disabled", 0.0);
-               set_state(PART:"shadow", "disabled", 0.0);
                set_state(PART:"base", "disabled", 0.0);
                set_state(PART:"clip", "disabled", 0.0);
                set_state(PART:"event", "disabled", 0.0);
@@ -52,7 +47,6 @@ group { name: "elm/check/base/default";
                set_state(PART:"elm.swallow.content", "default", 0.0);
                set_state(PART:"sizer.content", "default", 0.0);
                set_state(PART:"elm.text", "visible", 0.0);
-               set_state(PART:"shadow", "default", 0.0);
                set_state(PART:"base", "default", 0.0);
                set_state(PART:"clip", "default", 0.0);
                set_state(PART:"event", "default", 0.0);
@@ -60,7 +54,6 @@ group { name: "elm/check/base/default";
                set_state(PART:"elm.swallow.content", "default", 0.0);
                set_state(PART:"sizer.content", "default", 0.0);
                set_state(PART:"elm.text", "disabled_visible", 0.0);
-               set_state(PART:"shadow", "disabled", 0.0);
                set_state(PART:"base", "disabled", 0.0);
                set_state(PART:"clip", "disabled", 0.0);
                set_state(PART:"event", "disabled", 0.0);
@@ -70,7 +63,6 @@ group { name: "elm/check/base/default";
                set_state(PART:"elm.swallow.content", "default", 0.0);
                set_state(PART:"sizer.content", "default", 0.0);
                set_state(PART:"elm.text", "default", 0.0);
-               set_state(PART:"shadow", "default", 0.0);
                set_state(PART:"base", "default", 0.0);
                set_state(PART:"clip", "default", 0.0);
                set_state(PART:"event", "default", 0.0);
@@ -78,7 +70,6 @@ group { name: "elm/check/base/default";
                set_state(PART:"elm.swallow.content", "default", 0.0);
                set_state(PART:"sizer.content", "default", 0.0);
                set_state(PART:"elm.text", "default", 0.0);
-               set_state(PART:"shadow", "disabled", 0.0);
                set_state(PART:"base", "disabled", 0.0);
                set_state(PART:"clip", "disabled", 0.0);
                set_state(PART:"event", "disabled", 0.0);
@@ -86,42 +77,45 @@ group { name: "elm/check/base/default";
          }
       }
    }
+   styles {
+      style { name: "check_style_default";
+         base: "font="FN" font_size=8 text_class=tb_plain color=#ffffffff align=auto";
+	 FN_TAG_BR;
+      }
+      style { name: "check_style_focused";
+         base: "font="FN" font_size=8 text_class=tb_plain color=#000000ff align=auto";
+	 FN_TAG_BR;
+      }
+      style { name: "check_style_disabled";
+         base: "font="FN" font_size=8 text_class=tb_plain color=#000000ff align=auto";
+	 FN_TAG_BR;
+      }
+
+   }
    parts {
-      part { name: "base"; type: RECT;
+      part { name: "base"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            rel1.offset: 1 1;
-            rel1.to: "inset";
-            rel2.offset: -2 -2;
-            rel2.to: "inset";
-            color: 24 24 24 255;
+            rel1.offset: 0 0;
+            rel2.offset: -1 -1;
+	    color_class: "check";
          }
-         description { state: "disabled" 0.0;
+         description { state: "focus" 0.0;
             inherit: "default" 0.0;
-            color: 64 64 64 255;
-         }
-      }
-      part { name: "shadow"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "inset_shadow_tiny.png";
-            image.border: 4 4 4 4;
-            rel1.to: "base";
-            rel2.to: "base";
+	    color_class: "check_focus";
          }
-         description { state: "disabled" 0.0;
+         description { state: "clicked" 0.0;
             inherit: "default" 0.0;
-            visible: 0;
+	    color_class: "check_focus";
          }
       }
       part { name: "inset"; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 0;
-            rel1.offset: 2 2;
-            rel2.relative: 0.0 1.0;
-            rel2.offset: 2 -3;
             align: 0.0 0.5;
-            min: 13 13;
-            max: 13 13;
+            min: 10 10;
+            max: 10 10;
+            rel1.to: "elm.text";
             image.normal: "bevel_in.png";
             image.border: 1 1 1 1;
             image.middle: 0;
@@ -133,11 +127,11 @@ group { name: "elm/check/base/default";
          clip_to: "clip";
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.to: "base";
-            rel2.to: "base";
+            rel1.to: "inset";
+	    rel1.offset: 1 1;
+            rel2.to: "inset";
+	    rel2.offset: -2 -2;
             image.normal: "sym_check_alum.png";
-            min: 11 11;
-            max: 11 11;
             visible: 0;
          }
          description { state: "selected" 0.0;
@@ -161,19 +155,24 @@ group { name: "elm/check/base/default";
             visible: 0;
             align: 0.0 0.5;
             max: 0 0;
-            rel1.to_x: "inset";
-            rel1.relative: 1.0 0.0;
-            rel1.offset: 1 1;
-            rel2.to_x: "inset";
-            rel2.offset: 1 -2;
-            rel2.relative: 1.0 1.0;
+            rel1.to_x: "base";
+            rel2.to_x: "base";
+            rel2.relative: 0.0 1.0;
+	    visible: 0;
+	    color: 1 1 1 1;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            fixed: 0 0;
+	    fixed: 1 0;
+	    aspect: 1.0 1.0;
+            visible: 1;
+         }
+         description { state: "icononly" 0.0;
+            inherit: "default" 0.0;
+	    fixed: 0 0;
+	    aspect: 0.5 0.5;
+	    rel2.relative: 1.0 1.0;
             visible: 1;
-            aspect: 1.0 1.0;
-            min: 16 16;
          }
       }
       part { name: "sizer.content"; type: TEXT; mouse_events:  0;
@@ -181,7 +180,7 @@ group { name: "elm/check/base/default";
          description { state: "default" 0.0;
             fixed: 1 1;
             visible: 0;
-            text { font: FN; size: 10;
+            text { font: FN; size: 7;
                min: 0 0;
                text_class: "check_text";
             }
@@ -207,40 +206,71 @@ group { name: "elm/check/base/default";
             }
          }
       }
-      part { name: "elm.text"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
+      part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 2 2;
-            rel1.to_x: "elm.swallow.content";
+            rel1.offset: 0 0;
             rel1.relative: 1.0 0.0;
-            rel2.offset: -3 -3;
-            color: FN_COL_DEFAULT;
-            color_class: "check_text";
-            text { font: FN; size: 10;
-              min: 0 0;
-              align: 0.0 0.5;
-              text_class: "check";
+            rel1.to_x: "elm.swallow.content";
+	    rel1.to_y: "base";
+            rel2.offset: 0 0;
+	    rel2.to: "base";
+            text {
+              style: "check_style_default";
+	      min: 0 1;
             }
+	    visible: 0;
          }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            color_class: "check_text_disabled";
-            color3: 255 255 255 255;
-         }
+	 description { state: "unfocus" 0.0;
+	    inherit: "default" 0.0;
+            visible: 1;
+	 }
+	 description { state: "focus" 0.0;
+	    inherit: "default" 0.0;
+	    text {
+	       style: "check_style_focused";
+	    }
+            visible: 1;
+	 }
+	 description { state: "clicked" 0.0;
+	    inherit: "default" 0.0;
+	    text {
+	       style: "check_style_focused";
+	    }
+            visible: 1;
+	 }
+	 description { state: "unclicked" 0.0;
+	    inherit: "default" 0.0;
+            visible: 1;
+	 }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
+            text.min: 1 1;
+            text.ellipsis: -1;
             visible: 1;
+         }
+         description { state: "textonly" 0.0;
+            inherit: "default" 0.0;
             text.min: 1 1;
             text.ellipsis: -1;
+            visible: 1;
          }
          description { state: "disabled_visible" 0.0;
             inherit: "default" 0.0;
-            color_class: "check_text_disabled";
-            color3: 255 255 255 255;
+	    text {
+	       style: "check_style_disabled";
+	       ellipsis: -1;
+	       min: 0 1;
+	    }
+            visible: 1;
+         }
+         description { state: "disabled_textonly" 0.0;
+            inherit: "default" 0.0;
+	    text {
+	       style: "check_style_disabled";
+	       ellipsis: -1;
+	    }
             visible: 1;
-            text.min: 1 1;
-            text.ellipsis: -1;
          }
       }
       part { name: "event"; type: RECT;
@@ -256,6 +286,18 @@ group { name: "elm/check/base/default";
    }
    programs {
       program {
+         signal: "elm,action,unfocus"; source: "elm";
+	 action: STATE_SET "unfocus" 0.0;
+         target: "base";
+	 target: "elm.text";
+      }
+      program {
+         signal: "elm,action,focus"; source: "elm";
+	 action: STATE_SET "focus" 0.0;
+         target: "base";
+	 target: "elm.text";
+      }
+      program {
          signal: "mouse,clicked,1"; source: "event";
          action: SIGNAL_EMIT "elm,action,check,toggle" "elm";
       }
diff --git a/data/themes/default/img/sym_check_alum.png b/data/themes/default/img/sym_check_alum.png
index acd7f6e..6e95ec8 100644
--- a/data/themes/default/img/sym_check_alum.png
+++ b/data/themes/default/img/sym_check_alum.png