[EGIT] [core/efl] master 02/02: elm theme - more cc work
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=cd6e9f3e567caf0f4b6cc00d7a38181da3c995ba
commit cd6e9f3e567caf0f4b6cc00d7a38181da3c995ba
Author: Carsten Haitzler
Date: Thu Jul 29 00:02:50 2021 +0100
elm theme - more cc work
---
data/elementary/themes/colorclasses.edc | 11
data/elementary/themes/edc/elm/radio.edc | 76 +++---
data/elementary/themes/edc/elm/slideshow.edc | 94 +++-
data/elementary/themes/edc/elm/tooltip.edc | 14 ++---
4 files changed, 97 insertions(+), 98 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 504bae75ba..bf8cade741 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -204,16 +204,22 @@ color_classes {
///
color_class { name: "/bg/normal/button";
color: 96 96 96 255; }
+ color_class { name: "/bg/selected/button";
+ color: 128 128 128 255; }
color_class { name: "/bg/pressed/button";
color: 80 80 80 255; }
color_class { name: "/bg/disabled/button";
color: 64 64 64 255; }
color_class { name: "/fg/normal/button";
color: 192 192 192 255; }
+ color_class { name: "/fg/selected/button";
+ color: 255 255 255 255; }
color_class { name: "/fg/pressed/button";
color: 255 255 255 255; }
color_class { name: "/fg/disabled/button";
color: 97 96 96 255; }
+ color_class { name: "/fg/selected/button/bar";
+ color: 51 153 255 255; }
color_class { name: "/fg/normal/button-anchor";
color: 51 153 255 255; }
color_class { name: "/fg/pressed/button-anchor";
@@ -445,6 +451,11 @@ color_classes {
///
color_class { name: "/fg/normal/wizard/text/title";
color: 255 255 255 255; }
+///
+ color_class { name: "/fg/normal/tooltip/text";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/normal/toolip/text/hilight";
+ color: 51 153 255 255; }
///
color_class { name: "/fg/normal/gadgets/temperature/low";
color: 51 153 255 255; }
diff --git a/data/elementary/themes/edc/elm/radio.edc
b/data/elementary/themes/edc/elm/radio.edc
index 5920d162d1..482125e779 100644
--- a/data/elementary/themes/edc/elm/radio.edc
+++ b/data/elementary/themes/edc/elm/radio.edc
@@ -30,13 +30,13 @@ group { name: "elm/radio/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;
@@ -97,26 +97,26 @@ group { name: "elm/radio/base/default";
image.normal: "i-radio";
min: 15 15;
max: 15 15;
-color: 0 0 0 64;
+color_class: "/bg/normal/radio/base";
fixed: 1 1;
}
description { state: "pressed" 0.0;
inherit: "default" 0.0;
-color: 255 255 255 255;
+color_class: "/fg/pressed/radio/base";
}
description { state: "selected" 0.0;
inherit: "default" 0.0;
-color: 160 160 160 255;
+color_class: "/fg/selected/radio/base";
}
desc { "disabled"; inherit;
-color: 0 0 0 16;
+color_class: "/bg/disabled/radio/base";
}
}
text { "elm.text"; nomouse;
scale: 1;
desc { "default";
fixed: 0 1;
-color: 160 160 160 255;
+color_class: "/fg/normal/radio/text";
rel1.offset: 0 4;
rel1.relative: 1.0 0.0;
rel1.to_x: "elm.swallow.content";
@@ -138,7 +138,7 @@ group { name: "elm/radio/base/default";
}
desc { "pressed_visible"; inherit;
fixed: 0 0;
-color: 255 255 255 255;
+color_class: "/fg/prssed/radio/text";
rel1.offset: 4 4;
text.min: 1 1;
text.ellipsis: -1;
@@ -152,14 +152,14 @@ group { name: "elm/radio/base/default";
}
desc { "pressed_textonly"; inherit;
fixed: 0 0;
-color: 255 255 255 255;
+color_class: "/fg/pressed/radio/text";
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
}
desc { "disabled_visible"; inherit;
[EGIT] [core/efl] master 02/02: elm theme - more cc work
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=8e6376c035158786ae8847d372ffb3b6f061d58c
commit 8e6376c035158786ae8847d372ffb3b6f061d58c
Author: Carsten Haitzler (Rasterman)
Date: Sat Jun 26 01:05:28 2021 +0100
elm theme - more cc work
---
data/elementary/themes/edc/elm/frame.edc | 4 +--
data/elementary/themes/edc/fontpreview.edc | 2 +-
data/elementary/themes/edc/frame.edc | 44 --
3 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/data/elementary/themes/edc/elm/frame.edc
b/data/elementary/themes/edc/elm/frame.edc
index 1564f5b09b..66d3a79358 100644
--- a/data/elementary/themes/edc/elm/frame.edc
+++ b/data/elementary/themes/edc/elm/frame.edc
@@ -41,7 +41,6 @@ group { name: "elm/frame/base/default";
rel2.offset: -5 4;
align: 0.0 0.0;
color_class: "/fg/normal/frame/title";
-color: 255 255 255 255;
text { font: FNBD; size: 10;
align: 0.0 0.5;
min: 0 1;
@@ -62,8 +61,7 @@ group { name: "elm/frame/base/default";
}
part { name: "clip"; type: RECT;
description { state: "default" 0.0;
-rel1.to: "bg";
-rel2.to: "bg";
+rel.to: "bg";
}
}
part { name: "elm.swallow.content"; type: SWALLOW;
diff --git a/data/elementary/themes/edc/fontpreview.edc
b/data/elementary/themes/edc/fontpreview.edc
index 8c407535e6..74dedf8eb5 100644
--- a/data/elementary/themes/edc/fontpreview.edc
+++ b/data/elementary/themes/edc/fontpreview.edc
@@ -3,7 +3,7 @@ group { name: "e/widgets/fontpreview";
part { name: "e.fontpreview.text"; type: TEXT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
-color: FN_COL_DEFAULT;
+color_class: "/fg/normal/text/fontpreview";
rel1.offset: 4 4;
rel2.offset: -5 -5;
text { font: FN; size: 10;
diff --git a/data/elementary/themes/edc/frame.edc
b/data/elementary/themes/edc/frame.edc
index 4423ad51df..7ee29880a4 100644
--- a/data/elementary/themes/edc/frame.edc
+++ b/data/elementary/themes/edc/frame.edc
@@ -1,26 +1,27 @@
group { name: "e/widgets/frame";
- images.image: "win_shadow.png" COMP;
+ images.image: "win_shad_flat.png" COMP;
parts {
- part { name: "shadow"; mouse_events: 0;
- scale: 1;
+ part { name: "shadow"; type: RECT;
description { state: "default" 0.0;
-rel.to: "base";
-WIN_SHADOW_SMALL;
- }
- description { state: "hidden" 0.0;
-inherit;
-visible: 0;
+rel.to: "_sh1";
+color_class: "/shadow/normal/frame";
}
}
- part { name: "base"; type: RECT;
+ WIN_SHAD("base", "shadow", "win_shad_flat.png", 10, 10, 7, 14, 0.25);
+ part { name: "base"; type: SPACER;
scale: 1;
description { state: "default" 0.0;
rel1.offset: 6 6;
rel2.offset: -7 -7;
-color: 80 80 80 255;
offscale;
}
}
+ part { name: "top_bg"; type: RECT;
+ description { state: "default" 0.0;
+rel.to: "top";
+color_class: "/bg/normal/frame/title";
+ }
+ }
part { name: "top"; type: SPACER;
scale: 1;
description { state: "default" 0.0;
@@ -34,15 +35,14 @@ group { name: "e/widgets/frame";
part { name: "e.text.label"; type: TEXT;
scale: 1;
description { state: "default" 0.0;
+rel.to: "base";
rel1.offset: 4 4;
-rel1.to: "base";
rel2.relative: 1.0 0.0;
rel2.offset: -5 4;
-rel2.to: "base";
align: 0.0 0.0;
-color: 255 255 255 255;
+color_class: "/fg/normal/frame/title";
text { font: FNBD; size: 10;
- align: 0.0 0.0;
+ align: 0.0 0.5;
min: 0 1;
}
fixed: 0 1;
@@ -56,13 +56,12 @@ group { name: "e/widgets/frame";
rel1.to_y: "top";
rel1.relative: 0.0 1.0;
rel2.to: "base";
-color: 64 64 64 255;
+color_class: "/bg/normal/frame";
}
}
part { name: "clip"; type: RECT;
description { state: "default" 0.0;
-rel1.to: "bg";
-rel2.to: "bg";
+rel.to: "bg";
}
}
part { name: "e.swallow.content"; type: SWALLOW;
@@ -70,12 +69,17 @@ group { name: "e/widgets/frame";
scale: 1;
description { state: "default" 0.0;
align: 0.0 1.0;
-rel1.to: "bg";
+rel.to: "bg";
rel1.offset: 4 4;
-rel2.to: "bg";
rel2.offset: -5 -5;
offscale;
}
+ description { state: "collapsed" 0.0;
+inherit:
[EGIT] [core/efl] master 02/02: elm theme - more cc work
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6fb139f5f1e658ba5a485370acf7d82697a8063a
commit 6fb139f5f1e658ba5a485370acf7d82697a8063a
Author: Carsten Haitzler (Rasterman)
Date: Tue Jun 1 10:07:18 2021 +0100
elm theme - more cc work
---
data/elementary/themes/edc/button.edc| 44 ++--
data/elementary/themes/edc/check.edc | 1 +
data/elementary/themes/edc/elm/check.edc | 1 -
3 files changed, 14 insertions(+), 32 deletions(-)
diff --git a/data/elementary/themes/edc/button.edc
b/data/elementary/themes/edc/button.edc
index 1f938cc6c2..c0cd5b0341 100644
--- a/data/elementary/themes/edc/button.edc
+++ b/data/elementary/themes/edc/button.edc
@@ -6,35 +6,39 @@ group { name: "e/widgets/button";
description { state: "default" 0.0;
rel.to: "base";
WIN_SHADOW_SMALL;
+color_class: "/shadow/normal/button";
}
description { state: "clicked" 0.0;
inherit;
image.border_scale_by: 0.25;
-rel1.offset: -5 -3;
-rel2.offset: 4 6;
+rel1.offset: -2 -1;
+rel2.offset: 0 1;
+offscale;
+color_class: "/shadow/pressed/button";
}
}
rect { "base";
scale: 1;
desc { "default";
-color: 51 153 255 255;
+color_class: "/bg/normal/button";
rel1.offset: 2 2;
rel2.offset: -3 -3;
offscale;
}
desc { "clicked"; inherit;
-color: 255 153 51 255;
+color_class: "/bg/pressed/button";
}
desc { "disabled"; inherit;
-color: 64 64 64 255;
+color_class: "/bg/disabled/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;
@@ -83,7 +87,7 @@ group { name: "e/widgets/button";
clip_to: "label_clip";
description { state: "default" 0.0;
fixed: 0 0;
-color: 255 255 255 255;
+color_class: "/fg/normal/button";
rel1.offset: 4 4;
rel1.relative: 1.0 0.0;
rel1.to_x: "e.swallow.icon";
@@ -100,7 +104,7 @@ group { name: "e/widgets/button";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
-color: 96 96 96 255;
+color_class: "/fg/disabled/button";
}
description { state: "combo" 0.0;
inherit: "default" 0.0;
@@ -111,21 +115,7 @@ group { name: "e/widgets/button";
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
-color: 255 255 255 255;
- }
- }
- part { name: "glow"; type: RECT; mouse_events: 0;
- description { state: "default" 0.0;
-rel.to: "base";
-rel1.relative: 0.0 1.0;
-color: 255 255 255 255;
-align: 0.5 1.0;
-visible: 0;
- }
- description { state: "focused" 0.0;
-inherit: "default" 0.0;
-min: 0 5;
-visible: 1;
+color_class: "/fg/pressed/button";
}
}
part { name: "event"; type: RECT;
@@ -193,13 +183,5 @@ group { name: "e/widgets/button";
target: "icon_clip";
target: "e.text.label";
}
- program { signal: "e,state,focused"; source: "e";
- action: STATE_SET "focused" 0.0;
- target: "glow";
- }
- program { signal: "e,state,unfocused"; source: "e";
- action: STATE_SET "default" 0.0;
- target: "glow";
- }
}
}
diff --git a/data/elementary/themes/edc/check.edc
b/data/elementary/themes/edc/check.edc
index f455396e60..339ede176a 100644
--- a/data/elementary/themes/edc/check.edc
+++ b/data/elementary/themes/edc/check.edc
@@ -28,6 +28,7 @@ group { name: "e/widgets/check";
}
part { name: "indicator"; mouse_events: 0;
clip_to: "clip";
+ scale: 1;
description { state: "default" 0.0;
rel.to: "base";
image.normal: "i-check";
diff --git a/data/elementary/themes/edc/elm/check.edc
b/data/elementary/themes/edc/elm/check.edc
index b8019ffa7b..4a9217286d 100644
--- a/data/elementary/themes/edc/elm/check.edc
+++ b/data/elementary/themes/edc/elm/check.edc
@@ -1,4 +1,3 @@
-
group { name: "elm/check/base/default";
script {
BUTTONMODE_SCRIPT
--
[EGIT] [core/efl] master 02/02: elm theme - more cc work
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=96f10ecba0859478a3982627f114452ee9f8585b
commit 96f10ecba0859478a3982627f114452ee9f8585b
Author: Carsten Haitzler (Rasterman)
Date: Wed May 26 19:18:02 2021 +0100
elm theme - more cc work
---
data/elementary/themes/colorclasses.edc | 75
data/elementary/themes/edc/elm/button.edc | 145 +++---
2 files changed, 149 insertions(+), 71 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 708055a543..c264d7c331 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -119,6 +119,20 @@ color_classes {
color: 0 0 0 200; }
color_class { name: "/bg/disabled/button-overlay";
color: 0 0 0 80; }
+ color_class { name: "/fg/normal/button-anchor";
+ color: 51 153 255 255; }
+ color_class { name: "/fg/pressed/button-anchor";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/disabled/button-anchor";
+ color: 96 96 96 255; }
+ color_class { name: "/fg/normal/button-media";
+ color: 160 160 160 255; }
+ color_class { name: "/fg/pressed/button-media";
+ color: 255 255 255 255; }
+ color_class { name: "/bg/normal/button-media";
+ color: 96 96 96 0; }
+ color_class { name: "/bg/pressed/button-media";
+ color: 96 96 96 255; }
///
color_class { name: "/bg/normal/menu/item";
color: 32 32 32 0; }
@@ -170,6 +184,67 @@ color_classes {
color: 160 160 160 255; }
color_class { name: "/bg/normal/bubble";
color: 48 48 48 255; }
+///
+ color_class { name: "/bg/normal/hoversel/button";
+ color: 96 96 96 255; }
+ color_class { name: "/bg/pressed/hoversel/button";
+ color: 80 80 80 255; }
+ color_class { name: "/bg/disabled/hoversel/button";
+ color: 64 64 64 255; }
+ color_class { name: "/fg/normal/hoversel/button";
+ color: 192 192 192 255; }
+ color_class { name: "/fg/pressed/hoversel/button";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/disabled/hoversel/button";
+ color: 96 96 96 255; }
+ color_class { name: "/fg/normal/hoversel/selector";
+ color: 51 153 255 255; }
+ color_class { name: "/fg/pressed/hoversel/selector";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/disabled/hoversel/selector";
+ color: 96 96 96 255; }
+ color_class { name: "/bg/normal/hoversel/item";
+ color: 32 32 32 0; }
+ color_class { name: "/bg/disabled/hoversel/item";
+ color: 32 32 32 0; }
+ color_class { name: "/bg/selected/hoversel/item";
+ color: 32 32 32 255; }
+ color_class { name: "/fg/normal/hoversel/item";
+ color: 192 192 192 255; }
+ color_class { name: "/fg/disabled/hoversel/item";
+ color: 96 96 96 255; }
+ color_class { name: "/fg/selected/hoversel/item";
+ color: 255 255 255 255; }
+///
+ color_class { name: "/bg/normal/combobox/button";
+ color: 96 96 96 255; }
+ color_class { name: "/bg/pressed/combobox/button";
+ color: 80 80 80 255; }
+ color_class { name: "/bg/disabled/combobox/button";
+ color: 64 64 64 255; }
+ color_class { name: "/fg/normal/combobox/button";
+ color: 192 192 192 255; }
+ color_class { name: "/fg/pressed/combobox/button";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/disabled/combobox/button";
+ color: 96 96 96 255; }
+ color_class { name: "/fg/normal/combobox/selector";
+ color: 51 153 255 255; }
+ color_class { name: "/fg/pressed/combobox/selector";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/disabled/combobox/selector";
+ color: 96 96 96 255; }
+///
+ color_class { name: "/fg/normal/spinner/arrow";
+ color: 160 160 160 255; }
+ color_class { name: "/fg/pressed/spinner/arrow";
+ color: 255 255 255 255; }
+ color_class { name: "/fg/disabled/spinner/arrow";
+ color: 96 96 96 255; }
+ color_class { name: "/fg/normal/spinner/text";
+ color: 160 160 160 255; }
+ color_class { name: "/fg/disabled/spinner/text";
+ color: 96 96 96 255; }
///
color_class { name: "/bg/normal/shelf/translucent";
color: 64 64 64 128; }
diff --git a/data/elementary/themes/edc/elm/button.edc
b/data/elementary/themes/edc/elm/button.edc
index c19ecbce35..183998964b 100644
--- a/data/elementary/themes/edc/elm/button.edc
+++ b/data/elementary/themes/edc/elm/button.edc
@@ -58,13 +58,13 @@ group {
