diff --git a/data/elementary/themes/edc/border.edc b/data/elementary/themes/edc/border.edc index 4c6d4cdb0d..5e419a72c8 100644 --- a/data/elementary/themes/edc/border.edc +++ b/data/elementary/themes/edc/border.edc @@ -134,29 +134,28 @@ group { name: "e/widgets/border/default/border"; IMAGE_RING("ringb", 160) IMAGE_RING("ringc", 160) - images.image: "win_shadow.png" COMP; + images.image: "win_shad_flat.png" COMP; data.item: "shadow" "1"; parts { part { name: "shadow_clip"; type: RECT; mouse_events: 0; description { state: "default"; - rel.to: "shadow"; + rel.to: "_sh1"; } description { state: "hidden"; visible: 0; } } - part { name: "shadow"; mouse_events: 0; clip_to: "shadow_clip"; - scale: 1; + part { name: "shadow_base"; type: SPACER; description { state: "default" 0.0; rel1.to: "top"; rel2.to: "bottom"; - WIN_SHADOW; } description { state: "shaded"; inherit: "default"; rel2.to: "e.swallow.client"; } } + WIN_SHAD("shadow_base", "shadow_clip", "win_shad_flat.png", 21, 21, 14, 28, 0.5) part { name: "client_clip"; type: RECT; mouse_events: 0; description { state: "default" 0.0; rel1.to_y: "e.swallow.client"; @@ -628,7 +627,7 @@ group { name: "e/widgets/border/default/border"; program { signal: "e,state,shaded"; source: "e"; action: STATE_SET "shaded" 0.0; - target: "shadow"; + target: "shadow_base"; after: "shading"; } program { name: "shading"; @@ -654,7 +653,7 @@ group { name: "e/widgets/border/default/border"; signal: "e,state,unshading"; source: "e"; action: STATE_SET "default" 0.0; target: "e.swallow.client"; - target: "shadow"; + target: "shadow_base"; target: "client_clip"; } // program { @@ -1021,28 +1020,28 @@ group { name: "e/widgets/border/pixel/border"; } group { name: "e/widgets/border/tiling/border"; - images.image: "win_shadow.png" COMP; + images.image: "win_shad_flat.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"; + rel.to: "_sh1"; } description { state: "hidden"; visible: 0; } } - part { name: "shadow"; mouse_events: 0; clip_to: "shadow_clip"; + part { name: "shadow_base"; type: SPACER; description { state: "default" 0.0; - rel.to: "e.swallow.client"; - WIN_SHADOW; + rel1.to: "top"; + rel2.to: "bottom"; } description { state: "shaded"; inherit: "default"; rel2.to: "e.swallow.client"; } } + WIN_SHAD("shadow_base", "shadow_clip", "win_shad_flat.png", 21, 21, 14, 28, 0.5) part { name: "client_clip"; type: RECT; mouse_events: 0; description { state: "default" 0.0; rel1.to_y: "e.swallow.client"; diff --git a/data/elementary/themes/edc/comp.edc b/data/elementary/themes/edc/comp.edc index dd54df15e4..dc990e5137 100644 --- a/data/elementary/themes/edc/comp.edc +++ b/data/elementary/themes/edc/comp.edc @@ -180,7 +180,7 @@ group { name: "e/comp/screen/overlay/default"; group { name: "e/comp/frame/default"; alias: "e/comp/frame/default/fast"; // legacy - images.image: "win_shadow.png" COMP; + images.image: "win_shad_flat.png" COMP; script { public message(Msg_Type:type, id, ...) { if ((type == MSG_INT) && (id == 0)) { @@ -222,18 +222,17 @@ group { name: "e/comp/frame/default"; visible: 1; } } - part { name: "shadow"; mouse_events: 0; + part { name: "shadow"; type: RECT; clip_to: "clipper"; - scale: 1; description { state: "default" 0.0; - rel.to: "e.swallow.content"; - WIN_SHADOW; + rel.to: "clipper"; } description { state: "hidden" 0.0; inherit; visible: 0; } } + WIN_SHAD("e.swallow.content", "shadow", "win_shad_flat.png", 21, 21, 14, 28, 0.5) part { name: "shower"; type: SPACER; description { state: "default" 0.0; rel1.relative: 0.05 0.05; @@ -430,7 +429,6 @@ group { name: "e/comp/frame/flip"; group { name: "e/comp/frame/popup"; alias: "e/comp/frame/popup/fast"; // legacy inherit: "e/comp/frame/default"; - images.image: "win_shadow.png" COMP; parts { part { name: "focus-clipper"; description { state: "default"; @@ -473,14 +471,9 @@ group { name: "e/comp/frame/still"; group { name: "e/comp/frame/menu"; alias: "e/comp/frame/menu/fast"; // legacy inherit: "e/comp/frame/popup"; - images.image: "win_menu_shadow.png" COMP; + images.image: "win_shad_angle.png" COMP; parts { - part { name: "shadow"; - scale: 1; - description { state: "default" 0.0; - WIN_MENU_SHADOW; - } - } + WIN_SHAD("e.swallow.content", "shadow", "win_shad_angle.png", 21, 21, 14, 28, 0.5) 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 f54854e0e7..3cf0364730 100644 --- a/data/elementary/themes/edc/comp_compat.edc +++ b/data/elementary/themes/edc/comp_compat.edc @@ -1,6 +1,6 @@ group { name: "e/comp/border/default"; alias: "e/comp/border/default/fast"; // legacy - images.image: "win_shadow.png" COMP; + images.image: "win_shad_flat.png" COMP; parts { part { name: "clipper"; type: RECT; description { state: "default" 0.0; @@ -17,18 +17,17 @@ group { name: "e/comp/border/default"; visible: 1; } } - part { name: "shadow"; mouse_events: 0; + part { name: "shadow"; type: RECT; mouse_events: 0; clip_to: "clipper"; description { state: "default" 0.0; - rel1.to: "e.swallow.content"; - rel2.to: "e.swallow.content"; - WIN_SHADOW; + rel.to: "clipper"; } description { state: "hidden" 0.0; inherit: "default" 0.0; visible: 0; } } + WIN_SHAD("e.swallow.content", "shadow", "win_shad_flat.png", 21, 21, 14, 28, 0.5) part { name: "shower"; type: SPACER; description { state: "default" 0.0; rel1.relative: 0.05 0.05; diff --git a/data/elementary/themes/edc/elm/frame.edc b/data/elementary/themes/edc/elm/frame.edc index 54cceca81c..263147ae84 100644 --- a/data/elementary/themes/edc/elm/frame.edc +++ b/data/elementary/themes/edc/elm/frame.edc @@ -1,17 +1,16 @@ group { name: "elm/frame/base/default"; - images.image: "win_shadow.png" COMP; + images.image: "win_shad_flat.png" COMP; parts { - part { name: "shadow"; mouse_events: 0; - scale: 1; + part { name: "shadow"; type: RECT; description { state: "default" 0.0; - rel.to: "base"; - WIN_SHADOW_SMALL; + rel.to: "_sh1"; } description { state: "hidden" 0.0; inherit; visible: 0; } } + WIN_SHAD("base", "shadow", "win_shad_flat.png", 10, 10, 7, 14, 0.25); part { name: "base"; type: RECT; scale: 1; description { state: "default" 0.0; @@ -260,19 +259,18 @@ group { name: "elm/frame/base/outdent_bottom"; } group { name: "elm/frame/base/outline"; - images.image: "win_shadow.png" COMP; + images.image: "win_shad_flat.png" COMP; parts { - part { name: "shadow"; mouse_events: 0; - scale: 1; + part { name: "shadow"; type: RECT; description { state: "default" 0.0; - rel.to: "base"; - WIN_SHADOW_SMALL; + rel.to: "_sh1"; } description { state: "hidden" 0.0; inherit; visible: 0; } } + WIN_SHAD("base", "shadow", "win_shad_flat.png", 10, 10, 7, 14, 0.25); part { name: "base"; type: RECT; scale: 1; description { state: "default" 0.0; diff --git a/data/elementary/themes/img/map_circle.svg b/data/elementary/themes/img/map_circle.svg new file mode 100644 index 0000000000..93626a03aa --- /dev/null +++ b/data/elementary/themes/img/map_circle.svg @@ -0,0 +1,73 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/data/elementary/themes/img/map_marker.svg b/data/elementary/themes/img/map_marker.svg new file mode 100644 index 0000000000..87844ef0e2 --- /dev/null +++ b/data/elementary/themes/img/map_marker.svg @@ -0,0 +1,161 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/elementary/themes/img/win_shad_angle.png b/data/elementary/themes/img/win_shad_angle.png new file mode 100644 index 0000000000..3090bcc832 Binary files /dev/null and b/data/elementary/themes/img/win_shad_angle.png differ diff --git a/data/elementary/themes/img/win_shad_flat.png b/data/elementary/themes/img/win_shad_flat.png new file mode 100644 index 0000000000..af3e3e305e Binary files /dev/null and b/data/elementary/themes/img/win_shad_flat.png differ diff --git a/data/elementary/themes/img/win_shadow.xcf b/data/elementary/themes/img/win_shadow.xcf new file mode 100644 index 0000000000..1041b53836 Binary files /dev/null and b/data/elementary/themes/img/win_shadow.xcf differ diff --git a/data/elementary/themes/macros.edc b/data/elementary/themes/macros.edc index 878b69dd2c..972ae52ded 100644 --- a/data/elementary/themes/macros.edc +++ b/data/elementary/themes/macros.edc @@ -26,6 +26,88 @@ #define DARK_GREY_BG_COLOR 48 48 48 255 #define DARK_GREY_BG_DISABLED_COLOR 64 64 64 255 +#define SHAD(_to, _clip, _img, _l, _r, _t, _b, _scale) \ + scale: 1; clip_to: _clip; \ + description { state: "default" 0.0; \ + rel.to: _to; \ + image.normal: _img; \ + image.border: 44 44 44 44; \ + image.border_scale: 1; \ + image.border_scale_by: _scale; \ + rel1.offset: (-_l) (-_t); \ + rel2.offset: (_r-1) (_b-1); \ + fill.smooth: 0; \ + offscale; \ + } +#define SHAD_CLIP(_to, _clip, _l, _r, _t, _b, _scale) \ + part { type: RECT; name: "_shcl1"; \ + scale: 1; clip_to: _clip; \ + description { state: "default" 0.0; \ + rel.to: _to; \ + rel1.offset: (-_l) (-_t); \ + rel2.offset: (_r-1) -1; \ + rel2.relative: 1.0 0.0; \ + offscale; \ + } \ + } \ + part { type: RECT; name: "_shcl2"; \ + scale: 1; clip_to: _clip; \ + description { state: "default" 0.0; \ + rel.to: _to; \ + rel1.offset: (-_l) 0; \ + rel1.relative: 0.0 1.0; \ + rel2.offset: (_r-1) (_b-1); \ + offscale; \ + } \ + } \ + part { type: RECT; name: "_shcl3"; \ + scale: 1; clip_to: _clip; \ + description { state: "default" 0.0; \ + rel.to: _to; \ + rel1.offset: (-_l) 0; \ + rel2.offset: -1 -1; \ + rel2.relative: 0.0 1.0; \ + offscale; \ + } \ + } \ + part { type: RECT; name: "_shcl4"; \ + scale: 1; clip_to: _clip; \ + description { state: "default" 0.0; \ + rel.to: _to; \ + rel1.offset: 0 0; \ + rel1.relative: 1.0 0.0; \ + rel2.offset: (_r-1) -1; \ + offscale; \ + } \ + } + +#define WIN_SHAD(_to, _clip, _img, _l, _r, _t, _b, _scale) \ + SHAD_CLIP(_to, _clip, _l, _r, _t, _b, _scale) \ + part { name: "_sh1"; mouse_events: 0; \ + SHAD(_to, "_shcl1", _img, _l, _r, _t, _b, _scale) \ + } \ + part { name: "_sh2"; mouse_events: 0; \ + SHAD(_to, "_shcl2", _img, _l, _r, _t, _b, _scale) \ + } \ + part { name: "_sh3"; mouse_events: 0; \ + SHAD(_to, "_shcl3", _img, _l, _r, _t, _b, _scale) \ + } \ + part { name: "_sh4"; mouse_events: 0; \ + SHAD(_to, "_shcl4", _img, _l, _r, _t, _b, _scale) \ + } + +// XXX: below - remove these in favor of WIN_SHAD() above in the edc +#define WIN_SHADOW_SMALL \ + image.normal: "win_shadow.png"; \ + 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 \ image.normal: "win_shadow.png"; \ image.border: 32 32 32 32; \