raster pushed a commit to branch feature/themes/flat. http://git.enlightenment.org/core/efl.git/commit/?id=0128153e7c2bf4e9aeaf86b985bba5b740267395
commit 0128153e7c2bf4e9aeaf86b985bba5b740267395 Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Sat Feb 15 12:58:35 2020 +0000 TH - win shadow - scale properly too --- data/elementary/themes/edc/comp.edc | 2 ++ data/elementary/themes/edc/elm/border.edc | 2 ++ data/elementary/themes/macros.edc | 22 ++++++++++++---------- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/data/elementary/themes/edc/comp.edc b/data/elementary/themes/edc/comp.edc index b5d21768da..5c51e88806 100644 --- a/data/elementary/themes/edc/comp.edc +++ b/data/elementary/themes/edc/comp.edc @@ -223,6 +223,7 @@ group { name: "e/comp/frame/default"; } part { name: "shadow"; mouse_events: 0; clip_to: "clipper"; + scale: 1; description { state: "default" 0.0; rel.to: "e.swallow.content"; WIN_SHADOW; @@ -484,6 +485,7 @@ group { name: "e/comp/frame/menu"; images.image: "win_menu_shadow.png" COMP; parts { part { name: "shadow"; + scale: 1; description { state: "default" 0.0; WIN_MENU_SHADOW; } diff --git a/data/elementary/themes/edc/elm/border.edc b/data/elementary/themes/edc/elm/border.edc index aec91c66bb..e0943b3b95 100644 --- a/data/elementary/themes/edc/elm/border.edc +++ b/data/elementary/themes/edc/elm/border.edc @@ -39,6 +39,7 @@ group { name: "elm/border/base/default"; } /* shadow spacer and clipper */ spacer { "shadow_spacer"; + scale: 1; desc { "default"; WIN_SHADOW_SPACER; } @@ -48,6 +49,7 @@ group { name: "elm/border/base/default"; } } image { "shadow"; nomouse; + scale: 1; desc { "default"; rel.to: "shadow_spacer"; WIN_SHADOW; diff --git a/data/elementary/themes/macros.edc b/data/elementary/themes/macros.edc index 2da66d46df..1d2444aeb6 100644 --- a/data/elementary/themes/macros.edc +++ b/data/elementary/themes/macros.edc @@ -28,41 +28,43 @@ #define WIN_SHADOW \ image.normal: "win_shadow.png"; \ - image.border: 44 44 44 44; \ + image.border: 32 32 32 32; \ + image.border_scale: 1; \ + image.border_scale_by: 1.0; \ image.middle: 0; \ rel1.offset: -21 -14; \ rel2.offset: 20 27; \ - fill.smooth: 0 + offscale #define WIN_SHADOW_SMALL \ image.normal: "win_shadow.png"; \ - image.border: 44 44 44 44; \ + image.border: 32 32 32 32; \ image.border_scale: 1; \ image.border_scale_by: 0.5; \ image.middle: 0; \ rel1.offset: -10 -7; \ rel2.offset: 9 10; \ - fill.smooth: 0; \ offscale #define WIN_SHADOW_SPACER \ rel1.offset: 21 14; \ - rel2.offset: -21 -28 + rel2.offset: -21 -28; \ + offscale #define WIN_MENU_SHADOW \ image.normal: "win_menu_shadow.png"; \ - image.border: 44 44 16 29; \ + image.border: 32 32 32 32; \ + image.border_scale: 1; \ + image.border_scale_by: 1.0; \ image.middle: 0; \ rel1.offset: -21 -14; \ rel2.offset: 20 27; \ - fill.smooth: 0 - + offscale #define WIN_SHADOW_ANGLE_SMALL(_img) \ image.normal: _img; \ - image.border: 22 22 16 30; \ + image.border: 32 32 32 32; \ image.border_scale: 1; \ image.border_scale_by: 0.5; \ image.middle: 0; \ rel1.offset: -10 -7; \ rel2.offset: 9 13; \ - fill.smooth: 0; \ offscale #define IMAGE_RING(x, sz) \ --
