From 1ac2ae02985e89ee9d69e3fa36620ee7fe192967 Mon Sep 17 00:00:00 2001 From: Olliver Schinagl Date: Wed, 17 Jun 2015 08:18:26 +0200 Subject: update button and checkboxes, checkbox checkmark broken atm Signed-off-by: Olliver Schinagl --- data/themes/default/colorclasses.edc | 18 ++++++++++----- data/themes/default/edc/elm/button.edc | 24 ++++++++----------- data/themes/default/edc/elm/check.edc | 42 ++++++++++++---------------------- 3 files changed, 37 insertions(+), 47 deletions(-) diff --git a/data/themes/default/colorclasses.edc b/data/themes/default/colorclasses.edc index f1cdfd4..8ac944b 100644 --- a/data/themes/default/colorclasses.edc +++ b/data/themes/default/colorclasses.edc @@ -11,11 +11,20 @@ color_classes { color_class { name: "button_list_focus"; color: WIN_COL_HIGHLIGHT; } + color_class { name: "button_text"; + color: FN_COL_DEFAULT; + } + color_class { name: "check"; + color: FN_COL_DEFAULT_BASIC; + } + color_class { name: "check_focus"; + color: WIN_COL_HIGHLIGHT; + } + color_class { name: "check_text"; + color: FN_COL_DEFAULT; + } // widgets - color_class { name: "button_text"; - color: FN_COL_DEFAULT; - } color_class { name: "button_text_focus"; color: FN_COL_FOCUSED; } @@ -31,9 +40,6 @@ color_classes { color_class { name: "button_text_anchor_disabled"; color: FN_COL_HIGHLIGHT_DISABLE; } - color_class { name: "check_text"; - color: FN_COL_DEFAULT; - } color_class { name: "check_text_disabled"; color: FN_COL_DISABLE; } diff --git a/data/themes/default/edc/elm/button.edc b/data/themes/default/edc/elm/button.edc index 2f9dcf8..e34f422 100644 --- a/data/themes/default/edc/elm/button.edc +++ b/data/themes/default/edc/elm/button.edc @@ -540,7 +540,6 @@ group { name: "elm/button/base/list"; inherit: "default" 0.0; text { style: "button_list_style_focused"; - min: 0 1; } visible: 1; } @@ -548,7 +547,6 @@ group { name: "elm/button/base/list"; inherit: "default" 0.0; text { style: "button_list_style_focused"; - min: 0 1; } visible: 1; } @@ -570,26 +568,24 @@ group { name: "elm/button/base/list"; } description { state: "disabled_visible" 0.0; inherit: "default" 0.0; - text.min: 1 1; - text.ellipsis: -1; text { style: "button_list_style_disabled"; - min: 0 1; + min: 1 1; } visible: 1; } description { state: "disabled_textonly" 0.0; inherit: "default" 0.0; - text.min: 1 1; - text.ellipsis: -1; text { style: "button_list_style_disabled"; - min: 0 1; + min: 1 1; + ellipsis: -1; } visible: 1; } } part { name: "event"; type: RECT; + ignore_flags: ON_HOLD; description { state: "default" 0.0; color: 0 0 0 0; } @@ -647,7 +643,7 @@ group { name: "elm/button/base/list"; signal: "mouse,clicked,1"; source: "event"; action: SIGNAL_EMIT "elm,action,click" "elm"; } - program { name: "button_text_visible"; + program { signal: "elm,state,text,visible"; source: "elm"; script { new m = get_int(btmode); @@ -655,7 +651,7 @@ group { name: "elm/button/base/list"; eval_mode(m); } } - program { name: "button_text_hidden"; + program { signal: "elm,state,text,hidden"; source: "elm"; script { new m = get_int(btmode); @@ -663,7 +659,7 @@ group { name: "elm/button/base/list"; eval_mode(m); } } - program { name: "button_icon_visible"; + program { signal: "elm,state,icon,visible"; source: "elm"; script { new m = get_int(btmode); @@ -671,7 +667,7 @@ group { name: "elm/button/base/list"; eval_mode(m); } } - program { name: "button_icon_hidden"; + program { signal: "elm,state,icon,hidden"; source: "elm"; action: STATE_SET "default" 0.0; script { @@ -680,7 +676,7 @@ group { name: "elm/button/base/list"; eval_mode(m); } } - program { name: "button_state_disabled"; + program { signal: "elm,state,disabled"; source: "elm"; script { new m = get_int(btmode); @@ -688,7 +684,7 @@ group { name: "elm/button/base/list"; eval_mode(m); } } - program { name: "button_state_enabled"; + program { signal: "elm,state,enabled"; source: "elm"; script { new m = get_int(btmode); diff --git a/data/themes/default/edc/elm/check.edc b/data/themes/default/edc/elm/check.edc index 69ef2cf..17355ec 100644 --- a/data/themes/default/edc/elm/check.edc +++ b/data/themes/default/edc/elm/check.edc @@ -15,30 +15,26 @@ 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:"base", "default", 0.0); set_state(PART:"clip", "default", 0.0); set_state(PART:"event", "default", 0.0); } else { 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:"base", "disabled", 0.0); set_state(PART:"clip", "disabled", 0.0); set_state(PART:"event", "disabled", 0.0); } } else if (m1 == (ICON)) { if (!d) { - set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"elm.swallow.content", "icononly", 0.0); set_state(PART:"sizer.content", "icononly", 0.0); set_state(PART:"elm.text", "default", 0.0); - set_state(PART:"base", "default", 0.0); set_state(PART:"clip", "default", 0.0); set_state(PART:"event", "default", 0.0); } else { - set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"elm.swallow.content", "icononly", 0.0); set_state(PART:"sizer.content", "icononly", 0.0); - set_state(PART:"elm.text", "disabled", 0.0); - set_state(PART:"base", "disabled", 0.0); + set_state(PART:"elm.text", "default", 0.0); set_state(PART:"clip", "disabled", 0.0); set_state(PART:"event", "disabled", 0.0); } @@ -46,15 +42,13 @@ group { name: "elm/check/base/default"; if (!d) { 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:"base", "default", 0.0); + set_state(PART:"elm.text", "textonly", 0.0); set_state(PART:"clip", "default", 0.0); set_state(PART:"event", "default", 0.0); } else { 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:"base", "disabled", 0.0); + set_state(PART:"elm.text", "disabled_textonly", 0.0); set_state(PART:"clip", "disabled", 0.0); set_state(PART:"event", "disabled", 0.0); } @@ -62,15 +56,13 @@ group { name: "elm/check/base/default"; if (!d) { 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:"base", "default", 0.0); + set_state(PART:"elm.text", "icononly", 0.0); set_state(PART:"clip", "default", 0.0); set_state(PART:"event", "default", 0.0); } else { 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:"base", "disabled", 0.0); + set_state(PART:"elm.text", "icononly", 0.0); set_state(PART:"clip", "disabled", 0.0); set_state(PART:"event", "disabled", 0.0); } @@ -120,6 +112,7 @@ group { name: "elm/check/base/default"; image.border: 1 1 1 1; image.middle: 0; fill.smooth: 0; + visible: 0; } } part { name: "indicator"; mouse_events: 0; @@ -144,22 +137,18 @@ group { name: "elm/check/base/default"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 255 255 255 64; + color: 0 0 0 255; } } - part { name: "elm.swallow.content"; type: SWALLOW; - scale: 1; + part { name: "elm.swallow.content"; type: SWALLOW; mouse_events: 0; clip_to: "clip"; description { state: "default" 0.0; fixed: 1 0; - visible: 0; align: 0.0 0.5; - max: 0 0; rel1.to_x: "base"; - rel2.to_x: "base"; rel2.relative: 0.0 1.0; + rel2.to_x: "base"; visible: 0; - color: 1 1 1 1; } description { state: "visible" 0.0; inherit: "default" 0.0; @@ -170,7 +159,7 @@ group { name: "elm/check/base/default"; description { state: "icononly" 0.0; inherit: "default" 0.0; fixed: 0 0; - aspect: 0.5 0.5; + align: 0.5 0.5; rel2.relative: 1.0 1.0; visible: 1; } @@ -178,7 +167,6 @@ group { name: "elm/check/base/default"; part { name: "sizer.content"; type: TEXT; mouse_events: 0; scale: 1; description { state: "default" 0.0; - fixed: 1 1; visible: 0; text { font: FN; size: 7; min: 0 0; @@ -207,7 +195,6 @@ group { name: "elm/check/base/default"; } } part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 0; - scale: 1; description { state: "default" 0.0; rel1.offset: 0 0; rel1.relative: 1.0 0.0; @@ -259,8 +246,7 @@ group { name: "elm/check/base/default"; inherit: "default" 0.0; text { style: "check_style_disabled"; - ellipsis: -1; - min: 0 1; + min: 1 1; } visible: 1; } @@ -268,6 +254,7 @@ group { name: "elm/check/base/default"; inherit: "default" 0.0; text { style: "check_style_disabled"; + min: 1 1; ellipsis: -1; } visible: 1; @@ -337,6 +324,7 @@ group { name: "elm/check/base/default"; } program { signal: "elm,state,icon,hidden"; source: "elm"; + action: STATE_SET "default" 0.0; script { new m = get_int(btmode); m &= ~ICON; set_int(btmode, m); -- cgit v0.12