raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=89993e39ff5c7e073e4498ed1283a5cb9b54d3f3
commit 89993e39ff5c7e073e4498ed1283a5cb9b54d3f3
Author: Carsten Haitzler <ras...@rasterman.com>
Date: Sun Jun 27 18:18:46 2021 +0100
elm theme - more cc work
---
data/elementary/themes/colorclasses.edc | 9 ++++++
data/elementary/themes/edc/ilist.edc | 57 ++++++++++++---------------------
data/elementary/themes/edc/init.edc | 31 +++++++++---------
3 files changed, 46 insertions(+), 51 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 7ec512e475..a2103a7a71 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -48,6 +48,11 @@ color_classes {
///////////////////////////////////////////////////////////////////////////////
color_class { name: "/bg/normal/access";
color: 255 153 51 64; }
+///////////////////////////////////////////////////////////////////////////////
+ color_class { name: "/fg/normal/init/logo";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/normal/init/text/version";
+ color: 80 80 80 255; }
///////////////////////////////////////////////////////////////////////////////
color_class { name: "/fg/normal/fileman/icon/over";
color: 51 153 255 255; }
@@ -201,10 +206,14 @@ color_classes {
///////////////////////////////////////////////////////////////////////////////
color_class { name: "/bg/normal/list/group";
color: 32 32 32 255; }
+ color_class { name: "/fg/normal/list/toggle";
+ color: 96 96 96 255; }
color_class { name: "/fg/normal/list/group";
color: 255 255 255 255; }
color_class { name: "/fg/disabled/list/group";
color: 80 80 80 255; }
+ color_class { name: "/fg/normal/list/typebuf/text";
+ color: 255 255 255 255; }
///////////////////////////////////////////////////////////////////////////////
color_class { name: "/bg/normal/frame/title";
color: 80 80 80 255; }
diff --git a/data/elementary/themes/edc/ilist.edc
b/data/elementary/themes/edc/ilist.edc
index d07fbe4932..403b7a4696 100644
--- a/data/elementary/themes/edc/ilist.edc
+++ b/data/elementary/themes/edc/ilist.edc
@@ -3,22 +3,21 @@ group { name: "e/ilist";
part { name: "typebuf_clip"; type: RECT;
description { state: "default" 0.0;
visible: 0;
- color: 255 255 255 0;
+ color: 255 255 255 0; // no cc
}
description { state: "active" 0.0;
visible: 1;
- color: 255 255 255 255;
+ color: 255 255 255 255; // no cc
}
}
part { name: "base"; type: RECT; mouse_events: 0;
clip_to: "typebuf_clip";
scale: 1;
description { state: "default" 0.0;
+ rel.to: "e.text.label";
rel1.offset: -8 -8;
- rel1.to: "e.text.label";
rel2.offset: 7 7;
- rel2.to: "e.text.label";
- color: 0 0 0 192;
+ color_class: "/dim/normal/list/typebuf/base";
offscale;
}
}
@@ -30,7 +29,7 @@ group { name: "e/ilist";
rel1.offset: -8 -8;
rel2.relative: 0.5 0.5;
rel2.offset: 7 7;
- color: 255 255 255 255;
+ color_class: "/fg/normal/list/typebuf/text";
text { font: FNBD; size: 10;
min: 1 1;
ellipsis: -1;
@@ -62,12 +61,12 @@ group { name: "e/widgets/ilist";
parts {
part { name: "base"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
- color: 64 64 64 255;
+ color_class: "/bg/normal/list/item";
}
}
part { name: "sel_base"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
- color: 51 153 255 255;
+ color_class: "/bg/selected/list/item";
visible: 0;
}
description { state: "selected" 0.0;
@@ -99,7 +98,7 @@ group { name: "e/widgets/ilist";
rel2.offset: -5 -5;
rel2.relative: 0.0 1.0;
rel2.to_x: "e.swallow.end";
- color: 160 160 160 255;
+ color_class: "/fg/normal/list/item";
text { font: FN; size: 10;
min: 1 1;
ellipsis: -1;
@@ -110,11 +109,11 @@ group { name: "e/widgets/ilist";
}
description { state: "selected" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color_class: "/fg/selected/list/item";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 80 80 80 255;
+ color_class: "/fg/disabled/list/item";
}
}
part { name: "e.swallow.end"; type: SWALLOW; mouse_events: 0;
@@ -139,26 +138,22 @@ group { name: "e/widgets/ilist";
}
}
programs {
- program {
- signal: "e,state,selected"; source: "e";
+ program { signal: "e,state,selected"; source: "e";
action: STATE_SET "selected" 0.0;
target: "sel_base";
target: "e.text.label";
}
- program {
- signal: "e,state,unselected"; source: "e";
+ program { signal: "e,state,unselected"; source: "e";
action: STATE_SET "default" 0.0;
target: "sel_base";
target: "e.text.label";
}
- program {
- signal: "e,state,disabled"; source: "e";
+ program { signal: "e,state,disabled"; source: "e";
action: STATE_SET "disabled" 0.0;
target: "sel_base";
target: "e.text.label";
}
- program {
- signal: "e,state,enabled"; source: "e";
+ program { signal: "e,state,enabled"; source: "e";
action: STATE_SET "default" 0.0;
target: "sel_base";
target: "e.text.label";
@@ -171,15 +166,7 @@ group { name: "e/widgets/ilist_odd";
parts {
part { name: "base";
description { state: "default" 0.0;
- color: 56 56 56 255;
- }
- }
- part { name: "e.text.label";
- description { state: "default" 0.0;
- }
- description { state: "selected" 0.0;
- }
- description { state: "disabled" 0.0;
+ color_class: "/bg-alt/normal/list/item";
}
}
}
@@ -191,7 +178,7 @@ group { name: "e/widgets/ilist_header";
parts {
part { name: "base"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
- color: 32 32 32 255;
+ color_class: "/bg/normal/list/group";
}
}
part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;
@@ -214,7 +201,7 @@ group { name: "e/widgets/ilist_header";
rel2.offset: -8 -9;
rel2.relative: 0.0 1.0;
rel2.to_x: "e.swallow.end";
- color: 255 255 255 255;
+ color_class: "/fg/normal/list/group";
text { font: FNBD; size: 10;
min: 0 1;
align: 0.0 0.5;
@@ -244,25 +231,23 @@ group { name: "e/widgets/ilist/toggle_end";
description { state: "default" 0.0;
image.normal: "speaker_vol.png";
aspect: 1.0 1.0; aspect_preference: BOTH;
- color: 80 80 80 255;
+ color_class: "/fg/normal/list/toggle";
rel1.relative: 0.2 0.2;
rel2.relative: 0.8 0.8;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
- color: 51 153 255 255;
+ color_class: "/fg/selected/list/toggle";
}
}
}
programs {
- program {
- signal: "e,state,checked"; source: "e";
+ program { signal: "e,state,checked"; source: "e";
action: STATE_SET "visible" 0.0;
transition: SINUSOIDAL 0.3;
target: "base";
}
- program {
- signal: "e,state,unchecked"; source: "e";
+ program { signal: "e,state,unchecked"; source: "e";
action: STATE_SET "default" 0.0;
transition: SINUSOIDAL 0.3;
target: "base";
diff --git a/data/elementary/themes/edc/init.edc
b/data/elementary/themes/edc/init.edc
index d1b2936f49..58c1c3fa78 100644
--- a/data/elementary/themes/edc/init.edc
+++ b/data/elementary/themes/edc/init.edc
@@ -14,7 +14,7 @@ group { name: "e/init/splash";
part { name: "bg"; type: RECT;
clip_to: "fader";
description { state: "default" 0.0;
- color: 32 32 32 255;
+ color_class: "/bg-dark/normal/init/base";
}
}
part { name: "logo";
@@ -24,12 +24,13 @@ group { name: "e/init/splash";
image.normal: "logo_mono";
rel1.relative: 0.5 0.5;
rel2.relative: 0.5 0.5;
- color: 255 255 255 0;
+ color_class: "/fg/normal/init/logo";
+ color: 255 255 255 0; // no cc
FIXED_SIZE(150, 150)
}
description { state: "active" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color: 255 255 255 255; // no cc
}
}
part { name: "e.text.title"; type: TEXT; mouse_events: 0;
@@ -43,7 +44,7 @@ group { name: "e/init/splash";
rel2.relative: 0.95 0.0;
rel2.offset: -5 -16;
rel2.to_y: "e.text.status";
- color: 160 160 160 255;
+ color_class: "/fg/normal/init/text/title";
text { font: FNBD; size: 20;
text: "Title here";
min: 0 1;
@@ -63,7 +64,7 @@ group { name: "e/init/splash";
rel2.relative: 0.95 0.0;
rel2.offset: -5 -16;
rel2.to_y: "logo";
- color: 160 160 160 255;
+ color_class: "/fg/normal/init/text/status";
text { font: FN; size: 10;
text: "Status here";
min: 0 1;
@@ -81,7 +82,7 @@ group { name: "e/init/splash";
rel1.offset: -16 -16;
rel2.relative: 1.0 1.0;
rel2.offset: -16 -16;
- color: 80 80 80 255;
+ color_class: "/fg/normal/init/text/version";
text { font: FN; size: 8;
text: "0.22.0";
min: 1 1;
@@ -94,21 +95,21 @@ group { name: "e/init/splash";
}
part { name: "blanker"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
- color: 0 0 0 255;
+ color: 0 0 0 255; // no cc
visible: 1;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
visible: 0;
}
}
part { name: "fader"; type: RECT;
description { state: "default" 0.0;
- color: 255 255 255 255;
+ color: 255 255 255 255; // no cc
}
description { state: "faded" 0.0;
- color: 255 255 255 0;
+ color: 255 255 255 0; // no cc
}
}
}
@@ -175,26 +176,26 @@ group { name: "e/init/extra_screen";
part { name: "bg"; type: RECT;
clip_to: "fader";
description { state: "default" 0.0;
- color: 32 32 32 255;
+ color_class: "/bg-dark/normal/init/base";
}
}
part { name: "blanker"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
- color: 0 0 0 255;
+ color: 0 0 0 255; // no cc
visible: 1;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
visible: 0;
}
}
part { name: "fader"; type: RECT;
description { state: "default" 0.0;
- color: 255 255 255 255;
+ color: 255 255 255 255; // no cc
}
description { state: "faded" 0.0;
- color: 255 255 255 0;
+ color: 255 255 255 0; // no cc
}
}
}
--
