raster pushed a commit to branch feature/themes/flat. http://git.enlightenment.org/core/efl.git/commit/?id=2ee2966dd59b4563a68a9484fe8954df298a3f38
commit 2ee2966dd59b4563a68a9484fe8954df298a3f38 Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Tue Dec 4 18:01:57 2018 +0000 TH - ilist --- data/elementary/themes/edc/ilist.edc | 231 +++++++---------------------------- 1 file changed, 45 insertions(+), 186 deletions(-) diff --git a/data/elementary/themes/edc/ilist.edc b/data/elementary/themes/edc/ilist.edc index b6eae7c410..8d2b4c2da8 100644 --- a/data/elementary/themes/edc/ilist.edc +++ b/data/elementary/themes/edc/ilist.edc @@ -61,60 +61,17 @@ group { name: "e/ilist"; group { name: "e/widgets/ilist"; // data.item: "stacking" "above"; - data.item: "stacking" "below"; - data.item: "selectraise" "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; +// data.item: "stacking" "below"; +// data.item: "selectraise" "on"; parts { part { name: "base"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color_class: "ilist_item_base"; color: 64 64 64 255; } } - part { name: "bevel"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "bevel_curved_horiz_out.png"; - image.border: 0 0 2 2; - image.middle: 0; - fill.smooth: 0; - } - } - part { name: "sel_shadow"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "shadow_rounded_horiz.png"; - image.border: 0 0 9 9; - rel1.offset: 0 -4; - rel2.offset: -1 5; - fill.smooth: 0; - visible: 0; - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - part { name: "sel_base"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "vgrad_med_dark.png"; - fill.smooth: 0; - TILED_HORIZ(120) - visible: 0; - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - part { name: "sel_bevel"; mouse_events: 0; + part { name: "sel_base"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - image.normal: "bevel_horiz_out.png"; - image.border: 0 0 2 2; - image.middle: 0; - fill.smooth: 0; + color: 51 153 255 255; visible: 0; } description { state: "selected" 0.0; @@ -123,116 +80,52 @@ group { name: "e/widgets/ilist"; } } part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0; + scale: 1; description { state: "default" 0.0; align: 0.0 0.5; aspect: 1.0 1.0; aspect_preference: VERTICAL; - rel1.offset: 2 2; + rel1.offset: 4 4; rel2.relative: 0.0 1.0; - rel2.offset: 2 -3; + rel2.offset: 4 -5; + offscale; } } part { name: "e.text.label"; type: TEXT; mouse_events: 0; - effect: SHADOW BOTTOM; scale: 1; description { state: "default" 0.0; - rel1.offset: 2 3; + rel1.offset: 4 4; rel1.relative: 1.0 0.0; rel1.to_x: "e.swallow.icon"; - rel2.offset: -3 -3; + rel2.offset: -5 -5; rel2.relative: 0.0 1.0; rel2.to_x: "e.swallow.end"; - color_class: "ilist_item"; - color3: 255 255 255 255; + color: 160 160 160 255; text { font: FN; size: 10; min: 1 1; ellipsis: -1; align: 0.0 0.5; text_class: "ilist_item"; } + offscale; } description { state: "selected" 0.0; inherit: "default" 0.0; - visible: 0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } - part { name: "label2"; type: TEXT; mouse_events: 0; - effect: SHADOW BOTTOM; - scale: 1; - description { state: "default" 0.0; - rel1.to: "e.text.label"; - rel2.to: "e.text.label"; - color: FN_COL_DISABLE; - color_class: "ilist_item_disabled"; - text { font: FN; size: 10; - text_source: "e.text.label"; - align: 0.0 0.5; - text_class: "ilist_item"; - } - visible: 0; - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 1; - } - } - part { name: "label3"; type: TEXT; mouse_events: 0; - effect: GLOW; - scale: 1; - description { state: "default" 0.0; - rel1.offset: -2 -3; - rel1.to: "e.text.label"; - rel2.offset: 2 1; - rel2.to: "e.text.label"; - color_class: "ilist_item_selected"; - color2: 255 255 255 255; - color3: 255 255 255 255; - text { font: FN; size: 10; - text_source: "e.text.label"; - align: 0.0 0.5; - text_class: "ilist_item"; - } - visible: 0; - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; + color: 255 255 255 255; } description { state: "disabled" 0.0; inherit: "default" 0.0; - visible: 0; + color: 80 80 80 255; } } part { name: "e.swallow.end"; type: SWALLOW; mouse_events: 0; + scale: 1; description { state: "default" 0.0; align: 1.0 0.5; aspect: 1.0 1.0; aspect_preference: VERTICAL; - rel1.offset: -3 2; + rel1.offset: -5 4; rel1.relative: 1.0 0.0; - rel2.offset: -3 -3; - } - } - part { name: "sel_shine"; mouse_events: 0; - description { state: "default" 0.0; - 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"; - FIXED_SIZE(69, 5) - visible: 0; - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; + rel2.offset: -5 -5; + offscale; } } part { name: "event"; type: RECT; @@ -249,40 +142,26 @@ group { name: "e/widgets/ilist"; program { signal: "e,state,selected"; source: "e"; action: STATE_SET "selected" 0.0; - target: "sel_shadow"; target: "sel_base"; - target: "sel_bevel"; - target: "sel_shine"; target: "e.text.label"; - target: "label2"; - target: "label3"; } program { signal: "e,state,unselected"; source: "e"; action: STATE_SET "default" 0.0; - target: "sel_shadow"; target: "sel_base"; - target: "sel_bevel"; - target: "sel_shine"; target: "e.text.label"; - target: "label2"; - target: "label3"; } program { signal: "e,state,disabled"; source: "e"; action: STATE_SET "disabled" 0.0; - target: "event"; + target: "sel_base"; target: "e.text.label"; - target: "label2"; - target: "label3"; } program { signal: "e,state,enabled"; source: "e"; action: STATE_SET "default" 0.0; - target: "event"; + target: "sel_base"; target: "e.text.label"; - target: "label2"; - target: "label3"; } } } @@ -292,19 +171,18 @@ group { name: "e/widgets/ilist_odd"; parts { part { name: "base"; description { state: "default" 0.0; - color_class: "ilist_item_odd_base"; color: 56 56 56 255; } } part { name: "e.text.label"; description { state: "default" 0.0; - color_class: "ilist_item_odd"; +// color_class: "ilist_item_odd"; } description { state: "selected" 0.0; - color_class: "ilist_item_odd"; +// color_class: "ilist_item_odd"; } description { state: "disabled" 0.0; - color_class: "ilist_item_odd"; +// color_class: "ilist_item_odd"; } } } @@ -313,89 +191,69 @@ group { name: "e/widgets/ilist_odd"; group { name: "e/widgets/ilist_header"; alias: "e/widgets/ilist_header_odd"; data.item: "stacking" "above"; - images.image: "dot_pattern.png" COMP; - images.image: "inset_shadow.png" COMP; - images.image: "shadow_vertical_dark.png" COMP; parts { part { name: "base"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color_class: "ilist_item_base"; - color: 48 48 48 255; - } - } - part { name: "pat"; - description { state: "default" 0.0; - image.normal: "dot_pattern.png"; - TILED_PATTERN(256, 256) - } - } - part { name: "shadow"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "shadow_vertical_dark.png"; - color: 255 255 255 128; + color: 32 32 32 255; } } part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0; + scale: 1; description { state: "default" 0.0; align: 0.0 0.5; aspect: 1.0 1.0; aspect_preference: VERTICAL; - rel1.offset: 2 2; + rel1.offset: 4 4; rel2.relative: 0.0 1.0; - rel2.offset: 2 -3; + rel2.offset: 4 -5; + offscale; } } part { name: "e.text.label"; type: TEXT; mouse_events: 0; - effect: SHADOW BOTTOM; scale: 1; description { state: "default" 0.0; - rel1.offset: 2 6; + rel1.offset: 8 8; rel1.relative: 1.0 0.0; rel1.to_x: "e.swallow.icon"; - rel2.offset: -3 -7; + rel2.offset: -8 -9; rel2.relative: 0.0 1.0; rel2.to_x: "e.swallow.end"; - color_class: "ilist_item_header"; - color3: 255 255 255 255; + color: 255 255 255 255; text { font: FNBD; size: 10; min: 0 1; align: 0.0 0.5; text_class: "ilist_item"; } + offscale; } } part { name: "e.swallow.end"; type: SWALLOW; mouse_events: 0; + scale: 1; description { state: "default" 0.0; align: 1.0 0.5; aspect: 1.0 1.0; aspect_preference: VERTICAL; - rel1.offset: -3 2; + rel1.offset: -5 4; rel1.relative: 1.0 0.0; - rel2.offset: -3 -3; - } - } - part { name: "shadow2"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "inset_shadow.png"; - image.border: 5 5 7 3; - image.middle: 0; - fill.smooth: 0; + rel2.offset: -5 -5; + offscale; } } } } group { name: "e/widgets/ilist/toggle_end"; - images.image: "led_dark.png" COMP; - images.image: "led_light.png" COMP; + images.image: "speaker_vol.png" COMP; parts { part { name: "base"; mouse_events: 0; description { state: "default" 0.0; - image.normal: "led_dark.png"; + image.normal: "speaker_vol.png"; aspect: 1.0 1.0; aspect_preference: BOTH; - max: 32 32; + color: 80 80 80 255; + rel1.relative: 0.2 0.2; + rel2.relative: 0.8 0.8; } description { state: "visible" 0.0; inherit: "default" 0.0; - image.normal: "led_light.png"; + color: 51 153 255 255; } } } @@ -403,14 +261,15 @@ group { name: "e/widgets/ilist/toggle_end"; program { signal: "e,state,checked"; source: "e"; action: STATE_SET "visible" 0.0; - transition: BOUNCE 0.4 0.5 4; + transition: SINUSOIDAL 0.3; target: "base"; } program { signal: "e,state,unchecked"; source: "e"; action: STATE_SET "default" 0.0; + transition: SINUSOIDAL 0.3; target: "base"; } } } - + --
