raster pushed a commit to branch feature/themes/flat. http://git.enlightenment.org/core/efl.git/commit/?id=e40d78ee3fcb4556488ff32a8c524fa0ef99faa8
commit e40d78ee3fcb4556488ff32a8c524fa0ef99faa8 Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com> Date: Tue Nov 3 11:18:41 2020 +0000 TH - support new winlist stuff in e like large mode and win minis --- data/elementary/themes/edc/comp.edc | 4 +- data/elementary/themes/edc/winlist.edc | 218 +++++++++++++++++++++++++++++++-- 2 files changed, 212 insertions(+), 10 deletions(-) diff --git a/data/elementary/themes/edc/comp.edc b/data/elementary/themes/edc/comp.edc index 3435a0ac35..f325b9621f 100644 --- a/data/elementary/themes/edc/comp.edc +++ b/data/elementary/themes/edc/comp.edc @@ -265,8 +265,8 @@ group { name: "e/comp/frame/default"; spacer { "gspacer"; desc { rel.to: "e.swallow.content"; - rel1.offset: -5 -5; - rel2.offset: 4 4; + rel1.offset: -5 -5; + rel2.offset: 4 4; } } } diff --git a/data/elementary/themes/edc/winlist.edc b/data/elementary/themes/edc/winlist.edc index 153d481383..c17feb2ad9 100644 --- a/data/elementary/themes/edc/winlist.edc +++ b/data/elementary/themes/edc/winlist.edc @@ -21,6 +21,7 @@ group { name: "e/widgets/winlist/main"; min: 0 1; } fixed: 0 1; + offscale; } } part { name: "e.swallow.icon"; type: SWALLOW; @@ -71,15 +72,18 @@ group { name: "e/widgets/winlist/main"; min: 0 1; } fixed: 0 1; + offscale; } } part { name: "list_clip"; type: RECT; + scale: 1; description { state: "default" 0.0; color: 255 255 255 255; rel1.relative: 0.0 1.0; rel1.offset: 0 8; rel1.to_y: "e.swallow.icon"; rel2.offset: -1 -9; + offscale; } } part { name: "e.swallow.list"; type: SWALLOW; @@ -198,26 +202,22 @@ group { name: "e/widgets/winlist/item"; } } programs { - program { - signal: "e,state,selected"; source: "e"; + program { signal: "e,state,selected"; source: "e"; action: STATE_SET "selected" 0.0; target: "sel_base"; target: "label"; } - program { - signal: "e,state,unselected"; source: "e"; + program { signal: "e,state,unselected"; source: "e"; action: STATE_SET "default" 0.0; target: "sel_base"; target: "label"; } - program { - signal: "e,state,iconified"; source: "e"; + program { signal: "e,state,iconified"; source: "e"; action: STATE_SET "iconified" 0.0; target: "e.swallow.icon"; target: "e.text.label"; } - program { - signal: "e,state,invisible"; source: "e"; + program { signal: "e,state,invisible"; source: "e"; action: STATE_SET "iconified" 0.0; target: "e.swallow.icon"; target: "e.text.label"; @@ -227,3 +227,205 @@ group { name: "e/widgets/winlist/item"; // } } } + +//////////////////////////////////////////////////////////////////////////// + +group { name: "e/widgets/winlist/large/bg"; + alias: "e/widgets/winlist/bg"; + images.image: "screen_circular_shadow.png" COMP; + parts { + part { name: "bg_clip"; type: RECT; + description { state: "default" 0.0; + visible: 0; + color: 255 255 255 0; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + color: 255 255 255 255; + } + } + snapshot { "bg_blur"; + clip_to: "bg_clip"; + description { state: "default" 0.0; + filter.code: "padding_set { 0 } blur { state.pos * 50, color = '#ffff' }"; + visible: 0; + } + desc { state: "visible" 0.0; + inherit: "default" 0.0; + filter.code: "padding_set { 0 } blur { (1.0 - state.pos) * 50, color = '#ffff' }"; + visible: 1; + } + } + part { name: "bg_darken"; type: RECT; + clip_to: "bg_clip"; + description { state: "default" 0.0; + color: 0 0 0 128; + } + } + part { name: "shadow"; mouse_events: 0; + clip_to: "bg_clip"; + description { state: "default" 0.0; + rel1.relative: -1.0 -1.0; + rel2.relative: 2.0 2.0; + image.normal: "screen_circular_shadow.png"; + fill.smooth: 0; + color: 255 255 255 0; + visible: 0; + } + description { state: "visible" 0.0; + inherit; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 1.0; + color: 255 255 255 255; + visible: 1; + } + } + } + programs { + program { signal: "e,state,visible,on"; source: "e"; + action: STATE_SET "visible" 0.0; + transition: DECELERATE 0.2; + target: "bg_clip"; + target: "bg_blur"; + target: "shadow"; + after: "show2"; + } + program { name: "show2"; + action: SIGNAL_EMIT "e,action,show,done" "e"; + } + program { signal: "e,state,visible,off"; source: "e"; + action: STATE_SET "visible" 0.0; + transition: ACCELERATE 0.2; + target: "bg_clip"; + target: "bg_blur"; + target: "shadow"; + after: "hide2"; + } + program { name: "hide2"; + action: SIGNAL_EMIT "e,action,hide,done" "e"; + } + } +} + +group { name: "e/widgets/winlist/fg"; + alias: "e/widgets/winlist/fg"; + parts { + part { name: "fg_darken"; type: RECT; + description { state: "default" 0.0; + visible: 0; + } + } + } + programs { + program { signal: "e,state,visible,on"; source: "e"; + action: SIGNAL_EMIT "e,action,show,done" "e"; + } + program { signal: "e,state,visible,off"; source: "e"; + action: SIGNAL_EMIT "e,action,hide,done" "e"; + } + } +} + +group { name: "e/widgets/winlist/large"; + data.item: "noshadow" "1"; + parts { + part { name: "list_clip"; type: RECT; + scale: 1; + description { state: "default" 0.0; + rel1.offset: 8 8; + rel2.offset: -9 -9; + offscale; + } + } + part { name: "e.swallow.list"; type: SWALLOW; + clip_to: "list_clip"; + scale: 1; + description { state: "default" 0.0; + rel1.to_y: "list_clip"; + rel2.to_y: "list_clip"; + rel1.offset: 8 8; + rel2.offset: -9 -9; + offscale; + } + } + } +} + +group { name: "e/widgets/winlist/item_large"; + parts { + 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; + } + } + part { name: "icon"; type: SPACER; + scale: 1; + description { state: "default" 0.0; + rel.to: "e.swallow.win"; + align: 1.0 1.0; + rel1.offset: 8 8; + rel2.offset: -9 -9; + min: 40 40; + max: 40 40; + offscale; + } + } + part { name: "e.swallow.win"; type: SWALLOW; mouse_events: 0; + description { state: "default" 0.0; + rel1.offset: 16 16; + rel2.offset: -17 -17; + } + description { state: "iconified" 0.0; + inherit: "default" 0.0; + rel1.relative: 0.25 0.25; + rel2.relative: 0.75 0.75; + } + } + part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0; + description { state: "default" 0.0; + rel.to: "icon"; + } + description { state: "iconified" 0.0; + inherit: "default" 0.0; + rel1.relative: 0.25 0.25; + rel2.relative: 0.75 0.75; + } + } + part { name: "event"; type: RECT; + description { state: "default" 0.0; + color: 0 0 0 0; + } + description { state: "iconified" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } + } + programs { + program { signal: "e,state,selected"; source: "e"; + action: STATE_SET "selected" 0.0; + target: "sel_base"; + } + program { signal: "e,state,unselected"; source: "e"; + action: STATE_SET "default" 0.0; + target: "sel_base"; + } + program { signal: "e,state,iconified"; source: "e"; + action: STATE_SET "iconified" 0.0; + target: "e.swallow.icon"; + } + program { signal: "e,state,invisible"; source: "e"; + action: STATE_SET "iconified" 0.0; + target: "e.swallow.icon"; + } +// program { +// signal: "e,state,shaded"; source: "e"; +// } + } +} --