raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=64e02a04135caeff5607232db2ffed2bbc7cc9a8
commit 64e02a04135caeff5607232db2ffed2bbc7cc9a8
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Thu May 6 13:09:58 2021 +0100
elm theme - do more colorclasses
---
data/elementary/themes/colorclasses.edc | 39 +++++++++++++-
data/elementary/themes/edc/efl/bg.edc | 2 +-
data/elementary/themes/edc/elm/border.edc | 47 ++++++++--------
data/elementary/themes/edc/elm/button.edc | 86 ++++++++++++++++++++----------
data/elementary/themes/edc/elm/frame.edc | 11 ++--
data/elementary/themes/edc/elm/genlist.edc | 60 +++++++++++----------
data/elementary/themes/macros.edc | 12 -----
7 files changed, 158 insertions(+), 99 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 537b26f5ed..7a0d33ccca 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -17,13 +17,21 @@ color_classes {
///////////////////////////////////////////////////////////////////////////////
color_class { name: "/fg";
color: 160 160 160 255; description: "Base foreground"; }
+ color_class { name: "/fg/disabled";
+ color: 80 80 80 255; description: "Base foreground - disabled"; }
+ color_class { name: "/fg/pressed";
+ color: 255 255 255 255; description: "Base foreground - pressed"; }
color_class { name: "/fg/selected";
color: 255 255 255 255; description: "Base foreground - selected"; }
+ color_class { name: "/fg/selected-pressed";
+ color: 220 220 220 255; description: "Base foreground - selected
pressed"; }
///////////////////////////////////////////////////////////////////////////////
color_class { name: "/shadow";
color: 0 0 0 128; description: "Base shadow"; }
color_class { name: "/shadow/pressed";
color: 0 0 0 255; description: "Base shadow - pressed"; }
+ color_class { name: "/shadow/disabled";
+ color: 0 0 0 64; description: "Base shadow - disabled"; }
///////////////////////////////////////////////////////////////////////////////
color_class { name: "/dim";
color: 0 0 0 200; description: "Base dimming area"; }
@@ -35,6 +43,14 @@ color_classes {
color: 64 64 64 255; description: "Titlebar background"; }
color_class { name: "/bg/selected/titlebar";
color: 32 32 32 255; description: "Titlebar background - selected"; }
+ color_class { name: "/bg/normal/border";
+ color: 64 64 64 255; description: "Border background"; }
+ color_class { name: "/bg/selected/border";
+ color: 64 64 64 255; description: "Border background - selected"; }
+ color_class { name: "/bg/normal/win-blocker";
+ color: 64 64 64 255; description: "Window blocker"; }
+ color_class { name: "/bg/selected/win-blocker";
+ color: 64 64 64 255; description: "Window blocker - selected"; }
///////////////////////////////////////////////////////////////////////////////
color_class { name: "/bg/normal/entry";
color: 48 48 48 255; description: "Entry background"; }
@@ -58,10 +74,20 @@ color_classes {
color: 96 96 96 255; description: "Button background"; }
color_class { name: "/bg/pressed/button";
color: 80 80 80 255; description: "Button background - pressed"; }
+ color_class { name: "/bg/disabled/button";
+ color: 64 64 64 255; description: "Button background - disabled"; }
color_class { name: "/fg/normal/button";
color: 192 192 192 255; description: "Button foreground"; }
color_class { name: "/fg/pressed/button";
color: 255 255 255 255; description: "Button foreground - pressed"; }
+ color_class { name: "/fg/disabled/button";
+ color: 97 96 96 255; description: "Button foreground - disabled"; }
+ color_class { name: "/bg/normal/button-overlay";
+ color: 0 0 0 160; description: "Button (overlay) background"; }
+ color_class { name: "/bg/pressed/button-overlay";
+ color: 0 0 0 200; description: "Button (overlay) background -
pressed"; }
+ color_class { name: "/bg/disabled/button-overlay";
+ color: 0 0 0 80; description: "Button (overlay) background -
disabled"; }
///////////////////////////////////////////////////////////////////////////////
color_class { name: "/bg/normal/menu/item";
color: 32 32 32 0; description: "Menu item background"; }
@@ -70,8 +96,17 @@ color_classes {
color_class { name: "/fg/normal/menu/item";
color: 160 160 160 255; description: "Menu item foreground"; }
color_class { name: "/fg/selected/menu/item";
- color: 255 255 255 255; description: "Menu item foreground"; }
-
+ color: 255 255 255 255; description: "Menu item foreground - selected"; }
+///////////////////////////////////////////////////////////////////////////////
+ color_class { name: "/bg-alt/normal/list/group";
+ color: 32 32 32 255; description: "List group background"; }
+ color_class { name: "/fg-alt/normal/list/group";
+ color: 255 255 255 255; description: "List group foreground"; }
+///////////////////////////////////////////////////////////////////////////////
+ color_class { name: "/bg/normal/frame/title";
+ color: 80 80 80 255; description: "Frame title background"; }
+ color_class { name: "/fg/normal/frame/title";
+ color: 255 255 255 255; description: "Frame title foreground"; }
diff --git a/data/elementary/themes/edc/efl/bg.edc
b/data/elementary/themes/edc/efl/bg.edc
index 50be1caa46..01c57a753f 100644
--- a/data/elementary/themes/edc/efl/bg.edc
+++ b/data/elementary/themes/edc/efl/bg.edc
@@ -20,7 +20,7 @@ group { "efl/bg";
}
part { name: "base"; type: RECT;
description { state: "default" 0.0;
- color: 64 64 64 255;
+ color_class: "/bg/normal/background";
}
}
part { name: "efl.rectangle"; type: SWALLOW; required;
diff --git a/data/elementary/themes/edc/elm/border.edc
b/data/elementary/themes/edc/elm/border.edc
index 5e5a6354fc..0850a33516 100644
--- a/data/elementary/themes/edc/elm/border.edc
+++ b/data/elementary/themes/edc/elm/border.edc
@@ -105,7 +105,7 @@ group { name: "elm/border/base/default";
required; // @since 1.19
clip: "bg_clip";
desc { "default";
- color: 64 64 64 255;
+ color_class: "/bg/normal/background";
visible: 0;
rel.to: "elm.spacer.content";
}
@@ -137,7 +137,7 @@ group { name: "elm/border/base/default";
/* main menu */
rect { "menu_bg";
desc { "default";
- color: 64 64 64 255;
+ color_class: "/bg/normal/menu";
align: 0.5 0.0;
rel.to: "elm.swallow.menu";
fixed: 1 1;
@@ -196,12 +196,11 @@ group { name: "elm/border/base/default";
rel1.relative: 0.0 1.0;
rel2.to: "bottom_clip";
rel2.relative: 1.0 0.0;
- color: 0 0 0 0;
+ color_class: "/bg/normal/win-blocker";
hid;
}
desc { "visible";
inherit: "default";
- color: 32 32 32 255;
vis;
}
}
@@ -237,11 +236,11 @@ group { name: "elm/border/base/default";
clip: "top_clip";
description { state: "default" 0.0;
rel.to: "top_clip";
- color: 64 64 64 255;
+ color_class: "/bg/normal/titlebar";
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
- color: 32 32 32 255;
+ color_class: "/bg/selected/titlebar";
}
}
part { name: "elm.text.title"; type: TEXT; mouse_events: 0;
@@ -257,7 +256,7 @@ group { name: "elm/border/base/default";
rel2.to_x: "elm.event.minimize";
rel2.to_y: "shadow_base";
align: 0.5 0.0;
- color: 160 160 160 255;
+ color_class: "/fg/noemal/titlebar";
min: 0 16;
text { font: FNBD; size: 10;
text_class: "title_bar";
@@ -269,7 +268,7 @@ group { name: "elm/border/base/default";
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color_class: "/fg/selected/titlebar";
}
}
spacer { "icon";
@@ -324,11 +323,11 @@ group { name: "elm/border/base/default";
rel.to: "elm.event.close";
min: 15 15; max: 15 15;
fixed: 1 1;
- color: 160 160 160 255;
+ color_class: "/fg/noemal/titlebar/close";
}
desc { "selected";
inherit: "default";
- color: 255 255 255 255;
+ color_class: "/fg/pressed/titlebar/close";
}
}
image { "max1"; nomouse;
@@ -339,11 +338,11 @@ group { name: "elm/border/base/default";
rel.to: "elm.event.maximize";
min: 15 15; max: 15 15;
fixed: 1 1;
- color: 160 160 160 255;
+ color_class: "/fg/noemal/titlebar/maximize";
}
desc { "selected";
inherit: "default";
- color: 255 255 255 255;
+ color_class: "/fg/pressed/titlebar/maximize";
}
}
image { "min1"; nomouse;
@@ -354,11 +353,11 @@ group { name: "elm/border/base/default";
rel.to: "elm.event.minimize";
min: 15 15; max: 15 15;
fixed: 1 1;
- color: 160 160 160 255;
+ color_class: "/fg/normal/titlebar/minimize";
}
desc { "selected";
inherit: "default";
- color: 255 255 255 255;
+ color_class: "/fg/pressed/titlebar/minimize";
}
}
image { "close2"; nomouse;
@@ -369,11 +368,11 @@ group { name: "elm/border/base/default";
rel.to: "elm.event.close";
min: 15 15; max: 15 15;
fixed: 1 1;
- color: 255 255 255 255;
+ color_class: "/fg/selected/titlebar/close";
}
desc { "selected";
inherit: "default";
- color: 220 220 220 255;
+ color_class: "/fg/selected-pressed/titlebar/close";
}
}
image { "max2"; nomouse;
@@ -384,11 +383,11 @@ group { name: "elm/border/base/default";
rel.to: "elm.event.maximize";
min: 15 15; max: 15 15;
fixed: 1 1;
- color: 255 255 255 255;
+ color_class: "/fg/selected/titlebar/maximize";
}
desc { "selected";
inherit: "default";
- color: 220 220 220 255;
+ color_class: "/fg/selected-pressed/titlebar/maximize";
}
}
image { "min2"; nomouse;
@@ -399,11 +398,11 @@ group { name: "elm/border/base/default";
rel.to: "elm.event.minimize";
min: 15 15; max: 15 15;
fixed: 1 1;
- color: 255 255 255 255;
+ color_class: "/fg/selected/titlebar/minimize";
}
desc { "selected";
inherit: "default";
- color: 220 220 220 255;
+ color_class: "/fg/selected-pressed/titlebar/minimize";
}
}
rect { "elm.event.icon";
@@ -551,9 +550,13 @@ group { name: "elm/border/base/default";
part { name: "bottom"; type: RECT; mouse_events: 0;
clip: "bottom_clip";
description { state: "default" 0.0;
- color: 64 64 64 255;
+ color_class: "/bg/normal/border";
rel.to: "bottom_clip";
}
+ description { state: "focused" 0.0;
+ inherit: "default";
+ color_class: "/bg/selected/border";
+ }
}
rect { "elm.event.resize.bl";
@@ -708,6 +711,7 @@ group { name: "elm/border/base/default";
program { signal: "elm,action,focus"; source: "elm";
action: STATE_SET "focused";
target: "top";
+ target: "bottom";
target: "elm.text.title";
target: "clip1";
target: "clip2";
@@ -715,6 +719,7 @@ group { name: "elm/border/base/default";
program { signal: "elm,action,unfocus"; source: "elm";
action: STATE_SET "default";
target: "top";
+ target: "bottom";
target: "elm.text.title";
target: "clip1";
target: "clip2";
diff --git a/data/elementary/themes/edc/elm/button.edc
b/data/elementary/themes/edc/elm/button.edc
index 3070b911a9..c19ecbce35 100644
--- a/data/elementary/themes/edc/elm/button.edc
+++ b/data/elementary/themes/edc/elm/button.edc
@@ -11,34 +11,37 @@ group { name: "elm/button/base/default";
description { state: "default" 0.0;
rel.to: "base";
WIN_SHADOW_SMALL;
+ color_class: "/shadow/normal/button";
}
description { state: "pressed" 0.0; inherit;
image.border_scale_by: 0.1;
rel1.offset: -2 -1;
rel2.offset: 0 1;
+ color_class: "/shadow/pressed/button";
}
description { state: "disabled" 0.0; inherit;
image.border_scale_by: 0.1;
rel1.offset: -2 -1;
rel2.offset: 0 1;
+ color_class: "/shadow/disabled/button";
}
}
rect { "base";
scale: 1;
desc { "default";
- color: 96 96 96 255;
+ color_class: "/bg/normal/button";
rel1.offset: 2 2;
rel2.offset: -3 -3;
offscale;
}
desc { "pressed"; inherit;
- color: 128 128 128 255;
+ color_class: "/bg/pressed/button";
rel1.offset: 3 3;
rel2.offset: -4 -4;
offscale;
}
desc { "disabled"; inherit;
- color: 72 72 72 255;
+ color_class: "/bg/disabled/button";
}
desc { "hidden"; inherit;
visible: 0;
@@ -94,7 +97,7 @@ group { name: "elm/button/base/default";
text { "elm.text"; nomouse;
scale: 1;
desc { "default";
- color: 192 192 192 255;
+ color_class: "/fg/normal/button";
rel1.offset: 0 6;
rel1.relative: 1.0 0.0;
rel1.to_x: "elm.swallow.content";
@@ -116,7 +119,7 @@ group { name: "elm/button/base/default";
}
desc { "pressed_visible"; inherit;
fixed: 0 0;
- color: 255 255 255 255;
+ color_class: "/fg/pressed/button";
rel1.offset: 6 6;
text.min: 1 1;
text.ellipsis: -1;
@@ -130,14 +133,14 @@ group { name: "elm/button/base/default";
}
desc { "pressed_textonly"; inherit;
fixed: 0 0;
- color: 255 255 255 255;
+ color_class: "/fg/pressed/button";
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
}
desc { "disabled_visible"; inherit;
fixed: 0 0;
- color: 96 96 96 255;
+ color_class: "/fg/disabled/button";
rel1.offset: 6 6;
text.min: 1 1;
text.ellipsis: -1;
@@ -145,7 +148,7 @@ group { name: "elm/button/base/default";
}
desc { "disabled_textonly"; inherit;
fixed: 0 0;
- color: 96 96 96 255;
+ color_class: "/fg/disabled/button";
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
@@ -608,15 +611,15 @@ group { name: "elm/button/base/overlay";
}
part { name: "base";
description { state: "default" 0.0;
- color: 0 0 0 160;
+ color_class: "/bg/normal/button-overlay";
visible: 1;
}
description { state: "pressed" 0.0;
- color: 0 0 0 200;
+ color_class: "/bg/pressed/button-overlay";
visible: 1;
}
description { state: "disabled" 0.0;
- color: 0 0 0 0;
+ color_class: "/bg/disabled/button-overlay";
visible: 0;
}
}
@@ -861,7 +864,7 @@ group { name:
"elm/button/base/hoversel_vertical_entry/default";
text { font: FN; size: 10;
align: 0.0 0.5;
min: 1 1;
- text_class: "button";
+ text_class: "butt";
}
min: 0 ICMIN;
}
@@ -1431,23 +1434,32 @@ group { name:
"elm/button/base/combobox_vertical/default";
description { state: "default" 0.0;
rel.to: "base";
WIN_SHADOW_SMALL;
+ color_class: "/shadow/normal/button";
+ }
+ desc { "pressed";
+ inherit;
+ color_class: "/shadow/pressed/button";
+ }
+ desc { "disabled";
+ inherit;
+ color_class: "/shadow/disabled/button";
}
}
rect { "base";
scale: 1;
desc { "default";
- color: 96 96 96 255;
+ color_class: "/bg/normal/button";
rel1.offset: 2 2;
rel2.offset: -3 -3;
offscale;
}
desc { "pressed";
inherit;
- color: 128 128 128 255;
+ color_class: "/bg/pressed/button";
}
desc { "disabled";
inherit;
- color: 72 72 72 255;
+ color_class: "/bg/disabled/button";
}
}
rect { name: "event";
@@ -1489,11 +1501,15 @@ group { name:
"elm/button/base/combobox_vertical/default";
rel.to: "event2";
rel2.relative: 1.0 0.5;
fixed: 1 1;
- color: 160 160 160 255;
+ color_class: "/fg/normal/button";
}
desc { "pressed";
inherit;
- color: 255 255 255 255;
+ color_class: "/fg/pressed/button";
+ }
+ desc { "disabled";
+ inherit;
+ color_class: "/fg/disabled/button";
}
}
image { name: "expand2";
@@ -1506,11 +1522,15 @@ group { name:
"elm/button/base/combobox_vertical/default";
rel.to: "event2";
rel1.relative: 0.0 0.5;
fixed: 1 1;
- color: 160 160 160 255;
+ color_class: "/fg/normal/button";
}
desc { "pressed";
inherit;
- color: 255 255 255 255;
+ color_class: "/fg/pressed/button";
+ }
+ desc { "disabled";
+ inherit;
+ color_class: "/fg/disabled/button";
}
}
rect { name: "event2";
@@ -1557,6 +1577,9 @@ group { name: "elm/button/base/combobox_vertical/default";
program { name: "button_click_anim";
action: STATE_SET "pressed" 0.0;
target: "base";
+ target: "shadow";
+ target: "expand1";
+ target: "expand2";
target: "select_line";
}
program { name: "button_unclick";
@@ -1567,11 +1590,17 @@ group { name:
"elm/button/base/combobox_vertical/default";
program { name: "button_unclick_anim";
action: STATE_SET "default" 0.0;
target: "base";
+ target: "shadow";
+ target: "expand1";
+ target: "expand2";
target: "select_line";
}
program { signal: "elm,anim,activate"; source: "elm";
action: STATE_SET "pressed" 0.0;
target: "base";
+ target: "shadow";
+ target: "expand1";
+ target: "expand2";
target: "select_line";
after: "button_unpressed_anim";
}
@@ -1579,26 +1608,22 @@ group { name:
"elm/button/base/combobox_vertical/default";
action: STATE_SET "default" 0.0;
in: 0.5 0.0;
target: "base";
+ target: "shadow";
+ target: "expand1";
+ target: "expand2";
target: "select_line";
}
program { signal: "mouse,clicked,1"; source: "event*";
action: SIGNAL_EMIT "elm,action,click" "elm";
}
- program { signal: "mouse,down,1"; source: "event2";
- action: STATE_SET "pressed" 0.0;
- target: "expand1";
- target: "expand2";
- }
- program { signal: "mouse,up,1"; source: "event2";
- action: STATE_SET "default" 0.0;
- target: "expand1";
- target: "expand2";
- }
program { signal: "elm,state,disabled"; source: "elm";
action: STATE_SET "disabled" 0.0;
target: "base";
target: "event";
target: "event2";
+ target: "shadow";
+ target: "expand1";
+ target: "expand2";
target: "select_line";
target: "icon_clip";
}
@@ -1607,6 +1632,9 @@ group { name: "elm/button/base/combobox_vertical/default";
target: "base";
target: "event";
target: "event2";
+ target: "shadow";
+ target: "expand1";
+ target: "expand2";
target: "select_line";
target: "icon_clip";
}
diff --git a/data/elementary/themes/edc/elm/frame.edc
b/data/elementary/themes/edc/elm/frame.edc
index 12f0ca5ccf..26c91fbc99 100644
--- a/data/elementary/themes/edc/elm/frame.edc
+++ b/data/elementary/themes/edc/elm/frame.edc
@@ -4,6 +4,7 @@ group { name: "elm/frame/base/default";
part { name: "shadow"; type: RECT;
description { state: "default" 0.0;
rel.to: "_sh1";
+ color_class: "/shadow/normal/frame";
}
description { state: "hidden" 0.0;
inherit;
@@ -22,7 +23,7 @@ group { name: "elm/frame/base/default";
part { name: "top_bg"; type: RECT;
description { state: "default" 0.0;
rel.to: "top";
- color: 80 80 80 255;
+ color_class: "/bg/normal/frame/title";
}
}
part { name: "top"; type: SPACER;
@@ -43,6 +44,7 @@ group { name: "elm/frame/base/default";
rel2.relative: 1.0 0.0;
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;
@@ -59,7 +61,7 @@ group { name: "elm/frame/base/default";
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;
@@ -388,6 +390,7 @@ group { name: "elm/frame/base/outline";
part { name: "shadow"; type: RECT;
description { state: "default" 0.0;
rel.to: "_sh1";
+ color_class: "/shadow/normal/frame";
}
description { state: "hidden" 0.0;
inherit;
@@ -400,7 +403,7 @@ group { name: "elm/frame/base/outline";
description { state: "default" 0.0;
rel1.offset: 6 6;
rel2.offset: -7 -7;
- color: 64 64 64 255;
+ color_class: "/bg/normal/frame";
offscale;
}
}
@@ -408,8 +411,6 @@ group { name: "elm/frame/base/outline";
scale: 1;
description { state: "default" 0.0;
rel.to: "base";
- rel1.offset: 4 4;
- rel2.offset: -5 -5;
offscale;
}
}
diff --git a/data/elementary/themes/edc/elm/genlist.edc
b/data/elementary/themes/edc/elm/genlist.edc
index 387542521b..10838164fd 100644
--- a/data/elementary/themes/edc/elm/genlist.edc
+++ b/data/elementary/themes/edc/elm/genlist.edc
@@ -11,7 +11,7 @@
parts { \
rect { "base"; \
desc { "default"; \
- color: 56 56 56 255; \
+ color_class: "/bg-alt/normal/list/item"; \
} \
} \
} \
@@ -56,7 +56,7 @@
} \
rect { "base"; \
desc { "default"; \
- color: 56 56 56 255; \
+ color_class: "/bg-alt/normal/list/item"; \
} \
} \
} \
@@ -72,6 +72,7 @@ group { "elm/genlist/item/group_index/default"; nomouse;
program_source: "elm";
parts {
rect { "base";
desc { "default";
+ color_class: "/bg-alt/normal/list/group";
color: 32 32 32 255;
}
}
@@ -87,7 +88,7 @@ group { "elm/genlist/item/group_index/default"; nomouse;
program_source: "elm";
rel2.relative: 0.0 1.0;
rel2.to_x: "elm.swallow.end";
align: 0.0 0.5;
- color: 255 255 255 255;
+ color_class: "/fg-alt/normal/list/group";
text { font: FNBD; size: 10;
min: 1 1;
ellipsis: -1;
@@ -179,17 +180,17 @@ group { "genlist_base"; inherit_only: 1; nomouse;
program_source: "elm";
}
rect { "base";
desc { "default";
- color: 64 64 64 255;
+ color_class: "/bg/normal/list/group";
link.base: "elm,state,even";
}
desc { "odd";
- color: 56 56 56 255;
+ color_class: "/bg-alt/normal/list/item";
link.base: "elm,state,odd";
}
}
image { "sel_base"; type: RECT; mouse_events: 0;
desc { "default";
- color: 51 153 255 255;
+ color_class: "/bg/selected/list/item";
hid;
link.base: "elm,state,unselected";
}
@@ -262,7 +263,7 @@ group { "elm/genlist/item/default/default"; nomouse;
rel2.offset: -5 -5;
rel2.relative: 0.0 1.0;
rel2.to_x: "elm.swallow.end";
- color: 160 160 160 255;
+ color_class: "/fg/normal/list/item";
text { font: FN; size: 10;
min: 1 1;
ellipsis: -1;
@@ -273,10 +274,11 @@ group { "elm/genlist/item/default/default"; nomouse;
}
desc { "selected";
inherit: "default";
- color: 255 255 255 255;
+ color_class: "/fg/selected/list/item";
}
desc { "disabled";
inherit: "default";
+ color_class: "/fg/disabled/list/item";
color: 80 80 80 255;
}
desc { "flip_enabled";
@@ -620,7 +622,7 @@ group { "elm/genlist/item/one_icon/default"; nomouse;
rel1.relative: 1.0 0.0;
rel1.to_x: "elm.swallow.icon";
rel2.offset: -5 -5;
- color: 160 160 160 255;
+ color_class: "/fg/normal/list/item";
text { font: FN; size: 10;
min: 0 1;
align: 0.0 0.5;
@@ -630,11 +632,11 @@ group { "elm/genlist/item/one_icon/default"; nomouse;
}
desc { "selected";
inherit: "default";
- color: 255 255 255 255;
+ color_class: "/fg/selected/list/item";
}
desc { "disabled";
inherit: "default";
- color: 80 80 80 255;
+ color_class: "/fg/disabled/list/item";
}
desc { "flip_enabled";
inherit: "default";
@@ -753,7 +755,7 @@ group { "elm/genlist/item/end_icon/default"; nomouse;
rel2.offset: -5 -5;
rel2.relative: 0.0 1.0;
rel2.to_x: "elm.swallow.icon";
- color: 160 160 160 255;
+ color_class: "/fg/normal/list/item";
text { font: FN; size: 10;
min: 1 1;
ellipsis: -1;
@@ -764,11 +766,11 @@ group { "elm/genlist/item/end_icon/default"; nomouse;
}
desc { "selected";
inherit: "default";
- color: 255 255 255 255;
+ color_class: "/fg/selected/list/item";
}
desc { "disabled";
inherit: "default";
- color: 80 80 80 255;
+ color_class: "/fg/disabled/list/item";
}
desc { "flip_enabled";
inherit: "default";
@@ -881,7 +883,7 @@ group { "elm/genlist/item/no_icon/default"; nomouse;
rel1.relative: 1.0 0.0;
rel1.to_x: "elm.swallow.pad";
rel2.offset: -5 -5;
- color: 160 160 160 255;
+ color_class: "/fg/normal/list/item";
text { font: FN; size: 10;
min: 1 1;
ellipsis: -1;
@@ -892,11 +894,11 @@ group { "elm/genlist/item/no_icon/default"; nomouse;
}
desc { "selected";
inherit: "default";
- color: 255 255 255 255;
+ color_class: "/fg/selected/list/item";
}
desc { "disabled";
inherit: "default";
- color: 80 80 80 255;
+ color_class: "/fg/disabled/list/item";
}
desc { "flip_enabled";
inherit: "default";
@@ -1051,36 +1053,36 @@ group { "genlist_arrow"; inherit_only: 1;
program_source: "elm";
rel1.to: "arrow";
rel2.to: "arrow";
image.normal: "big_arrow_right.png";
- color: 160 160 160 255;
+ color_class: "/fg/normal/list/item";
}
desc { "selected";
inherit: "default";
- color: 255 255 255 255;
+ color_class: "/fg/selected/list/item";
}
desc { "disabled";
inherit: "default";
- color: 80 80 80 255;
+ color_class: "/fg/disabled/list/item";
}
desc { "default" 1.0;
inherit: "default";
min: 17 14;
max: 17 14;
image.normal: "big_arrow_down.png";
- color: 160 160 160 255;
+ color_class: "/fg/normal/list/item";
}
desc { "selected" 1.0;
inherit: "default";
min: 17 14;
max: 17 14;
image.normal: "big_arrow_down.png";
- color: 255 255 255 255;
+ color_class: "/fg/selected/list/item";
}
desc { "disabled" 1.0;
inherit: "default";
min: 17 14;
max: 17 14;
image.normal: "big_arrow_down.png";
- color: 80 80 80 255;
+ color_class: "/fg/disabled/list/item";
}
}
image { "arrow_img_r";
@@ -1094,36 +1096,36 @@ group { "genlist_arrow"; inherit_only: 1;
program_source: "elm";
rel1.to: "arrow";
rel2.to: "arrow";
image.normal: "big_arrow_left.png";
- color: 160 160 160 255;
+ color_class: "/fg/normal/list/item";
}
desc { "selected";
inherit: "default";
- color: 255 255 255 255;
+ color_class: "/fg/selected/list/item";
}
desc { "disabled";
inherit: "default";
- color: 80 80 80 255;
+ color_class: "/fg/disabled/list/item";
}
desc { "default" 1.0;
inherit: "default";
min: 17 14;
max: 17 14;
image.normal: "big_arrow_down.png";
- color: 160 160 160 255;
+ color_class: "/fg/normal/list/item";
}
desc { "selected" 1.0;
inherit: "default";
min: 17 14;
max: 17 14;
image.normal: "big_arrow_down.png";
- color: 255 255 255 255;
+ color_class: "/fg/selected/list/item";
}
desc { "disabled" 1.0;
inherit: "default";
min: 17 14;
max: 17 14;
image.normal: "big_arrow_down.png";
- color: 80 80 80 255;
+ color_class: "/fg/disabled/list/item";
}
}
rect { "arrow"; mouse;
diff --git a/data/elementary/themes/macros.edc
b/data/elementary/themes/macros.edc
index 158ffa5822..d1d3f1311d 100644
--- a/data/elementary/themes/macros.edc
+++ b/data/elementary/themes/macros.edc
@@ -99,18 +99,6 @@
SHAD(_to, "_shcl4", _img, _l, _r, _t, _b, _scale) \
}
-// XXX: below - remove these in favor of WIN_SHAD() above in the edc
-#define WIN_SHADOW_SMALL \
- image.normal: "win_shadow.png"; \
- image.border: 32 32 32 32; \
- image.border_scale: 1; \
- image.border_scale_by: 0.5; \
- image.middle: 0; \
- rel1.offset: -10 -7; \
- rel2.offset: 9 10; \
- fill.smooth: 0; \
- offscale
-
#define WIN_SHADOW \
image.normal: "win_shadow.png"; \
image.border: 32 32 32 32; \
--
