raster pushed a commit to branch feature/themes/flat. http://git.enlightenment.org/core/efl.git/commit/?id=c80ad311959e55450b0d8efd55c3699853970153
commit c80ad311959e55450b0d8efd55c3699853970153 Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Fri Apr 12 18:57:55 2019 +0100 TH - panes --- data/elementary/themes/edc/efl/panes.edc | 4 + data/elementary/themes/edc/elm/panes.edc | 393 +++++++++++++-------------- data/elementary/themes/img/pane_handle_h.png | Bin 0 -> 819 bytes data/elementary/themes/img/pane_handle_v.png | Bin 0 -> 826 bytes 4 files changed, 198 insertions(+), 199 deletions(-) diff --git a/data/elementary/themes/edc/efl/panes.edc b/data/elementary/themes/edc/efl/panes.edc index 6dc5e26537..f7d769972d 100644 --- a/data/elementary/themes/edc/efl/panes.edc +++ b/data/elementary/themes/edc/efl/panes.edc @@ -1004,3 +1004,7 @@ group { name: "efl/panes/horizontal:down-fold"; } } } + +#undef PANEMIN +#undef PANEMIN2 +#undef PANEWID diff --git a/data/elementary/themes/edc/elm/panes.edc b/data/elementary/themes/edc/elm/panes.edc index 9009123f92..23a41c9f1f 100644 --- a/data/elementary/themes/edc/elm/panes.edc +++ b/data/elementary/themes/edc/elm/panes.edc @@ -11,12 +11,12 @@ elm,action,unpress: Used for "unpress" smart callback. */ -#define PANEMIN 10 -#define PANEMIN2 16 -#define PANEWID 32 +#define PANEMIN 8 +#define PANEMIN2 24 +#define PANEWID 24 group { name: "elm/panes/vertical/default"; - images.image: "holes_vert.png" COMP; + images.image: "pane_handle_v.png" COMP; parts { part { name: "whole"; type: SPACER; description { state: "default" 0.0; @@ -51,31 +51,27 @@ group { name: "elm/panes/vertical/default"; part { name: "whole_left"; type: RECT; description { state: "default" 0.0; rel2.to_x: "elm.bar"; - rel2.relative: 1.0 1.0; - rel2.offset: -4 -1; + rel2.relative: 0.0 1.0; } } part { name: "whole_right"; type: RECT; description { state: "default" 0.0; rel1.to_x: "elm.bar"; - rel1.relative: 0.0 0.0; - rel1.offset: 3 0; + rel1.relative: 1.0 0.0; } } part { name: "elm.swallow.left"; type: SWALLOW; clip_to: "whole_left"; description { state: "default" 0.0; rel2.to_x: "elm.bar"; - rel2.relative: 1.0 1.0; - rel2.offset: -4 -1; + rel2.relative: 0.0 1.0; } } part { name: "elm.swallow.right"; type: SWALLOW; clip_to: "whole_right"; description { state: "default" 0.0; rel1.to_x: "elm.bar"; - rel1.relative: 0.0 0.0; - rel1.offset: 3 0; + rel1.relative: 1.0 0.0; } } part { name: "elm.bar"; type: SPACER; @@ -84,8 +80,8 @@ group { name: "elm/panes/vertical/default"; y: 0 0 0; } description { state: "default" 0.0; - max: 0 99999; - min: 0 14; + max: 8 99999; + min: 8 24; fixed: 1 1; rel1.relative: 0.0 0.5; rel2.relative: 1.0 0.5; @@ -93,10 +89,11 @@ group { name: "elm/panes/vertical/default"; } part { name: "dots"; mouse_events: 0; description { state: "default" 0.0; - image.normal: "holes_vert.png"; - rel1.to: "elm.bar"; - rel2.to: "elm.bar"; - FIXED_SIZE(4, 14) + FIXED_SIZE(8, 24) + image.normal: "pane_handle_v.png"; + fill.smooth: 0; + rel.to: "elm.bar"; + color: 160 160 160 255; } } part { name: "elm.swallow.event"; type: SWALLOW; @@ -104,8 +101,7 @@ group { name: "elm/panes/vertical/default"; visible: 0; min: PANEMIN PANEMIN2; fixed: 1 1; - rel1.to: "elm.bar"; - rel2.to: "elm.bar"; + rel.to: "elm.bar"; } } part { name: "bar"; type: RECT; @@ -151,7 +147,7 @@ group { name: "elm/panes/vertical/default"; } group { name: "elm/panes/horizontal/default"; - images.image: "holes_horiz.png" COMP; + images.image: "pane_handle_h.png" COMP; parts { part { name: "whole"; type: SPACER; description { state: "default" 0.0; @@ -186,31 +182,27 @@ group { name: "elm/panes/horizontal/default"; part { name: "whole_left"; type: RECT; description { state: "default" 0.0; rel2.to_y: "elm.bar"; - rel2.relative: 1.0 1.0; - rel2.offset: -1 -4; + rel2.relative: 1.0 0.0; } } part { name: "whole_right"; type: RECT; description { state: "default" 0.0; rel1.to_y: "elm.bar"; - rel1.relative: 0.0 0.0; - rel1.offset: 0 3; + rel1.relative: 0.0 1.0; } } part { name: "elm.swallow.left"; type: SWALLOW; clip_to: "whole_left"; description { state: "default" 0.0; rel2.to_y: "elm.bar"; - rel2.relative: 1.0 1.0; - rel2.offset: -1 -4; + rel2.relative: 1.0 0.0; } } part { name: "elm.swallow.right"; type: SWALLOW; clip_to: "whole_right"; description { state: "default" 0.0; rel1.to_y: "elm.bar"; - rel1.relative: 0.0 0.0; - rel1.offset: 0 3; + rel1.relative: 0.0 1.0; } } part { name: "elm.bar"; type: SPACER; @@ -219,8 +211,8 @@ group { name: "elm/panes/horizontal/default"; y: 1 1 1; } description { state: "default" 0.0; - max: 99999 0; - min: 14 0; + max: 99999 8; + min: 24 8; fixed: 1 1; rel1.relative: 0.5 0.0; rel2.relative: 0.5 1.0; @@ -228,10 +220,11 @@ group { name: "elm/panes/horizontal/default"; } part { name: "dots"; mouse_events: 0; description { state: "default" 0.0; - image.normal: "holes_horiz.png"; - rel1.to: "elm.bar"; - rel2.to: "elm.bar"; - FIXED_SIZE(14, 4) + FIXED_SIZE(24, 8) + image.normal: "pane_handle_h.png"; + fill.smooth: 0; + rel.to: "elm.bar"; + color: 160 160 160 255; } } part { name: "elm.swallow.event"; type: SWALLOW; @@ -239,8 +232,7 @@ group { name: "elm/panes/horizontal/default"; visible: 0; min: PANEMIN2 PANEMIN; fixed: 1 1; - rel1.to: "elm.bar"; - rel2.to: "elm.bar"; + rel.to: "elm.bar"; } } part { name: "bar"; type: RECT; @@ -287,10 +279,8 @@ group { name: "elm/panes/horizontal/default"; //////////////////////////////////////////////////////////////////////////// - group { name: "elm/panes/vertical/flush"; - images.image: "downlight_glow_left.png" COMP; - images.image: "downlight_glow_right.png" COMP; + images.image: "shadow_circle_vert.png" COMP; parts { part { name: "whole"; type: SPACER; description { state: "default" 0.0; @@ -390,64 +380,81 @@ group { name: "elm/panes/vertical/flush"; } } part { name: "glow1a"; mouse_events: 0; + clip_to: "whole_right"; + scale: 1; description { state: "default" 0.0; - image.normal: "downlight_glow_left.png"; - image.border: 0 3 0 0; - max: 32 99999; + image.normal: "shadow_circle_vert.png"; + rel1.to_x: "elm.bar"; rel2.to_x: "elm.bar"; color: 255 255 255 0; - align: 1.0 0.5; + offscale; + visible: 0; } description { state: "active" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; + inherit: "default" 0.0; + color: 255 255 255 128; + rel1.offset: -16 0; + rel2.offset: 15 -1; + visible: 1; } } - part { name: "glow1b"; mouse_events: 0; + part { name: "glow2a"; mouse_events: 0; + clip_to: "whole_left"; + scale: 1; description { state: "default" 0.0; - image.normal: "downlight_glow_right.png"; - max: 4 99999; + image.normal: "shadow_circle_vert.png"; rel1.to_x: "elm.bar"; + rel2.to_x: "elm.bar"; color: 255 255 255 0; - align: 0.0 0.5; + offscale; + visible: 0; } description { state: "active" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; + inherit: "default" 0.0; + color: 255 255 255 128; + rel1.offset: -16 0; + rel2.offset: 15 -1; + visible: 1; } } - part { name: "glow2a"; mouse_events: 0; + part { name: "glowbar1a"; type: RECT; mouse_events: 0; + clip_to: "whole_left"; + scale: 1; description { state: "default" 0.0; - image.normal: "downlight_glow_left.png"; - max: 4 99999; + rel1.to_x: "elm.bar"; rel2.to_x: "elm.bar"; - color: 255 255 255 0; - align: 1.0 0.5; + color: 51 153 255 255; + offscale; + visible: 0; } description { state: "active" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; + inherit: "default" 0.0; + rel1.offset: -5 0; + rel2.offset: 4 -1; + visible: 1; } } - part { name: "glow2b"; mouse_events: 0; + part { name: "glowbar2a"; type: RECT; mouse_events: 0; + clip_to: "whole_right"; + scale: 1; description { state: "default" 0.0; - image.normal: "downlight_glow_right.png"; - image.border: 3 0 0 0; - max: 32 99999; rel1.to_x: "elm.bar"; - color: 255 255 255 0; - align: 0.0 0.5; + rel2.to_x: "elm.bar"; + color: 51 153 255 255; + offscale; + visible: 0; } description { state: "active" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; + inherit: "default" 0.0; + rel1.offset: -5 0; + rel2.offset: 4 -1; + visible: 1; } } part { name: "bar1"; type: RECT; repeat_events: 1; description { state: "default" 0.0; fixed: 1 1; - rel1.to: "bar"; - rel2.to: "bar"; + rel.to: "bar"; rel2.relative: 0.5 1.0; color: 0 0 0 0; } @@ -455,9 +462,8 @@ group { name: "elm/panes/vertical/flush"; part { name: "bar2"; type: RECT; repeat_events: 1; description { state: "default" 0.0; fixed: 1 1; - rel1.to: "bar"; + rel.to: "bar"; rel1.relative: 0.5 0.0; - rel2.to: "bar"; color: 0 0 0 0; } } @@ -488,37 +494,36 @@ group { name: "elm/panes/vertical/flush"; program { signal: "mouse,in"; source: "bar1"; action: STATE_SET "active" 0.0; - transition: BOUNCE 0.4 0.5 4; + transition: DECELERATE 0.2; target: "glow1a"; - target: "glow1b"; + target: "glowbar1a"; } program { signal: "mouse,out"; source: "bar1"; action: STATE_SET "default" 0.0; transition: DECELERATE 0.5; target: "glow1a"; - target: "glow1b"; + target: "glowbar1a"; } program { signal: "mouse,in"; source: "bar2"; action: STATE_SET "active" 0.0; - transition: BOUNCE 0.4 0.5 4; + transition: DECELERATE 0.2; target: "glow2a"; - target: "glow2b"; + target: "glowbar2a"; } program { signal: "mouse,out"; source: "bar2"; action: STATE_SET "default" 0.0; transition: DECELERATE 0.5; target: "glow2a"; - target: "glow2b"; + target: "glowbar2a"; } } } group { name: "elm/panes/horizontal/flush"; - images.image: "downlight_glow.png" COMP; - images.image: "downlight_glow_up.png" COMP; + images.image: "shadow_circle_horiz.png" COMP; parts { part { name: "whole"; type: SPACER; description { state: "default" 0.0; @@ -618,64 +623,81 @@ group { name: "elm/panes/horizontal/flush"; } } part { name: "glow1a"; mouse_events: 0; + clip_to: "whole_right"; + scale: 1; description { state: "default" 0.0; - image.normal: "downlight_glow_up.png"; - image.border: 0 0 0 3; - max: 99999 32; + image.normal: "shadow_circle_horiz.png"; + rel1.to_y: "elm.bar"; rel2.to_y: "elm.bar"; color: 255 255 255 0; - align: 0.5 1.0; + offscale; + visible: 0; } description { state: "active" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; + inherit: "default" 0.0; + color: 255 255 255 128; + rel1.offset: 0 -16; + rel2.offset: -1 15; + visible: 1; } } - part { name: "glow1b"; mouse_events: 0; + part { name: "glow2a"; mouse_events: 0; + clip_to: "whole_left"; + scale: 1; description { state: "default" 0.0; - image.normal: "downlight_glow.png"; - max: 99999 4; + image.normal: "shadow_circle_horiz.png"; rel1.to_y: "elm.bar"; + rel2.to_y: "elm.bar"; color: 255 255 255 0; - align: 0.5 0.0; + offscale; + visible: 0; } description { state: "active" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; + inherit: "default" 0.0; + color: 255 255 255 128; + rel1.offset: 0 -16; + rel2.offset: -1 15; + visible: 1; } } - part { name: "glow2a"; mouse_events: 0; + part { name: "glowbar1a"; type: RECT; mouse_events: 0; + clip_to: "whole_left"; + scale: 1; description { state: "default" 0.0; - image.normal: "downlight_glow_up.png"; - max: 99999 4; + rel1.to_y: "elm.bar"; rel2.to_y: "elm.bar"; - color: 255 255 255 0; - align: 0.5 1.0; + color: 51 153 255 255; + offscale; + visible: 0; } description { state: "active" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; + inherit: "default" 0.0; + rel1.offset: 0 -5; + rel2.offset: -1 4; + visible: 1; } } - part { name: "glow2b"; mouse_events: 0; + part { name: "glowbar2a"; type: RECT; mouse_events: 0; + clip_to: "whole_right"; + scale: 1; description { state: "default" 0.0; - image.normal: "downlight_glow.png"; - image.border: 0 0 3 0; - max: 99999 32; rel1.to_y: "elm.bar"; - color: 255 255 255 0; - align: 0.5 0.0; + rel2.to_y: "elm.bar"; + color: 51 153 255 255; + offscale; + visible: 0; } description { state: "active" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; + inherit: "default" 0.0; + rel1.offset: 0 -5; + rel2.offset: -1 4; + visible: 1; } } part { name: "bar1"; type: RECT; repeat_events: 1; description { state: "default" 0.0; fixed: 1 1; - rel1.to: "bar"; - rel2.to: "bar"; + rel.to: "bar"; rel2.relative: 1.0 0.5; color: 0 0 0 0; } @@ -683,42 +705,13 @@ group { name: "elm/panes/horizontal/flush"; part { name: "bar2"; type: RECT; repeat_events: 1; description { state: "default" 0.0; fixed: 1 1; - rel1.to: "bar"; + rel.to: "bar"; rel1.relative: 0.0 0.5; - rel2.to: "bar"; color: 0 0 0 0; } } } programs { - program { - signal: "mouse,in"; source: "bar1"; - action: STATE_SET "active" 0.0; - transition: BOUNCE 0.4 0.5 4; - target: "glow1a"; - target: "glow1b"; - } - program { - signal: "mouse,out"; source: "bar1"; - action: STATE_SET "default" 0.0; - transition: DECELERATE 0.5; - target: "glow1a"; - target: "glow1b"; - } - program { - signal: "mouse,in"; source: "bar2"; - action: STATE_SET "active" 0.0; - transition: BOUNCE 0.4 0.5 4; - target: "glow2a"; - target: "glow2b"; - } - program { - signal: "mouse,out"; source: "bar2"; - action: STATE_SET "default" 0.0; - transition: DECELERATE 0.5; - target: "glow2a"; - target: "glow2b"; - } program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback action: SIGNAL_EMIT "elm,action,press" "elm"; } @@ -741,39 +734,62 @@ group { name: "elm/panes/horizontal/flush"; action: STATE_SET "default" 0.0; target: "bar"; } + program { + signal: "mouse,in"; source: "bar1"; + action: STATE_SET "active" 0.0; + transition: DECELERATE 0.2; + target: "glow1a"; + target: "glowbar1a"; + } + program { + signal: "mouse,out"; source: "bar1"; + action: STATE_SET "default" 0.0; + transition: DECELERATE 0.5; + target: "glow1a"; + target: "glowbar1a"; + } + program { + signal: "mouse,in"; source: "bar2"; + action: STATE_SET "active" 0.0; + transition: DECELERATE 0.2; + target: "glow2a"; + target: "glowbar2a"; + } + program { + signal: "mouse,out"; source: "bar2"; + action: STATE_SET "default" 0.0; + transition: DECELERATE 0.5; + target: "glow2a"; + target: "glowbar2a"; + } } } group { name: "elm/panes/vertical/left-fold"; inherit: "elm/panes/vertical/default"; - images.image: "icon_arrow_left.png" COMP; - images.image: "icon_arrow_right.png" COMP; + images.image: "big_arrow_left.png" COMP; + images.image: "big_arrow_right.png" COMP; script { public open; public drag_x; public drag_y; } parts { - spacer { "sub_whole"; - desc { "default"; - rel1.offset: 3 0; - } - } image { "dots"; desc { "default"; - image.normal: "icon_arrow_left.png"; - FIXED_SIZE(14, 14) + image.normal: "big_arrow_left.png"; + FIXED_SIZE(14, 17) + fill.smooth: 1; } desc { "closed"; inherit: "default" 0.0; - image.normal: "icon_arrow_right.png"; + image.normal: "big_arrow_right.png"; } } rect { "event"; repeat; desc { "default"; - rel1.to: "dots"; - rel2.to: "dots"; + rel.to: "dots"; color: 0 0 0 0; } } @@ -786,8 +802,7 @@ group { name: "elm/panes/vertical/left-fold"; } program { signal: "mouse,clicked,1"; source: "event"; script { - if (get_int(open) == 1) - { + if (get_int(open) == 1) { new Float: dx; new Float: dy; set_int(open, 0); @@ -795,9 +810,7 @@ group { name: "elm/panes/vertical/left-fold"; set_float(drag_x, dx); set_drag(PART:"elm.bar", 0.0, 0.5); set_state(PART:"dots", "closed", 0.0); - } - else if (get_int(open) == 0) - { + } else if (get_int(open) == 0) { set_int(open, 1); set_drag(PART:"elm.bar", get_float(drag_x), 0.5); set_state(PART:"dots", "default", 0.0); @@ -809,34 +822,29 @@ group { name: "elm/panes/vertical/left-fold"; group { name: "elm/panes/vertical/right-fold"; inherit: "elm/panes/vertical/default"; - images.image: "icon_arrow_left.png" COMP; - images.image: "icon_arrow_right.png" COMP; + images.image: "big_arrow_left.png" COMP; + images.image: "big_arrow_right.png" COMP; script { public open; public drag_x; public drag_y; } parts { - spacer { "sub_whole"; - desc { "default"; - rel2.offset: -4 0; - } - } image { "dots"; desc { "default"; - image.normal: "icon_arrow_right.png"; + image.normal: "big_arrow_right.png"; FIXED_SIZE(14, 17) + fill.smooth: 1; } desc { "closed"; inherit: "default" 0.0; - image.normal: "icon_arrow_left.png"; + image.normal: "big_arrow_left.png"; } } rect { "event"; repeat; desc { "default"; - rel1.to: "dots"; - rel2.to: "dots"; + rel.to: "dots"; color: 0 0 0 0; } } @@ -849,8 +857,7 @@ group { name: "elm/panes/vertical/right-fold"; } program { signal: "mouse,clicked,1"; source: "event"; script { - if (get_int(open) == 1) - { + if (get_int(open) == 1) { new Float: dx; new Float: dy; set_int(open, 0); @@ -858,9 +865,7 @@ group { name: "elm/panes/vertical/right-fold"; set_float(drag_x, dx); set_drag(PART:"elm.bar", 1.0, 0.5); set_state(PART:"dots", "closed", 0.0); - } - else if (get_int(open) == 0) - { + } else if (get_int(open) == 0) { set_int(open, 1); set_drag(PART:"elm.bar", get_float(drag_x), 0.5); set_state(PART:"dots", "default", 0.0); @@ -872,27 +877,23 @@ group { name: "elm/panes/vertical/right-fold"; group { name: "elm/panes/horizontal/up-fold"; inherit: "elm/panes/horizontal/default"; - images.image: "icon_arrow_up.png" COMP; - images.image: "icon_arrow_down.png" COMP; + images.image: "big_arrow_up.png" COMP; + images.image: "big_arrow_down.png" COMP; script { public open; public drag_x; public drag_y; } parts { - spacer { "sub_whole"; - desc { "default"; - rel1.offset: 0 3; - } - } image { "dots"; desc { "default"; - image.normal: "icon_arrow_up.png"; + image.normal: "big_arrow_up.png"; FIXED_SIZE(17, 14) + fill.smooth: 1; } desc { "closed"; inherit: "default" 0.0; - image.normal: "icon_arrow_down.png"; + image.normal: "big_arrow_down.png"; } } rect { "event"; @@ -912,8 +913,7 @@ group { name: "elm/panes/horizontal/up-fold"; } program { signal: "mouse,clicked,1"; source: "event"; script { - if (get_int(open) == 1) - { + if (get_int(open) == 1) { new Float: dx; new Float: dy; set_int(open, 0); @@ -921,9 +921,7 @@ group { name: "elm/panes/horizontal/up-fold"; set_float(drag_y, dy); set_drag(PART:"elm.bar", 0.5, 0.0); set_state(PART:"dots", "closed", 0.0); - } - else if (get_int(open) == 0) - { + } else if (get_int(open) == 0) { set_int(open, 1); set_drag(PART:"elm.bar", 0.5, get_float(drag_y)); set_state(PART:"dots", "default", 0.0); @@ -935,27 +933,23 @@ group { name: "elm/panes/horizontal/up-fold"; group { name: "elm/panes/horizontal/down-fold"; inherit: "elm/panes/horizontal/default"; - images.image: "icon_arrow_up.png" COMP; - images.image: "icon_arrow_down.png" COMP; + images.image: "big_arrow_up.png" COMP; + images.image: "big_arrow_down.png" COMP; script { public open; public drag_x; public drag_y; } parts { - spacer { "sub_whole"; - desc { "default"; - rel2.offset: 0 -4; - } - } image { "dots"; desc { "default"; - image.normal: "icon_arrow_down.png"; + image.normal: "big_arrow_down.png"; FIXED_SIZE(17, 14) + fill.smooth: 1; } desc { "closed"; inherit: "default" 0.0; - image.normal: "icon_arrow_up.png"; + image.normal: "big_arrow_up.png"; } } rect { "event"; @@ -975,8 +969,7 @@ group { name: "elm/panes/horizontal/down-fold"; } program { signal: "mouse,clicked,1"; source: "event"; script { - if (get_int(open) == 1) - { + if (get_int(open) == 1) { new Float: dx; new Float: dy; set_int(open, 0); @@ -984,9 +977,7 @@ group { name: "elm/panes/horizontal/down-fold"; set_float(drag_y, dy); set_drag(PART:"elm.bar", 0.5, 1.0); set_state(PART:"dots", "closed", 0.0); - } - else if (get_int(open) == 0) - { + } else if (get_int(open) == 0) { set_int(open, 1); set_drag(PART:"elm.bar", 0.5, get_float(drag_y)); set_state(PART:"dots", "default", 0.0); @@ -995,3 +986,7 @@ group { name: "elm/panes/horizontal/down-fold"; } } } + +#undef PANEMIN +#undef PANEMIN2 +#undef PANEWID diff --git a/data/elementary/themes/img/pane_handle_h.png b/data/elementary/themes/img/pane_handle_h.png new file mode 100644 index 0000000000..2dc59dda33 Binary files /dev/null and b/data/elementary/themes/img/pane_handle_h.png differ diff --git a/data/elementary/themes/img/pane_handle_v.png b/data/elementary/themes/img/pane_handle_v.png new file mode 100644 index 0000000000..36b1b7fa8a Binary files /dev/null and b/data/elementary/themes/img/pane_handle_v.png differ --
