From 4e085efd845434aefe78dc5a93e63aa830cdf77c Mon Sep 17 00:00:00 2001 From: Olliver Schinagl Date: Wed, 29 Apr 2015 10:33:43 +0200 Subject: Use colorclasses rather then directly setting the font. This patch properly uses colorclasses to set the font color etc. It also fixes a concistency typo for focus instead of focused. Signed-off-by: Olliver Schinagl --- data/themes/default/colorclasses.edc | 2 +- data/themes/default/edc/elm/button.edc | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/data/themes/default/colorclasses.edc b/data/themes/default/colorclasses.edc index 03e8ca3..38e9784 100644 --- a/data/themes/default/colorclasses.edc +++ b/data/themes/default/colorclasses.edc @@ -78,7 +78,7 @@ color_classes { color_class { name: "button_text"; color: FN_COL_DEFAULT; } - color_class { name: "button_text_focused"; + color_class { name: "button_text_focus"; color: FN_COL_FOCUSED; } color_class { name: "button_text_disabled"; diff --git a/data/themes/default/edc/elm/button.edc b/data/themes/default/edc/elm/button.edc index 0ca594e..0e58608 100644 --- a/data/themes/default/edc/elm/button.edc +++ b/data/themes/default/edc/elm/button.edc @@ -173,13 +173,11 @@ group { name: "elm/button/base/default"; } description { state: "focus" 0.0; inherit: "default" 0.0; -// color_class: "button_text_focus"; - color: 0 0 0 255; + color_class: "button_text_focus"; } description { state: "clicked" 0.0; inherit: "default" 0.0; - // color_class: "button_text_focus"; - color: 0 0 0 255; + color_class: "button_text_focus"; } description { state: "visible" 0.0; inherit: "default" 0.0; -- cgit v0.12