raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c36d61729c437210d4fe0adc34d59898da6dd9f4
commit c36d61729c437210d4fe0adc34d59898da6dd9f4
Author: Carsten Haitzler <ras...@rasterman.com>
Date: Tue Sep 14 17:49:38 2021 +0100
elm theme - more cc work
---
data/elementary/themes/colorclasses.edc | 26 ++-
data/elementary/themes/edc/efl/spin.edc | 8 +-
data/elementary/themes/edc/efl/tab_bar.edc | 42 ++---
data/elementary/themes/edc/efl/tab_pager.edc | 3 +-
data/elementary/themes/edc/efl/tags.edc | 81 +++------
data/elementary/themes/edc/efl/text.edc | 189 ++++++++++++---------
data/elementary/themes/edc/efl/timepicker.edc | 22 +--
data/elementary/themes/edc/elm/entry.edc | 5 +-
.../elementary/themes/edc/elm/multibuttonentry.edc | 3 +-
9 files changed, 189 insertions(+), 190 deletions(-)
diff --git a/data/elementary/themes/colorclasses.edc
b/data/elementary/themes/colorclasses.edc
index 51c1f94f0a..3eba41566a 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -1,6 +1,10 @@
color_tree {
":bg" {
"/bg";
+ "/bg/selected/border";
+ }
+ ":bg-alt" {
+ "/bg-alt";
}
":fg" {
"/fg";
@@ -58,6 +62,8 @@ color_classes {
color: 51 153 255 255; }
color_class { name: ":bg";
color: 64 64 64 255; }
+ color_class { name: ":bg-alt";
+ color: 56 56 56 255; }
color_class { name: ":fg";
color: 160 160 160 255; }
///////////////////////////////////////////////////////////////////////////////
@@ -67,7 +73,7 @@ color_classes {
// specific element color classes. they fall abck like a directory search to
// parent dirs so like if something is "/fg/normal" first that is looked for
// then if that fails "/fg" is looked for etc.
-//
+//
// this below is inteneded to allow overriding in detail of specific uses
// and elements, but the abovbe coarser ":something" palette is intended
// for a simpler smaller set of colors used in a theme to allow very simple
@@ -75,8 +81,8 @@ color_classes {
///////////////////////////////////////////////////////////////////////////////
// color_class { name: "/bg";
// color: 64 64 64 255; }
- color_class { name: "/bg-alt";
- color: 56 56 56 255; }
+// color_class { name: "/bg-alt";
+// color: 56 56 56 255; }
color_class { name: "/bg-dark";
color: 32 32 32 255; }
color_class { name: "/bg-dark-alt";
@@ -293,14 +299,14 @@ color_classes {
color_class { name: "/fg/pressed/fileman/overlay/progress/close";
color: 200 200 200 255; }
///////////////////////////////////////////////////////////////////////////////
- color_class { name: "/bg/normal/titlebar";
- color: 64 64 64 255; }
+// color_class { name: "/bg/normal/titlebar";
+// color: 64 64 64 255; }
color_class { name: "/bg/selected/titlebar";
color: 32 32 32 255; }
- color_class { name: "/bg/normal/border";
- color: 64 64 64 255; }
- color_class { name: "/bg/selected/border";
- color: 64 64 64 255; }
+// color_class { name: "/bg/normal/border";
+// color: 64 64 64 255; }
+// color_class { name: "/bg/selected/border";
+// color: 64 64 64 255; }
color_class { name: "/bg/normal/win-blocker";
color: 64 64 64 255; }
color_class { name: "/bg/selected/win-blocker";
@@ -364,6 +370,8 @@ color_classes {
color: 112 112 112 255; }
color_class { name: "/fg/disabled/entry/text/guide";
color: 80 80 80 255; }
+ color_class { name: "/fg/normal/entry/handler/start";
+ color: 51 153 255 255; }
color_class { name: "/fg/normal/entry/handler/end";
color: 51 153 255 255; }
color_class { name: "/fg/normal/entry/cursor";
diff --git a/data/elementary/themes/edc/efl/spin.edc
b/data/elementary/themes/edc/efl/spin.edc
index 81b73c8d6c..cac5570435 100644
--- a/data/elementary/themes/edc/efl/spin.edc
+++ b/data/elementary/themes/edc/efl/spin.edc
@@ -4,17 +4,15 @@ group { "efl/spin";
rect { "bg";
scale;
desc { "default";
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
}
}
text { "efl.text";
nomouse;
scale;
desc { "default";
- color: 160 160 160 255;
- text {
- font: FN;
- size: 10;
+ color_class: "/fg/normal/spinner/text";
+ text { font: FN; size: 10;
min: 1 1;
ellipsis: -1;
align: 0.5 0.5;
diff --git a/data/elementary/themes/edc/efl/tab_bar.edc
b/data/elementary/themes/edc/efl/tab_bar.edc
index 4350a04c10..089b06fbcd 100644
--- a/data/elementary/themes/edc/efl/tab_bar.edc
+++ b/data/elementary/themes/edc/efl/tab_bar.edc
@@ -73,17 +73,18 @@ group { "efl/tab_bar/tab";
rel1.to_y: "_sh1";
rel2.to_x: "_sh1";
rel2.to_y: "";
- color: 255 255 255 128;
+ color: 255 255 255 128; // no cc
+ color_class: "/shadow/normal/tab";
}
desc { "selected";
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color: 255 255 255 255; // no cc
}
}
WIN_SHAD("base", "shadow", "win_shad_flat.png", 10, 10, 7, 14, 0.25)
rect { "base";
desc { "default";
- color: 64 64 64 255;
+ color_class: "/bg/normal/tab";
}
desc { "vert";
inherit: "default" 0.0;
@@ -92,7 +93,7 @@ group { "efl/tab_bar/tab";
rect { "inset_clip";
desc { "default";
rel.to: "base";
- color: 255 255 255 128;
+ color: 255 255 255 128; // no cc
}
desc { "selected";
inherit;
@@ -112,6 +113,7 @@ group { "efl/tab_bar/tab";
rel1.relative: 0.0 1.0;
rel1.offset: -22 -11;
rel2.offset: 21 20;
+ color_class: "/shadow/normal/tab";
offscale;
}
}
@@ -119,7 +121,7 @@ group { "efl/tab_bar/tab";
desc { "default";
rel.to: "base";
hid;
- color: 51 153 255 255;
+ color_class: "/bg/selected/tab/hilight";
}
desc { "selected";
inherit: "default" 0.0;
@@ -131,18 +133,18 @@ group { "efl/tab_bar/tab";
}
desc { "disabled";
inherit: "default";
- color: 255 255 255 64;
+ color: 255 255 255 64; // no cc
}
}
rect { "icon_clip1";
clip_to: "icon_clip";
desc { "default";
- color: 255 255 255 255;
+ color: 255 255 255 255; // no cc
vis;
}
desc { "animation";
inherit: "default";
- color: 255 255 255 0;
+ color: 255 255 255 0; // no cc
hid;
}
}
@@ -175,12 +177,12 @@ group { "efl/tab_bar/tab";
rect { "icon_clip2";
clip_to: "icon_clip";
desc { "default";
- color: 255 255 255 0;
+ color: 255 255 255 0; // no cc
hid;
}
desc { "animation";
inherit: "default" 0.0;
- color: 255 255 255 255;
+ color: 255 255 255 255; // no cc
vis;
}
}
@@ -213,12 +215,12 @@ group { "efl/tab_bar/tab";
}
rect { "text_clip1";
desc { "default";
- color: 255 255 255 255;
+ color: 255 255 255 255; // no cc
vis;
}
desc { "animation";
inherit: "default";
- color: 255 255 255 0;
+ color: 255 255 255 0; // no cc
hid;
}
}
@@ -231,7 +233,7 @@ group { "efl/tab_bar/tab";
rel1.relative: 0.0 1.0;
rel2.offset: -5 -5;
align: 0.5 1.0;
- color: 160 160 160 255;
+ color_class: "/fg/normal/tab/text";
offscale;
text { font: FN; size: 10;
min: 1 1;
@@ -243,11 +245,11 @@ group { "efl/tab_bar/tab";
}
desc { "selected";
inherit: "default";
- color: 255 255 255 255;
+ color_class: "/fg/selected/tab/text";
}
desc { "disabled";
inherit: "default";
- color: 96 96 96 255;
+ color_class: "/fg/disabled/tab/text";
}
desc { "noicon";
inherit: "default";
@@ -257,7 +259,7 @@ group { "efl/tab_bar/tab";
}
desc { "noicon_disabled";
inherit: "noicon";
- color: 96 96 96 255;
+ color_class: "/fg/disabled/tab/text";
}
desc { "icononly";
inherit: "default";
@@ -268,12 +270,12 @@ group { "efl/tab_bar/tab";
}
rect { "text_clip2";
desc { "default";
- color: 255 255 255 0;
+ color: 255 255 255 0; // no cc
hid;
}
desc { "animation";
inherit: "default";
- color: 255 255 255 255;
+ color: 255 255 255 255; // no cc
vis;
}
}
@@ -286,7 +288,7 @@ group { "efl/tab_bar/tab";
min: 0 0;
max: -1 0;
align: 0.5 0.0;
- color: 51 153 255 255;
+ color_class: "/bg/selected/tab/bar";
hid;
}
desc { "selected";
@@ -298,7 +300,7 @@ group { "efl/tab_bar/tab";
}
rect { "event";
desc { "default";
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
}
}
swallow { "efl.extra";
diff --git a/data/elementary/themes/edc/efl/tab_pager.edc
b/data/elementary/themes/edc/efl/tab_pager.edc
index 0d72795ada..f94a683b21 100644
--- a/data/elementary/themes/edc/efl/tab_pager.edc
+++ b/data/elementary/themes/edc/efl/tab_pager.edc
@@ -5,6 +5,7 @@ group { "efl/tab_pager";
part { name: "shadow"; type: RECT;
description { state: "default" 0.0;
rel.to: "_sh1";
+ color_class: "/shadow/normal/tab";
}
}
WIN_SHAD("bg", "shadow", "win_shad_flat.png", 10, 10, 7, 14, 0.25)
@@ -27,7 +28,7 @@ group { "efl/tab_pager";
description { state: "default" 0.0;
rel1.to_y: "efl.tab_root";
rel1.relative: 0.0 1.0;
- color: 64 64 64 255;
+ color_class: "/bg/normal/tab";
rel1.offset: 4 0;
rel2.offset: -5 -5;
offscale;
diff --git a/data/elementary/themes/edc/efl/tags.edc
b/data/elementary/themes/edc/efl/tags.edc
index 4aa3588417..6996a38d4f 100644
--- a/data/elementary/themes/edc/efl/tags.edc
+++ b/data/elementary/themes/edc/efl/tags.edc
@@ -5,9 +5,8 @@ group { "efl/tags";
data.item: "closed_height" 0;
parts {
rect { "bg";
- scale;
desc { "default";
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
}
}
swallow { "efl.background";
@@ -31,7 +30,7 @@ group { "efl/tags/label";
nomouse;
scale;
desc { "default";
- color: 255 255 255 255;
+ color_class: "/fg/normal/multibuttonentry/text";
text { font: FNBD; size: 10;
min: 1 1;
ellipsis: -1;
@@ -47,33 +46,16 @@ group { "efl/tags/label";
group { "efl/tags/btn";
data.item: "version" "123";
- images.image: "win_shadow.png" COMP;
styles {
style { name: "efl_tags_textblock_style";
- base: "font="FN" align=0.5 font_size=10 color=#a0a0a0
text_class=tags_item ellipsis=1.0";
- tag: "br" "\n";
- tag: "ps" "ps";
- tag: "hilight" "+ color=#ffffff font="FNBD;
- tag: "b" "+ font="FNBD;
- tag: "tab" "\t";
- }
- style { name: "efl_tags_textblock_style_pressed";
- base: "font="FN" align=0.5 font_size=10 color=#ffffff
text_class=tags_item ellipsis=1.0";
+ base: "font="FN" align=0.5 font_size=10 color=#fff
text_class=tags_item ellipsis=1.0";
tag: "br" "\n";
tag: "ps" "ps";
tag: "hilight" "+ color=#ffffff font="FNBD;
tag: "b" "+ font="FNBD;
tag: "tab" "\t";
}
- style { name: "efl_tags_textblock_style_disabled";
- base: "font="FN" align=0.5 font_size=10 color=#606060
text_class=tags_item ellipsis=1.0";
- tag: "br" "\n";
- tag: "ps" "ps";
- tag: "hilight" "+ color=#808080 font="FNBD;
- tag: "b" "+ font="FNBD;
- tag: "tab" "\t";
- }
}
script {
@@ -81,44 +63,31 @@ group { "efl/tags/btn";
}
parts {
- part { name: "shadow"; mouse_events: 0;
- scale: 1;
- description { state: "default" 0.0;
- rel.to: "base";
- WIN_SHADOW_SMALL;
- }
- description { state: "pressed" 0.0; inherit;
- image.border_scale_by: 0.1;
- rel1.offset: -2 -1;
- rel2.offset: 0 1;
- }
- }
rect { "base";
scale: 1;
desc { "default";
- color: 96 96 96 255;
+ color_class: "/bg/normal/multibuttonentry/button";
rel1.offset: 2 2;
rel2.offset: -3 -3;
offscale;
}
desc { "pressed";
- color: 128 128 128 255;
- rel1.offset: 3 3;
- rel2.offset: -4 -4;
- offscale;
+ color_class: "/bg/pressed/multibuttonentry/button";
}
}
- rect { "glow";
- nomouse;
- desc { "default";
+ part { name: "glow"; type: RECT; mouse_events: 0;
+ description { state: "default" 0.0;
rel.to: "base";
- color: 51 153 255 0;
- hid;
+ rel1.offset: 0 -1;
+ rel1.relative: 0.0 1.0;
+ align: 0.5 1.0;
+ color_class: "/bg/selected/multibuttonentry/button/bar";
+ visible: 0;
}
- desc { "focused";
- inherit: "default";
- color: 51 153 255 255;
- vis;
+ description { state: "focused" 0.0;
+ inherit: "default" 0.0;
+ min: 0 5;
+ visible: 1;
}
}
image { "close";
@@ -128,16 +97,16 @@ group { "efl/tags/btn";
rel.to: "del";
min: 15 15;
max: 15 15;
- color: 160 160 160 255;
fixed: 1 1;
+ color_class: "/fg/normal/multibuttonentry/button/delete";
}
desc { "pressed";
inherit: "default";
- color: 255 255 255 255;
+ color_class: "/fg/pressed/multibuttonentry/button/delete";
}
desc { "clicked";
inherit: "default";
- color: 255 255 255 255;
+ color_class: "/fg/pressed/multibuttonentry/button/delete";
}
}
rect { "del";
@@ -150,7 +119,7 @@ group { "efl/tags/btn";
rel1.relative: 1.0 0.0;
rel1.offset: -5 4;
rel2.offset: -5 -5;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
offscale;
}
}
@@ -158,7 +127,6 @@ group { "efl/tags/btn";
nomouse;
scale;
desc { "default";
- color: FN_COL_DEFAULT;
text { style: "efl_tags_textblock_style";
min: 1 1;
ellipsis: -1;
@@ -171,14 +139,15 @@ group { "efl/tags/btn";
rel2.offset: -5 -5;
min: 30 15;
offscale;
+ color_class: "/fg/normal/multibuttonentry/text/button";
}
desc { "pressed";
inherit: "default";
- text.style: "efl_tags_textblock_style_pressed";
+ color_class: "/fg/pressed/multibuttonentry/text/button";
}
desc { "disabled";
inherit: "default";
- text.style: "efl_tags_textblock_style_disabled";
+ color_class: "/fg/disabled/multibuttonentry/text/button";
}
}
}
@@ -224,7 +193,6 @@ group { "efl/tags/btn";
if (get_int(disabled) == 0) {
set_state(PART:"close", "pressed", 0.0);
set_state(PART:"base", "pressed", 0.0);
- set_state(PART:"shadow", "pressed", 0.0);
set_state(PART:"efl.btn.text", "pressed", 0.0);
}
}
@@ -234,7 +202,6 @@ group { "efl/tags/btn";
if (get_int(disabled) == 0) {
set_state(PART:"close", "default", 0.0);
set_state(PART:"base", "default", 0.0);
- set_state(PART:"shadow", "default", 0.0);
set_state(PART:"efl.btn.text", "default", 0.0);
}
}
@@ -260,7 +227,7 @@ group { "efl/tags/number";
nomouse;
scale;
desc { "default";
- color: 160 160 160 255;
+ color_class: "/fg/normal/multibuttonentry/number";
text { font: FN; size: 10;
min: 1 1;
ellipsis: -1;
diff --git a/data/elementary/themes/edc/efl/text.edc
b/data/elementary/themes/edc/efl/text.edc
index f592b00640..826330ac27 100644
--- a/data/elementary/themes/edc/efl/text.edc
+++ b/data/elementary/themes/edc/efl/text.edc
@@ -4,19 +4,19 @@ group { "efl/text/scroller";
parts {
part { name: "bg";
description { state: "default" 0.0;
- color: DARK_GREY_BG_COLOR;
+ color_class: "/bg/normal/entry";
}
}
part { name: "validation_glow"; type: RECT; mouse_events: 0;
insert_after: "efl.background";
description { state: "default" 0.0;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
}
description { state: "pass" 0.0;
- color: 0 255 0 90;
+ color_class: "/bg/selected/entry/validate-pass";
}
description { state: "fail" 0.0;
- color: 255 0 0 90;
+ color_class: "/bg/selected/entry/validate-fail";
}
}
program { name: "validation_fail";
@@ -43,14 +43,16 @@ group { "efl/text/scroller";
description { state: "default" 0.0;
rel.to: "bg";
rel1.relative: 0.0 1.0;
- color: 51 153 255 0;
+ color_class: "/bg/normal/entry/focus";
+ color: 255 255 255 0; // no cc
visible: 0;
offscale;
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
- color: 51 153 255 255;
rel1.offset: 0 -3;
+ color_class: "/bg/selected/entry/focus";
+ color: 255 255 255 255; // no cc
visible: 1;
}
}
@@ -82,8 +84,8 @@ group { "efl/text/scroller";
clip_to: "clipper";
description { state: "default" 0.0;
fixed: 1 1;
- rel1.offset: 2 2;
- rel2.offset: 2 -3;
+ rel1.offset: -1 2;
+ rel2.offset: -1 -3;
rel2.relative: 0.0 1.0;
visible: 0;
align: 1.0 0.5;
@@ -91,6 +93,8 @@ group { "efl/text/scroller";
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
+ rel1.offset: 2 2;
+ rel2.offset: 2 -3;
visible: 1;
align: 0.0 0.5;
}
@@ -108,15 +112,17 @@ group { "efl/text/scroller";
clip_to: "clipper";
description { state: "default" 0.0;
fixed: 1 1;
- rel1.offset: -3 2;
rel1.relative: 1.0 0.0;
- rel2.offset: -3 -3;
+ rel1.offset: 0 2;
+ rel2.offset: 0 -3;
visible: 0;
align: 0.0 0.5;
offscale;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
+ rel1.offset: -3 2;
+ rel2.offset: -3 -3;
visible: 1;
align: 1.0 0.5;
}
@@ -185,7 +191,7 @@ group { "efl/text/single/scroller";
part { name: "bg"; type: RECT;
description { state: "default" 0.0;
rel.to: "efl.background";
- color: DARK_GREY_BG_COLOR;
+ color_class: "/bg/normal/entry";
}
}
part { name: "clipper"; type: RECT;
@@ -201,13 +207,13 @@ group { "efl/text/single/scroller";
part { name: "validation_glow"; type: RECT;
mouse_events: 0;
description { state: "default" 0.0;
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
}
description { state: "pass" 0.0;
- color: 0 255 0 90;
+ color_class: "/bg/selected/entry/validate-pass";
}
description { state: "fail" 0.0;
- color: 255 0 0 90;
+ color_class: "/bg/selected/entry/validate-fail";
}
}
part { name: "glow"; type: RECT; mouse_events: 0;
@@ -216,13 +222,15 @@ group { "efl/text/single/scroller";
description { state: "default" 0.0;
rel.to: "bg";
rel1.relative: 0.0 1.0;
- color: 51 153 255 0;
+ color_class: "/bg/normal/entry/focus";
+ color: 255 255 255 0; // no cc
visible: 0;
offscale;
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
- color: 51 153 255 255;
+ color_class: "/bg/selected/entry/focus";
+ color: 255 255 255 255; // no cc
rel1.offset: 0 -3;
visible: 1;
}
@@ -245,8 +253,8 @@ group { "efl/text/single/scroller";
clip_to: "clipper";
description { state: "default" 0.0;
fixed: 1 1;
- rel1.offset: 2 2;
- rel2.offset: 2 -3;
+ rel1.offset: -1 2;
+ rel2.offset: -1 -3;
rel2.relative: 0.0 1.0;
visible: 0;
align: 1.0 0.5;
@@ -254,6 +262,8 @@ group { "efl/text/single/scroller";
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
+ rel1.offset: 2 2;
+ rel2.offset: 2 -3;
visible: 1;
align: 0.0 0.5;
}
@@ -271,9 +281,9 @@ group { "efl/text/single/scroller";
clip_to: "clipper";
description { state: "default" 0.0;
fixed: 1 1;
- rel1.offset: -3 2;
rel1.relative: 1.0 0.0;
- rel2.offset: -3 -3;
+ rel1.offset: 0 2;
+ rel2.offset: 0 -3;
visible: 0;
align: 0.0 0.5;
offscale;
@@ -281,6 +291,8 @@ group { "efl/text/single/scroller";
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
+ rel1.offset: -3 2;
+ rel2.offset: -3 -3;
align: 1.0 0.5;
}
}
@@ -341,6 +353,7 @@ group { "efl/text/cursor";
clip_to: "clipper";
description { state: "default" 0.0;
min: 1 10;
+ color_class: "/fg/normal/entry/cursor";
visible: 0;
}
description { state: "visible" 0.0;
@@ -350,8 +363,7 @@ group { "efl/text/cursor";
}
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;
@@ -428,7 +440,7 @@ group { "efl/text/selection";
parts {
part { name: "base"; type: RECT;
description { state: "default" 0.0;
- color: 51 153 255 128;
+ color_class: "/bg/normal/entry/selection";
}
}
}
@@ -440,7 +452,7 @@ group { "efl/text/anchor";
part { name: "bar"; type: RECT;
scale: 1;
description { state: "default" 0.0;
- color: 51 153 255 255;
+ color_class: "/fg/normal/entry/anchor";
fixed: 0 1;
rel1.relative: 0.0 1.0;
rel1.offset: -1 -1;
@@ -456,16 +468,16 @@ group { "efl/text";
data {
item: "font.name" "Sans";
item: "font.size" "10";
- item: "style.color" "#a0a0a0";
- item: "style.color_disabled" "#707070";
+ item: "style.color" "cc:/fg/normal/entry/text";
+ item: "style.color_disabled" "cc:/fg/disabled/entry/text";
item: "guide.font.name" "Sans";
item: "guide.font.size" "10";
- item: "guide.style.color" "#505050";
+ item: "guide.style.color" "cc:/fg/normal/entry/text/guide";
}
styles {
style { name: "efl_ui_text_guide_style";
- base: "font="FN" font_size=10 color=#505050 wrap=word
text_class=entry_guide_text left_margin=2 right_margin=2 ellipsis=0.0";
+ base: "font="FN" font_size=10 color=cc:/fg/normal/entry/text/guide
wrap=word text_class=entry_guide_text left_margin=2 right_margin=2
ellipsis=0.0";
DISABLED_TEXTBLOCK_TAGS
}
}
@@ -555,6 +567,7 @@ group { "efl/text/magnifier";
description { state: "default" 0.0;
rel.to: "bg";
WIN_SHADOW;
+ color_class: "/shadow/normal/entry/magnifier";
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@@ -567,7 +580,7 @@ group { "efl/text/magnifier";
min: 80 40;
rel1.offset: 4 4;
rel2.offset: -5 -5;
- color: 48 48 48 255;
+ color_class: "/bg/normal/entry";
offscale;
}
description { state: "hidden" 0.0;
@@ -603,54 +616,57 @@ group { "efl/text/magnifier";
group { "efl/text/handler/start";
data.item: "version" "123";
+ images.image: "handle_pick_up_left.png" COMP;
parts {
- part { name: "shadow"; mouse_events: 0;
+ part { name: "base"; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
- rel.to: "bg";
- WIN_SHADOW;
+ image.normal: "handle_pick_up_left.png";
+ min: 21 27; // 42 54
+ align: (29/42) (11/54);
+ color_class: "/fg/normal/entry/handler/start";
+ visible: 0;
}
- description { state: "hidden" 0.0;
+ description { state: "visible" 0.0;
inherit: "default" 0.0;
- visible: 0;
+ visible: 1;
}
}
- part { name: "bg"; type: RECT; mouse_events: 0;
- scale: 1;
+ part { name: "elm.swallow.content"; type: SWALLOW; mouse_events: 0;
description { state: "default" 0.0;
- min: 80 40;
- rel1.offset: 4 4;
- rel2.offset: -5 -5;
- color: 48 48 48 255;
- offscale;
+ rel.to: "base";
+ visible: 0;
}
- description { state: "hidden" 0.0;
+ description { state: "visible" 0.0;
inherit: "default" 0.0;
- visible: 0;
+ visible: 1;
}
}
- part { name: "elm.swallow.content"; type: SWALLOW; mouse_events: 0;
+ part { name: "event"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
- rel.to: "bg";
+ rel.to: "base";
+ color: 0 0 0 0; // no cc
+ min: 32 32;
+ visible: 0;
}
- description { state: "hidden" 0.0;
+ description { state: "visible" 0.0;
inherit: "default" 0.0;
- visible: 0;
+ visible: 1;
}
}
}
programs {
- program {
- signal: "efl,handler,show"; source: "efl";
- action: STATE_SET "default" 0.0;
- target: "shadow";
- target: "bg";
+ program { signal: "efl,handler,show"; source: "efl";
+ action: STATE_SET "visible" 0.0;
+ target: "base";
+ target: "event";
target: "elm.swallow.content";
}
- program {
- signal: "efl,handler,hide"; source: "efl";
- action: STATE_SET "hidden" 0.0;
- target: "shadow";
- target: "bg";
+ program { signal: "efl,handler,hide"; source: "efl";
+ action: STATE_SET "default" 0.0;
+ target: "base";
+ target: "event";
target: "elm.swallow.content";
}
}
@@ -658,54 +674,57 @@ group { "efl/text/handler/start";
group { "efl/text/handler/end";
data.item: "version" "123";
+ images.image: "handle_pick_up_right.png" COMP;
parts {
- part { name: "shadow"; mouse_events: 0;
+ part { name: "base"; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
- rel.to: "bg";
- WIN_SHADOW;
+ image.normal: "handle_pick_up_right.png";
+ min: 21 27; // 42 54
+ align: (29/42) (11/54);
+ color_class: "/fg/normal/entry/handler/end";
+ visible: 0;
}
- description { state: "hidden" 0.0;
+ description { state: "visible" 0.0;
inherit: "default" 0.0;
- visible: 0;
+ visible: 1;
}
}
- part { name: "bg"; type: RECT; mouse_events: 0;
- scale: 1;
+ part { name: "elm.swallow.content"; type: SWALLOW; mouse_events: 0;
description { state: "default" 0.0;
- min: 80 40;
- rel1.offset: 4 4;
- rel2.offset: -5 -5;
- color: 48 48 48 255;
- offscale;
+ rel.to: "base";
+ visible: 0;
}
- description { state: "hidden" 0.0;
+ description { state: "visible" 0.0;
inherit: "default" 0.0;
- visible: 0;
+ visible: 1;
}
}
- part { name: "elm.swallow.content"; type: SWALLOW; mouse_events: 0;
+ part { name: "event"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
- rel.to: "bg";
+ rel.to: "base";
+ color: 0 0 0 0; // no cc
+ min: 32 32;
+ visible: 0;
}
- description { state: "hidden" 0.0;
+ description { state: "visible" 0.0;
inherit: "default" 0.0;
- visible: 0;
+ visible: 1;
}
}
}
programs {
- program {
- signal: "efl,handler,show"; source: "efl";
- action: STATE_SET "default" 0.0;
- target: "shadow";
- target: "bg";
+ program { signal: "efl,handler,show"; source: "efl";
+ action: STATE_SET "visible" 0.0;
+ target: "base";
+ target: "event";
target: "elm.swallow.content";
}
- program {
- signal: "efl,handler,hide"; source: "efl";
- action: STATE_SET "hidden" 0.0;
- target: "shadow";
- target: "bg";
+ program { signal: "efl,handler,hide"; source: "efl";
+ action: STATE_SET "default" 0.0;
+ target: "base";
+ target: "event";
target: "elm.swallow.content";
}
}
diff --git a/data/elementary/themes/edc/efl/timepicker.edc
b/data/elementary/themes/edc/efl/timepicker.edc
index 555a9d8057..75e0bb7ca5 100644
--- a/data/elementary/themes/edc/efl/timepicker.edc
+++ b/data/elementary/themes/edc/efl/timepicker.edc
@@ -101,7 +101,7 @@ group { "efl/timepicker";
rect { "bg";
desc { "default";
rel.to: "base";
- color: 64 64 64 255;
+ color: 0 0 0 0; // no cc
}
}
text { "colon";
@@ -109,20 +109,22 @@ group { "efl/timepicker";
desc { "default";
rel1.to: "efl.field1";
rel1.relative: 1.0 0.0;
+ rel1.offset: 4 4;
rel2.to: "efl.field2";
rel2.relative: 0.0 1.0;
- color: 160 160 160 255;
- text {
- font: FN;
- size: 10;
+ rel2.offset: -5 -5;
+ offscale;
+ color_class: "/fg/normal/timepicker";
+ text { font: FN; size: 10;
min: 1 1;
text: ":";
align: 0.5 0.5;
}
vis;
+ fixed: 1 1;
}
desc { "invisible";
- inherit: default 0.0;
+ inherit: "default" 0.0;
hid;
}
}
@@ -131,7 +133,7 @@ group { "efl/timepicker";
desc { "default";
min: 23 69;
rel1.offset: 4 4;
- rel2.offset: -3 -5;
+ rel2.offset: -5 -5;
rel2.relative: (1/3) 1.0;
offscale;
}
@@ -144,9 +146,9 @@ group { "efl/timepicker";
scale;
desc { "default";
min: 23 69;
- rel1.offset: 2 4;
+ rel1.offset: 4 4;
rel1.relative: (1/3) 0.0;
- rel2.offset: -3 -5;
+ rel2.offset: -5 -5;
rel2.relative: (2/3) 1.0;
offscale;
}
@@ -173,7 +175,7 @@ group { "efl/timepicker";
repeat;
desc { "default";
rel.to: "base";
- color: 0 0 0 0;
+ color: 0 0 0 0; // no cc
}
}
}
diff --git a/data/elementary/themes/edc/elm/entry.edc
b/data/elementary/themes/edc/elm/entry.edc
index 38840e3cb2..aac153a582 100644
--- a/data/elementary/themes/edc/elm/entry.edc
+++ b/data/elementary/themes/edc/elm/entry.edc
@@ -222,6 +222,7 @@ group { name: "elm/scroller/entry_single/default";
rel1.relative: 0.0 1.0;
rel1.offset: 0 0;
color_class: "/bg/normal/entry/focus";
+ color: 255 255 255 0; // no cc
visible: 0;
offscale;
}
@@ -229,6 +230,7 @@ group { name: "elm/scroller/entry_single/default";
inherit: "default" 0.0;
rel1.offset: 0 -3;
color_class: "/bg/selected/entry/focus";
+ color: 255 255 255 255; // no cc
visible: 1;
}
}
@@ -547,7 +549,7 @@ group { name: "elm/entry/base/default";
DISABLED_TEXTBLOCK_TAGS
}
style { name: "entry_guide_style";
- base: "font="FN" font_size=10 color=cc:/fg/disabled/entry/text/guide
wrap=word text_class=entry_guide_text left_margin=2 right_margin=2
ellipsis=0.0";
+ base: "font="FN" font_size=10 color=cc:/fg/normal/entry/text/guide
wrap=word text_class=entry_guide_text left_margin=2 right_margin=2
ellipsis=0.0";
DISABLED_TEXTBLOCK_TAGS
}
}
@@ -977,6 +979,7 @@ group { name: "elm/entry/magnifier/default";
description { state: "default" 0.0;
rel.to: "bg";
WIN_SHADOW;
+ color_class: "/shadow/normal/entry/magnifier";
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
diff --git a/data/elementary/themes/edc/elm/multibuttonentry.edc
b/data/elementary/themes/edc/elm/multibuttonentry.edc
index d8be64b85b..b3aebad83c 100644
--- a/data/elementary/themes/edc/elm/multibuttonentry.edc
+++ b/data/elementary/themes/edc/elm/multibuttonentry.edc
@@ -129,9 +129,8 @@ group { name: "elm/multibuttonentry/btn/default";
scale: 1;
description { state: "default" 0.0;
fixed: 1 0;
- min: 4 4;
+ min: 15 15;
align: 1.0 0.5;
- aspect: 1.0 1.0; aspect_preference: VERTICAL;
rel.to: "base";
rel1.relative: 1.0 0.0;
rel1.offset: -5 4;
--
