raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7bce24743bcf04b63aaddde93ca59d205a6e1ddf
commit 7bce24743bcf04b63aaddde93ca59d205a6e1ddf
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Fri Jun 18 18:39:56 2021 +0100
elm theme - more cc
---
data/elementary/themes/colorclasses.edc | 6 +++++-
data/elementary/themes/edc/elm/entry.edc | 20 +++++++-------------
data/elementary/themes/edc/entry.edc | 27 +++++++++++----------------
3 files changed, 23 insertions(+), 30 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 3320bad093..a70a936be1 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -84,7 +84,9 @@ color_classes {
color: 255 32 16 80; }
color_class { name: "/bg/selected/entry/validate-pass";
color: 32 255 16 80; }
- color_class { name: "/fg/entry/anchor";
+ color_class { name: "/bg/normal/entry/selection";
+ color: 51 153 255 128; }
+ color_class { name: "/fg/normal/entry/anchor";
color: 51 153 255 255; }
color_class { name: "/fg/disabled/entry/text";
color: 112 112 112 255; }
@@ -92,6 +94,8 @@ color_classes {
color: 80 80 80 255; }
color_class { name: "/fg/normal/entry/handler/end";
color: 51 153 255 255; }
+ color_class { name: "/fg/normal/entry/cursor";
+ color: 255 255 255 255; }
///////////////////////////////////////////////////////////////////////////////
color_class { name: "/fg/normal/text-heading";
color: 255 255 255 255; }
diff --git a/data/elementary/themes/edc/elm/entry.edc
b/data/elementary/themes/edc/elm/entry.edc
index 8fa68867e0..e6d5dcc22e 100644
--- a/data/elementary/themes/edc/elm/entry.edc
+++ b/data/elementary/themes/edc/elm/entry.edc
@@ -398,21 +398,15 @@ group { name: "elm/scroller/entry_single/default";
}
}
programs {
- program { name: "validation_fail";
- signal: "validation,default,fail";
- source: "elm";
+ program { signal: "validation,default,fail"; source: "elm";
action: STATE_SET "fail" 0.0;
target: "validation_glow";
}
- program { name: "validation_pass";
- signal: "validation,default,pass";
- source: "elm";
+ program { signal: "validation,default,pass"; source: "elm";
action: STATE_SET "pass" 0.0;
target: "validation_glow";
}
- program { name: "validation_off";
- signal: "validation,default";
- source: "elm";
+ program { signal: "validation,default"; source: "elm";
action: STATE_SET "default" 0.0;
target: "validation_glow";
}
@@ -427,6 +421,7 @@ group { name: "elm/entry/cursor/default";
clip_to: "clipper";
description { state: "default" 0.0;
min: 1 10;
+ color_class: "/fg/normal/entry/cursor";
visible: 0;
}
description { state: "visible" 0.0;
@@ -436,8 +431,7 @@ group { name: "elm/entry/cursor/default";
}
part { name: "clipper"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "cursor";
- rel2.to: "cursor";
+ rel.to: "cursor";
fixed: 1 1;
}
description { state: "hidden" 0.0;
@@ -512,7 +506,7 @@ group { name: "elm/entry/selection/default";
parts {
part { name: "base"; type: RECT;
description { state: "default" 0.0;
- color: 51 153 255 128;
+ color_class: "/bg/normal/entry/selection";
}
}
}
@@ -523,7 +517,7 @@ group { name: "elm/entry/anchor/default";
part { name: "bar"; type: RECT;
scale: 1;
description { state: "default" 0.0;
- color_class: "/fg/entry/anchor";
+ color_class: "/fg/normal/entry/anchor";
fixed: 0 1;
rel1.relative: 0.0 1.0;
rel1.offset: -1 -1;
diff --git a/data/elementary/themes/edc/entry.edc
b/data/elementary/themes/edc/entry.edc
index a1741cd5fd..b0069fe258 100644
--- a/data/elementary/themes/edc/entry.edc
+++ b/data/elementary/themes/edc/entry.edc
@@ -2,21 +2,21 @@ group { name: "e/widgets/entry/scrollframe";
parts {
part { name: "bg"; type: RECT;
description { state: "default" 0.0;
- color: DARK_GREY_BG_COLOR;
+ color_class: "/bg/normal/entry";
}
}
part { name: "clipper"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "bg";
- rel2.to: "bg";
+ rel.to: "bg";
}
}
part { name: "e.swallow.content"; type: SWALLOW;
- mouse_events: 1;
+ scale: 1;
clip_to: "clipper";
description { state: "default" 0.0;
rel1.offset: 2 2;
rel2.offset: -3 -3;
+ offscale;
}
}
}
@@ -25,10 +25,10 @@ group { name: "e/widgets/entry/scrollframe";
group { name: "e/widgets/entry/text";
styles {
style { name: "entry_textblock_style";
- base: "font="FN" font_size=10 color=#a0a0a0 text_class=entry
left_margin=2 right_margin=2";
+ base: "font="FN" font_size=10 color_class=/fg/normal/entry
text_class=entry left_margin=2 right_margin=2";
}
style { name: "entry_textblock_disabled_style";
- base: "font="FN" font_size=10 color=#707070 text_class=entry
left_margin=2 right_margin=2";
+ base: "font="FN" font_size=10 color_class=/fg/disabled/entry
text_class=entry left_margin=2 right_margin=2";
}
}
parts {
@@ -41,7 +41,6 @@ group { name: "e/widgets/entry/text";
source: "e/widgets/entry/selection"; // selection under
source4: "e/widgets/entry/cursor"; // cursorover
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
align: 0.0 0.5;
text {
style: "entry_textblock_style";
@@ -53,24 +52,19 @@ group { name: "e/widgets/entry/text";
description { state: "disabled" 0.0;
inherit: "default" 0.0;
text.style: "entry_textblock_disabled_style";
- color: FN_COL_DISABLE;
}
}
}
programs {
- program { name: "focus";
- signal: "load";
- source: "";
+ program { signal: "load"; source: "";
action: FOCUS_SET;
target: "e.text.text";
}
- program {
- signal: "e,state,disabled"; source: "e";
+ program { signal: "e,state,disabled"; source: "e";
action: STATE_SET "disabled" 0.0;
target: "e.text.text";
}
- program {
- signal: "e,state,enabled"; source: "e";
+ program { signal: "e,state,enabled"; source: "e";
action: STATE_SET "default" 0.0;
target: "e.text.text";
}
@@ -102,6 +96,7 @@ group { name: "e/widgets/entry/cursor";
scale: 1;
description { state: "default" 0.0;
min: 1 10;
+ color_class: "/fg/normal/entry/cursor";
visible: 0;
}
description { state: "visible" 0.0;
@@ -162,7 +157,7 @@ group { name: "e/widgets/entry/selection";
parts {
part { name: "selection"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
- color: 51 153 255 255;
+ color_class: "/bg/normal/entry/selection";
}
}
}
--
