diff options
author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2021-02-28 23:32:39 +0000 |
---|---|---|
committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2021-02-28 23:32:39 +0000 |
commit | 60adecf11dcef7ce6d85473a888e968b288c52bd (patch) | |
tree | cd45a95b2f7a12119e3c737aa4c64062aef65f55 /data/elementary | |
parent | 8852214816433700c969a45f1bdfe75e7b75294e (diff) | |
download | efl-60adecf11dcef7ce6d85473a888e968b288c52bd.tar.gz |
TH - grid + group header
Diffstat (limited to 'data/elementary')
-rw-r--r-- | data/elementary/themes/edc/comp.edc | 1 | ||||
-rw-r--r-- | data/elementary/themes/edc/comp_compat.edc | 11 | ||||
-rw-r--r-- | data/elementary/themes/edc/efl/grid.edc | 340 | ||||
-rw-r--r-- | data/elementary/themes/edc/efl/group_item.edc | 100 |
4 files changed, 149 insertions, 303 deletions
diff --git a/data/elementary/themes/edc/comp.edc b/data/elementary/themes/edc/comp.edc index f325b9621f..f7e3e0be99 100644 --- a/data/elementary/themes/edc/comp.edc +++ b/data/elementary/themes/edc/comp.edc @@ -254,6 +254,7 @@ group { name: "e/comp/frame/default"; description { state: "focused" 0.0; inherit; color_class: "comp_focus_color"; + color: 255 255 255 255; } } part { name: "e.swallow.content"; type: SWALLOW; diff --git a/data/elementary/themes/edc/comp_compat.edc b/data/elementary/themes/edc/comp_compat.edc index 3cf0364730..ffc9990b37 100644 --- a/data/elementary/themes/edc/comp_compat.edc +++ b/data/elementary/themes/edc/comp_compat.edc @@ -45,8 +45,7 @@ group { name: "e/comp/border/default"; mouse_events: 0; description { state: "default" 0.0; color_class: "comp_alpha"; - rel1.to: "clipper"; - rel2.to: "clipper"; + rel.to: "clipper"; } } part { name: "focus-clipper"; @@ -55,20 +54,18 @@ group { name: "e/comp/border/default"; mouse_events: 0; description { state: "default" 0.0; color_class: "comp_focus-out_color"; - rel1.to: "clipper"; - rel2.to: "clipper"; + rel.to: "clipper"; } description { state: "focused" 0.0; inherit: "default" 0.0; - color_class: ""; + color_class: "comp_focus_color"; color: 255 255 255 255; } } part { name: "e.swallow.content"; type: SWALLOW; clip_to: "focus-clipper"; description { state: "default" 0.0; - rel1.to: "shower"; - rel2.to: "shower"; + rel.to: "shower"; } } } diff --git a/data/elementary/themes/edc/efl/grid.edc b/data/elementary/themes/edc/efl/grid.edc index d312ee71db..5879f543ef 100644 --- a/data/elementary/themes/edc/efl/grid.edc +++ b/data/elementary/themes/edc/efl/grid.edc @@ -41,265 +41,163 @@ group { "efl/view_grid"; data.item: "version" "123"; } -group { "efl/grid_item"; data.item: "version" "124"; +group { "efl/grid_item"; + data.item: "version" "124"; data.item: "selectraise" "on"; data.item: "focusraise" "on"; - images.image: "bevel_dark_out.png" COMP; - images.image: "shadow_rounded_horiz.png" COMP; - images.image: "vgrad_med_dark.png" COMP; - images.image: "bevel_out.png" COMP; - images.image: "shine.png" COMP; + data.item: "texts" "elm.text"; parts { +//--------------------------------------------------------------------------- +#define BASEP() \ + part { name: "base"; type: RECT; mouse_events: 0; \ + description { state: "default" 0.0; \ + color: 64 64 64 255; \ + } \ + } \ + part { name: "sel_base"; type: RECT; mouse_events: 0; \ + description { state: "default" 0.0; \ + color: 51 153 255 255; \ + visible: 0; \ + } \ + description { state: "selected" 0.0; \ + inherit: "default" 0.0; \ + visible: 1; \ + } \ + } \ + program { signal: "efl,state,selected"; source: "efl"; \ + action: STATE_SET "selected" 0.0; \ + target: "sel_base"; \ + } \ + program { signal: "efl,state,unselected"; source: "efl"; \ + action: STATE_SET "default" 0.0; \ + target: "sel_base"; \ + } \ + program { signal: "efl,state,disabled"; source: "efl"; \ + action: STATE_SET "disabled" 0.0; \ + target: "event"; \ + } \ + program { signal: "efl,state,enabled"; source: "efl"; \ + action: STATE_SET "default" 0.0; \ + target: "event"; \ + } +#define TOPP() \ + part { name: "event"; type: RECT; \ + repeat_events: 1; \ + description { state: "default" 0.0; \ + color: 0 0 0 0; \ + } \ + description { state: "disabled" 0.0; \ + inherit: "default" 0.0; \ + visible: 0; \ + } \ + } \ + part { name: "event_block"; type: RECT; \ + description { state: "default" 0.0; \ + color: 0 0 0 0; \ + visible: 0; \ + } \ + description { state: "disabled" 0.0; \ + inherit: "default" 0.0; \ + visible: 1; \ + } \ + } \ + program { signal: "efl,state,disabled"; source: "efl"; \ + action: STATE_SET "disabled" 0.0; \ + target: "event_block"; \ + } \ + program { signal: "efl,state,enabled"; source: "efl"; \ + action: STATE_SET "default" 0.0; \ + target: "event_block"; \ + } +//--------------------------------------------------------------------------- + BASEP() - // BASE PARTS // - rect { "base"; mouse; - desc { "default"; - } - } - image { "bevel"; nomouse; - desc { "default"; - image.normal: "bevel_dark_out.png"; - image.border: 2 2 2 2; - image.middle: 0; - fill.smooth: 0; - } - } - 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; - desc { "default"; - image.normal: "vgrad_med_dark.png"; - fill.smooth: 0; - hid; - TILED_HORIZ(120) - } - desc { "selected"; - inherit: "default"; - vis; - } - } - image { "sel_bevel"; nomouse; - desc { "default"; - image.normal: "bevel_out.png"; - image.border: 2 2 2 2; - image.middle: 0; - fill.smooth: 0; - hid; - } - desc { "selected"; - inherit: "default"; - vis; - } - } - // BASE PARTS // - - // TEXT PARTS // - text { "efl.text"; nomouse; - effect: SHADOW BOTTOM; + //##// + part { name: "efl.text"; type: TEXT; mouse_events: 0; scale: 1; - desc { "default"; + description { state: "default" 0.0; fixed: 0 1; rel1.relative: 0.0 1.0; - rel1.offset: 5 -5; - rel2.relative: 1.0 1.0; + rel1.offset: 4 -5; rel2.offset: -5 -5; - color: FN_COL_DEFAULT; - color_class: "grid_item"; + color: 160 160 160 255; align: 0.5 1.0; + offscale; text { font: FN; size: 10; min: 0 1; align: 0.5 1.0; text_class: "grid_item"; } } - desc { "selected"; - inherit: "default"; - hid; + description { state: "selected" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; } - desc { "disabled"; - inherit: "default"; - hid; + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 80 80 80 255; } } - text { "label2"; nomouse; - effect: SHADOW BOTTOM; - scale: 1; - desc { "default"; - rel1.to: "efl.text"; - rel2.to: "efl.text"; - color: FN_COL_DISABLE; - color_class: "grid_item_disabled"; - text { font: FN; size: 10; - text_source: "efl.text"; - align: 0.5 1.0; - text_class: "grid_item"; - } - hid; - } - desc { "selected"; - inherit: "default"; - hid; - } - desc { "disabled"; - inherit: "default"; - vis; - } + program { signal: "efl,state,selected"; source: "efl"; + action: STATE_SET "selected" 0.0; + target: "efl.text"; } - text { "label3"; nomouse; - effect: GLOW; - scale: 1; - desc { "default"; - rel1.offset: -2 -2; - rel1.to: "efl.text"; - rel2.offset: 1 0; - rel2.to: "efl.text"; - color: FN_COL_HIGHLIGHT; - color_class: "grid_item_selected"; - text { font: FN; size: 10; - text_source: "efl.text"; - align: 0.5 1.0; - text_class: "grid_item"; - } - hid; - } - desc { "selected"; - inherit: "default"; - vis; - } - desc { "disabled"; - inherit: "default"; - hid; - } + program { signal: "efl,state,unselected"; source: "efl"; + action: STATE_SET "default" 0.0; + target: "efl.text"; } - // TEXT PARTS // - - // CONTENT PARTS // - rect { "icon_area"; - desc { "default"; - fixed: 1 0; - rel1.offset: 2 2; + program { signal: "efl,state,disabled"; source: "efl"; + action: STATE_SET "disabled" 0.0; + target: "efl.text"; + target: "icon_area"; + } + program { signal: "efl,state,enabled"; source: "efl"; + action: STATE_SET "default" 0.0; + target: "efl.text"; + target: "icon_area"; + } + //##// + part { name: "icon_area"; type: RECT; + scale: 1; + description { state: "default" 0.0; + rel1.offset: 4 4; rel2.to_y: "efl.text"; rel2.relative: 1.0 0.0; - rel2.offset: -3 -3; + rel2.offset: -5 -5; + offscale; } - desc { "disabled"; - inherit: "default"; + description { state: "disabled" 0.0; + inherit: "default" 0.0; color: 255 255 255 64; } } - rect { "event"; - desc { "default"; - color: 0 0 0 0; - } - desc { "disabled"; - inherit: "default"; - hid; - } - } - swallow { "efl.icon"; + part { name: "efl.icon"; type: SWALLOW; clip_to: "icon_area"; - desc { "default"; - rel1.to: "icon_area"; - rel2.to: "icon_area"; + description { state: "default" 0.0; + rel.to: "icon_area"; } } - swallow { "efl.extra"; + part { name: "efl.extra"; type: SWALLOW; + scale: 1; clip_to: "icon_area"; - desc { "default"; - fixed: 1 1; + description { state: "default" 0.0; + min: ICMIN ICMIN; align: 1.0 0.0; + rel.to: "icon_area"; rel1.relative: 1.0 0.0; - rel1.offset: -3 2; + rel1.offset: -5 4; rel2.relative: 1.0 0.0; - rel2.offset: -3 2; + rel2.offset: -5 4; + offscale; } } - // CONTENT PARTS // + //##// - // TOP PARTS // - 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; - } - } - rect { "event_block"; - desc { "default"; - color: 0 0 0 0; - hid; - } - desc { "disabled"; - inherit: "default"; - vis; - } - } - // TOP PARTS // + TOPP() } programs { EFL_UI_CLICKABLE_PART_BIND("event") - program { - signal: "efl,state,selected"; source: "efl"; - action: STATE_SET "selected"; - target: "sel_shadow"; - target: "sel_base"; - target: "sel_bevel"; - target: "sel_shine"; - target: "efl.text"; - target: "label2"; - target: "label3"; - } - program { - signal: "efl,state,unselected"; source: "efl"; - action: STATE_SET "default"; - target: "sel_shadow"; - target: "sel_base"; - target: "sel_bevel"; - target: "sel_shine"; - target: "efl.text"; - target: "label2"; - target: "label3"; - } - program { - signal: "efl,state,disabled"; source: "efl"; - action: STATE_SET "disabled"; - target: "event"; - target: "event_block"; - target: "efl.text"; - target: "label2"; - target: "label3"; - target: "icon_area"; - } - program { - signal: "efl,state,enabled"; source: "efl"; - action: STATE_SET "default"; - target: "event"; - target: "event_block"; - target: "efl.text"; - target: "label2"; - target: "label3"; - target: "icon_area"; - } } } +#undef BASEP +#undef TOPP diff --git a/data/elementary/themes/edc/efl/group_item.edc b/data/elementary/themes/edc/efl/group_item.edc index 16d4c78b94..f19a720a83 100644 --- a/data/elementary/themes/edc/efl/group_item.edc +++ b/data/elementary/themes/edc/efl/group_item.edc @@ -7,56 +7,29 @@ Group: efl/group_item (@since 1.23) Signal: efl,state,enabled */ - -group { "efl/group_item"; data.item: "version" "124"; nomouse; program_source: "efl"; - images.image: "shadow_square_tiny.png" COMP; - images.image: "bevel_out.png" COMP; - images.image: "horizontal_separated_bar_small_glow.png" COMP; - +group { "efl/group_item"; + data.item: "version" "124"; + nomouse; + program_source: "efl"; parts { - image { "shadow_vbar"; - desc { "default"; - rel1.offset: -3 -2; - rel1.to: "base_vbar"; - rel2.offset: 2 4; - rel2.to: "base_vbar"; - image.normal: "shadow_square_tiny.png"; - image.border: 6 6 6 6; - fill.smooth: 0; - } - } - image { "base_vbar"; - desc { "default"; - image.normal: "vgrad_med_lighter.png"; - fill.smooth: 0; - min: 5 13; - TILED_HORIZ(120) - } - } - image { "bevel_vbar"; + rect { "base"; desc { "default"; - rel1.to: "base_vbar"; - rel2.to: "base_vbar"; - image.normal: "bevel_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; - min: 5 5; + color: 32 32 32 255; } } - text { "efl.text"; - effect: SHADOW BOTTOM; scale; desc { "default"; - rel1.offset: 2 3; + offscale; + min: 0 ICMIN; + 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_group_item"; + align: 0.0 0.5; + color: 255 255 255 255; text { font: FNBD; size: 10; min: 1 1; ellipsis: -1; @@ -67,56 +40,33 @@ group { "efl/group_item"; data.item: "version" "124"; nomouse; program_source: " } desc { "disabled"; inherit: "default"; - color: FN_COL_DISABLE; - color_class: "list_group_item_disabled"; + color: 80 80 80 255; link.base: "efl,state,disabled"; } } - swallow { "pad"; mouse; - desc { "default"; - fixed: 1 0; - align: 0.0 0.5; - rel1.offset: 2 2; - rel2.relative: 0.0 1.0; - rel2.offset: 2 -3; - } - } swallow { "efl.icon"; mouse; + scale; desc { "default"; + offscale; + min: ICMIN ICMIN; fixed: 1 0; align: 0.0 0.5; - rel1.to_x: "pad"; - rel1.relative: 1.0 0.0; - rel1.offset: -1 2; - rel2.to_x: "pad"; - rel2.relative: 1.0 1.0; - rel2.offset: -1 -3; + rel1.relative: 0.0 0.0; + rel1.offset: 4 2; + rel2.relative: 0.0 1.0; + rel2.offset: 4 -3; } } swallow { "efl.extra"; mouse; + scale; desc { "default"; + offscale; + min: ICMIN ICMIN; fixed: 1 0; align: 1.0 0.5; - rel1.offset: -3 2; + rel1.offset: -5 4; rel1.relative: 1.0 0.0; - rel2.offset: -3 -3; - } - } - image { "bar"; - desc { "default"; - image.normal: "horizontal_separated_bar_small_glow.png"; - image.border: 4 4 4 4; - fill.smooth: 0; - fixed: 0 1; - rel1.relative: 0.0 1.0; - rel1.offset: -3 -6; - rel2.offset: 2 3; - link.base: "efl,state,enabled"; - } - desc { "disabled"; - inherit: "default"; - color: 255 255 255 64; - link.base: "efl,state,disabled"; + rel2.offset: -5 -5; } } } |