raster pushed a commit to branch feature/themes/flat.
http://git.enlightenment.org/core/efl.git/commit/?id=ffdaabc0ade5d0090f5a47f1feb06fc13af9a547
commit ffdaabc0ade5d0090f5a47f1feb06fc13af9a547
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Sat Nov 9 21:43:26 2019 +0000
TH - entry magnifier and handles
---
data/elementary/themes/edc/elm/entry.edc | 60 ++++++++-----------
data/elementary/themes/img/handle_pick_up_left.png | Bin 1348 -> 237 bytes
data/elementary/themes/img/handle_pick_up_left.svg | 65 +++++++++++++++++++++
.../elementary/themes/img/handle_pick_up_right.png | Bin 1367 -> 222 bytes
4 files changed, 89 insertions(+), 36 deletions(-)
diff --git a/data/elementary/themes/edc/elm/entry.edc
b/data/elementary/themes/edc/elm/entry.edc
index 40a7030a6a..8058b939ce 100644
--- a/data/elementary/themes/edc/elm/entry.edc
+++ b/data/elementary/themes/edc/elm/entry.edc
@@ -1021,40 +1021,34 @@ group { name: "elm/entry/base-password/default";
}
group { name: "elm/entry/magnifier/default";
- images.image: "frame_rounded.png" COMP;
parts {
- part { name: "bg"; type: RECT; mouse_events: 0;
+ part { name: "shadow"; mouse_events: 0;
description { state: "default" 0.0;
- rel.to: "over";
- rel1.offset: 10 10;
- rel2.offset: -11 -11;
- color: 48 48 48 255;
+ rel.to: "bg";
+ WIN_SHADOW;
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
visible: 0;
}
}
- part { name: "elm.swallow.content"; type: SWALLOW; mouse_events: 0;
+ part { name: "bg"; type: RECT; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
- rel.to: "over";
- rel1.offset: 10 10;
- rel2.offset: -11 -11;
+ min: 80 40;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ color: 48 48 48 255;
+ offscale;
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
visible: 0;
}
}
- part { name: "over"; mouse_events: 0;
- scale: 1;
+ part { name: "elm.swallow.content"; type: SWALLOW; mouse_events: 0;
description { state: "default" 0.0;
- min: 128 64;
- align: 0 0;
- image.normal: "frame_rounded.png";
- image.border: 14 14 14 14;
- image.middle: 0;
- fill.smooth: 0;
+ rel.to: "bg";
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@@ -1063,19 +1057,17 @@ group { name: "elm/entry/magnifier/default";
}
}
programs {
- program { name: "magnifier_show";
- signal: "elm,action,show,magnifier"; source: "elm";
+ program { signal: "elm,action,show,magnifier"; source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.swallow.content";
target: "bg";
- target: "over";
+ target: "shadow";
}
- program { name: "magnifier_hide";
- signal: "elm,action,hide,magnifier"; source: "elm";
+ program { signal: "elm,action,hide,magnifier"; source: "elm";
action: STATE_SET "hidden" 0.0;
target: "elm.swallow.content";
target: "bg";
- target: "over";
+ target: "shadow";
}
}
}
@@ -1086,10 +1078,10 @@ group { name: "elm/entry/handler/start/default";
part { name: "base"; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
- min: 21 27; // 42 54
image.normal: "handle_pick_up_left.png";
+ min: 21 27; // 42 54
align: (29/42) (11/54);
- color_class: "entry_selection_handler";
+ color: 51 153 255 255;
visible: 0;
}
description { state: "visible" 0.0;
@@ -1112,14 +1104,12 @@ group { name: "elm/entry/handler/start/default";
}
}
programs {
- program {
- signal: "elm,handler,show"; source: "elm";
+ program { signal: "elm,handler,show"; source: "elm";
action: STATE_SET "visible" 0.0;
target: "base";
target: "event";
}
- program {
- signal: "elm,handler,hide"; source: "elm";
+ program { signal: "elm,handler,hide"; source: "elm";
action: STATE_SET "default" 0.0;
target: "base";
target: "event";
@@ -1133,10 +1123,10 @@ group { name: "elm/entry/handler/end/default";
part { name: "base"; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
- min: 21 27; // 42 54
image.normal: "handle_pick_up_right.png";
+ min: 21 27; // 42 54
align: (12/42) (11/54);
- color_class: "entry_selection_handler";
+ color: 51 153 255 255;
visible: 0;
}
description { state: "visible" 0.0;
@@ -1159,14 +1149,12 @@ group { name: "elm/entry/handler/end/default";
}
}
programs {
- program {
- signal: "elm,handler,show"; source: "elm";
+ program { signal: "elm,handler,show"; source: "elm";
action: STATE_SET "visible" 0.0;
target: "base";
target: "event";
}
- program {
- signal: "elm,handler,hide"; source: "elm";
+ program { signal: "elm,handler,hide"; source: "elm";
action: STATE_SET "default" 0.0;
target: "base";
target: "event";
diff --git a/data/elementary/themes/img/handle_pick_up_left.png
b/data/elementary/themes/img/handle_pick_up_left.png
index 44bae50845..bb67211d2c 100644
Binary files a/data/elementary/themes/img/handle_pick_up_left.png and
b/data/elementary/themes/img/handle_pick_up_left.png differ
diff --git a/data/elementary/themes/img/handle_pick_up_left.svg
b/data/elementary/themes/img/handle_pick_up_left.svg
new file mode 100644
index 0000000000..dad8ca54e0
--- /dev/null
+++ b/data/elementary/themes/img/handle_pick_up_left.svg
@@ -0,0 +1,65 @@
+<?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="42"
+ height="54"
+ viewBox="0 0 42 54"
+ sodipodi:docname="handle_pick_up_left.svg"
+ inkscape:version="0.92.4 5da689c313, 2019-01-14">
+ <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="1920"
+ inkscape:window-height="1017"
+ id="namedview4"
+ showgrid="true"
+ inkscape:showpageshadow="false"
+ inkscape:snap-bbox="true"
+ inkscape:bbox-paths="true"
+ inkscape:bbox-nodes="true"
+ inkscape:zoom="11.064912"
+ inkscape:cx="13.367123"
+ inkscape:cy="29.726447"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg2">
+ <inkscape:grid
+ type="xygrid"
+ id="grid3715" />
+ </sodipodi:namedview>
+ <path
+
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3.77952766;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 30 11 L 13 28 L 12.994141 28.011719 A 3 3 0 0 0 12.013672 29.972656
L 12 30 L 12 30.236328 L 12 39 A 3 3 0 0 0 15 42 L 27 42 A 3 3 0 0 0 30 39 L 30
11 z "
+ id="path3719" />
+</svg>
diff --git a/data/elementary/themes/img/handle_pick_up_right.png
b/data/elementary/themes/img/handle_pick_up_right.png
index 53fee75122..81cb80b150 100644
Binary files a/data/elementary/themes/img/handle_pick_up_right.png and
b/data/elementary/themes/img/handle_pick_up_right.png differ
--
