raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=8f0ba01374fd38d289ac4c3d1b6df00b0898660a
commit 8f0ba01374fd38d289ac4c3d1b6df00b0898660a
Author: Carsten Haitzler <ras...@rasterman.com>
Date: Wed Jun 30 18:02:04 2021 +0100
elm theme - more cc work
---
data/elementary/themes/colorclasses.edc | 3 ++
data/elementary/themes/edc/randr.edc | 54 +++++++++++++------------
data/elementary/themes/edc/scrollframe.edc | 65 +++++++++++-------------------
3 files changed, 54 insertions(+), 68 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 0c957b23df..87cf853c5b 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -61,6 +61,9 @@ color_classes {
color: 51 153 255 255; }
color_class { name: "/fg/normal/pointer/manipulator";
color: 51 153 255 192; }
+///////////////////////////////////////////////////////////////////////////////
+ color_class { name: "/fg/normal/scroller/bar";
+ color: 51 153 255 255; }
///////////////////////////////////////////////////////////////////////////////
color_class { name: "/bg/normal/access";
color: 255 153 51 64; }
diff --git a/data/elementary/themes/edc/randr.edc
b/data/elementary/themes/edc/randr.edc
index 55f348712b..73da9978d2 100644
--- a/data/elementary/themes/edc/randr.edc
+++ b/data/elementary/themes/edc/randr.edc
@@ -6,7 +6,7 @@ group { name: "e/conf/randr/main";
description { state: "default" 0.0;
rel1.offset: 2 2;
rel2.offset: -3 -3;
- color: DARK_GREY_BG_COLOR;
+ color_class: "/bg-dark/normal";
min: 18 18;
offscale;
}
@@ -19,7 +19,7 @@ group { name: "e/conf/randr/main";
rel1.offset: 2 2;
rel2.offset: -3 -3;
image.normal: "diagonal_stripes.png";
- color: 255 255 255 64;
+ color_class: "/bg-dark-alt/normal";
TILED_PATTERN(240, 240)
offscale;
}
@@ -83,7 +83,7 @@ group { name: "e/conf/randr/main/frame";
part { name: "primary"; type: RECT;
scale: 1;
description { state: "default" 0.0;
- color: 48 48 48 255;
+ color_class: "/bg-alt/normal";
rel1.offset: -4 -4;
rel2.offset: 3 3;
offscale;
@@ -109,7 +109,7 @@ group { name: "e/conf/randr/main/frame";
}
description { state: "off" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 16;
+ color: 255 255 255 16; // no cc
}
}
part { name: "e.box.clone"; type: BOX;
@@ -141,7 +141,8 @@ group { name: "e/conf/randr/main/frame";
}
description { state: "active" 0.0;
inherit: "default" 0.0;
- color: 51 153 255 128;
+ color_class: "/bg/selected";
+ color: 255 255 255 128; // no cc
visible: 1;
}
}
@@ -156,7 +157,7 @@ group { name: "e/conf/randr/main/frame";
min: 12 12;
max: 12 12;
image.normal: "i-radio";
- color: 32 32 32 255;
+ color_class: "/bg-dark/normal";
offscale;
fixed: 1 1;
}
@@ -168,11 +169,12 @@ group { name: "e/conf/randr/main/frame";
min: 10 10;
max: 10 10;
image.normal: "i-radio";
+ color_class: "/fg/normal";
fixed: 1 1;
}
description { state: "pulse" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 128;
+ color: 255 255 255 128; // no cc
}
description { state: "off" 0.0;
inherit: "default" 0.0;
@@ -242,7 +244,7 @@ group { name: "e/conf/randr/main/frame";
FIXED_SIZE(15, 15)
image.normal: "i-arrow-u";
fixed: 1 1;
- color: 51 153 255 255;
+ color_class: "/fg-alt/selected";
offscale;
}
}
@@ -256,7 +258,7 @@ group { name: "e/conf/randr/main/frame";
FIXED_SIZE(20, 20)
image.normal: "i-system-shutdown";
fixed: 1 1;
- color: 51 153 255 255;
+ color_class: "/fg-alt/selected";
}
}
part { name: "rsz1"; mouse_events: 0;
@@ -268,13 +270,13 @@ group { name: "e/conf/randr/main/frame";
rel.to: "e.event.resize";
image.normal: "i-arrow-lu";
FIXED_SIZE(5, 5)
- color: 51 153 255 255;
+ color_class: "/fg-alt/selected";
}
description { state: "pulse" 0.0;
inherit: "default" 0.0;
rel1.relative: -1.0 -1.0;
rel2.relative: -1.0 -1.0;
- color: 51 153 255 0;
+ color: 255 255 255 0; // no cc
}
}
part { name: "rsz2"; mouse_events: 0;
@@ -286,19 +288,19 @@ group { name: "e/conf/randr/main/frame";
rel.to: "e.event.resize";
image.normal: "i-arrow-rd";
FIXED_SIZE(5, 5)
- color: 51 153 255 255;
+ color_class: "/fg-alt/selected";
}
description { state: "pulse" 0.0;
inherit: "default" 0.0;
rel1.relative: 2.0 2.0;
rel2.relative: 2.0 2.0;
- color: 51 153 255 0;
+ color: 255 255 255 0; // no cc
}
}
part { name: "rotc"; type: RECT;
scale: 1;
description { state: "default" 0.0;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
rel1.offset: 16 16;
rel2.offset: -17 -17;
max: 1 1;
@@ -317,12 +319,12 @@ group { name: "e/conf/randr/main/frame";
map.on: 1;
map.smooth: 1;
map.rotation.center: "rotc";
- color: 51 153 255 255;
+ color_class: "/fg-alt/selected";
}
description { state: "pulse" 0.0;
inherit: "default" 0.0;
- color: 51 153 255 0;
map.rotation.z: -60;
+ color: 255 255 255 0; // no cc
}
}
part { name: "rot2"; mouse_events: 0;
@@ -337,12 +339,12 @@ group { name: "e/conf/randr/main/frame";
map.on: 1;
map.smooth: 1;
map.rotation.center: "rotc";
- color: 51 153 255 255;
+ color_class: "/fg-alt/selected";
}
description { state: "pulse" 0.0;
inherit: "default" 0.0;
- color: 51 153 255 0;
map.rotation.z: 60;
+ color: 255 255 255 0; // no cc
}
}
part { name: "e.swallow.refresh"; type: SWALLOW;
@@ -398,11 +400,11 @@ group { name: "e/conf/randr/main/frame";
rel.to: "e.event.arrow.show";
image.normal: "i-arrow-d";
FIXED_SIZE(15, 15)
- color: 51 153 255 255;
+ color_class: "/fg/normal";
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color_class: "/fg/pressed";
}
}
part { name: "arrow2"; mouse_events: 0;
@@ -412,18 +414,18 @@ group { name: "e/conf/randr/main/frame";
rel.to: "e.event.arrow.show";
image.normal: "i-arrow-u";
FIXED_SIZE(15, 15)
- color: 51 153 255 255;
+ color_class: "/fg/normal";
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color_class: "/fg/pressed";
}
}
part { name: "e.event.arrow.show"; type: RECT;
clip_to: "arrowclip";
scale: 1;
description { state: "default" 0.0;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
max: 21 21;
align: 0.0 0.0;
}
@@ -431,7 +433,7 @@ group { name: "e/conf/randr/main/frame";
part { name: "e.event.rotate"; type: RECT;
scale: 1;
description { state: "default" 0.0;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
max: 21 21;
align: 1.0 0.0;
}
@@ -449,7 +451,7 @@ group { name: "e/conf/randr/main/frame";
}
part { name: "e.event.indicator"; type: RECT;
description { state: "default" 0.0;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
align: 0.0 1.0;
rel2.to_y: "pwrhint2";
rel2.to_x: "pwrhint2";
@@ -642,7 +644,7 @@ group { name: "e/conf/randr/main/mini";
parts {
part { name: "base"; type: RECT;
description { state: "default" 0.0;
- color: 32 32 32 255;
+ color_class: "/bg-dark/normal";
}
}
part { name: "e.swallow.preview"; type: SWALLOW;
diff --git a/data/elementary/themes/edc/scrollframe.edc
b/data/elementary/themes/edc/scrollframe.edc
index 6e6908df91..e612ab2e6a 100644
--- a/data/elementary/themes/edc/scrollframe.edc
+++ b/data/elementary/themes/edc/scrollframe.edc
@@ -66,7 +66,7 @@ group { name: "e/widgets/scrollframe";
part { name: "bg"; type: RECT;
description { state: "default" 0.0;
rel.to: "e.swallow.content";
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
}
}
part { name: "clipper"; type: RECT;
@@ -111,7 +111,7 @@ group { name: "e/widgets/scrollframe";
part { name: "sb_vbar_p1"; type: RECT;
clip_to: "sb_vbar";
description { state: "default" 0.0;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
rel1.to: "sb_vbar";
rel2.relative: 1.0 0.0;
rel2.to: "e.dragable.vbar";
@@ -121,7 +121,7 @@ group { name: "e/widgets/scrollframe";
part { name: "sb_vbar_p2"; type: RECT;
clip_to: "sb_vbar";
description { state: "default" 0.0;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
rel1.relative: 0.0 1.0;
rel1.to: "e.dragable.vbar";
rel2.to: "sb_vbar";
@@ -141,7 +141,7 @@ group { name: "e/widgets/scrollframe";
rel1.to: "sb_vbar";
rel2.relative: 0.5 0.5;
rel2.to: "sb_vbar";
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@@ -155,7 +155,7 @@ group { name: "e/widgets/scrollframe";
repeat_events: 1;
scale: 1;
description { state: "default" 0.0;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
rel1.to: "sb_vbar";
rel1.offset: -45 0;
rel2.to: "sb_vbar";
@@ -309,7 +309,7 @@ group { name: "e/widgets/scrollframe";
part { name: "sb_hbar_p1"; type: RECT;
clip_to: "sb_hbar";
description { state: "default" 0.0;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
rel1.to: "sb_hbar";
rel2.relative: 0.0 1.0;
rel2.to: "e.dragable.hbar";
@@ -319,7 +319,7 @@ group { name: "e/widgets/scrollframe";
part { name: "sb_hbar_p2"; type: RECT;
clip_to: "sb_hbar";
description { state: "default" 0.0;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
rel1.relative: 1.0 0.0;
rel1.to: "e.dragable.hbar";
rel2.to: "sb_hbar";
@@ -339,7 +339,7 @@ group { name: "e/widgets/scrollframe";
rel1.to: "sb_hbar";
rel2.relative: 0.5 0.5;
rel2.to: "sb_hbar";
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@@ -353,7 +353,7 @@ group { name: "e/widgets/scrollframe";
repeat_events: 1;
scale: 1;
description { state: "default" 0.0;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
rel1.to: "sb_hbar";
rel1.offset: 0 -45;
rel2.to: "sb_hbar";
@@ -485,15 +485,15 @@ group { name: "e/widgets/scrollframe";
clip_to: "sb_vbar_show";
description { state: "default" 0.0;
fixed: 1 1;
- color: 51 153 255 255;
+ color_class: "/fg/normal/scroller/bar/horizontal";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 80 80 80 255;
+ color_class: "/fg/disabled/scroller/bar/horizontal";
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color_class: "/fg/pressed/scroller/bar/horizontal";
}
}
@@ -519,15 +519,15 @@ group { name: "e/widgets/scrollframe";
clip_to: "sb_hbar_show";
description { state: "default" 0.0;
fixed: 1 1;
- color: 51 153 255 255;
+ color_class: "/fg/normal/scroller/bar/horizontal";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: 80 80 80 255;
+ color_class: "/fg/disabled/scroller/bar/horizontal";
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color_class: "/fg/pressed/scroller/bar/horizontal";
}
}
@@ -547,58 +547,39 @@ group { name: "e/widgets/scrollframe";
max: 999999 15;
}
}
-
- //////////////////////////////////////////////////////////////////////
-
- part { name: "dim_effect"; type: RECT; mouse_events: 0;
- description { state: "default" 0.0;
- color: 0 0 0 0;
- }
- description { state: "effect" 0.0;
- color: 32 32 32 255;
- }
- }
}
programs {
- program {
- signal: "mouse,down,1*"; source: "e.dragable.vbar";
+ program { signal: "mouse,down,1*"; source: "e.dragable.vbar";
action: STATE_SET "clicked" 0.0;
target: "e.dragable.vbar";
target: "color_vbar";
}
- program {
- signal: "mouse,down,*"; source: "e.dragable.vbar";
+ program { signal: "mouse,down,*"; source: "e.dragable.vbar";
action: SIGNAL_EMIT "e,vbar,press" "e";
}
- program {
- signal: "mouse,up,1"; source: "e.dragable.vbar";
+ program { signal: "mouse,up,1"; source: "e.dragable.vbar";
action: STATE_SET "default" 0.0;
target: "e.dragable.vbar";
target: "color_vbar";
}
- program {
- signal: "mouse,up,*"; source: "e.dragable.vbar";
+ program { signal: "mouse,up,*"; source: "e.dragable.vbar";
action: SIGNAL_EMIT "e,vbar,unpress" "e";
}
- program {
- signal: "mouse,down,1*"; source: "e.dragable.hbar";
+ program { signal: "mouse,down,1*"; source: "e.dragable.hbar";
action: STATE_SET "clicked" 0.0;
target: "e.dragable.hbar";
target: "color_hbar";
}
- program {
- signal: "mouse,down,*"; source: "e.dragable.hbar";
+ program { signal: "mouse,down,*"; source: "e.dragable.hbar";
action: SIGNAL_EMIT "e,hbar,press" "e";
}
- program {
- signal: "mouse,up,1"; source: "e.dragable.hbar";
+ program { signal: "mouse,up,1"; source: "e.dragable.hbar";
action: STATE_SET "default" 0.0;
target: "e.dragable.hbar";
target: "color_hbar";
}
- program {
- signal: "mouse,up,*"; source: "e.dragable.hbar";
+ program { signal: "mouse,up,*"; source: "e.dragable.hbar";
action: SIGNAL_EMIT "e,hbar,unpress" "e";
}
}
--
