fix button color classes/colors after colorclass intro

diff --git a/data/themes/colorclasses.edc b/data/themes/colorclasses.edc
index 6f57ccf..72c74c3 100644 (file)
--- a/data/themes/colorclasses.edc
+++ b/data/themes/colorclasses.edc
@@ -73,6 +73,15 @@ color_classes {
    color_class { name: "button_text_disabled";
       color: FN_COL_DISABLE;
    }
+   color_class { name: "button_text_anchor";
+      color: FN_COL_HIGHLIGHT;
+   }
+   color_class { name: "button_text_anchor_clicked";
+      color: FN_COL_HIGHLIGHT_CLICKED;
+   }
+   color_class { name: "button_text_anchor_disabled";
+      color: FN_COL_HIGHLIGHT_DISABLE;
+   }
    color_class { name: "check_text";
       color: FN_COL_DEFAULT;
    }

diff --git a/data/themes/edc/elm/button.edc b/data/themes/edc/elm/button.edc
index e665457..8eb5bfd 100644 (file)
--- a/data/themes/edc/elm/button.edc
+++ b/data/themes/edc/elm/button.edc
@@ -153,8 +153,8 @@ group { name: "elm/button/base/default";
             rel1.to_y: "base";
             rel2.offset: -7 -7;
             rel2.to: "base";
-            color: FN_COL_DEFAULT;
             color_class: "button_text";
+            color3: 255 255 255 255;
             text { font: FN; size: 10;
                align: 0.5 0.5;
                min: 0 0;
@@ -176,15 +176,15 @@ group { name: "elm/button/base/default";
          description { state: "disabled_visible" 0.0;
             inherit: "default" 0.0;
             rel1.offset: 2 5;
-            color: FN_COL_DISABLE;
             color_class: "button_text_disabled";
+            color3: 255 255 255 255;
             text.min: 1 1;
             visible: 1;
          }
          description { state: "disabled_textonly" 0.0;
             inherit: "default" 0.0;
-            color: FN_COL_DISABLE;
             color_class: "button_text_disabled";
+            color3: 255 255 255 255;
             text.min: 1 1;
             visible: 1;
          }
@@ -438,8 +438,9 @@ group { name: "elm/button/base/anchor";
             rel1.to_y: "base";
             rel2.offset: -1 -1;
             rel2.to: "base";
-            color: FN_COL_HIGHLIGHT;
             color_class: "button_text_anchor";
+            color2: 255 255 255 255;
+            color3: 255 255 255 255;
             text { font: FN; size: 10;
                align: 0.5 0.5;
                min: 0 0;
@@ -461,18 +462,12 @@ group { name: "elm/button/base/anchor";
          description { state: "disabled_visible" 0.0;
             inherit: "default" 0.0;
             rel1.offset: 0 0;
-            color: 51 153 255 128;
-            color2: 51 153 255 12;
-            color3: 51 153 255 8;
             color_class: "button_text_anchor_disabled";
             text.min: 1 1;
             visible: 1;
          }
          description { state: "disabled_textonly" 0.0;
             inherit: "default" 0.0;
-            color: 51 153 255 128;
-            color2: 51 153 255 12;
-            color3: 51 153 255 8;
             color_class: "button_text_anchor_disabled";
             text.min: 1 1;
             visible: 1;
@@ -485,8 +480,9 @@ group { name: "elm/button/base/anchor";
             fixed: 1 1;
             rel1.to: "elm.text";
             rel2.to: "elm.text";
-            color: FN_COL_HIGHLIGHT_CLICKED;
             color_class: "button_text_anchor";
+            color2: 255 255 255 255;
+            color3: 255 255 255 255;
             text { font: FN; size: 10;
                text_source: "elm.text";
                min: 1 1;