raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=53801eb1b8c93cc28c7e64cb32d5036dc65fc2af
commit 53801eb1b8c93cc28c7e64cb32d5036dc65fc2af
Author: Carsten Haitzler <ras...@rasterman.com>
Date: Thu Jul 8 13:28:43 2021 +0100
elm theme - more cc work
---
data/elementary/themes/colorclasses.edc | 33 ++++++++++++++++++++++++
data/elementary/themes/edc/sys.edc | 8 +++---
data/elementary/themes/edc/systray.edc | 10 +-------
data/elementary/themes/edc/tasks.edc | 40 ++++++++++++++++--------------
data/elementary/themes/edc/temperature.edc | 37 ++++++++++++---------------
data/elementary/themes/edc/tiling.edc | 26 ++++++++-----------
data/elementary/themes/edc/transitions.edc | 22 ++++++++--------
7 files changed, 99 insertions(+), 77 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 26b363a4c2..422069dce3 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -70,6 +70,11 @@ color_classes {
///////////////////////////////////////////////////////////////////////////////
color_class { name: "/bg/normal/access";
color: 255 153 51 64; }
+///////////////////////////////////////////////////////////////////////////////
+ color_class { name: "/bg/normal/tiling/position/base";
+ color: 51 153 255 25; }
+ color_class { name: "/bg/normal/tiling/position/outline";
+ color: 51 153 255 255; }
///////////////////////////////////////////////////////////////////////////////
color_class { name: "/fg/normal/init/logo";
color: 255 255 255 255; }
@@ -427,6 +432,34 @@ color_classes {
///////////////////////////////////////////////////////////////////////////////
color_class { name: "/fg/selected/edgebindings/edge";
color: 51 153 255 255; }
+///////////////////////////////////////////////////////////////////////////////
+ color_class { name: "/fg/normal/gadgets/temperature/low";
+ color: 51 153 255 255; }
+ color_class { name: "/fg/normal/gadgets/temperature/medium";
+ color: 255 153 51 255; }
+ color_class { name: "/fg/normal/gadgets/temperature/hi";
+ color: 255 51 51 255; }
+///////////////////////////////////////////////////////////////////////////////
+ color_class { name: "/bg/normal/gadgets/tasks/base/normal";
+ color: 64 64 64 255; }
+ color_class { name: "/bg/normal/gadgets/tasks/base/iconified";
+ color: 64 64 64 255; }
+ color_class { name: "/bg/normal/gadgets/tasks/base/focused";
+ color: 32 32 32 255; }
+ color_class { name: "/bg/pressed/gadgets/tasks/base";
+ color: 16 16 16 255; }
+ color_class { name: "/bg/selected/gadgets/tasks/bar";
+ color: 51 153 255 255; }
+ color_class { name: "/bg/selected/gadgets/tasks/urgent";
+ color: 51 153 255 255; }
+ color_class { name: "/fg/normal/gadgets/tasks/text/focused";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/pressed/gadgets/tasks/text/focused";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/normal/gadgets/tasks/text/iconified";
+ color: 128 128 128 255; }
+ color_class { name: "/fg/pressed/gadgets/tasks/text/iconified";
+ color: 160 160 160 255; }
///////////////////////////////////////////////////////////////////////////////
color_class { name: "/bg/normal/gadgets/control/base";
color: 51 153 255 255; }
diff --git a/data/elementary/themes/edc/sys.edc
b/data/elementary/themes/edc/sys.edc
index 9e79a2b95e..6f6840c5f1 100644
--- a/data/elementary/themes/edc/sys.edc
+++ b/data/elementary/themes/edc/sys.edc
@@ -7,18 +7,18 @@ group { name: "e/sys/logout";
styles {
style { name: "sys_style";
- base: "font="FN" font_size=10 text_class=tb_plain align=left
color=#a0a0a0 wrap=word";
+ base: "font="FN" font_size=10 text_class=tb_plain align=left
color=cc:/fg/normal/sys/text wrap=word";
tag: "br" "\n";
tag: "b" "+ font="FNBD"";
tag: "hilight" "+ font="FNBD" text_class=tb_light";
- tag: "urgent" "+ font="FNBD" color=#fa4";
- tag: "title" "+ font="FNBD" font_size=16 underline=on
underline_color=#3399ff";
+ tag: "urgent" "+ font="FNBD" color=cc:/fg/normal/sys/text/urgent";
+ tag: "title" "+ font="FNBD" font_size=16 underline=on
underline_color=cc:/fg/normal/sys/text/title/underline";
}
}
parts {
part { name: "bg"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
- color: 64 64 64 255;
+ color_class: "/bg/normal/sys";
}
}
part { name: "e.textblock.message"; type: TEXTBLOCK;
diff --git a/data/elementary/themes/edc/systray.edc
b/data/elementary/themes/edc/systray.edc
index 19d20af3db..1e435c2b0d 100644
--- a/data/elementary/themes/edc/systray.edc
+++ b/data/elementary/themes/edc/systray.edc
@@ -1,19 +1,11 @@
group { name: "e/modules/systray/main";
alias: "e/modules/systray/main/default";
alias: "e/modules/systray/main/invisible";
- data.item: "default" "64 64 64";
- data.item: "inset" "64 64 64";
- data.item: "plain" "64 64 64";
parts {
alias: "box" "e.box";
part { name: "base"; type: RECT;
description { state: "default" 0.0;
- color: 0 0 0 0;
- align: 0 0;
- }
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 128;
+ color: 0 0 0 0; // no cc
}
}
part { name: "e.box"; type: BOX;
diff --git a/data/elementary/themes/edc/tasks.edc
b/data/elementary/themes/edc/tasks.edc
index efa0a2ccbc..1ceae93a91 100644
--- a/data/elementary/themes/edc/tasks.edc
+++ b/data/elementary/themes/edc/tasks.edc
@@ -23,41 +23,44 @@ group { name:"e/modules/tasks/item";
clip_to: "clip";
scale: 1;
description { state: "default" 0.0;
- color: 64 64 64 255;
+ color_class: "/bg/normal/gadgets/tasks/base/normal";
rel1.offset: 0 (0 - SHELFPAD);
rel2.offset: -1 (SHELFPAD - 1);
offscale;
}
description { state: "iconic" 0.0;
inherit: "default" 0.0;
+ color_class: "/bg/normal/gadgets/tasks/base/iconified";
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
- color: 40 40 40 255;
+ color_class: "/bg/normal/gadgets/tasks/base/focused";
}
}
part { name: "click"; type: RECT; mouse_events: 0;
clip_to: "clip";
scale: 1;
description { state: "default" 0.0;
- color: 32 32 32 0;
+ color_class: "/bg/pressed/gadgets/tasks/base";
+ color: 255 255 255 0; // no cc
rel1.offset: 0 (0 - SHELFPAD);
rel2.offset: -1 (SHELFPAD - 1);
offscale;
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
- color: 32 32 32 255;
+ color: 255 255 255 255; // no cc
}
}
part { name: "urgent"; type: RECT; mouse_events: 0;
clip_to: "clip";
description { state: "default" 0.0;
- color: 51 153 255 0;
+ color_class: "/bg/selected/gadgets/tasks/urgent";
+ color: 255 255 255 0; // no cc
}
description { state: "urgent" 0.0;
inherit: "default" 0.0;
- color: 51 153 255 255;
+ color: 255 255 255 255; // no cc
}
}
part { name: "label_clip"; type: RECT; mouse_events: 0;
@@ -107,7 +110,7 @@ group { name:"e/modules/tasks/item";
rel1.relative: 1.0 0.0;
rel1.offset: 4 4;
rel2.offset: -5 -5;
- color: 160 160 160 255;
+ color_class: "/fg/normal/gadgets/tasks/text/normal";
offscale;
text { font: FN; size: 10;
min: 0 1;
@@ -117,7 +120,7 @@ group { name:"e/modules/tasks/item";
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color_class: "/fg/pressed/gadgets/tasks/text/normal";
}
}
part { name: "focused_clip"; type: RECT; mouse_events: 0;
@@ -142,7 +145,7 @@ group { name:"e/modules/tasks/item";
rel1.relative: 1.0 0.0;
rel1.offset: 4 4;
rel2.offset: -5 -5;
- color: 255 255 255 255;
+ color_class: "/fg/normal/gadgets/tasks/text/focused";
offscale;
text { font: FNBD; size: 10;
min: 0 1;
@@ -153,7 +156,7 @@ group { name:"e/modules/tasks/item";
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
- color: 220 220 220 255;
+ color_class: "/fg/pressed/gadgets/tasks/text/focused";
}
}
part { name: "iconic_clip"; type: RECT; mouse_events: 0;
@@ -178,7 +181,7 @@ group { name:"e/modules/tasks/item";
rel1.relative: 1.0 0.0;
rel1.offset: 4 4;
rel2.offset: -5 -5;
- color: 128 128 128 255;
+ color_class: "/fg/normal/gadgets/tasks/text/iconified";
offscale;
text { font: FN; size: 10;
min: 0 1;
@@ -189,7 +192,7 @@ group { name:"e/modules/tasks/item";
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color_class: "/fg/pressed/gadgets/tasks/text/iconified";
}
}
part { name: "icon"; type: SPACER;
@@ -237,7 +240,7 @@ group { name:"e/modules/tasks/item";
scale: 1;
clip_to: "clip";
description { state: "default" 0.0;
- color: 51 153 255 255;
+ color_class: "/bg/selected/gadgets/tasks/bar";
align: 0.5 1.0;
rel1.offset: 0 (SHELFPAD - 1);
rel1.relative: 0.0 1.0;
@@ -263,7 +266,7 @@ group { name:"e/modules/tasks/item";
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
}
}
part { name: "clip"; type: RECT;
@@ -448,10 +451,11 @@ group { name:"e/modules/tasks/item_vert";
}
description { state: "iconic" 0.0;
inherit: "default" 0.0;
+ color_class: "/bg/selected/gadgets/tasks/base/iconified";
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
- color: 40 40 40 255;
+ color_class: "/bg/selected/gadgets/tasks/base/focused";
}
}
part { name: "e.text.label";
@@ -463,7 +467,7 @@ group { name:"e/modules/tasks/item_vert";
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color_class: "/fg/pressed/gadgets/tasks/text/normal";
}
}
part { name: "label_focused";
@@ -475,7 +479,7 @@ group { name:"e/modules/tasks/item_vert";
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
- color: 220 220 220 255;
+ color_class: "/fg/pressed/gadgets/tasks/text/focused";
}
}
part { name: "label_iconic";
@@ -487,7 +491,7 @@ group { name:"e/modules/tasks/item_vert";
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color_class: "/fg/pressed/gadgets/tasks/text/iconified";
}
}
part { name: "icon";
diff --git a/data/elementary/themes/edc/temperature.edc
b/data/elementary/themes/edc/temperature.edc
index aeb02731af..49cafd06e3 100644
--- a/data/elementary/themes/edc/temperature.edc
+++ b/data/elementary/themes/edc/temperature.edc
@@ -17,10 +17,9 @@ group { name: "e/modules/temperature/main";
parts {
part { name: "base";
description { state: "default" 0.0;
- rel1.to: "temp";
- rel2.to: "temp";
+ rel.to: "temp";
image.normal: "therm_content.png";
- color: 32 32 32 255;
+ color_class: "/bg-dark/normal/gadgets/temperature";
}
}
part { name: "temp";
@@ -30,15 +29,15 @@ group { name: "e/modules/temperature/main";
align: 0.5 0.5;
max: 80 160;
image.normal: "therm_content.png";
- color: 51 153 255 255;
+ color_class: "/fg/normal/gadgets/temperature/low";
}
description { state: "warm" 0.0;
inherit: "default" 0.0;
- color: 255 153 51 255;
+ color_class: "/fg/normal/gadgets/temperature/medium";
}
description { state: "hot" 0.0;
inherit: "default" 0.0;
- color: 255 0 0 255;
+ color_class: "/fg/normal/gadgets/temperature/hi";
}
}
part { name: "e.text.reading"; type: TEXT;
@@ -46,7 +45,8 @@ group { name: "e/modules/temperature/main";
clip_to: "fade_clip";
description { state: "default" 0.0;
visible: 0;
- color: 255 255 255 0;
+ color_class: "/fg/normal/gadgets/temperature/text";
+ color: 255 255 255 0; // no cc
text { font: FN; size: 10;
min: 1 1;
ellipsis: -1;
@@ -56,15 +56,15 @@ group { name: "e/modules/temperature/main";
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
- color: 255 255 255 255;
+ color: 255 255 255 255; // no cc
}
}
part { name: "fade_clip"; 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 128;
+ color: 255 255 255 64; // no cc
}
}
part { name: "temp_clip"; type: RECT;
@@ -82,38 +82,33 @@ group { name: "e/modules/temperature/main";
}
part { name: "temp_limit"; type: SPACER;
description { state: "default" 0.0;
- rel1.to: "temp";
+ rel.to: "temp";
rel1.relative: 0.0 0.1;
- rel2.to: "temp";
rel2.relative: 1.0 0.9;
}
}
part { name: "over"; type: RECT;
description { state: "default" 0.0;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
}
}
}
programs {
- program {
- signal: "mouse,in"; source: "over";
+ program { signal: "mouse,in"; source: "over";
action: STATE_SET "visible" 0.0;
transition: LINEAR 0.3;
target: "e.text.reading";
}
- program {
- signal: "mouse,out"; source: "over";
+ program { signal: "mouse,out"; source: "over";
action: STATE_SET "default" 0.0;
transition: LINEAR 1.0;
target: "e.text.reading";
}
- program {
- signal: "e,state,known"; source: "e";
+ program { signal: "e,state,known"; source: "e";
action: STATE_SET "default" 0.0;
target: "fade_clip";
}
- program {
- signal: "e,state,unknown"; source: "e";
+ program { signal: "e,state,unknown"; source: "e";
action: STATE_SET "faded" 0.0;
target: "fade_clip";
}
diff --git a/data/elementary/themes/edc/tiling.edc
b/data/elementary/themes/edc/tiling.edc
index fd5b82396f..0ed5ff5087 100644
--- a/data/elementary/themes/edc/tiling.edc
+++ b/data/elementary/themes/edc/tiling.edc
@@ -2,32 +2,28 @@ group { "e/modules/tiling/indicator";
images.image: "outline.png" COMP;
images.image: "diagonal_stripes.png" COMP;
parts {
+ image { "background";
+ desc { "default";
+ image.normal: "diagonal_stripes.png";
+ color_class: "/bg/normal/tiling/position/base";
+ TILED_PATTERN(240, 240)
+ }
+ }
part { name: "base"; mouse_events: 0;
description { state: "default" 0.0;
image.normal: "outline.png";
image.border: 4 4 4 4;
image.middle: 0;
fill.smooth: 0;
- color: 51 153 255 255;
- }
- }
- image { "background";
- desc { "default";
- image.normal: "diagonal_stripes.png";
- color: 51 153 255 50;
- TILED_PATTERN(240, 240)
+ color_class: "/bg/normal/tiling/position/outline";
}
}
swallow { "e.client.icon";
scale: 1;
desc { "default";
min: 24 24;
- rel1 {
- relative: 0.5 0.5;
- }
- rel2 {
- relative: 0.5 0.5;
- }
+ rel1.relative: 0.5 0.5;
+ rel2.relative: 0.5 0.5;
}
}
}
@@ -43,7 +39,7 @@ group { name: "e/modules/tiling/main";
description { state: "default" 0.0;
aspect: 1.0 1.0; aspect_preference: BOTH;
image.normal: "tiling-vert.png";
- color: 160 160 160 255;
+ color_class: "/fg/normal/gadgets/tiling/status";
}
description { state: "vertical" 0.0;
inherit: "default" 0.0;
diff --git a/data/elementary/themes/edc/transitions.edc
b/data/elementary/themes/edc/transitions.edc
index b385d0a88b..27df89964e 100644
--- a/data/elementary/themes/edc/transitions.edc
+++ b/data/elementary/themes/edc/transitions.edc
@@ -45,17 +45,16 @@ group { name: "e/transitions/crossfade";
}
part { name: "bg_new_clip"; type: RECT;
description { state: "default" 0.0;
- color: 255 255 255 0;
+ color: 255 255 255 0; // no cc
}
description { state: "done" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color: 255 255 255 255; // no cc
}
}
}
programs {
- program {
- signal: "e,action,start"; source: "e";
+ program { signal: "e,action,start"; source: "e";
action: STATE_SET "done" 0.0;
transition: SINUSOIDAL 1.0;
target: "bg_new_clip";
@@ -82,11 +81,11 @@ group { name: "e/transitions/vswipe";
}
part { name: "divideold";
clip_to: "bg_prev_clip";
+ scale: 1;
description { state: "default" 0.0;
image.normal: "vgrad_shadow_bi.png";
- rel1.to: "bg_prev_clip";
+ rel.to: "bg_prev_clip";
rel1.relative: 0.0 0.0;
- rel2.to: "bg_prev_clip";
rel2.relative: 1.0 0.0;
min: 0 80;
max: 99999 80;
@@ -95,11 +94,11 @@ group { name: "e/transitions/vswipe";
}
part { name: "dividenew";
clip_to: "bg_new_clip";
+ scale: 1;
description { state: "default" 0.0;
image.normal: "vgrad_shadow_bi.png";
- rel1.to: "bg_new_clip";
+ rel.to: "bg_new_clip";
rel1.relative: 0.0 1.0;
- rel2.to: "bg_new_clip";
rel2.relative: 1.0 1.0;
min: 0 80;
max: 99999 80;
@@ -107,9 +106,11 @@ group { name: "e/transitions/vswipe";
}
}
part { name: "bg_prev_clip"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
rel1.offset: 0 -40;
rel2.offset: -1 39;
+ offscale;
}
description { state: "done" 0.0;
inherit: "default" 0.0;
@@ -118,10 +119,12 @@ group { name: "e/transitions/vswipe";
}
}
part { name: "bg_new_clip"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
rel2.relative: 1.0 0.0;
rel1.offset: 0 -40;
rel2.offset: -1 -40;
+ offscale;
}
description { state: "done" 0.0;
inherit: "default" 0.0;
@@ -130,8 +133,7 @@ group { name: "e/transitions/vswipe";
}
}
programs {
- program {
- signal: "e,action,start"; source: "e";
+ program { signal: "e,action,start"; source: "e";
action: STATE_SET "done" 0.0;
transition: SINUSOIDAL 1.0;
target: "bg_new_clip";
--
