raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=33a5a94e4c2f4efad36e95a5ad94dfaaf5ba09b5
commit 33a5a94e4c2f4efad36e95a5ad94dfaaf5ba09b5
Author: Carsten Haitzler <ras...@rasterman.com>
Date: Thu Jul 8 11:08:17 2021 +0100
elm theme - more cc work
---
data/elementary/themes/colorclasses.edc | 12 +++++
data/elementary/themes/edc/slider.edc | 96 ++++++++++++++-------------------
data/elementary/themes/edc/spectrum.edc | 10 ++--
data/elementary/themes/edc/start.edc | 7 ++-
data/elementary/themes/edc/syscon.edc | 32 +++++------
5 files changed, 76 insertions(+), 81 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 89e5bae56d..26b363a4c2 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -64,6 +64,9 @@ color_classes {
///////////////////////////////////////////////////////////////////////////////
color_class { name: "/fg/normal/scroller/bar";
color: 51 153 255 255; }
+///////////////////////////////////////////////////////////////////////////////
+ color_class { name: "/fg/normal/color/cursor";
+ color: 255 255 255 192; }
///////////////////////////////////////////////////////////////////////////////
color_class { name: "/bg/normal/access";
color: 255 153 51 64; }
@@ -140,6 +143,15 @@ color_classes {
///////////////////////////////////////////////////////////////////////////////
color_class { name: "/fg/normal/separator";
color: 80 80 80 255; }
+///////////////////////////////////////////////////////////////////////////////
+ color_class { name: "/bg/normal/slider/base";
+ color: 48 48 48 255; }
+ color_class { name: "/bg/disabled/slider/base";
+ color: 56 56 56 255; }
+ color_class { name: "/fg/normal/slider/bar";
+ color: 51 153 255 255; }
+ color_class { name: "/fg/disabled/slider/bar";
+ color: 80 80 80 255; }
///////////////////////////////////////////////////////////////////////////////
color_class { name: "/bg/normal/entry";
color: 48 48 48 255; }
diff --git a/data/elementary/themes/edc/slider.edc
b/data/elementary/themes/edc/slider.edc
index 8af62471a9..c1ebe764ec 100644
--- a/data/elementary/themes/edc/slider.edc
+++ b/data/elementary/themes/edc/slider.edc
@@ -5,7 +5,7 @@ group { name: "e/widgets/slider_horizontal";
scale: 1;
description { state: "default" 0.0;
min: 56 28;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
offscale;
}
description { state: "active" 0.0;
@@ -18,16 +18,15 @@ group { name: "e/widgets/slider_horizontal";
part { name: "base"; type: RECT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
- rel1.to: "bg";
- rel2.to: "bg";
- color: 48 48 48 255;
+ rel.to: "bg";
+ color_class: "/bg/normal/slider/base";
min: 8 4;
max: 99999 4;
fixed: 0 1;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 56 56 56 255;
+ color_class: "/bg/disabled/slider/base";
}
}
part { name: "glow"; type: RECT; mouse_events: 0;
@@ -36,11 +35,11 @@ group { name: "e/widgets/slider_horizontal";
rel2.relative: 0.5 1.0;
rel2.to_x: "knob";
rel2.to_y: "base";
- color: 53 153 255 255;
+ color_class: "/fg/normal/slider/bar";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 192 192 192 64;
+ color_class: "/fg/disabled/slider/bar";
}
}
part { name: "clip1"; type: RECT;
@@ -59,7 +58,7 @@ group { name: "e/widgets/slider_horizontal";
rel1.relative: 1.0 0.0;
rel2.offset: -5 -5;
align: 1.0 0.5;
- color: 160 160 160 255;
+ color_class: "/fg/normal/slider/text";
text { font: FN; size: 10;
min: 0 1;
align: 0.0 0.5;
@@ -91,9 +90,8 @@ group { name: "e/widgets/slider_horizontal";
clip_to: "clip2";
scale: 1;
description { state: "default" 0.0;
- rel1.to: "e.text.label";
- rel2.to: "e.text.label";
- color: 96 96 96 255;
+ rel.to: "e.text.label";
+ color_class: "/fg/disabled/slider/text";
text { font: FN; size: 10;
text_source: "e.text.label";
align: 0.0 0.5;
@@ -109,11 +107,10 @@ group { name: "e/widgets/slider_horizontal";
part { name: "knob";
scale: 1;
description { state: "default" 0.0;
+ rel.to: "e.dragable.slider";
rel1.offset: -1 -1;
- rel1.to: "e.dragable.slider";
rel2.offset: 0 0;
- rel2.to: "e.dragable.slider";
- color: 160 160 160 255;
+ color_class: "/fg/normal/slider/knob";
image.normal: "speaker_vol.png";
min: 16 16;
max: 16 16;
@@ -121,11 +118,11 @@ group { name: "e/widgets/slider_horizontal";
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color_class: "/fg/pressed/slider/knob";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 96 96 96 255;
+ color_class: "/fg/disabled/slider/knob";
}
}
part { name: "e.swallow.bar"; type: SWALLOW;
@@ -146,13 +143,13 @@ group { name: "e/widgets/slider_horizontal";
rel1.to_x: "bg";
rel2.relative: 0.5 1.0;
rel2.to_x: "bg";
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
fixed: 1 1;
}
}
part { name: "event"; type: RECT;
description { state: "default" 0.0;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
visible: 0;
}
description { state: "disabled" 0.0;
@@ -162,32 +159,27 @@ group { name: "e/widgets/slider_horizontal";
}
}
programs {
- program {
- signal: "mouse,down,1"; source: "e.dragable.slider";
+ program { signal: "mouse,down,1"; source: "e.dragable.slider";
action: STATE_SET "clicked" 0.0;
target: "knob";
}
- program {
- signal: "mouse,up,1"; source: "e.dragable.slider";
+ program { signal: "mouse,up,1"; source: "e.dragable.slider";
action: STATE_SET "default" 0.0;
target: "knob";
}
- program {
- signal: "e,action,show,label"; source: "e";
+ program { signal: "e,action,show,label"; source: "e";
action: STATE_SET "active" 0.0;
target: "bg";
target: "e.text.label";
target: "label2";
}
- program {
- signal: "e,action,hide,label"; source: "e";
+ program { signal: "e,action,hide,label"; source: "e";
action: STATE_SET "default" 0.0;
target: "bg";
target: "e.text.label";
target: "label2";
}
- program {
- signal: "e,state,disabled"; source: "e";
+ program { signal: "e,state,disabled"; source: "e";
action: STATE_SET "disabled" 0.0;
target: "event";
target: "glow";
@@ -196,8 +188,7 @@ group { name: "e/widgets/slider_horizontal";
target: "clip2";
target: "knob";
}
- program {
- signal: "e,state,enabled"; source: "e";
+ program { signal: "e,state,enabled"; source: "e";
action: STATE_SET "default" 0.0;
target: "event";
target: "glow";
@@ -216,7 +207,7 @@ group { name: "e/widgets/slider_vertical";
scale: 1;
description { state: "default" 0.0;
min: 28 56;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
offscale;
}
description { state: "active" 0.0;
@@ -229,16 +220,15 @@ group { name: "e/widgets/slider_vertical";
part { name: "base"; type: RECT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
- rel1.to: "bg";
- rel2.to: "bg";
- color: 48 48 48 255;
+ rel.to: "bg";
+ color_class: "/bg/normal/slider/base";
min: 4 8;
max: 4 99999;
fixed: 1 0;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 56 56 56 255;
+ color_class: "/bg/disabled/slider/base";
}
}
part { name: "glow"; type: RECT; mouse_events: 0;
@@ -247,11 +237,11 @@ group { name: "e/widgets/slider_vertical";
rel1.to_y: "knob";
rel1.to_x: "base";
rel2.to: "base";
- color: 53 153 255 255;
+ color_class: "/fg/normal/slider/bar";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 192 192 192 64;
+ color_class: "/fg/disabled/slider/bar";
}
}
part { name: "clip1"; type: RECT;
@@ -270,7 +260,7 @@ group { name: "e/widgets/slider_vertical";
rel1.relative: 0.0 1.0;
rel2.offset: -1 -1;
align: 0.5 1.0;
- color: 160 160 160 255;
+ color_class: "/fg/normal/slider/text";
text { font: FN; size: 10;
min: 0 0;
align: 0.5 0.5;
@@ -304,7 +294,7 @@ group { name: "e/widgets/slider_vertical";
description { state: "default" 0.0;
rel1.to: "e.text.label";
rel2.to: "e.text.label";
- color: 96 96 96 255;
+ color_class: "/fg/disabled/slider/text";
text { font: FN; size: 10;
text_source: "e.text.label";
align: 0.5 0.5;
@@ -324,7 +314,7 @@ group { name: "e/widgets/slider_vertical";
rel1.to: "e.dragable.slider";
rel2.offset: 0 0;
rel2.to: "e.dragable.slider";
- color: 160 160 160 255;
+ color_class: "/fg/normal/slider/knob";
image.normal: "speaker_vol.png";
min: 16 16;
max: 16 16;
@@ -332,11 +322,11 @@ group { name: "e/widgets/slider_vertical";
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color_class: "/fg/pressed/slider/knob";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 96 96 96 255;
+ color_class: "/fg/disabled/slider/knob";
}
}
part { name: "e.swallow.bar"; type: SWALLOW;
@@ -357,13 +347,13 @@ group { name: "e/widgets/slider_vertical";
rel1.to_x: "bg";
rel2.relative: 1.0 0.5;
rel2.to_x: "bg";
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
fixed: 1 1;
}
}
part { name: "event"; type: RECT;
description { state: "default" 0.0;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
visible: 0;
}
description { state: "disabled" 0.0;
@@ -373,32 +363,27 @@ group { name: "e/widgets/slider_vertical";
}
}
programs {
- program {
- signal: "mouse,down,1"; source: "e.dragable.slider";
+ program { signal: "mouse,down,1"; source: "e.dragable.slider";
action: STATE_SET "clicked" 0.0;
target: "knob";
}
- program {
- signal: "mouse,up,1"; source: "e.dragable.slider";
+ program { signal: "mouse,up,1"; source: "e.dragable.slider";
action: STATE_SET "default" 0.0;
target: "knob";
}
- program {
- signal: "e,action,show,label"; source: "e";
+ program { signal: "e,action,show,label"; source: "e";
action: STATE_SET "active" 0.0;
target: "bg";
target: "e.text.label";
target: "label2";
}
- program {
- signal: "e,action,hide,label"; source: "e";
+ program { signal: "e,action,hide,label"; source: "e";
action: STATE_SET "default" 0.0;
target: "bg";
target: "e.text.label";
target: "label2";
}
- program {
- signal: "e,state,disabled"; source: "e";
+ program { signal: "e,state,disabled"; source: "e";
action: STATE_SET "disabled" 0.0;
target: "event";
target: "glow";
@@ -407,8 +392,7 @@ group { name: "e/widgets/slider_vertical";
target: "clip2";
target: "knob";
}
- program {
- signal: "e,state,enabled"; source: "e";
+ program { signal: "e,state,enabled"; source: "e";
action: STATE_SET "default" 0.0;
target: "event";
target: "glow";
diff --git a/data/elementary/themes/edc/spectrum.edc
b/data/elementary/themes/edc/spectrum.edc
index 9ca81a8d17..234cff82f9 100644
--- a/data/elementary/themes/edc/spectrum.edc
+++ b/data/elementary/themes/edc/spectrum.edc
@@ -6,7 +6,7 @@ group { name: "e/widgets/spectrum";
description { state: "default" 0.0;
rel1.offset: 2 2;
rel2.offset: -3 -3;
- color: DARK_GREY_BG_COLOR;
+ color_class: "/bg-dark/normal/color";
offscale;
}
}
@@ -17,7 +17,7 @@ group { name: "e/widgets/spectrum";
rel1.offset: 2 2;
rel2.offset: -3 -3;
image.normal: "diagonal_stripes.png";
- color: 255 255 255 64;
+ color_class: "/bg-dark-alt/normal/color";
TILED_PATTERN(240, 240)
offscale;
}
@@ -28,7 +28,7 @@ group { name: "e/widgets/spectrum";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 64;
+ color: 255 255 255 64; // no cc
}
}
part { name: "e.swallow.content"; type: SWALLOW;
@@ -57,7 +57,7 @@ group { name: "e/widgets/spectrum";
rel1.to_y: "e.swallow.content";
rel2.to_x: "e.dragable.cursor";
rel2.to_y: "e.swallow.content";
- color: 255 255 255 192;
+ color_class: "/fg/normal/color/cursor";
}
}
part { name: "cursor_y"; type: RECT;
@@ -66,7 +66,7 @@ group { name: "e/widgets/spectrum";
rel1.to_y: "e.dragable.cursor";
rel2.to_x: "e.swallow.content";
rel2.to_y: "e.dragable.cursor";
- color: 255 255 255 192;
+ color_class: "/fg/normal/color/cursor";
}
}
}
diff --git a/data/elementary/themes/edc/start.edc
b/data/elementary/themes/edc/start.edc
index 899dee81a5..c0c22114c9 100644
--- a/data/elementary/themes/edc/start.edc
+++ b/data/elementary/themes/edc/start.edc
@@ -2,18 +2,17 @@ group { name: "e/modules/start/main";
parts {
part { name: "arrow_base"; type: RECT;
description { state: "default" 0.0;
- color: 255 255 255 255;
+ color_class: "/fg/normal/gadgets/start";
}
description { state: "active" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 64;
+ color_class: "/fg/selected/gadgets/start";
}
}
part { name: "arrow";
clip_to: "arrow_base";
description { state: "default" 0.0;
image.normal: "i-arrow-u";
- color: 160 160 160 255;
rel1.relative: (5/40) (5/40);
rel2.relative: (35/40) (35/40);
}
@@ -32,7 +31,7 @@ group { name: "e/modules/start/main";
}
part { name: "events"; type: RECT;
description { state: "default" 0.0;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
}
}
}
diff --git a/data/elementary/themes/edc/syscon.edc
b/data/elementary/themes/edc/syscon.edc
index f7eda13a9b..39673cb8eb 100644
--- a/data/elementary/themes/edc/syscon.edc
+++ b/data/elementary/themes/edc/syscon.edc
@@ -2,7 +2,7 @@ group { name: "e/widgets/syscon/main";
parts {
part { name: "bg"; type: RECT;
description { state: "default" 0.0;
- color: 64 64 64 255;
+ color_class: "/bg/normal/syscon";
}
}
part { name: "e.swallow.main"; type: SWALLOW;
@@ -19,9 +19,8 @@ group { name: "e/widgets/syscon/main";
part { name: "e.swallow.secondary"; type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
- rel1.to: "e.swallow.main";
+ rel.to: "e.swallow.main";
rel1.relative: 0.0 1.0;
- rel2.to: "e.swallow.main";
align: 0.5 0.0;
fixed: 0 1;
offscale;
@@ -47,7 +46,7 @@ group { name: "e/widgets/syscon/main";
rel2.offset: -1 -17;
rel2.relative: 0.5 1.0;
align: 0.5 1.0;
- color: 160 160 160 255;
+ color_class: "/fg/normal/syscon/text";
text { font: FN; size: 10;
min: 1 1;
ellipsis: -1;
@@ -59,7 +58,7 @@ group { name: "e/widgets/syscon/main";
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color_class: "/fg/pressed/syscon/text";
}
}
part { name: "button"; type: RECT;
@@ -69,7 +68,7 @@ group { name: "e/widgets/syscon/main";
rel1.offset: -12 -12;
rel2.to: "e.text.label";
rel2.offset: 11 11;
- color: 255 255 255 0;
+ color: 255 255 255 0; // no cc
offscale;
}
}
@@ -98,10 +97,11 @@ group { name: "e/widgets/syscon/item/button";
}
part { name: "icon_clip"; type: RECT;
description { state: "default" 0.0;
+ color: 255 255 255 255; // no cc
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 64;
+ color: 255 255 255 64; // no cc
}
}
part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;
@@ -124,7 +124,7 @@ group { name: "e/widgets/syscon/item/button";
rel1.offset: 8 -9;
rel2.offset: -9 -9;
align: 0.5 1.0;
- color: 160 160 160 255;
+ color_class: "/fg/normal/syscon/button/text";
text { font: FN; size: 10;
min: 1 1;
ellipsis: -1;
@@ -135,22 +135,22 @@ group { name: "e/widgets/syscon/item/button";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 96 96 96 255;
+ color_class: "/fg/disabled/syscon/button/text";
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color_class: "/fg/pressed/syscon/button/text";
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color_class: "/fg/selected/syscon/button/text";
}
}
part { name: "sel"; type: RECT; mouse_events: 0;
scale: 1;
clip_to: "clip";
description { state: "default" 0.0;
- color: 51 153 255 255;
+ color_class: "/bg/selected/syscon/button/bar";
visible: 0;
rel2.offset: -1 0;
rel1.relative: 0.0 1.0;
@@ -167,7 +167,7 @@ group { name: "e/widgets/syscon/item/button";
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;
@@ -223,12 +223,12 @@ group { name: "e/modules/syscon/button";
rel2.relative: 0.95 0.95;
image.normal: "i-system-shutdown";
aspect: 1.0 1.0; aspect_preference: BOTH;
- color: 160 160 160 255;
+ color_class: "/fg/normal/gadgets/syscon";
offscale;
}
description { state: "hilight" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color_class: "/fg/selected/gadgets/syscon";
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
@@ -236,7 +236,7 @@ group { name: "e/modules/syscon/button";
rel2.relative: 0.93 0.93;
rel1.offset: 1 1;
rel2.offset: -2 -2;
- color: 200 200 200 255;
+ color_class: "/fg/pressed/gadgets/syscon";
}
}
}
--
