raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=76e61a701c43bce29ee44d5bbf207dfb009182a7
commit 76e61a701c43bce29ee44d5bbf207dfb009182a7
Author: Carsten Haitzler <ras...@rasterman.com>
Date: Sun Aug 8 17:18:18 2021 +0100
elm theme - more cc
---
data/elementary/themes/edc/elm/layout.edc | 71 +++++++++++++------------------
data/elementary/themes/edc/elm/map.edc | 11 ++---
2 files changed, 35 insertions(+), 47 deletions(-)
diff --git a/data/elementary/themes/edc/elm/layout.edc
b/data/elementary/themes/edc/elm/layout.edc
index a2e0fec9eb..def5df4256 100644
--- a/data/elementary/themes/edc/elm/layout.edc
+++ b/data/elementary/themes/edc/elm/layout.edc
@@ -6,7 +6,6 @@ group { name: "elm/layout/application/content-back";
rel1 {
to_y: "title_clipper";
relative: 0.0 1.0;
- offset: -1 1;
}
}
}
@@ -34,43 +33,40 @@ group { name: "elm/layout/application/content-back";
part { name: "back"; type: EXTERNAL;
source: "elm/button";
clip_to: "back_clipper";
+ scale;
description { state: "default" 0.0;
align: 0.0 0.0;
fixed: 1 1;
rel1 {
relative: 0.0 0.0;
- offset: 0 1;
+ offset: 0 0;
}
rel2 {
relative: 0.0 0.0;
offset: 50 32;
}
params.string: "label" "Back";
+ offscale;
}
}
programs {
- program {
- signal: "clicked"; source: "back";
+ program { signal: "clicked"; source: "back";
action: SIGNAL_EMIT "elm,action,back" "elm";
}
- program {
- signal: "elm,back,hide"; source: "elm";
+ program { signal: "elm,back,hide"; source: "elm";
action: STATE_SET "hidden" 0.0;
target: "back_clipper";
}
- program {
- signal: "elm,back,show"; source: "elm";
+ program { signal: "elm,back,show"; source: "elm";
action: STATE_SET "default" 0.0;
target: "back_clipper";
}
- program {
- signal: "elm,title,hide"; source: "elm";
+ program { signal: "elm,title,hide"; source: "elm";
action: STATE_SET "hidden" 0.0;
transition: LINEAR 0.1;
target: "title_clipper";
}
- program {
- signal: "elm,title,show"; source: "elm";
+ program { signal: "elm,title,show"; source: "elm";
action: STATE_SET "default" 0.0;
target: "title_clipper";
}
@@ -90,10 +86,10 @@ group { name: "elm/layout/application/content-back";
}
}
part { name: "elm.text.title"; type: TEXT;
- effect: SHADOW BOTTOM;
scale: 1;
clip_to: "title_clipper";
description { state: "default" 0.0;
+ offscale;
rel1 {
to_x: "back";
relative: 1.0 0.0;
@@ -105,7 +101,7 @@ group { name: "elm/layout/application/content-back";
relative: 0.0 1.0;
offset: -3 -1;
}
- color: FN_COL_DEFAULT;
+ color_class: "/fg/normal/layout/content-back/title";
text { font: FNBD; size: 10;
}
}
@@ -140,6 +136,7 @@ group { name: "elm/layout/application/content-back-next";
part { name: "back"; type: EXTERNAL;
source: "elm/button";
clip_to: "back_clipper";
+ scale;
description { state: "default" 0.0;
align: 0.0 0.0;
fixed: 1 1;
@@ -152,6 +149,7 @@ group { name: "elm/layout/application/content-back-next";
offset: 50 32;
}
params.string: "label" "Back";
+ offscale;
}
}
part { name: "back_clipper"; type: RECT;
@@ -166,6 +164,7 @@ group { name: "elm/layout/application/content-back-next";
part { name: "next"; type: EXTERNAL;
source: "elm/button";
clip_to: "next_clipper";
+ scale;
description { state: "default" 0.0;
align: 1.0 0.0;
fixed: 1 1;
@@ -178,6 +177,7 @@ group { name: "elm/layout/application/content-back-next";
offset: -1 32;
}
params.string: "label" "Next";
+ offscale;
}
}
part { name: "next_clipper"; type: RECT;
@@ -190,48 +190,39 @@ group { name: "elm/layout/application/content-back-next";
}
}
programs {
- program {
- signal: "clicked"; source: "back";
+ program { signal: "clicked"; source: "back";
action: SIGNAL_EMIT "elm,action,back" "elm";
}
- program {
- signal: "elm,title,hide"; source: "elm";
+ program { signal: "elm,title,hide"; source: "elm";
action: STATE_SET "hidden" 0.0;
transition: LINEAR 0.1;
target: "title_clipper";
}
- program {
- signal: "elm,title,show"; source: "elm";
+ program { signal: "elm,title,show"; source: "elm";
action: STATE_SET "default" 0.0;
target: "title_clipper";
}
- program {
- signal: "elm,back,hide"; source: "elm";
+ program { signal: "elm,back,hide"; source: "elm";
action: STATE_SET "hidden" 0.0;
target: "back_clipper";
}
- program {
- signal: "elm,back,show"; source: "elm";
+ program { signal: "elm,back,show"; source: "elm";
action: STATE_SET "default" 0.0;
target: "back_clipper";
}
- program {
- signal: "clicked"; source: "next";
+ program { signal: "clicked"; source: "next";
action: SIGNAL_EMIT "elm,action,next" "elm";
}
- program {
- signal: "elm,next,hide"; source: "elm";
+ program { signal: "elm,next,hide"; source: "elm";
action: STATE_SET "hidden" 0.0;
target: "next_clipper";
}
- program {
- signal: "elm,next,show"; source: "elm";
+ program { signal: "elm,next,show"; source: "elm";
action: STATE_SET "default" 0.0;
target: "next_clipper";
}
}
part { name: "elm.text.title"; type: TEXT;
- effect: SHADOW BOTTOM;
scale: 1;
clip_to: "title_clipper";
description { state: "default" 0.0;
@@ -246,7 +237,7 @@ group { name: "elm/layout/application/content-back-next";
relative: 0.0 1.0;
offset: -3 -1;
}
- color: FN_COL_DEFAULT;
+ color_class: "/fg/normal/layout/content-back/title";
text { font: FNBD; size: 10;
}
}
@@ -482,6 +473,7 @@ group { name: "elm/layout/application/titlebar";
relative: 1.0 0.0;
offset: -3 2;
}
+ offscale;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
@@ -489,29 +481,24 @@ group { name: "elm/layout/application/titlebar";
}
}
programs {
- program {
- signal: "elm,state,icon,visible"; source: "elm";
+ program { signal: "elm,state,icon,visible"; source: "elm";
action: STATE_SET "visible" 0.0;
target: "elm.swallow.icon";
}
- program {
- signal: "elm,state,icon,hidden"; source: "elm";
+ program { signal: "elm,state,icon,hidden"; source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.swallow.icon";
}
- program {
- signal: "elm,state,end,visible"; source: "elm";
+ program { signal: "elm,state,end,visible"; source: "elm";
action: STATE_SET "visible" 0.0;
target: "elm.swallow.end";
}
- program {
- signal: "elm,state,end,hidden"; source: "elm";
+ program { signal: "elm,state,end,hidden"; source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.swallow.end";
}
}
part { name: "elm.text"; type: TEXT;
- effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
rel1 {
@@ -522,7 +509,7 @@ group { name: "elm/layout/application/titlebar";
to: "elm.swallow.end";
relative: 0.0 1.0;
}
- color: FN_COL_DEFAULT;
+ color_class: "/fg/normal/layout/content-back/title";
text { font: FNBD; size: 10;
}
}
diff --git a/data/elementary/themes/edc/elm/map.edc
b/data/elementary/themes/edc/elm/map.edc
index 108a721d9b..4fb997df5c 100644
--- a/data/elementary/themes/edc/elm/map.edc
+++ b/data/elementary/themes/edc/elm/map.edc
@@ -19,7 +19,7 @@ group { name: "elm/map/marker/radio/default";
align: 0.5 1.0;
min: 65 35; max: 65 35;
image.normal: "map_marker.png";
- color: 51 153 255 255;
+ color_class: "/bg/selected/map/marker";
}
}
part { name: "elm.icon"; type: SWALLOW; mouse_events: 0;
@@ -34,7 +34,7 @@ group { name: "elm/map/marker/radio/default";
description { state: "default" 0.0;
fixed: 1 1;
rel.to: "elm.icon";
- color: 255 255 255 255;
+ color_class: "/fg/selected/map/marker";
text { font: FNBD; size: 10;
text_class: "map_radio";
min: 1 1;
@@ -52,6 +52,7 @@ group { name: "elm/map/marker/empty/default";
data.item: "size_max_h" 24;
parts {
part { name: "knob"; type: SPACER;
+ scale;
description { state: "default" 0.0;
min: 16 16;
max: 24 24;
@@ -65,7 +66,7 @@ group { name: "elm/map/marker/empty/default";
part { name: "elm.text"; type: TEXT;
description { state: "default" 0.0;
rel.to: "knob";
- color: 160 160 160 255;
+ color_class: "/fg/normal/map/marker";
text { font: FNBD; size: 10;
text_class: "map_empty";
min: 1 1;
@@ -105,7 +106,7 @@ group { name: "elm/map/scale/base/default";
description { state: "default" 0.0;
rel1.offset: 6 5;
rel2.offset: -7 -5;
- color: 255 255 255 255;
+ color_class: "/fg/selected/map/text/scale";
text { font: FNBD; size: 10;
text_class: "map_scale";
min: 1 1;
@@ -124,7 +125,7 @@ group { name: "elm/map/marker_bubble/default";
part { name: "base"; type: RECT;
scale: 1;
description { state: "default" 0.0;
- color: 0 0 0 192;
+ color_class: "/dim/normal/map/marker/bubble";
rel1.offset: 4 4;
rel2.offset: -5 -5;
offscale;
--
