raster pushed a commit to branch feature/themes/flat.
http://git.enlightenment.org/core/efl.git/commit/?id=8fffd59dd1595d02f328075339ac6e149421c51c
commit 8fffd59dd1595d02f328075339ac6e149421c51c
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Fri Mar 5 21:54:01 2021 +0000
TH - efl ui list
---
data/elementary/themes/edc/efl/list.edc | 328 +++++---------------------------
1 file changed, 52 insertions(+), 276 deletions(-)
diff --git a/data/elementary/themes/edc/efl/list.edc
b/data/elementary/themes/edc/efl/list.edc
index debbd77944..6bc0521fde 100644
--- a/data/elementary/themes/edc/efl/list.edc
+++ b/data/elementary/themes/edc/efl/list.edc
@@ -56,47 +56,22 @@ group { "efl/list_view";
data.item: "version" "123";
}
-group { "efl/list_item"; data.item: "version" "124";
+group { "efl/list_item";
+ data.item: "version" "124";
data.item: "selectraise" "on";
data.item: "focusraise" "on";
- images.image: "bevel_curved_horiz_out.png" COMP;
- images.image: "shadow_rounded_horiz.png" COMP;
- images.image: "vgrad_med_dark.png" COMP;
- images.image: "bevel_horiz_out.png" COMP;
- images.image: "shine.png" COMP;
parts {
rect { "base"; nomouse;
desc { "default";
color: 64 64 64 255;
- color_class: "list_item_base";
}
desc { "odd";
color: 56 56 56 255;
- color_class: "list_item_base_odd";
}
}
-
- image { "bevel"; nomouse;
- desc { "default";
- image.normal: "bevel_curved_horiz_out.png";
- image.border: 0 0 2 2;
- image.middle: 0;
- fill.smooth: 0;
- }
- }
- swallow { "efl.background";
- desc { "default";
- rel.to: "base";
- vis;
- }
- }
- image { "sel_shadow"; nomouse;
+ rect { "sel_base"; nomouse;
desc { "default";
- image.normal: "shadow_rounded_horiz.png";
- image.border: 0 0 9 9;
- rel1.offset: 0 -4;
- rel2.offset: -1 5;
- fill.smooth: 0;
+ color: 51 153 255 255;
hid;
}
desc { "selected";
@@ -104,109 +79,38 @@ group { "efl/list_item"; data.item: "version" "124";
vis;
}
}
- image { "sel_base"; nomouse;
- desc { "default";
- image.normal: "vgrad_med_dark.png";
- fill.smooth: 0;
- hid;
- TILED_HORIZ(120)
- }
- desc { "selected";
- inherit: "default";
- vis;
- }
- }
- image { "sel_bevel"; nomouse;
+ swallow { "efl.background";
desc { "default";
- image.normal: "bevel_horiz_out.png";
- image.border: 0 0 2 2;
- image.middle: 0;
- fill.smooth: 0;
- hid;
- }
- desc { "selected";
- inherit: "default";
+ rel.to: "base";
vis;
}
}
-
//##//
text { "efl.text"; nomouse;
- effect: SHADOW BOTTOM;
scale: 1;
desc { "default";
- rel1.offset: 2 3;
+ rel1.offset: 4 4;
rel1.relative: 1.0 0.0;
rel1.to_x: "efl.icon";
- rel2.offset: -3 -3;
+ rel2.offset: -5 -5;
rel2.relative: 0.0 1.0;
rel2.to_x: "efl.extra";
- color: FN_COL_DEFAULT;
- color_class: "list_item";
+ color: 160 160 160 255;
text { font: FN; size: 10;
min: 1 1;
ellipsis: -1;
align: 0.0 0.5;
text_class: "list_item";
}
+ offscale;
}
desc { "selected";
inherit: "default";
- hid;
- }
- desc { "disabled";
- inherit: "default";
- hid;
- }
- }
- text { "label2"; nomouse;
- effect: SHADOW BOTTOM;
- scale: 1;
- desc { "default";
- rel1.to: "efl.text";
- rel2.to: "efl.text";
- color: FN_COL_DISABLE;
- color_class: "list_item_disabled";
- text { font: FN; size: 10;
- text_source: "efl.text";
- align: 0.0 0.5;
- text_class: "list_item";
- }
- hid;
- }
- desc { "selected";
- inherit: "default";
- hid;
- }
- desc { "disabled";
- inherit: "default";
- vis;
- }
- }
- text { "label3"; nomouse;
- effect: GLOW;
- scale: 1;
- desc { "default";
- rel1.offset: -2 -3;
- rel1.to: "efl.text";
- rel2.offset: 1 1;
- rel2.to: "efl.text";
- color: FN_COL_HIGHLIGHT;
- color_class: "list_item_selected";
- text { font: FN; size: 10;
- text_source: "efl.text";
- align: 0.0 0.5;
- text_class: "list_item";
- }
- hid;
- }
- desc { "selected";
- inherit: "default";
- vis;
+ color: 255 255 255 255;
}
desc { "disabled";
inherit: "default";
- hid;
+ color: 80 80 80 255;
}
}
rect { "event";
@@ -220,40 +124,27 @@ group { "efl/list_item"; data.item: "version" "124";
}
//##//
swallow { "efl.icon";
+ scale: 1;
desc { "default";
fixed: 1 0;
align: 0.0 0.5;
- aspect: 1.0 1.0;
- rel1.offset: 2 2;
+ rel1.offset: 4 4;
rel2.relative: 0.0 1.0;
- rel2.offset: 2 -3;
+ rel2.offset: 4 -5;
+ min: ICMIN ICMIN;
+ offscale;
}
}
swallow { "efl.extra";
+ scale: 1;
desc { "default";
fixed: 1 0;
align: 1.0 0.5;
- aspect: 1.0 1.0;
- rel1.offset: -3 2;
+ rel1.offset: -5 4;
rel1.relative: 1.0 0.0;
- rel2.offset: -3 -3;
- }
- }
- //##//
- image { "sel_shine"; nomouse;
- desc { "default";
- image.normal: "shine.png";
- rel1.offset: 0 -2;
- rel1.to: "sel_base";
- rel2.relative: 1.0 0.0;
- rel2.offset: -1 2;
- rel2.to: "sel_base";
- hid;
- FIXED_SIZE(69, 5)
- }
- desc { "selected";
- inherit: "default";
- vis;
+ rel2.offset: -5 -5;
+ min: ICMIN ICMIN;
+ offscale;
}
}
rect { "event_block";
@@ -269,154 +160,77 @@ group { "efl/list_item"; data.item: "version" "124";
}
programs {
EFL_UI_CLICKABLE_PART_BIND("event")
- program {
- signal: "efl,state,odd"; source: "efl";
+ program { signal: "efl,state,odd"; source: "efl";
action: STATE_SET "odd";
target: "base";
}
- program {
- signal: "efl,state,even"; source: "efl";
+ program { signal: "efl,state,even"; source: "efl";
action: STATE_SET "default";
target: "base";
}
- program {
- signal: "efl,state,pressed"; source: "efl";
+ program { signal: "efl,state,pressed"; source: "efl";
action: STATE_SET "selected";
- target: "sel_shadow";
target: "sel_base";
- target: "sel_bevel";
target: "efl.text";
- target: "label2";
- target: "label3";
- target: "sel_shine";
}
- program {
- signal: "efl,state,unpressed"; source: "efl";
+ program { signal: "efl,state,unpressed"; source: "efl";
action: STATE_SET "default";
- target: "sel_shadow";
target: "sel_base";
- target: "sel_bevel";
target: "efl.text";
- target: "label2";
- target: "label3";
- target: "sel_shine";
}
- program {
- signal: "efl,state,selected"; source: "efl";
+ program { signal: "efl,state,selected"; source: "efl";
action: STATE_SET "selected";
- target: "sel_shadow";
target: "sel_base";
- target: "sel_bevel";
target: "efl.text";
- target: "label2";
- target: "label3";
- target: "sel_shine";
}
- program {
- signal: "efl,state,unselected"; source: "efl";
+ program { signal: "efl,state,unselected"; source: "efl";
action: STATE_SET "default";
- target: "sel_shadow";
target: "sel_base";
- target: "sel_bevel";
target: "efl.text";
- target: "label2";
- target: "label3";
- target: "sel_shine";
}
- program {
- signal: "efl,state,disabled"; source: "efl";
+ program { signal: "efl,state,disabled"; source: "efl";
action: STATE_SET "disabled";
target: "event";
target: "efl.text";
- target: "label2";
- target: "label3";
- target: "event_block";
}
- program {
- signal: "efl,state,enabled"; source: "efl";
+ program { signal: "efl,state,enabled"; source: "efl";
action: STATE_SET "default";
target: "event";
target: "efl.text";
- target: "label2";
- target: "label3";
- target: "event_block";
}
}
}
-group { "efl/list_item:placeholder"; data.item: "version" "124";
+group { "efl/list_item:placeholder";
+ data.item: "version" "124";
data.item: "selectraise" "on";
data.item: "focusraise" "on";
- images.image: "bevel_curved_horiz_out.png" COMP;
- images.image: "shadow_rounded_horiz.png" COMP;
- images.image: "vgrad_med_dark.png" COMP;
- images.image: "bevel_horiz_out.png" COMP;
- images.image: "shine.png" COMP;
parts {
rect { "base"; nomouse;
desc { "default";
color: 64 64 64 255;
- color_class: "list_item_base";
}
desc { "odd";
color: 56 56 56 255;
- color_class: "list_item_base_odd";
- }
- }
-
- image { "bevel"; nomouse;
- desc { "default";
- image.normal: "bevel_curved_horiz_out.png";
- image.border: 0 0 2 2;
- image.middle: 0;
- fill.smooth: 0;
- }
- }
- swallow { "efl.background";
- desc { "default";
- rel.to: "base";
- vis;
- }
- }
- image { "sel_shadow"; nomouse;
- desc { "default";
- image.normal: "shadow_rounded_horiz.png";
- image.border: 0 0 9 9;
- rel1.offset: 0 -4;
- rel2.offset: -1 5;
- fill.smooth: 0;
- hid;
- }
- desc { "selected";
- inherit: "default";
- vis;
}
}
- image { "sel_base"; nomouse;
+ rect { "sel_base"; nomouse;
desc { "default";
- image.normal: "vgrad_med_dark.png";
- fill.smooth: 0;
+ color: 51 153 255 255;
hid;
- TILED_HORIZ(120)
}
desc { "selected";
inherit: "default";
vis;
}
}
- image { "sel_bevel"; nomouse;
+ swallow { "efl.background";
desc { "default";
- image.normal: "bevel_horiz_out.png";
- image.border: 0 0 2 2;
- image.middle: 0;
- fill.smooth: 0;
- hid;
- }
- desc { "selected";
- inherit: "default";
+ rel.to: "base";
vis;
}
}
+ //##//
rect { "event";
desc { "default";
color: 0 0 0 0;
@@ -427,32 +241,16 @@ group { "efl/list_item:placeholder"; data.item: "version"
"124";
}
}
//##//
- swallow { "efl.content"; mouse;
- scale;
+ swallow { "efl.content";
+ scale: 1;
desc { "default";
- min: 19 19;
- rel1.offset: -1 2;
- rel2.offset: -3 -3;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ min: ICMIN ICMIN;
+ offscale;
}
}
- //##//
- image { "sel_shine";
- desc { "default";
- image.normal: "shine.png";
- rel1.offset: 0 -2;
- rel1.to: "sel_base";
- rel2.relative: 1.0 0.0;
- rel2.offset: -1 2;
- rel2.to: "sel_base";
- hid;
- FIXED_SIZE(69, 5)
- }
- desc { "selected";
- inherit: "default";
- vis;
- }
- }
- rect { "event_block"; mouse;
+ rect { "event_block";
desc { "default";
color: 0 0 0 0;
hid;
@@ -465,59 +263,37 @@ group { "efl/list_item:placeholder"; data.item: "version"
"124";
}
programs {
EFL_UI_CLICKABLE_PART_BIND("event")
- program {
- signal: "efl,state,odd"; source: "efl";
+ program { signal: "efl,state,odd"; source: "efl";
action: STATE_SET "odd";
target: "base";
}
- program {
- signal: "efl,state,even"; source: "efl";
+ program { signal: "efl,state,even"; source: "efl";
action: STATE_SET "default";
target: "base";
}
- program {
- signal: "efl,state,pressed"; source: "efl";
+ program { signal: "efl,state,pressed"; source: "efl";
action: STATE_SET "selected";
- target: "sel_shadow";
target: "sel_base";
- target: "sel_bevel";
- target: "sel_shine";
}
- program {
- signal: "efl,state,unpressed"; source: "efl";
+ program { signal: "efl,state,unpressed"; source: "efl";
action: STATE_SET "default";
- target: "sel_shadow";
target: "sel_base";
- target: "sel_bevel";
- target: "sel_shine";
}
- program {
- signal: "efl,state,selected"; source: "efl";
+ program { signal: "efl,state,selected"; source: "efl";
action: STATE_SET "selected";
- target: "sel_shadow";
target: "sel_base";
- target: "sel_bevel";
- target: "sel_shine";
}
- program {
- signal: "efl,state,unselected"; source: "efl";
+ program { signal: "efl,state,unselected"; source: "efl";
action: STATE_SET "default";
- target: "sel_shadow";
target: "sel_base";
- target: "sel_bevel";
- target: "sel_shine";
}
- program {
- signal: "efl,state,disabled"; source: "efl";
+ program { signal: "efl,state,disabled"; source: "efl";
action: STATE_SET "disabled";
target: "event";
- target: "event_block";
}
- program {
- signal: "efl,state,enabled"; source: "efl";
+ program { signal: "efl,state,enabled"; source: "efl";
action: STATE_SET "default";
target: "event";
- target: "event_block";
}
}
}
--
