raster pushed a commit to branch feature/themes/flat. http://git.enlightenment.org/core/efl.git/commit/?id=e34717795a7c2ef13b7fd69420b79fd03a267ec8
commit e34717795a7c2ef13b7fd69420b79fd03a267ec8 Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Sat Feb 8 22:46:35 2020 +0000 TH - panel --- data/elementary/themes/edc/elm/panel.edc | 290 ++++++++++--------------------- 1 file changed, 95 insertions(+), 195 deletions(-) diff --git a/data/elementary/themes/edc/elm/panel.edc b/data/elementary/themes/edc/elm/panel.edc index 3f34c7c52d..9968d9567a 100644 --- a/data/elementary/themes/edc/elm/panel.edc +++ b/data/elementary/themes/edc/elm/panel.edc @@ -289,8 +289,7 @@ group { name: "elm/scroller/panel/top/default"; group { name: "elm/scroller/panel/bottom/default"; parts { - part { name: "elm.event_area"; - type: SWALLOW; + part { name: "elm.event_area"; type: SWALLOW; description { state: "default" 0.0; rel2.relative: 1.0 0.0; align: 0.5 0.0; @@ -302,17 +301,11 @@ group { name: "elm/scroller/panel/bottom/default"; visible: 1; } } - part { name: "elm.panel_area"; - type: SWALLOW; + part { name: "elm.panel_area"; type: SWALLOW; description { state: "default" 0.0; - rel1 { - relative: 0.0 1.0; - to: "elm.event_area"; - } - rel2 { - relative: 1.0 1.0; - to: "elm.event_area"; - } + rel.to: "elm.event_area"; + rel1.relative: 0.0 1.0; + rel2.relative: 1.0 1.0; align: 0.5 0.0; fixed: 1 1; visible: 0; @@ -322,20 +315,15 @@ group { name: "elm/scroller/panel/bottom/default"; visible: 1; } } - part { name: "access.outline"; - type: RECT; - repeat_events: 1; + part { name: "access.outline"; type: RECT; repeat_events: 1; description { state: "default" 0.0; - rel1.to: "elm.panel_area"; - rel2.to: "elm.panel_area"; + rel.to: "elm.panel_area"; color: 0 0 0 0; } } - part { name: "bg"; - type: RECT; + part { name: "bg"; type: RECT; description { state: "default" 0.0; - rel1.to: "elm.panel_area"; - rel2.to: "elm.panel_area"; + rel.to: "elm.panel_area"; color: 64 64 64 255; visible: 0; } @@ -344,11 +332,9 @@ group { name: "elm/scroller/panel/bottom/default"; visible: 1; } } - part { name: "elm.swallow.content"; - type: SWALLOW; + part { name: "elm.swallow.content"; type: SWALLOW; description { state: "default" 0.0; - rel1.to: "elm.panel_area"; - rel2.to: "elm.panel_area"; + rel.to: "elm.panel_area"; visible: 0; } description { state: "visible" 0.0; @@ -358,18 +344,14 @@ group { name: "elm/scroller/panel/bottom/default"; } } programs { - program { name: "active"; - signal: "elm,state,content,visible"; - source: "elm"; + program { signal: "elm,state,content,visible"; source: "elm"; action: STATE_SET "visible" 0.0; target: "elm.panel_area"; target: "elm.event_area"; target: "bg"; target: "elm.swallow.content"; } - program { name: "inactive"; - signal: "elm,state,content,hidden"; - source: "elm"; + program { signal: "elm,state,content,hidden"; source: "elm"; action: STATE_SET "default" 0.0; target: "elm.panel_area"; target: "elm.event_area"; @@ -379,49 +361,45 @@ group { name: "elm/scroller/panel/bottom/default"; } } +#define IC(_NAME, _ICON) \ + set { name: _NAME; \ + image {image: _ICON"-060.png" COMP; size: 31 31 60000 60000; } \ + image {image: _ICON"-030.png" COMP; size: 16 16 30 30; } \ + image {image: _ICON"-015.png" COMP; size: 0 0 15 15; } \ + } +IC("ic-arrow-l", "arrow-l") +IC("ic-arrow-r", "arrow-r") +IC("ic-arrow-u", "arrow-u") +IC("ic-arrow-d", "arrow-d") +IC("ic-reload", "reload") +IC("ic-heart", "heart") +#undef IC + group { name: "elm/panel/left/default"; - images.image: "bevel_out.png" COMP; - images.image: "shine.png" COMP; - images.image: "shadow_square_tiny.png" COMP; - images.image: "holes_tiny_glow_vert.png" COMP; - images.image: "holes_tiny_glow_horiz.png" COMP; - images.image: "win_glow.png" COMP; - images.image: "icon_arrow_right.png" COMP; - images.image: "icon_arrow_left.png" COMP; - images.image: "icon_arrow_up.png" COMP; - images.image: "icon_arrow_down.png" COMP; data.item: "focus_highlight" "on"; script { public is_rtl = 0; } parts { part { name: "shadow"; mouse_events: 0; + scale: 1; description { state: "default" 0.0; - rel1.offset: -3 -2; - rel1.to: "base"; - rel2.offset: 2 4; - rel2.to: "base"; - image.normal: "shadow_square_tiny.png"; - image.border: 6 6 6 6; - fill.smooth: 0; + rel.to: "base"; + WIN_SHADOW_SMALL; } } - part { name: "glow"; mouse_events: 0; + part { name: "glow"; type: RECT; mouse_events: 0; + scale: 1; description { state: "default" 0.0; - image.normal: "win_glow.png"; - image.border: 9 9 9 9; - image.middle: 0; - rel1.offset: -5 -5; - rel1.to: "base"; - rel2.offset: 4 4; - rel2.to: "base"; - fill.smooth: 0; - color: 255 255 255 0; + rel.to: "base"; + color: 51 153 255 255; visible: 0; + offscale; } description { state: "focused" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + rel1.offset: -5 -5; + rel2.offset: 4 4; visible: 1; } } @@ -434,44 +412,23 @@ group { name: "elm/panel/left/default"; rel1.to_x: "all"; rel2.to_x: "elm.swallow.event"; rel2.relative: 0.0 1.0; - rel2.offset: -4 -1; color: 64 64 64 255; } } part { name: "elm.swallow.content"; type: SWALLOW; + scale: 1; description { state: "default" 0.0; + rel.to: "base"; rel1.offset: 4 4; - rel1.to: "base"; rel2.offset: -5 -5; - rel2.to: "base"; - } - } - part { name: "bevel"; mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - image.normal: "bevel_out.png"; - image.border: 1 1 1 1; - image.middle: 0; - fill.smooth: 0; - } - } - part { name: "shine"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "shine.png"; - rel1.offset: 0 -2; - rel1.to: "base"; - rel2.relative: 1.0 0.0; - rel2.offset: -1 2; - rel2.to: "base"; - FIXED_SIZE(69, 5) + offscale; } } part { name: "elm.swallow.event"; type: SWALLOW; + scale: 1; description { state: "default" 0.0; fixed: 1 1; - min: 20 20; - max: 20 20; + min: 30 30; max: 30 999999; align: 1.0 0.5; rel1.relative: 1.0 0.0; rel2.relative: 1.0 1.0; @@ -486,54 +443,38 @@ group { name: "elm/panel/left/default"; } part { name: "btn"; type: RECT; description { state: "default" 0.0; - rel1.to: "elm.swallow.event"; - rel2.to: "elm.swallow.event"; + rel.to: "elm.swallow.event"; color: 0 0 0 0; } description { state: "hidden" 0.0; - rel1.to: "elm.swallow.event"; - rel2.to: "elm.swallow.event"; - } - } - part { name: "dots"; mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "icn"; - rel2.to: "icn"; - align: 0.0 0.5; - image.normal: "holes_tiny_glow_vert.png"; - FIXED_SIZE(11, 17) + rel.to: "elm.swallow.event"; } } part { name: "icn"; mouse_events: 0; scale: 1; description { state: "default" 0.0; fixed: 1 1; - min: 20 20; - max: 20 20; - rel1.to: "btn"; - rel2.to: "btn"; - image.normal: "icon_arrow_left.png"; + min: 30 30; max: 30 30; + rel.to: "btn"; + image.normal: "ic-arrow-l"; } description { state: "hidden" 0.0; inherit: "default" 0.0; - image.normal: "icon_arrow_right.png"; + image.normal: "ic-arrow-r"; } } } programs { - program { - signal: "mouse,clicked,1"; source: "btn"; + program { signal: "mouse,clicked,1"; source: "btn"; action: SIGNAL_EMIT "elm,action,panel,toggle" "elm"; } - program { - signal: "elm,action,show"; source: "elm"; + program { signal: "elm,action,show"; source: "elm"; action: STATE_SET "default" 0.0; - transition: DECELERATE 0.3; + transition: DECELERATE 0.2; target: "elm.swallow.event"; target: "base"; } - program { - signal: "elm,action,show"; source: "elm"; + program { signal: "elm,action,show"; source: "elm"; script { if (get_int(is_rtl) == 0) set_state(PART:"icn", "default", 0.0); @@ -541,14 +482,12 @@ group { name: "elm/panel/left/default"; set_state(PART:"icn", "hidden", 0.0); } } - program { - signal: "elm,action,show,no_animate"; source: "elm"; + program { signal: "elm,action,show,no_animate"; source: "elm"; action: STATE_SET "default" 0.0; target: "elm.swallow.event"; target: "base"; } - program { - signal: "elm,action,show,no_animate"; source: "elm"; + program { signal: "elm,action,show,no_animate"; source: "elm"; script { if (get_int(is_rtl) == 0) set_state(PART:"icn", "default", 0.0); @@ -556,9 +495,7 @@ group { name: "elm/panel/left/default"; set_state(PART:"icn", "hidden", 0.0); } } - program { - signal: "edje,state,rtl"; - source: "edje"; + program { signal: "edje,state,rtl"; source: "edje"; script { new st[31]; new Float:vl; @@ -570,9 +507,7 @@ group { name: "elm/panel/left/default"; set_int(is_rtl, 1); } } - program { - signal: "edje,state,ltr"; - source: "edje"; + program { signal: "edje,state,ltr"; source: "edje"; script { new st[31]; new Float:vl; @@ -584,14 +519,12 @@ group { name: "elm/panel/left/default"; set_int(is_rtl, 0); } } - program { - signal: "elm,action,hide"; source: "elm"; + program { signal: "elm,action,hide"; source: "elm"; action: STATE_SET "hidden" 0.0; - transition: ACCELERATE 0.3; + transition: ACCELERATE 0.2; target: "elm.swallow.event"; } - program { - signal: "elm,action,hide"; source: "elm"; + program { signal: "elm,action,hide"; source: "elm"; script { if (get_int(is_rtl) == 0) set_state(PART:"icn", "hidden", 0.0); @@ -603,21 +536,18 @@ group { name: "elm/panel/left/default"; signal: "elm,action,hide"; source: "elm"; script { new x, y, w, h; - if (get_int(is_rtl) == 0) - { - custom_state(PART:"base", "default", 0.0); - set_state_val(PART:"base", STATE_REL1, -1.0, 0.0); - get_geometry(PART:"elm.swallow.event", x, y, w, h); - set_state_val(PART:"base", STATE_REL1_OFFSET, w, 0); - } - else - { - custom_state(PART:"base", "default", 0.0); - set_state_val(PART:"base", STATE_REL1, -1.0, 0.0); - set_state_val(PART:"base", STATE_REL2, -2.0, 1.0); - get_geometry(PART:"elm.swallow.event", x, y, w, h); - set_state_val(PART:"base", STATE_REL2_OFFSET, -w, 0); - } + if (get_int(is_rtl) == 0) { + custom_state(PART:"base", "default", 0.0); + set_state_val(PART:"base", STATE_REL1, -1.0, 0.0); + get_geometry(PART:"elm.swallow.event", x, y, w, h); + set_state_val(PART:"base", STATE_REL1_OFFSET, w, 0); + } else { + custom_state(PART:"base", "default", 0.0); + set_state_val(PART:"base", STATE_REL1, -1.0, 0.0); + set_state_val(PART:"base", STATE_REL2, -2.0, 1.0); + get_geometry(PART:"elm.swallow.event", x, y, w, h); + set_state_val(PART:"base", STATE_REL2_OFFSET, -w, 0); + } } after: "hide2"; } @@ -626,13 +556,11 @@ group { name: "elm/panel/left/default"; transition: ACCELERATE 0.3; target: "base"; } - program { - signal: "elm,action,hide,no_animate"; source: "elm"; + program { signal: "elm,action,hide,no_animate"; source: "elm"; action: STATE_SET "hidden" 0.0; target: "elm.swallow.event"; } - program { - signal: "elm,action,hide,no_animate"; source: "elm"; + program { signal: "elm,action,hide,no_animate"; source: "elm"; script { if (get_int(is_rtl) == 0) set_state(PART:"icn", "hidden", 0.0); @@ -644,21 +572,18 @@ group { name: "elm/panel/left/default"; signal: "elm,action,hide,no_animate"; source: "elm"; script { new x, y, w, h; - if (get_int(is_rtl) == 0) - { - custom_state(PART:"base", "default", 0.0); - set_state_val(PART:"base", STATE_REL1, -1.0, 0.0); - get_geometry(PART:"elm.swallow.event", x, y, w, h); - set_state_val(PART:"base", STATE_REL1_OFFSET, w, 0); - } - else - { - custom_state(PART:"base", "default", 0.0); - set_state_val(PART:"base", STATE_REL1, -1.0, 0.0); - set_state_val(PART:"base", STATE_REL2, -2.0, 1.0); - get_geometry(PART:"elm.swallow.event", x, y, w, h); - set_state_val(PART:"base", STATE_REL2_OFFSET, -w, 0); - } + if (get_int(is_rtl) == 0) { + custom_state(PART:"base", "default", 0.0); + set_state_val(PART:"base", STATE_REL1, -1.0, 0.0); + get_geometry(PART:"elm.swallow.event", x, y, w, h); + set_state_val(PART:"base", STATE_REL1_OFFSET, w, 0); + } else { + custom_state(PART:"base", "default", 0.0); + set_state_val(PART:"base", STATE_REL1, -1.0, 0.0); + set_state_val(PART:"base", STATE_REL2, -2.0, 1.0); + get_geometry(PART:"elm.swallow.event", x, y, w, h); + set_state_val(PART:"base", STATE_REL2_OFFSET, -w, 0); + } } after: "hide2_no_animate"; } @@ -666,14 +591,12 @@ group { name: "elm/panel/left/default"; action: STATE_SET "custom" 0.0; target: "base"; } - program { - signal: "elm,action,focus_highlight,show"; source: "elm"; + program { signal: "elm,action,focus_highlight,show"; source: "elm"; action: STATE_SET "focused" 0.0; transition: ACCELERATE 0.2; target: "glow"; } - program { - signal: "elm,action,focus_highlight,hide"; source: "elm"; + program { signal: "elm,action,focus_highlight,hide"; source: "elm"; action: STATE_SET "default" 0.0; transition: DECELERATE 0.5; target: "glow"; @@ -706,17 +629,12 @@ group { name: "elm/panel/right/default"; rel2.relative: 1.0 1.0; } } - part { name: "dots"; - description { state: "default" 0.0; - align: 1.0 0.5; - } - } part { name: "icn"; description { state: "default" 0.0; - image.normal: "icon_arrow_right.png"; + image.normal: "ic-arrow-r"; } description { state: "hidden" 0.0; - image.normal: "icon_arrow_left.png"; + image.normal: "ic-arrow-l"; } } } @@ -724,7 +642,7 @@ group { name: "elm/panel/right/default"; program { name: "hide1"; script { new x, y, w, h; - + custom_state(PART:"base", "default", 0.0); set_state_val(PART:"base", STATE_REL1, 1.0, 0.0); set_state_val(PART:"base", STATE_REL2, 2.0, 1.0); @@ -743,15 +661,14 @@ group { name: "elm/panel/top/default"; rel1.relative: 0.0 0.0; rel1.to_x: "all"; rel1.to_y: "all"; - rel1.offset: 0 0; rel2.relative: 1.0 0.0; rel2.to_x: "all"; rel2.to_y: "elm.swallow.event"; - rel2.offset: -1 -4; } } part { name: "elm.swallow.event"; description { state: "default" 0.0; + min: 30 30; max: 999999 30; align: 0.5 1.0; rel1.relative: 0.0 1.0; rel2.relative: 1.0 1.0; @@ -762,19 +679,12 @@ group { name: "elm/panel/top/default"; rel2.relative: 1.0 0.0; } } - part { name: "dots"; - description { state: "default" 0.0; - align: 0.5 0.0; - image.normal: "holes_tiny_glow_horiz.png"; - FIXED_SIZE(17, 11) - } - } part { name: "icn"; description { state: "default" 0.0; - image.normal: "icon_arrow_up.png"; + image.normal: "ic-arrow-u"; } description { state: "hidden" 0.0; - image.normal: "icon_arrow_down.png"; + image.normal: "ic-arrow-d"; } } } @@ -782,7 +692,6 @@ group { name: "elm/panel/top/default"; program { name: "hide1"; script { new x, y, w, h; - custom_state(PART:"base", "default", 0.0); set_state_val(PART:"base", STATE_REL1, 0.0, -1.0); set_state_val(PART:"base", STATE_REL2, 1.0, 0.0); @@ -837,11 +746,9 @@ group { name: "elm/panel/bottom/default"; rel1.relative: 0.0 1.0; rel1.to_x: "all"; rel1.to_y: "elm.swallow.event"; - rel1.offset: 0 3; rel2.relative: 1.0 1.0; rel2.to_x: "all"; rel2.to_y: "all"; - rel2.offset: -1 -1; } } part { name: "elm.swallow.event"; @@ -856,19 +763,12 @@ group { name: "elm/panel/bottom/default"; rel2.relative: 1.0 1.0; } } - part { name: "dots"; - description { state: "default" 0.0; - align: 0.5 0.0; - image.normal: "holes_tiny_glow_horiz.png"; - FIXED_SIZE(17, 11) - } - } part { name: "icn"; description { state: "default" 0.0; - image.normal: "icon_arrow_down.png"; + image.normal: "ic-arrow-d"; } description { state: "hidden" 0.0; - image.normal: "icon_arrow_up.png"; + image.normal: "ic-arrow-u"; } } } --
