From c413544ef74ba2ceee220e4e70b044758e4038c7 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Fri, 25 Mar 2016 11:04:35 +0900 Subject: [PATCH] elm theme: do some slickening up of shadows so i had a separate flat theme i was working on but i just can't keep up with changes so i'm just putting in some of the nicest bits here slowly like nicer shadows. @feat --- data/elementary/themes/Makefile.am | 1 + data/elementary/themes/edc/border.edc | 7 +---- data/elementary/themes/edc/comp.edc | 13 +++++----- data/elementary/themes/edc/comp_compat.edc | 7 +---- data/elementary/themes/edc/elm/border.edc | 24 +++--------------- .../themes/edc/elm/flipselector.edc | 7 +---- data/elementary/themes/edc/elm/menu.edc | 14 ++-------- data/elementary/themes/edc/elm/photo.edc | 7 +---- .../elementary/themes/img/win_menu_shadow.png | Bin 0 -> 1363 bytes data/elementary/themes/img/win_shadow.png | Bin 501 -> 1263 bytes data/elementary/themes/macros.edc | 18 +++++++++++++ 11 files changed, 36 insertions(+), 62 deletions(-) create mode 100644 data/elementary/themes/img/win_menu_shadow.png diff --git a/data/elementary/themes/Makefile.am b/data/elementary/themes/Makefile.am index fcdcdff292..0bfc070e9f 100644 --- a/data/elementary/themes/Makefile.am +++ b/data/elementary/themes/Makefile.am @@ -669,6 +669,7 @@ elementary/themes/img/wifi_sig_2.png \ elementary/themes/img/wifi_sig_3.png \ elementary/themes/img/win_glow.png \ elementary/themes/img/win_shadow.png \ +elementary/themes/img/win_menu_shadow.png \ \ elementary/themes/img/O/about_bot.png \ elementary/themes/img/O/about_mid.png \ diff --git a/data/elementary/themes/edc/border.edc b/data/elementary/themes/edc/border.edc index f7ee515743..33e48fd3af 100644 --- a/data/elementary/themes/edc/border.edc +++ b/data/elementary/themes/edc/border.edc @@ -34,14 +34,9 @@ group { name: "e/widgets/border/default/border"; } part { name: "shadow"; mouse_events: 0; clip_to: "shadow_clip"; description { state: "default" 0.0; - image.normal: "win_shadow.png"; - image.border: 14 14 14 14; - image.middle: 0; rel1.to: "top"; - rel1.offset: -7 -3; rel2.to: "bottom"; - rel2.offset: 6 11; - fill.smooth: 0; + WIN_SHADOW; } description { state: "shaded"; inherit: "default"; diff --git a/data/elementary/themes/edc/comp.edc b/data/elementary/themes/edc/comp.edc index 2b18e8ebbb..0eb3bc8328 100644 --- a/data/elementary/themes/edc/comp.edc +++ b/data/elementary/themes/edc/comp.edc @@ -270,13 +270,8 @@ group { name: "e/comp/frame/default"; part { name: "shadow"; mouse_events: 0; clip_to: "clipper"; description { state: "default" 0.0; - image.normal: "win_shadow.png"; - image.border: 14 14 14 14; - image.middle: 0; rel.to: "e.swallow.content"; - rel1.offset: -7 -3; - rel2.offset: 6 11; - fill.smooth: 0; + WIN_SHADOW; } description { state: "hidden" 0.0; inherit; @@ -613,7 +608,13 @@ group { name: "e/comp/frame/still/fast"; group { name: "e/comp/frame/menu"; inherit: "e/comp/frame/popup"; + images.image: "win_menu_shadow.png" COMP; parts { + part { name: "shadow"; + description { state: "default" 0.0; + WIN_MENU_SHADOW; + } + } part { name: "shower"; description { state: "default" 0.0; rel1.relative: 0.05 0.0; diff --git a/data/elementary/themes/edc/comp_compat.edc b/data/elementary/themes/edc/comp_compat.edc index 5b9f7ebefd..e5a0f0a0be 100644 --- a/data/elementary/themes/edc/comp_compat.edc +++ b/data/elementary/themes/edc/comp_compat.edc @@ -20,14 +20,9 @@ group { name: "e/comp/border/default"; part { name: "shadow"; mouse_events: 0; clip_to: "clipper"; description { state: "default" 0.0; - image.normal: "win_shadow.png"; - image.border: 14 14 14 14; - image.middle: 0; rel1.to: "e.swallow.content"; - rel1.offset: -7 -3; rel2.to: "e.swallow.content"; - rel2.offset: 6 11; - fill.smooth: 0; + WIN_SHADOW; } description { state: "hidden" 0.0; inherit: "default" 0.0; diff --git a/data/elementary/themes/edc/elm/border.edc b/data/elementary/themes/edc/elm/border.edc index 7a0345e78f..2576d0e0d9 100644 --- a/data/elementary/themes/edc/elm/border.edc +++ b/data/elementary/themes/edc/elm/border.edc @@ -44,14 +44,9 @@ group { name: "elm/ews/decoration/default"; parts { part { name: "shadow"; mouse_events: 0; description { state: "default" 0.0; - image.normal: "win_shadow.png"; - image.border: 14 14 14 14; - image.middle: 0; - rel1.offset: -7 -3; rel1.to: "top"; - rel2.offset: 6 11; rel2.to: "bottom"; - fill.smooth: 0; + WIN_SHADOW; } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -665,12 +660,7 @@ group { name: "elm/ews/decoration/borderless"; parts { part { name: "shadow"; mouse_events: 0; description { state: "default" 0.0; - image.normal: "win_shadow.png"; - image.border: 14 14 14 14; - image.middle: 0; - rel1.offset: -7 -3; - rel2.offset: 6 11; - fill.smooth: 0; + WIN_SHADOW; } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -819,8 +809,7 @@ group { name: "elm/border/base/default"; } part { name: "shadow_spacer"; type: SPACER; description { state: "default"; - rel1.offset: 7 5; - rel2.offset: -8 -12; + WIN_SHADOW_SPACER; } description { state: "max"; rel1.offset: 0 0; @@ -829,14 +818,9 @@ group { name: "elm/border/base/default"; } part { name: "shadow"; mouse_events: 0; clip_to: "shadow_clip"; description { state: "default" 0.0; - image.normal: "win_shadow.png"; - image.border: 14 14 14 14; - image.middle: 0; rel1.to: "shadow_spacer"; - rel1.offset: -7 -3; rel2.to: "shadow_spacer"; - rel2.offset: 6 11; - fill.smooth: 0; + WIN_SHADOW; } description { state: "shaded"; inherit: "default"; diff --git a/data/elementary/themes/edc/elm/flipselector.edc b/data/elementary/themes/edc/elm/flipselector.edc index dff2880f7b..6aba3a56d5 100644 --- a/data/elementary/themes/edc/elm/flipselector.edc +++ b/data/elementary/themes/edc/elm/flipselector.edc @@ -154,14 +154,9 @@ group { name: "elm/flipselector/base/default"; parts { part { name: "base_shadow"; mouse_events: 0; description { state: "default" 0.0; - image.normal: "win_shadow.png"; - image.border: 14 14 14 14; - image.middle: 0; rel1.to: "base"; - rel1.offset: -7 -3; rel2.to: "base"; - rel2.offset: 6 11; - fill.smooth: 0; + WIN_SHADOW; } } part { name: "base"; type: RECT; diff --git a/data/elementary/themes/edc/elm/menu.edc b/data/elementary/themes/edc/elm/menu.edc index 784025558d..c4c510ebb1 100644 --- a/data/elementary/themes/edc/elm/menu.edc +++ b/data/elementary/themes/edc/elm/menu.edc @@ -770,14 +770,9 @@ group { name: "elm/hover/base/menu/default"; part { name: "shadow"; clip_to: "bottomclip"; description { state: "default" 0.0; - image.normal: "win_shadow.png"; - image.border: 14 14 14 14; - image.middle: 0; rel1.to: "bottom"; - rel1.offset: -7 -3; rel2.to: "bottom"; - rel2.offset: 6 11; - fill.smooth: 0; + WIN_SHADOW; } } part { name: "top"; @@ -1030,14 +1025,9 @@ group { name: "elm/hover/base/main_menu_submenu/default"; part { name: "shadow"; clip_to: "bottomclip"; description { state: "default" 0.0; - image.normal: "win_shadow.png"; - image.border: 14 14 14 14; - image.middle: 0; rel1.to: "bottom"; - rel1.offset: -7 -3; rel2.to: "bottom"; - rel2.offset: 6 11; - fill.smooth: 0; + WIN_SHADOW; } } part { name: "top"; diff --git a/data/elementary/themes/edc/elm/photo.edc b/data/elementary/themes/edc/elm/photo.edc index 55dcfb704c..40eb10edfa 100644 --- a/data/elementary/themes/edc/elm/photo.edc +++ b/data/elementary/themes/edc/elm/photo.edc @@ -3,14 +3,9 @@ group { name: "elm/photo/base/default"; parts { part { name: "shadow"; mouse_events: 0; description { state: "default" 0.0; - image.normal: "win_shadow.png"; - image.border: 14 14 14 14; - image.middle: 0; rel1.to: "base"; - rel1.offset: -7 -3; rel2.to: "base"; - rel2.offset: 6 11; - fill.smooth: 0; + WIN_SHADOW; } } part { name: "base"; type: RECT; diff --git a/data/elementary/themes/img/win_menu_shadow.png b/data/elementary/themes/img/win_menu_shadow.png new file mode 100644 index 0000000000000000000000000000000000000000..f05c750e29f3c2ebba64cadbd78fd596f2ee566b GIT binary patch literal 1363 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 diff --git a/data/elementary/themes/macros.edc b/data/elementary/themes/macros.edc index a298742ed0..5f2e33ee66 100644 --- a/data/elementary/themes/macros.edc +++ b/data/elementary/themes/macros.edc @@ -9,3 +9,21 @@ #define DARK_GREY_BG_COLOR 48 48 48 255 #define DARK_GREY_BG_DISABLED_COLOR 64 64 64 255 + +#define WIN_SHADOW \ + image.normal: "win_shadow.png"; \ + image.border: 44 44 44 44; \ + image.middle: 0; \ + rel1.offset: -21 -14; \ + rel2.offset: 20 27; \ + fill.smooth: 0 +#define WIN_SHADOW_SPACER \ + rel1.offset: 21 14; \ + rel2.offset: -21 -28 +#define WIN_MENU_SHADOW \ + image.normal: "win_menu_shadow.png"; \ + image.border: 44 44 16 29; \ + image.middle: 0; \ + rel1.offset: -21 -14; \ + rel2.offset: 20 27; \ + fill.smooth: 0