hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=cf46aad5ca4a4686b53fb8a13d7d9619f37f4c88
commit cf46aad5ca4a4686b53fb8a13d7d9619f37f4c88 Author: ChunEon Park <[email protected]> Date: Tue Aug 5 15:48:36 2014 +0900 panes: apply flush style. --- data/themes/default/images/Makefile.am | 5 +- data/themes/default/images/downlight_glow_left.png | Bin 0 -> 963 bytes .../themes/default/images/downlight_glow_right.png | Bin 0 -> 987 bytes data/themes/default/images/holes_vert.png | Bin 194 -> 0 bytes data/themes/default/theme_ext.edc | 190 +++++++++++++++++---- 5 files changed, 157 insertions(+), 38 deletions(-) diff --git a/data/themes/default/images/Makefile.am b/data/themes/default/images/Makefile.am index 474bb67..aed5a5d 100644 --- a/data/themes/default/images/Makefile.am +++ b/data/themes/default/images/Makefile.am @@ -18,7 +18,6 @@ EXTRA_DIST = \ holes_tiny_glow_vert.png \ holes_tiny_horiz.png \ holes_tiny_vert.png \ - holes_vert.png \ inset_shadow.png \ logo.png \ frame_bg.png \ @@ -53,4 +52,6 @@ EXTRA_DIST = \ setting.png \ status.png \ swallow_s.png \ - goto.png + goto.png \ + downlight_glow_left.png \ + downlight_glow_right.png diff --git a/data/themes/default/images/downlight_glow_left.png b/data/themes/default/images/downlight_glow_left.png new file mode 100644 index 0000000..d74def7 Binary files /dev/null and b/data/themes/default/images/downlight_glow_left.png differ diff --git a/data/themes/default/images/downlight_glow_right.png b/data/themes/default/images/downlight_glow_right.png new file mode 100644 index 0000000..8b20af0 Binary files /dev/null and b/data/themes/default/images/downlight_glow_right.png differ diff --git a/data/themes/default/images/holes_vert.png b/data/themes/default/images/holes_vert.png deleted file mode 100644 index 01611d1..0000000 Binary files a/data/themes/default/images/holes_vert.png and /dev/null differ diff --git a/data/themes/default/theme_ext.edc b/data/themes/default/theme_ext.edc index 78b741d..6f83631 100644 --- a/data/themes/default/theme_ext.edc +++ b/data/themes/default/theme_ext.edc @@ -7,6 +7,9 @@ fill { size { relative: 0.0 1.0; offset: _WIDTH 0; } } #define FIXED_SIZE(_WIDTH, _HEIGHT) \ min: _WIDTH _HEIGHT; max: _WIDTH _HEIGHT; fixed: 1 1; +#define PANEMIN 10 +#define PANEMIN2 16 +#define PANEWID 32 group { name: "elm/scroller/base/enventor"; images.image: "inset_shadow.png" COMP; @@ -881,25 +884,30 @@ group { name: "elm/ctxpopup/bg/enventor"; } group { name: "elm/panes/vertical/enventor"; - images.image: "holes_vert.png" COMP; + images.image: "downlight_glow_left.png" COMP; + images.image: "downlight_glow_right.png" COMP; images.image: "pm_fill.png" COMP; parts { part { name: "whole"; type: SPACER; description { state: "default" 0.0; } } - part { name: "whole_left"; type: RECT; + part { name: "right_constraint"; type: SPACER; + dragable { confine: "whole"; + x: 1 1 1; + y: 0 0 0; + } description { state: "default" 0.0; - rel2.to_x: "elm.bar"; - rel2.relative: 0.0 1.0; - fixed: 1 0; + max: 0 0; } } - part { name: "whole_right"; type: RECT; + part { name: "left_constraint"; type: SPACER; + dragable { confine: "whole"; + x: 1 1 1; + y: 0 0 0; + } description { state: "default" 0.0; - rel1.to_x: "elm.bar"; - rel1.relative: 1.0 0.0; - fixed: 1 0; + max: 0 0; } } part { name: "left_bg"; type: IMAGE; @@ -917,85 +925,195 @@ group { name: "elm/panes/vertical/enventor"; description { state: "default" 0.0; rel1.to: "elm.swallow.right"; rel2.to: "elm.swallow.right"; - color: 20 20 20 255; + color: 0 0 0 255; + } + } + part { name: "sub_whole"; type: SPACER; + description { state: "default" 0.0; + rel1.relative: 1.0 0.0; + rel1.to_x: "left_constraint"; + rel2.relative: 0.0 1.0; + rel2.to_x: "right_constraint"; + } + } + part { name: "whole_left"; type: RECT; + description { state: "default" 0.0; + rel2.to_x: "elm.bar"; + rel2.relative: 1.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; } } part { name: "elm.swallow.left"; type: SWALLOW; clip_to: "whole_left"; description { state: "default" 0.0; rel2.to_x: "elm.bar"; - rel2.relative: 0.0 1.0; - fixed: 1 0; + rel2.relative: 1.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: 1.0 0.0; - fixed: 1 0; + rel1.relative: 0.0 0.0; } } part { name: "elm.bar"; type: SPACER; - scale: 1; - dragable { confine: "whole"; + dragable { confine: "sub_whole"; x: 1 1 1; y: 0 0 0; } description { state: "default" 0.0; - max: 10 99999; - min: 10 14; - fixed: 1 1; - rel1.relative: 0.5 0.5; - rel2.relative: 0.5 0.5; - } - } - part { name: "dots"; mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - image.normal: "holes_vert.png"; - rel1.to: "elm.bar"; - rel2.to: "elm.bar"; - min: 4 14; - max: 4 14; + max: 0 99999; + min: 0 14; fixed: 1 1; + rel1.relative: 0.0 0.5; + rel2.relative: 1.0 0.5; } } part { name: "elm.swallow.event"; type: SWALLOW; - scale: 1; description { state: "default" 0.0; visible: 0; - min: 10 16; + min: PANEMIN PANEMIN2; fixed: 1 1; rel1.to: "elm.bar"; rel2.to: "elm.bar"; } } part { name: "bar"; type: RECT; - scale: 1; dragable.events: "elm.bar"; description { state: "default" 0.0; - min: 18 32; + min: PANEMIN PANEWID; max: 99999 99999; fixed: 1 1; rel1.to_x: "elm.swallow.event"; + rel1.relative: 0.0 0.25; rel2.to_x: "elm.swallow.event"; + rel2.relative: 1.0 0.75; + color: 0 0 0 0; + } + } + part { name: "glow1a"; mouse_events: 0; + description { state: "default" 0.0; + image.normal: "downlight_glow_left.png"; + image.border: 0 3 0 0; + max: 32 99999; + rel2.to_x: "elm.bar"; + color: 255 255 255 0; + align: 1.0 0.5; + } + description { state: "active" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + } + part { name: "glow1b"; mouse_events: 0; + description { state: "default" 0.0; + image.normal: "downlight_glow_right.png"; + max: 4 99999; + rel1.to_x: "elm.bar"; + color: 255 255 255 0; + align: 0.0 0.5; + } + description { state: "active" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + } + part { name: "glow2a"; mouse_events: 0; + description { state: "default" 0.0; + image.normal: "downlight_glow_left.png"; + max: 4 99999; + rel2.to_x: "elm.bar"; + color: 255 255 255 0; + align: 1.0 0.5; + } + description { state: "active" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + } + part { name: "glow2b"; mouse_events: 0; + 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; + } + description { state: "active" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + } + part { name: "bar1"; type: RECT; repeat_events: 1; + description { state: "default" 0.0; + fixed: 1 1; + rel1.to: "bar"; + rel2.to: "bar"; + rel2.relative: 0.5 1.0; + color: 0 0 0 0; + } + } + part { name: "bar2"; type: RECT; repeat_events: 1; + description { state: "default" 0.0; + fixed: 1 1; + rel1.to: "bar"; + rel1.relative: 0.5 0.0; + rel2.to: "bar"; color: 0 0 0 0; } } } programs { - program { signal: "mouse,down,1"; source: "bar"; + // for "press" smart callback + program {signal: "mouse,down,1"; source: "bar"; action: SIGNAL_EMIT "elm,action,press" "elm"; } + // for "unpress" smart callback program { signal: "mouse,up,1"; source: "bar"; action: SIGNAL_EMIT "elm,action,unpress" "elm"; } + // for "clicked" smart callback program { signal: "mouse,clicked,1"; source: "bar"; action: SIGNAL_EMIT "elm,action,click" "elm"; } + // for "clicked,double" smart callback program { signal: "mouse,down,1,double"; source: "bar"; action: SIGNAL_EMIT "elm,action,click,double" "elm"; } + 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"; + } } } --
