Merge branch 'feature/themes/flat' into devs/hermet/lottie

This commit is contained in:
Hermet Park 2020-06-04 10:45:25 +09:00
commit 24f658cfea
10 changed files with 346 additions and 41 deletions

View File

@ -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";

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -0,0 +1,73 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="svg2"
width="800"
height="800"
viewBox="0 0 800 800"
sodipodi:docname="map_circle.svg"
inkscape:version="0.92.4 5da689c313, 2019-01-14"
inkscape:export-filename="/home/raster/C/th-efl/th/img/map_circle.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96">
<metadata
id="metadata8">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs6" />
<sodipodi:namedview
pagecolor="#404040"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1756"
inkscape:window-height="1372"
id="namedview4"
showgrid="true"
inkscape:zoom="1.34625"
inkscape:cx="400"
inkscape:cy="400"
inkscape:window-x="804"
inkscape:window-y="0"
inkscape:window-maximized="0"
inkscape:current-layer="svg2">
<inkscape:grid
type="xygrid"
id="grid4520" />
</sodipodi:namedview>
<path
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path4522"
sodipodi:type="arc"
sodipodi:cx="-400"
sodipodi:cy="400"
sodipodi:rx="390"
sodipodi:ry="390"
sodipodi:start="0"
sodipodi:end="6.2760818"
sodipodi:open="true"
d="M -10,400 A 390,390 0 0 1 -399.30741,789.99939 390,390 0 0 1 -789.99754,401.38518 390,390 0 0 1 -402.07777,10.005535 390,390 0 0 1 -10.00984,397.22966"
transform="rotate(-90)" />
</svg>

After

Width:  |  Height:  |  Size: 2.3 KiB

View File

@ -0,0 +1,161 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="svg2"
width="65"
height="35"
viewBox="0 0 65 35"
sodipodi:docname="map_marker.svg"
inkscape:version="0.92.4 5da689c313, 2019-01-14"
inkscape:export-filename="/home/raster/C/th-efl/th/img/map_marker.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96">
<metadata
id="metadata8">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs6">
<linearGradient
inkscape:collect="always"
id="linearGradient830">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop826" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop828" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient830"
id="linearGradient832"
x1="32.490234"
y1="30.146484"
x2="32.433594"
y2="22.5"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient830"
id="linearGradient990"
gradientUnits="userSpaceOnUse"
x1="32.490234"
y1="30.146484"
x2="32.5"
y2="25" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient830"
id="linearGradient994"
gradientUnits="userSpaceOnUse"
x1="32.490234"
y1="30.146484"
x2="32.5"
y2="27.5" />
<filter
inkscape:collect="always"
style="color-interpolation-filters:sRGB"
id="filter1000"
x="-0.15670322"
width="1.3134064"
y="-0.51233614"
height="2.0246723">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="1.6323305"
id="feGaussianBlur1002" />
</filter>
<filter
inkscape:collect="always"
style="color-interpolation-filters:sRGB"
id="filter1004"
x="-0.07835161"
width="1.1567032"
y="-0.25616807"
height="1.5123361">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.81616526"
id="feGaussianBlur1006" />
</filter>
<filter
inkscape:collect="always"
style="color-interpolation-filters:sRGB"
id="filter1008"
x="-0.039175805"
width="1.0783516"
y="-0.12808404"
height="1.2561681">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.40808263"
id="feGaussianBlur1010" />
</filter>
</defs>
<sodipodi:namedview
pagecolor="#404040"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1756"
inkscape:window-height="1372"
id="namedview4"
showgrid="true"
inkscape:zoom="16.569231"
inkscape:cx="32.5"
inkscape:cy="17.5"
inkscape:window-x="804"
inkscape:window-y="0"
inkscape:window-maximized="0"
inkscape:current-layer="svg2">
<inkscape:grid
type="xygrid"
id="grid817"
spacingx="1"
spacingy="1" />
</sodipodi:namedview>
<path
inkscape:connector-curvature="0"
style="opacity:0.25;fill:url(#linearGradient990);fill-opacity:1;stroke:none;stroke-width:0.10072622;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter1004)"
d="M 32.433594,22.5 A 12.5,3.1705538 0 0 0 20,25.681948 a 12.5,3.1705538 0 0 0 3.84375,2.270909 l 8.646484,2.193627 8.400391,-2.130711 A 12.5,3.1705538 0 0 0 45,25.670554 v -0.02229 A 12.5,3.1705538 0 0 0 32.433594,22.5 Z"
id="path988" />
<path
id="path824"
d="M 32.433594,22.5 A 12.5,3.1705538 0 0 0 20,25.681948 a 12.5,3.1705538 0 0 0 3.84375,2.270909 l 8.646484,2.193627 8.400391,-2.130711 A 12.5,3.1705538 0 0 0 45,25.670554 v -0.02229 A 12.5,3.1705538 0 0 0 32.433594,22.5 Z"
style="opacity:0.12;fill:url(#linearGradient832);fill-opacity:1;stroke:none;stroke-width:0.10072622;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter1000)"
inkscape:connector-curvature="0" />
<path
id="path992"
d="M 32.433594,22.5 A 12.5,3.1705538 0 0 0 20,25.681948 a 12.5,3.1705538 0 0 0 3.84375,2.270909 l 8.646484,2.193627 8.400391,-2.130711 A 12.5,3.1705538 0 0 0 45,25.670554 v -0.02229 A 12.5,3.1705538 0 0 0 32.433594,22.5 Z"
style="opacity:0.5;fill:url(#linearGradient994);fill-opacity:1;stroke:none;stroke-width:0.10072622;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter1008)"
inkscape:connector-curvature="0" />
<path
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 32.433594 0 A 12.5 12.5 0 0 0 20 12.544922 A 12.5 12.5 0 0 0 23.84375 21.498047 L 32.490234 30.146484 L 40.890625 21.746094 A 12.5 12.5 0 0 0 45 12.5 L 45 12.412109 A 12.5 12.5 0 0 0 32.433594 0 z "
id="path819" />
</svg>

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

View File

@ -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; \