rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=87258635635002cfeccc28fed5dcf2385c2aa923
commit 87258635635002cfeccc28fed5dcf2385c2aa923 Author: Vyacheslav Reutskiy <v.reuts...@samsung.com> Date: Tue Jul 14 16:42:49 2015 +0300 Styles: update base default entry style Change-Id: I816f7edaa49ec4a993cac9c1f6ddde324664e3c2 --- data/themes/default/widgets/entry.edc | 662 +++++++++++++++++++++++++++++++--- 1 file changed, 612 insertions(+), 50 deletions(-) diff --git a/data/themes/default/widgets/entry.edc b/data/themes/default/widgets/entry.edc index 2e2143c..bb81633 100644 --- a/data/themes/default/widgets/entry.edc +++ b/data/themes/default/widgets/entry.edc @@ -77,124 +77,686 @@ group { name: "elm/entry/base/default"; } group { name: "elm/scroller/entry/default"; - inherit: "elm/scroller/base/default"; - images { - image: "input-text-bg.png" COMP; - } data { item: "focus_highlight" "on"; } + images { + image: "control-bg.png" COMP; + image: "scroll-bar.png" COMP; + image: "control-shadow.png" COMP; + image: "control-focus.png" COMP; + } parts { part { name: "bg"; type: IMAGE; description { state: "default" 0.0; - visible: 1; + color_class: "bg_entry"; image { - normal: "input-text-bg.png"; - border: 5 5 5 5; + normal: "control-bg.png"; + border: 8 8 8 8; + middle: DEFAULT; + } + } + description { state: "disabled" 0.0; + image { + normal: "control-bg-disabled.png"; + border: 8 8 8 8; middle: DEFAULT; } } } - part { name: "padding.rel1.content"; - type: SPACER; + part { name: "sb_vbar"; + type: RECT; + scale: 1; description { state: "default" 0.0; - SET_SIZE(2, 2); - align: 0.0 0.0; + align: 1.0 0.0; + fixed: 1 0; + min: 8 0; + max: 8 -1; + rel1 { + to_y: "bg"; + } + rel2 { + relative: 1.0 0.0; + offset: -1 0; + to_x: "bg"; + to_y: "sb_hbar"; + } + } + description { state: "hidden" 0.0; + align: 1.0 0.0; + fixed: 1 0; + max: 0 -1; + rel1 { + offset: 0 1; + to_y: "bg"; + } + rel2 { + relative: 1.0 0.0; + offset: -2 -1; + to_x: "bg"; + to_y: "sb_hbar"; + } } } - part { name: "padding.rel2.content"; - type: SPACER; + part { name: "sb_vbar_p1"; + type: RECT; + clip_to: "sb_vbar"; description { state: "default" 0.0; - SET_SIZE(0, 1); - align: 1.0 1.0; + color: 0 0 0 0; + rel1 { + to: "sb_vbar"; + } + rel2 { + relative: 1.0 0.0; + to: "elm.dragable.vbar"; + } } } - - part { name: "base"; - type: SPACER; + part { name: "sb_vbar_p2"; + type: RECT; + clip_to: "sb_vbar"; description { state: "default" 0.0; + color: 0 0 0 0; rel1 { - to: "padding.rel1.content"; - relative: 1.0 1.0; + relative: 0.0 1.0; + to: "elm.dragable.vbar"; } rel2 { - to: "padding.rel2.content"; - relative: 0.0 0.0; + to: "sb_vbar"; } } } - part { name: "sb_vbar"; + part { name: "elm.dragable.vbar"; type: RECT; + scale: 1; + clip_to: "sb_vbar"; + dragable { + x: 0 0 0; + y: 1 1 0; + confine: "sb_vbar"; + } description { state: "default" 0.0; - rel1.to: ""; + fixed: 1 1; + min: 8 24; + max: 8 -1; + color: 0 0 0 0; + rel1 { + relative: 0.5 0.5; + to: "sb_vbar"; + } + rel2 { + relative: 0.5 0.5; + to: "sb_vbar"; + } } } part { name: "sb_hbar"; type: RECT; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + align: 0.0 1.0; + fixed: 0 1; + max: -1 8; + rel1 { + to_x: "bg"; + } + rel2 { + relative: 0.0 1.0; + offset: 0 -2; + to_x: "sb_vbar"; + to_y: "bg"; + } + } + description { state: "hidden" 0.0; + align: 0.0 1.0; + fixed: 0 1; + max: -1 0; + rel1 { + to: "bg"; + } + rel2 { + relative: 0.0 1.0; + to_x: "sb_vbar"; + to_y: "bg"; + } + } + } + part { name: "sb_hbar_p1"; + type: RECT; + clip_to: "sb_hbar"; + description { state: "default" 0.0; + fixed: 1 1; + color: 0 0 0 0; + rel1 { + to: "sb_hbar"; + } + rel2 { + relative: 0.0 1.0; + to: "elm.dragable.hbar"; + } + } + } + part { name: "sb_hbar_p2"; + type: RECT; + clip_to: "sb_hbar"; + description { state: "default" 0.0; + color: 0 0 0 0; + rel1 { + relative: 1.0 0.0; + to: "elm.dragable.hbar"; + } + rel2 { + to: "sb_hbar"; + } + } + } + part { name: "elm.dragable.hbar"; + type: RECT; + scale: 1; + clip_to: "sb_hbar"; + dragable { + x: 1 1 0; + y: 0 0 0; + confine: "sb_hbar"; + } + description { state: "default" 0.0; + fixed: 1 1; + min: 24 8; + max: -1 8; + color: 0 0 0 0; + rel1 { + relative: 0.5 0.5; + to: "sb_hbar"; + } + rel2 { + relative: 0.5 0.5; + to: "sb_hbar"; + } + } + } + part { name: "clipper"; + type: RECT; + description { state: "default" 0.0; + rel1 { + to: "elm.swallow.content"; + } + rel2 { + to: "elm.swallow.content"; + } + } + } + part { name: "elm.swallow.background"; + type: SWALLOW; + clip_to: "clipper"; + description { state: "default" 0.0; + rel1 { + offset: 1 1; + to: "bg"; + } + rel2 { + offset: -2 -2; + to: "bg"; + } + } + } + part { name: "elm.swallow.content"; + type: SWALLOW; + clip_to: "clipper"; + description { state: "default" 0.0; + rel1 { + offset: 1 1; + to: "elm.swallow.background"; + } + rel2 { + relative: 0.0 0.0; + offset: -2 -2; + to_x: "sb_vbar"; + to_y: "sb_hbar"; + } + } + } + part { name: "elm.swallow.overlay"; + type: SWALLOW; + repeat_events: 1; + clip_to: "clipper"; + description { state: "default" 0.0; + rel1 { + to: "elm.swallow.background"; + } + rel2 { + to: "elm.swallow.background"; + } + } + } + part { name: "base_vbar"; + type: IMAGE; + mouse_events: 0; + clip_to: "sb_vbar"; description { state: "default" 0.0; - rel1.to: ""; + fixed: 1 0; + rel1 { + to: "elm.dragable.vbar"; + } + rel2 { + to: "elm.dragable.vbar"; + } + image { + normal: "scroll-bar.png"; + border: 2 2 2 2; + middle: DEFAULT; + } + fill { + smooth: 0; + } + } + description { state: "focused" 0.0; + fixed: 1 0; + color_class: "select_light"; + rel1 { + to: "elm.dragable.vbar"; + } + rel2 { + to: "elm.dragable.vbar"; + } + image { + normal: "scroll-bar.png"; + border: 2 2 2 2; + middle: DEFAULT; + } + fill { + smooth: 0; + } + } + description { state: "clicked" 0.0; + fixed: 1 0; + color_class: "select"; + rel1 { + to: "elm.dragable.vbar"; + } + rel2 { + to: "elm.dragable.vbar"; + } + image { + normal: "scroll-bar.png"; + border: 2 2 2 2; + middle: DEFAULT; + } + fill { + smooth: 0; + } + } + } + part { name: "base_hbar"; + type: IMAGE; + mouse_events: 0; + clip_to: "sb_hbar"; + description { state: "default" 0.0; + fixed: 0 1; + rel1 { + to: "elm.dragable.hbar"; + } + rel2 { + to: "elm.dragable.hbar"; + } + image { + normal: "scroll-bar.png"; + border: 2 2 2 2; + middle: DEFAULT; + } + fill { + smooth: 0; + } + } + description { state: "focused" 0.0; + fixed: 0 1; + color_class: "select_light"; + rel1 { + to: "elm.dragable.hbar"; + } + rel2 { + to: "elm.dragable.hbar"; + } + image { + normal: "scroll-bar.png"; + border: 2 2 2 2; + middle: DEFAULT; + } + fill { + smooth: 0; + } + } + description { state: "clicked" 0.0; + fixed: 0 1; + color_class: "select"; + rel1 { + to: "elm.dragable.hbar"; + } + rel2 { + to: "elm.dragable.hbar"; + } + image { + normal: "scroll-bar.png"; + border: 2 2 2 2; + middle: DEFAULT; + } + fill { + smooth: 0; + } } } part { name: "elm.swallow.icon"; type: SWALLOW; clip_to: "clipper"; description { state: "default" 0.0; + visible: 0; + align: 1.0 0.0; fixed: 1 1; - rel1.to: "base"; + rel1 { + to: "bg"; + } rel2 { - to: "base"; relative: 0.0 1.0; + to: "bg"; } - visible: 0; - align: 1.0 0.0; } description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; align: 0.0 0.0; + fixed: 1 1; + rel1 { + to: "bg"; + } + rel2 { + relative: 0.0 1.0; + to: "bg"; + } } } - part { name: "elm.swallow.end"; type: SWALLOW; + part { name: "elm.swallow.end"; + type: SWALLOW; clip_to: "clipper"; description { state: "default" 0.0; + visible: 0; + align: 0.0 0.0; fixed: 1 1; rel1 { - to: "base"; relative: 1.0 0.0; + to: "bg"; + } + rel2 { + to: "bg"; } - rel2.to: "base"; - visible: 0; - align: 0.0 0.0; } description { state: "visible" 0.0; - inherit: "default" 0.0; - visible: 1; align: 1.0 0.0; + fixed: 1 1; + rel1 { + relative: 1.0 0.0; + to: "bg"; + } + rel2 { + to: "bg"; + } + } + } + part { name: "shadow"; + type: IMAGE; + repeat_events: 1; + description { state: "default" 0.0; + rel1 { + to: "bg"; + } + rel2 { + to: "bg"; + } + image { + normal: "control-shadow.png"; + border: 8 8 8 8; + middle: DEFAULT; + } + } + description { state: "disabled" 0.0; + visible: 0; + rel1 { + to: "bg"; + } + rel2 { + to: "bg"; + } + image { + normal: "control-shadow.png"; + border: 8 8 8 8; + middle: DEFAULT; + } + } + } + part { name: "focus"; + type: IMAGE; + repeat_events: 1; + description { state: "default" 0.0; + color: 255 255 255 0; + rel1 { + to: "bg"; + } + rel2 { + to: "bg"; + } + image { + normal: "control-focus.png"; + border: 8 8 8 8; + middle: DEFAULT; + } + } + description { state: "pass" 0.0; + color_class: "valid"; + rel1 { + to: "bg"; + } + rel2 { + to: "bg"; + } + image { + normal: "control-focus.png"; + border: 8 8 8 8; + middle: DEFAULT; + } + } + description { state: "fail" 0.0; + color_class: "invalid"; + rel1 { + to: "bg"; + } + rel2 { + to: "bg"; + } + image { + normal: "control-focus.png"; + border: 8 8 8 8; + middle: DEFAULT; + } } } } programs { - program { - signal: "elm,action,show,icon"; source: "elm"; - action: STATE_SET "visible" 0.0; + program { name: "v_mouse_down"; + signal: "mouse,down,1*"; + source: "elm.dragable.vbar"; + action: STATE_SET "clicked" 0.00; + target: "elm.dragable.vbar"; + after: "v_bar_selected"; + } + program { name: "h_mouse_down"; + signal: "mouse,down,1*"; + source: "elm.dragable.hbar"; + action: STATE_SET "clicked" 0.00; + target: "elm.dragable.hbar"; + after: "h_bar_selected"; + } + program { name: "horizontal_scroll_down"; + signal: "mouse,down,1*"; + source: "sb_hbar_p1"; + action: DRAG_VAL_PAGE -1.0000 0.0000; + target: "elm.dragable.vbar"; + } + program { name: "horizontal_scroll_up"; + signal: "mouse,down,1*"; + source: "sb_hbar_p2"; + action: DRAG_VAL_PAGE 1.0000 0.0000; + target: "elm.dragable.vbar"; + } + program { name: "vertical_scroll_down"; + signal: "mouse,down,1*"; + source: "sb_vbar_p1"; + action: DRAG_VAL_PAGE 0.0000 -1.0000; + target: "elm.dragable.hbar"; + } + program { name: "vertical_scroll_up"; + signal: "mouse,down,1*"; + source: "sb_vbar_p2"; + action: DRAG_VAL_PAGE 0.0000 1.0000; + target: "elm.dragable.hbar"; + } + program { name: "reload_on_load"; + signal: "load"; + source: ""; + action: SIGNAL_EMIT "reload" "elm"; + } + program { name: "v_mouse_up"; + signal: "mouse,up,1"; + source: "elm.dragable.vbar"; + action: STATE_SET "default" 0.00; + target: "elm.dragable.vbar"; + after: "v_bar_unselected"; + } + program { name: "h_mouse_up"; + signal: "mouse,up,1"; + source: "elm.dragable.hbar"; + action: STATE_SET "default" 0.00; + target: "elm.dragable.hbar"; + after: "h_bar_unselected"; + } + program { name: "show_horizontal_scroll"; + signal: "elm,action,show,hbar"; + source: "elm"; + action: STATE_SET "default" 0.00; + target: "sb_hbar"; + } + program { name: "hide_horizontal_scroll"; + signal: "elm,action,hide,hbar"; + source: "elm"; + action: STATE_SET "hidden" 0.00; + target: "sb_hbar"; + } + program { name: "show_vertical_scroll"; + signal: "elm,action,show,vbar"; + source: "elm"; + action: STATE_SET "default" 0.00; + target: "sb_vbar"; + } + program { name: "hide_vertical_scroll"; + signal: "elm,action,hide,vbar"; + source: "elm"; + action: STATE_SET "hidden" 0.00; + target: "sb_vbar"; + } + program { name: "icon_show"; + signal: "elm,action,show,icon"; + source: "elm"; + action: STATE_SET "visible" 0.00; target: "elm.swallow.icon"; } - program { - signal: "elm,action,hide,icon"; source: "elm"; - action: STATE_SET "default" 0.0; + program { name: "icon_hide"; + signal: "elm,action,hide,icon"; + source: "elm"; + action: STATE_SET "default" 0.00; target: "elm.swallow.icon"; } - program { - signal: "elm,action,show,end"; source: "elm"; - action: STATE_SET "visible" 0.0; + program { name: "end_show"; + signal: "elm,action,show,end"; + source: "elm"; + action: STATE_SET "visible" 0.00; target: "elm.swallow.end"; } - program { - signal: "elm,action,hide,end"; source: "elm"; - action: STATE_SET "default" 0.0; + program { name: "end_hide"; + signal: "elm,action,hide,end"; + source: "elm"; + action: STATE_SET "default" 0.00; target: "elm.swallow.end"; } + program { name: "v_bar_selected"; + action: STATE_SET "clicked" 0.00; + target: "base_vbar"; + } + program { name: "v_bar_unselected"; + action: STATE_SET "default" 0.00; + target: "base_vbar"; + } + program { name: "v_mouse_in"; + signal: "mouse,in"; + source: "elm.dragable.vbar"; + action: STATE_SET "focused" 0.00; + target: "base_vbar"; + } + program { name: "v_mouse_out"; + signal: "mouse,out"; + source: "elm.dragable.vbar"; + action: STATE_SET "default" 0.00; + target: "base_vbar"; + } + program { name: "h_bar_selected"; + action: STATE_SET "clicked" 0.00; + target: "base_hbar"; + } + program { name: "h_bar_unselected"; + action: STATE_SET "default" 0.00; + target: "base_hbar"; + } + program { name: "h_mouse_in"; + signal: "mouse,in"; + source: "elm.dragable.hbar"; + action: STATE_SET "focused" 0.00; + target: "base_hbar"; + } + program { name: "h_mouse_out"; + signal: "mouse,out"; + source: "elm.dragable.hbar"; + action: STATE_SET "default" 0.00; + target: "base_hbar"; + } + program { name: "enable"; + signal: "elm,state,enable"; + source: "elm"; + action: STATE_SET "default" 0.00; + target: "bg"; + target: "shadow"; + } + program { name: "disable"; + signal: "elm,state,disabled"; + source: "elm"; + action: STATE_SET "disabled" 0.00; + target: "bg"; + target: "shadow"; + target: "focus"; + } + program { name: "validation_pass"; + signal: "validation,default,pass"; + source: "elm"; + action: STATE_SET "pass" 0.00; + target: "focus"; + } + program { name: "validation_fail"; + signal: "validation,default,fail"; + source: "elm"; + action: STATE_SET "fail" 0.00; + target: "focus"; + } + program { name: "validation_off"; + signal: "validation,default"; + source: "elm"; + action: STATE_SET "default" 0.00; + target: "focus"; + } } } --