raster pushed a commit to branch feature/themes/flat. http://git.enlightenment.org/core/efl.git/commit/?id=6095f9060d3b86e2b59a55a29dcbea9508346c5f
commit 6095f9060d3b86e2b59a55a29dcbea9508346c5f Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Sat Apr 25 13:26:34 2020 +0100 TH - map really basic as map is broken due ot openstreetmaps server changes --- data/elementary/themes/edc/elm/map.edc | 103 ++++++------------------------ data/elementary/themes/img/map_circle.png | Bin 28715 -> 17903 bytes data/elementary/themes/img/map_marker.png | Bin 1806 -> 956 bytes data/elementary/themes/img/map_scale.png | Bin 365 -> 2293 bytes 4 files changed, 19 insertions(+), 84 deletions(-) diff --git a/data/elementary/themes/edc/elm/map.edc b/data/elementary/themes/edc/elm/map.edc index c84533e744..108a721d9b 100644 --- a/data/elementary/themes/edc/elm/map.edc +++ b/data/elementary/themes/edc/elm/map.edc @@ -17,28 +17,24 @@ group { name: "elm/map/marker/radio/default"; rel2.relative: 0.5 0.5; rel2.offset: 0 3; align: 0.5 1.0; - min: 65 35; - max: 65 35; + min: 65 35; max: 65 35; image.normal: "map_marker.png"; + color: 51 153 255 255; } } part { name: "elm.icon"; type: SWALLOW; mouse_events: 0; description { state: "default" 0.0; - rel1.to: "mark"; + rel.to: "mark"; rel1.relative: (25/65) (5/35); - rel2.to: "mark"; rel2.relative: (40/65) (20/35); rel2.offset: 0 0; } } part { name: "elm.text"; type: TEXT; - effect: SHADOW BOTTOM; description { state: "default" 0.0; fixed: 1 1; - rel1.to: "elm.icon"; - rel2.to: "elm.icon"; - color_class: "map_radio"; - color: FN_COL_DISABLE_SHADOW; + rel.to: "elm.icon"; + color: 255 255 255 255; text { font: FNBD; size: 10; text_class: "map_radio"; min: 1 1; @@ -63,17 +59,13 @@ group { name: "elm/map/marker/empty/default"; } part { name: "elm.icon"; type: SWALLOW; mouse_events: 0; description { state: "default" 0.0; - rel1.to: "knob"; - rel2.to: "knob"; + rel.to: "knob"; } } part { name: "elm.text"; type: TEXT; - effect: SHADOW BOTTOM; description { state: "default" 0.0; - rel1.to: "knob"; - rel2.to: "knob"; - color_class: "map_empty"; - color: FN_COL_DEFAULT; + rel.to: "knob"; + color: 160 160 160 255; text { font: FNBD; size: 10; text_class: "map_empty"; min: 1 1; @@ -113,8 +105,7 @@ group { name: "elm/map/scale/base/default"; description { state: "default" 0.0; rel1.offset: 6 5; rel2.offset: -7 -5; - color_class: "map_scale"; - color: FN_COL_DEFAULT; + color: 255 255 255 255; text { font: FNBD; size: 10; text_class: "map_scale"; min: 1 1; @@ -129,78 +120,22 @@ group { name: "elm/map/scale/base/default"; group { name: "elm/map/marker_bubble/default"; data.item: "size_w" 320; data.item: "size_h" 160; - images.image: "bub_base_b0.png" COMP; - images.image: "bub_base_b1.png" COMP; - images.image: "bub_base_b2.png" COMP; - images.image: "bub_over_bot.png" COMP; - images.image: "shine.png" COMP; parts { - part { name: "base0"; - description { state: "default" 0.0; - image.normal: "bub_base_b0.png"; - image.border: 12 0 8 13; - image.middle: SOLID; - fill.smooth: 0; - rel2.relative: 0.0 1.0; - rel2.to: "base1"; - } - } - part { name: "base1"; + part { name: "base"; type: RECT; + scale: 1; description { state: "default" 0.0; - image.normal: "bub_base_b1.png"; - image.border: 0 0 8 13; - image.middle: SOLID; - fill.smooth: 0; - max: 17 99999; - min: 17 22; - } - } - part { name: "base2"; - description { state: "default" 0.0; - image.normal: "bub_base_b2.png"; - image.border: 0 12 8 13; - image.middle: SOLID; - fill.smooth: 0; - rel1.relative: 1.0 0.0; - rel1.to: "base1"; + color: 0 0 0 192; + rel1.offset: 4 4; + rel2.offset: -5 -5; + offscale; } } part { name: "elm.swallow.content"; type: SWALLOW; description { state: "default" 0.0; - rel1.to: "base0"; - rel1.offset: 5 4; - rel2.to: "base2"; - rel2.offset: -6 -12; - } - } - part { name: "over"; mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "base0"; - rel1.offset: 2 1; - rel2.to: "base2"; - rel2.offset: -3 1; - rel2.relative: 1.0 0.4; - image.normal: "bub_over_bot.png"; - fill.smooth: 0; - } - } - part { name: "shine_clip"; type: RECT; - description { state: "default" 0.0; - rel1.to: "over"; - rel1.offset: 0 -10; - rel2.to: "over"; - } - } - part { name: "shine"; mouse_events: 0; - clip_to: "shine_clip"; - description { state: "default" 0.0; - image.normal: "shine.png"; - rel1.offset: 0 -2; - rel1.to: "over"; - rel2.relative: 1.0 0.0; - rel2.offset: -1 2; - rel2.to: "over"; - FIXED_SIZE(69, 5) + rel1.to: "base"; + rel1.offset: 4 4; + rel2.offset: -5 -5; + offscale; } } } diff --git a/data/elementary/themes/img/map_circle.png b/data/elementary/themes/img/map_circle.png index 1641097cb9..8445add954 100644 Binary files a/data/elementary/themes/img/map_circle.png and b/data/elementary/themes/img/map_circle.png differ diff --git a/data/elementary/themes/img/map_marker.png b/data/elementary/themes/img/map_marker.png index 0e545a5962..258bff31e3 100644 Binary files a/data/elementary/themes/img/map_marker.png and b/data/elementary/themes/img/map_marker.png differ diff --git a/data/elementary/themes/img/map_scale.png b/data/elementary/themes/img/map_scale.png index 35215c13e5..540fa1d04e 100644 Binary files a/data/elementary/themes/img/map_scale.png and b/data/elementary/themes/img/map_scale.png differ --
