From ac1460dab3e2c49ccd20245c80f4151a4885f63c Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Fri, 4 Jun 2021 10:14:57 +0100 Subject: [PATCH] elm theme - more cc work --- data/elementary/themes/colorclasses.edc | 20 ++++ data/elementary/themes/edc/check.edc | 33 +++--- data/elementary/themes/edc/elm/check.edc | 128 ++++++++++------------- 3 files changed, 96 insertions(+), 85 deletions(-) diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc index 42a53fbb47..7912824982 100644 --- a/data/elementary/themes/colorclasses.edc +++ b/data/elementary/themes/colorclasses.edc @@ -252,6 +252,26 @@ color_classes { color: 255 255 255 128; } color_class { name: "/fg/normal/progress/busy/3"; color: 51 153 255 128; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/bg/normal/check/base"; + color: 48 48 48 255; } + color_class { name: "/bg/pressed/check/base"; + color: 32 32 32 255; } + color_class { name: "/bg/disabled/check/base"; + color: 56 56 56 255; } + color_class { name: "/fg/selected/check/check"; + color: 160 160 160 255; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/bg/normal/toggle/base"; + color: 48 48 48 255; } + color_class { name: "/bg/pressed/toggle/base"; + color: 32 32 32 255; } + color_class { name: "/bg/disabled/toggle/base"; + color: 56 56 56 255; } + color_class { name: "/fg/normal/toggle/text/on"; + color: 51 153 255 255; } + color_class { name: "/fg/normal/toggle/button"; + color: 51 153 255 255; } /////////////////////////////////////////////////////////////////////////////// color_class { name: "/bg/normal/shelf/translucent"; color: 64 64 64 128; } diff --git a/data/elementary/themes/edc/check.edc b/data/elementary/themes/edc/check.edc index 339ede176a..8e653f48e2 100644 --- a/data/elementary/themes/edc/check.edc +++ b/data/elementary/themes/edc/check.edc @@ -3,27 +3,28 @@ group { name: "e/widgets/check"; part { name: "base"; type: RECT; scale: 1; description { state: "default" 0.0; + color_class: "/bg/normal/check/base"; + align: 0.0 0.5; min: 13 13; max: 13 13; rel1.offset: 4 4; rel2.offset: 4 -5; rel2.relative: 0.0 1.0; - align: 0.0 0.5; - color: 0 0 0 64; offscale; fixed: 1 1; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 0 0 0 16; + color_class: "/bg/disabled/check/base"; } } part { name: "clip"; type: RECT; description { state: "default" 0.0; + rel.to: "base"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 153 153 153 255; + color: 255 255 255 153; // no cc } } part { name: "indicator"; mouse_events: 0; @@ -35,15 +36,17 @@ group { name: "e/widgets/check"; min: 15 15; max: 15 15; visible: 0; - color: 160 160 160 255; - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; + color_class: "/fg/normal/check/check"; + fixed: 1 1; } description { state: "pressed" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/pressed/check/check"; + visible: 1; + } + description { state: "selected" 0.0; + inherit: "default" 0.0; + color_class: "/fg/selected/check/check"; visible: 1; } } @@ -54,7 +57,7 @@ group { name: "e/widgets/check"; rel1.to_x: "base"; rel1.relative: 1.0 0.0; rel2.offset: -5 -5; - color: 160 160 160 255; + color_class: "/fg/normal/check/text"; text { font: FN; size: 10; min: 1 1; ellipsis: -1; @@ -66,17 +69,17 @@ group { name: "e/widgets/check"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 96 96 96 255; + color_class: "/fg/disabled/check/text"; } description { state: "pressed" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/pressed/check/text"; } } part { name: "event"; type: RECT; ignore_flags: ON_HOLD; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -148,7 +151,7 @@ group { name: "e/widgets/check_icon"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 96 96 96 255; + color_class: "/fg/disabled/check/text"; } } } diff --git a/data/elementary/themes/edc/elm/check.edc b/data/elementary/themes/edc/elm/check.edc index 4a9217286d..60422da36f 100644 --- a/data/elementary/themes/edc/elm/check.edc +++ b/data/elementary/themes/edc/elm/check.edc @@ -21,13 +21,13 @@ group { name: "elm/check/base/default"; } rect { "icon_clip"; desc { "default"; - color: 255 255 255 255; + color: 255 255 255 255; // no cc } desc { "pressed"; inherit; - color: 255 255 255 255; + color: 255 255 255 255; // no cc } desc { "disabled"; inherit; - color: 255 255 255 64; + color: 255 255 255 64; // no cc } } swallow { "elm.swallow.content"; nomouse; @@ -64,22 +64,30 @@ group { name: "elm/check/base/default"; part { name: "base"; type: RECT; scale: 1; description { state: "default"; - fixed: 1 0; - color: 0 0 0 64; + color_class: "/bg/normal/check/base"; align: 0.0 0.5; min: 13 13; max: 13 13; rel1.offset: 4 4; - rel2.relative: 0.0 1.0; rel2.offset: 4 -5; - aspect: 1.0 1.0; aspect_preference: VERTICAL; + rel2.relative: 0.0 1.0; offscale; + fixed: 1 1; } desc { "pressed"; inherit; - color: 0 0 0 128; + color_class: "/bg/pressed/check/base"; } desc { "disabled"; inherit; - color: 0 0 0 16; + color_class: "/bg/disabled/check/base"; + } + } + part { name: "ck_selected"; type: RECT; + description { state: "default" 0.0; + rel.to: "base"; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 255 255 255 153; // no cc } } part { name: "ck_check"; @@ -91,33 +99,25 @@ group { name: "elm/check/base/default"; min: 15 15; max: 15 15; visible: 0; - color: 160 160 160 255; + color_class: "/fg/normal/check/check"; fixed: 1 1; } description { state: "pressed" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/pressed/check/check"; visible: 1; } description { state: "selected" 0.0; inherit: "default" 0.0; + color_class: "/fg/selected/check/check"; visible: 1; } } - part { name: "ck_selected"; type: RECT; - description { state: "default" 0.0; - rel.to: "base"; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 153 153 153 255; - } - } text { "elm.text"; nomouse; scale: 1; desc { "default"; fixed: 0 1; - color: 160 160 160 255; + color_class: "/fg/normal/check/text"; rel1.offset: 0 4; rel1.relative: 1.0 0.0; rel1.to_x: "elm.swallow.content"; @@ -139,7 +139,7 @@ group { name: "elm/check/base/default"; } desc { "pressed_visible"; inherit; fixed: 0 0; - color: 255 255 255 255; + color_class: "/fg/pressed/check/text"; rel1.offset: 4 4; text.min: 1 1; text.ellipsis: -1; @@ -153,14 +153,14 @@ group { name: "elm/check/base/default"; } desc { "pressed_textonly"; inherit; fixed: 0 0; - color: 255 255 255 255; + color_class: "/fg/pressed/check/text"; text.min: 1 1; text.ellipsis: -1; visible: 1; } desc { "disabled_visible"; inherit; fixed: 0 0; - color: 96 96 96 255; + color_class: "/fg/disabled/check/text"; rel1.offset: 4 4; text.min: 1 1; text.ellipsis: -1; @@ -168,7 +168,7 @@ group { name: "elm/check/base/default"; } desc { "disabled_textonly"; inherit; fixed: 0 0; - color: 96 96 96 255; + color_class: "/fg/disabled/check/text"; text.min: 1 1; text.ellipsis: -1; visible: 1; @@ -177,7 +177,7 @@ group { name: "elm/check/base/default"; rect { "event"; ignore_flags: ON_HOLD; desc { "default"; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } desc { "disabled"; inherit; visible: 0; @@ -317,13 +317,13 @@ group { name: "elm/check/base/toggle"; } rect { "icon_clip"; desc { "default"; - color: 255 255 255 255; + color: 255 255 255 255; // no cc } desc { "pressed"; inherit; - color: 255 255 255 255; + color: 255 255 255 255; // no cc } desc { "disabled"; inherit; - color: 255 255 255 64; + color: 255 255 255 64; // no cc } } swallow { "elm.swallow.content"; nomouse; @@ -370,14 +370,14 @@ group { name: "elm/check/base/toggle"; rect { name: "base"; description { state: "default"; fixed: 1 1; - color: 0 0 0 64; + color_class: "/bg/normal/toggle/base"; rel.to: "tog"; } desc { "pressed"; inherit; - color: 0 0 0 128; + color_class: "/bg/pressed/toggle/base"; } desc { "disabled"; inherit; - color: 0 0 0 16; + color_class: "/bg/disabled/toggle/base"; } } spacer { name: "onrect"; @@ -404,7 +404,7 @@ group { name: "elm/check/base/toggle"; rel2.to: "offrect"; rel2.offset: -5 -1; offscale; - color: 160 160 160 255; + color_class: "/fg/normal/toggle/text/off"; text { font: FN; size: 10; min: 0 1; align: 0.5 0.5; @@ -414,11 +414,11 @@ group { name: "elm/check/base/toggle"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 96 96 96 255; + color_class: "/fg/disabled/toggle/text/off"; } description { state: "clicked" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/pressed/toggle/text/off"; } } text { name: "elm.ontext"; nomouse; scale: 1; @@ -431,7 +431,7 @@ group { name: "elm/check/base/toggle"; rel2.relative: 0.0 1.0; rel2.offset: -5 -1; offscale; - color: 51 153 255 255; + color_class: "/fg/normal/toggle/text/on"; text { font: FN; size: 10; min: 0 1; align: 0.5 0.5; @@ -441,11 +441,11 @@ group { name: "elm/check/base/toggle"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 96 96 96 255; + color_class: "/fg/disabled/toggle/text/on"; } description { state: "clicked" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/pressed/toggle/text/on"; } } part { name: "tog_clip"; type: RECT; @@ -471,15 +471,15 @@ group { name: "elm/check/base/toggle"; rect { name: "base_but"; nomouse; description { state: "default" 0.0; rel.to: "button"; - color: 51 153 255 255; + color_class: "/fg/normal/toggle/button"; } description { state: "clicked" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/pressed/toggle/button"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 64 64 64 255; + color_class: "/fg/disabled/toggle/button"; } } rect { name: "button_events"; @@ -492,7 +492,7 @@ group { name: "elm/check/base/toggle"; scale: 1; desc { "default"; fixed: 0 1; - color: 160 160 160 255; + color_class: "/fg/normal/toggle/text"; rel1.offset: 0 4; rel1.relative: 1.0 0.0; rel1.to_x: "elm.swallow.content"; @@ -516,7 +516,7 @@ group { name: "elm/check/base/toggle"; } desc { "pressed_visible"; inherit; fixed: 0 0; - color: 255 255 255 255; + color_class: "/fg/pressed/toggle/text"; rel1.offset: 4 4; text.min: 1 1; text.ellipsis: -1; @@ -530,14 +530,14 @@ group { name: "elm/check/base/toggle"; } desc { "pressed_textonly"; inherit; fixed: 0 0; - color: 255 255 255 255; + color_class: "/fg/pressed/toggle/text"; text.min: 1 1; text.ellipsis: -1; visible: 1; } desc { "disabled_visible"; inherit; fixed: 0 0; - color: 96 96 96 255; + color_class: "/fg/disabled/toggle/text"; rel1.offset: 4 4; text.min: 1 1; text.ellipsis: -1; @@ -545,7 +545,7 @@ group { name: "elm/check/base/toggle"; } desc { "disabled_textonly"; inherit; fixed: 0 0; - color: 96 96 96 255; + color_class: "/fg/disabled/toggle/text"; text.min: 1 1; text.ellipsis: -1; visible: 1; @@ -650,12 +650,10 @@ group { name: "elm/check/base/toggle"; target: "elm.ontext"; target: "elm.offtext"; } - program { - signal: "mouse,clicked,1"; source: "event"; + program { signal: "mouse,clicked,1"; source: "event"; action: SIGNAL_EMIT "elm,action,check,toggle" "elm"; } - program { - signal: "mouse,down,1"; source: "event"; + program { signal: "mouse,down,1"; source: "event"; action: SIGNAL_EMIT "elm,action,press" "elm"; after: "button_click_anim"; } @@ -670,8 +668,7 @@ group { name: "elm/check/base/toggle"; program { name: "button_unclick_anim"; script { flag_unset(PRESSED); } } - program { - signal: "elm,anim,activate"; source: "elm"; + program { signal: "elm,anim,activate"; source: "elm"; script { new Float:drag; if (get_int(is_rtl) == 0) { drag = 100.0; } @@ -689,40 +686,31 @@ group { name: "elm/check/base/toggle"; set_drag(PART:"button", drag, 0.0); } } - program { - signal: "mouse,clicked,1"; source: "event"; + program { signal: "mouse,clicked,1"; source: "event"; action: SIGNAL_EMIT "elm,action,click" "elm"; } - program { name: "button_text_visible"; - signal: "elm,state,text,visible"; source: "elm"; + program { signal: "elm,state,text,visible"; source: "elm"; script { flag_set(LABEL); } } - program { name: "button_text_hidden"; - signal: "elm,state,text,hidden"; source: "elm"; + program { signal: "elm,state,text,hidden"; source: "elm"; script { flag_unset(LABEL); } } - program { name: "button_icon_visible"; - signal: "elm,state,icon,visible"; source: "elm"; + program { signal: "elm,state,icon,visible"; source: "elm"; script { flag_set(ICON); } } - program { name: "button_icon_hidden"; - signal: "elm,state,icon,hidden"; source: "elm"; + program { signal: "elm,state,icon,hidden"; source: "elm"; script { flag_unset(ICON); } } - program { name: "button_background_visible"; - signal: "elm,state,background,visible"; source: "elm"; + program { signal: "elm,state,background,visible"; source: "elm"; script { flag_set(BACKGROUND); } } - program { name: "button_background_hidden"; - signal: "elm,state,background,hidden"; source: "elm"; + program { signal: "elm,state,background,hidden"; source: "elm"; script { flag_unset(BACKGROUND); } } - program { name: "button_state_disabled"; - signal: "elm,state,disabled"; source: "elm"; + program { signal: "elm,state,disabled"; source: "elm"; script { flag_set(DISABLE); } } - program { name: "button_state_enabled"; - signal: "elm,state,enabled"; source: "elm"; + program { signal: "elm,state,enabled"; source: "elm"; script { flag_unset(DISABLE); } } program { signal: "elm,state,disabled"; source: "elm";