raster pushed a commit to branch feature/themes/flat. http://git.enlightenment.org/core/efl.git/commit/?id=a8c937f4a144ee3e96e0f1f1103c366f343bf3f9
commit a8c937f4a144ee3e96e0f1f1103c366f343bf3f9 Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Thu Aug 1 14:50:59 2019 +0100 TH - tiling border has shadows now too --- data/elementary/themes/edc/border.edc | 179 ++++++++++++++++++++++++++++++ data/elementary/themes/edc/deskmirror.edc | 45 +++++++- 2 files changed, 222 insertions(+), 2 deletions(-) diff --git a/data/elementary/themes/edc/border.edc b/data/elementary/themes/edc/border.edc index 8864ae7194..385b66ea34 100644 --- a/data/elementary/themes/edc/border.edc +++ b/data/elementary/themes/edc/border.edc @@ -1018,6 +1018,185 @@ group { name: "e/widgets/border/pixel/border"; } } +group { name: "e/widgets/border/tiling/border"; + images.image: "win_shadow.png" COMP; + data.item: "shadow" "1"; + parts { + part { name: "shadow_clip"; type: RECT; mouse_events: 0; + description { state: "default"; + rel1.to: "shadow"; + rel2.to: "shadow"; + } + description { state: "hidden"; + visible: 0; + } + } + part { name: "shadow"; mouse_events: 0; clip_to: "shadow_clip"; + description { state: "default" 0.0; + rel.to: "e.swallow.client"; + WIN_SHADOW; + } + description { state: "shaded"; + inherit: "default"; + rel2.to: "e.swallow.client"; + } + } + part { name: "client_clip"; type: RECT; mouse_events: 0; + description { state: "default" 0.0; + rel1.to_y: "e.swallow.client"; + rel2.to_y: "e.swallow.client"; + } + } + part { name: "e.swallow.client"; type: SWALLOW; + clip_to: "client_clip"; + description { state: "default" 0.0; + } + } + part { name: "top"; type: RECT; + description { state: "default" 0.0; + color: 0 0 0 0; + align: 0.0 0.0; + rel1.offset: -1 -1; + rel2.offset: 0 0; + max: 99999 1; + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + color: 51 153 255 255; + } + } + part { name: "bottom"; type: RECT; + description { state: "default" 0.0; + color: 0 0 0 0; + align: 0.0 1.0; + rel1.offset: -1 -1; + rel2.offset: 0 0; + max: 99999 1; + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + color: 51 153 255 255; + } + } + part { name: "left"; type: RECT; + description { state: "default" 0.0; + color: 0 0 0 0; + align: 0.0 0.0; + rel1.offset: -1 -1; + rel2.offset: 0 0; + max: 1 99999; + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + color: 51 153 255 255; + } + } + part { name: "right"; type: RECT; + description { state: "default" 0.0; + color: 0 0 0 0; + align: 1.0 0.0; + rel1.offset: -1 -1; + rel2.offset: 0 0; + max: 1 99999; + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + color: 51 153 255 255; + } + } + part { name: "e.event.resize.tl"; type: RECT; + description { state: "default" 0.0; + rel2.relative: 0.0 0.0; + min: 32 4; + rel1.offset: -1 -1; + rel2.offset: 0 0; + align: 0.0 0.0; + color: 0 0 0 0; + } + } + part { name: "e.event.resize.t"; type: RECT; + description { state: "default" 0.0; + rel1.relative: 1.0 0.0; + rel1.to_x: "e.event.resize.tl"; + rel2.relative: 0.0 0.0; + rel2.to_x: "e.event.resize.tr"; + rel1.offset: -1 -1; + rel2.offset: 0 0; + min: 0 4; + align: 0.5 0.0; + color: 0 0 0 0; + } + } + part { name: "e.event.resize.tr"; type: RECT; + description { state: "default" 0.0; + rel1.relative: 1.0 0.0; + rel2.relative: 1.0 0.0; + min: 32 4; + rel1.offset: -1 -1; + rel2.offset: 0 0; + align: 1.0 0.0; + color: 0 0 0 0; + } + } + part { name: "e.event.resize.bl"; type: RECT; + description { state: "default" 0.0; + rel1.relative: 0.0 1.0; + rel2.relative: 0.0 1.0; + min: 32 5; + rel1.offset: -1 -1; + rel2.offset: 0 0; + align: 0.0 1.0; + color: 0 0 0 0; + fixed: 1 1; + } + } + part { name: "e.event.resize.b"; type: RECT; + description { state: "default" 0.0; + rel1.relative: 1.0 1.0; + rel1.to_x: "e.event.resize.tl"; + rel2.relative: 0.0 1.0; + rel2.to_x: "e.event.resize.tr"; + rel1.offset: -1 -1; + rel2.offset: 0 0; + min: 0 5; + align: 0.5 1.0; + color: 0 0 0 0; + fixed: 0 1; + } + } + part { name: "e.event.resize.br"; type: RECT; + description { state: "default" 0.0; + rel1.relative: 1.0 1.0; + rel2.relative: 1.0 1.0; + rel1.offset: -1 -1; + rel2.offset: 0 0; + min: 32 5; + align: 1.0 1.0; + color: 0 0 0 0; + fixed: 1 1; + } + } + } + programs { + program { + signal: "e,state,focused"; source: "e"; + action: STATE_SET "focused" 0.0; + target: "top"; + target: "bottom"; + target: "left"; + target: "right"; + } + program { + signal: "e,state,unfocused"; source: "e"; + action: STATE_SET "default" 0.0; + target: "top"; + target: "bottom"; + target: "left"; + target: "right"; + } + } +} + group { name: "e/widgets/border/default/move"; images.image: "ic_win_move.png" COMP; parts { diff --git a/data/elementary/themes/edc/deskmirror.edc b/data/elementary/themes/edc/deskmirror.edc index 0898c622af..1b0cb4919d 100644 --- a/data/elementary/themes/edc/deskmirror.edc +++ b/data/elementary/themes/edc/deskmirror.edc @@ -322,17 +322,58 @@ group { name: "e/deskmirror/frame/pixel"; part { name: "frame"; type: RECT; description { state: "default" 0.0; color: 0 0 0 255; - rel2.offset: 0 0; } description { state: "focused" 0.0; inherit: "default" 0.0; - color: 64 64 64 255; + color: 51 153 255 255; } } part { name: "e.swallow.client"; type: SWALLOW; clip_to: "client_clip"; description { state: "default" 0.0; rel1.offset: 1 1; + rel2.offset: -2 -2; + } + } + } + programs { + program { + name: "focus"; + signal: "e,state,focused"; source: "e"; + action: STATE_SET "focused" 0.0; + target: "frame"; + } + program { + name: "unfocus"; + signal: "e,state,unfocused"; source: "e"; + action: STATE_SET "default" 0.0; + target: "frame"; + } + } +} + +group { name: "e/deskmirror/frame/tiling"; + parts { + part { name: "client_clip"; type: RECT; + description { state: "default" 0.0; + rel1.to: "e.swallow.client"; + rel2.to: "e.swallow.client"; + } + } + part { name: "frame"; type: RECT; + description { state: "default" 0.0; + color: 0 0 0 0; + rel1.offset: -1 -1; + rel2.offset: 0 0; + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + color: 51 153 255 255; + } + } + part { name: "e.swallow.client"; type: SWALLOW; + clip_to: "client_clip"; + description { state: "default" 0.0; } } } --
