rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=650a42485d75c062550d04066ccc186692a0110a
commit 650a42485d75c062550d04066ccc186692a0110a Author: Vitalii Vorobiov <[email protected]> Date: Fri Jul 1 12:15:31 2016 +0300 TIZEN hoversel style: style for history_hoversel --- data/themes/tizen/widgets/button.edc | 370 +++++++++++++++++++++++++++++++++ data/themes/tizen/widgets/combobox.edc | 1 + data/themes/tizen/widgets/scroller.edc | 1 + 3 files changed, 372 insertions(+) diff --git a/data/themes/tizen/widgets/button.edc b/data/themes/tizen/widgets/button.edc index accce4f..2d2fe67 100644 --- a/data/themes/tizen/widgets/button.edc +++ b/data/themes/tizen/widgets/button.edc @@ -410,6 +410,376 @@ group { name: "elm/button/base/hoversel_vertical/entry"; } } +group { name: "elm/button/base/hoversel_vertical/history"; + min: 9 9; + max: 9 9; + images { + image: "tool_s_ic_arrow_nor.png" COMP; + image: "tool_s_ic_arrow_sel.png" COMP; + } + parts { + part { name: "arrow"; + type: IMAGE; + clip_to: "disabler"; + description { state: "default" 0.0; + fixed: 1 1; + min: 9 9; + max: 9 9; + image.normal: "tool_s_ic_arrow_nor.png"; + } + description { state: "expanded" 0.0; + inherit: "default" 0.00; + image.normal: "tool_s_ic_arrow_sel.png"; + } + } + part { name: "expand.btn"; + type: RECT; + description { state: "default" 0.0; + color: 0 0 0 0; + } + description { state: "unvisible" 0.0; + inherit: "default" 0.00; + visible: 0; + } + } + part { name: "disabler"; + type: RECT; + description { state: "default" 0.0; + } + description { state: "active" 0.0; + color: 64 64 64 225; + } + } + } + programs { + program { name: "button_click"; + signal: "mouse,down,1"; + source: "expand.btn"; + action: SIGNAL_EMIT "elm,action,press" ""; + } + program { name: "button_unclick"; + signal: "mouse,up,1"; + source: "expand.btn"; + action: SIGNAL_EMIT "elm,action,unpress" ""; + } + program { name: "button_click2"; + signal: "mouse,down,1"; + source: "expand.btn"; + action: STATE_SET "expanded" 0.00; + target: "arrow"; + } + program { name: "button_unclick2"; + signal: "mouse,up,1"; + source: "expand.btn"; + action: STATE_SET "default" 0.00; + target: "arrow"; + } + program { name: "button_unclick3"; + signal: "mouse,clicked,1"; + source: "expand.btn"; + action: SIGNAL_EMIT "elm,action,click" ""; + } + } +} + +group { name: "elm/button/base/hoversel_vertical_entry/history"; + data { + item: "focus_highlight" "on"; + } + parts { + part { name: "button_image"; + type: RECT; + description { state: "default" 0.0; + color: 0 0 0 0; + min: 0 24; + max: -1 0; + } + description { state: "hovered" 0.0; + color: 203 233 255 255; + min: 0 19; + max: -1 0; + } + } + part { name: "elm.swallow.content"; + type: SWALLOW; + description { state: "default" 0.0; + visible: 0; + align: 0.0 0.5; + fixed: 1 0; + rel1.offset: 4 4; + rel2 { + relative: 0.0 1.0; + offset: 3 -5; + } + } + description { state: "visible" 0.0; + inherit: "default" 0.00; + visible: 1; + aspect: 1.0 1.0; + rel2.offset: 4 -5; + } + description { state: "icononly" 0.0; + inherit: "visible" 0.00; + align: 0.5 0.5; + fixed: 0 0; + aspect: 0.0 0.0; + rel2 { + relative: 1.0 1.0; + offset: -5 -5; + } + } + } + part { name: "elm.text"; + type: TEXT; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + visible: 0; + color: 85 85 85 255; + text { + font: FN; + size: 15; + align: 0.0 0.5; + } + rel1 { + relative: 1.0 0.0; + offset: 0 4; + to_x: "elm.swallow.content"; + } + rel2.offset: -5 -5; + } + description { state: "visible" 0.0; + inherit: "default" 0.00; + visible: 1; + text.min: 1 1; + text.ellipsis: -1; + } + description { state: "disabled" 0.0; + inherit: "default" 0.00; + visible: 0; + } + description { state: "disabled_visible" 0.0; + inherit: "visible" 0.00; + color: 128 128 128 255; + text.ellipsis: -1; + } + } + part { name: "over2"; + type: RECT; + repeat_events: 1; + ignore_flags: "ON_HOLD"; + description { state: "default" 0.0; + color: 0 0 0 0; + } + description { state: "visible" 0.0; + inherit: "default" 0.00; + } + description { state: "disabled" 0.0; + inherit: "default" 0.00; + visible: 0; + } + } + part { name: "over3"; + type: RECT; + repeat_events: 1; + description { state: "default" 0.0; + color: 0 0 0 0; + } + description { state: "clicked" 0.0; + inherit: "default" 0.00; + } + } + part { name: "disabler"; + type: RECT; + description { state: "default" 0.0; + visible: 0; + color: 0 0 0 0; + } + description { state: "visible" 0.0; + inherit: "default" 0.00; + visible: 0; + } + description { state: "disabled" 0.0; + inherit: "default" 0.00; + visible: 1; + } + } + part { name: "sizer.content"; + type: TEXT; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + visible: 0; + text { + font: FN; + size: 11; + text_class: "button"; + } + } + description { state: "visible" 0.0; + visible: 0; + text { + text: "M"; + font: FN; + size: 11; + text_class: "button"; + min: 1 1; + ellipsis: -1; + } + rel1.to: "elm.swallow.content"; + rel2.to: "elm.swallow.content"; + } + description { state: "icononly" 0.0; + inherit: "visible" 0.00; + visible: 0; + } + } + } + programs { + program { name: "button_mouse_in"; + signal: "mouse,in"; + source: "over2"; + action: STATE_SET "hovered" 0.00; + target: "button_image"; + } + program { name: "button_mouse_out"; + signal: "mouse,out"; + source: "over2"; + action: STATE_SET "default" 0.00; + target: "button_image"; + } + program { name: "button_click"; + signal: "mouse,down,1"; + source: "over2"; + action: SIGNAL_EMIT "elm,action,press" ""; + } + program { name: "button_unclick"; + signal: "mouse,up,1"; + source: "over3"; + action: SIGNAL_EMIT "elm,action,unpress" ""; + } + program { name: "button_click2"; + signal: "mouse,down,1"; + source: "over3"; + action: STATE_SET "clicked" 0.00; + target: "over3"; + } + program { name: "button_unclick2"; + signal: "mouse,up,1"; + source: "over3"; + action: STATE_SET "default" 0.00; + transition: DECELERATE 0.50000; + target: "over3"; + } + program { name: "button_unclick3"; + signal: "mouse,clicked,1"; + source: "over2"; + action: SIGNAL_EMIT "elm,action,click" ""; + } + program { name: "text_show"; + signal: "elm,state,text,visible"; + source: "elm"; + script { + + + new st[31]; + new Float:vl; + get_state(PART:"elm.swallow.content", st, 30, vl); + if (!strcmp(st, "icononly")) { + set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"sizer.content", "visible", 0.0); + } + get_state(PART:"elm.text", st, 30, vl); + if (!strcmp(st, "disabled") || (!strcmp(st, "disabled_visible"))) + set_state(PART:"elm.text", "disabled_visible", 0.0); + else + set_state(PART:"elm.text", "visible", 0.0); + } + } + program { name: "text_hide"; + signal: "elm,state,text,hidden"; + source: "elm"; + script { + + + new st[31]; + new Float:vl; + get_state(PART:"elm.swallow.content", st, 30, vl); + if (!strcmp(st, "visible")) { + set_state(PART:"elm.swallow.content", "icononly", 0.0); + set_state(PART:"sizer.content", "icononly", 0.0); + } + set_state(PART:"elm.text", "default", 0.0); + get_state(PART:"elm.text", st, 30, vl); + if (!strcmp(st, "default") || (!strcmp(st, "visible"))) + set_state(PART:"elm.text", "default", 0.0); + else + set_state(PART:"elm.text", "disabled", 0.0); + } + } + program { name: "icon_show"; + signal: "elm,state,icon,visible"; + source: "elm"; + script { + + + new st[31]; + new Float:vl; + get_state(PART:"elm.text", st, 30, vl); + if (!strcmp(st, "visible")) { + set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"sizer.content", "visible", 0.0); + } + else { + set_state(PART:"elm.swallow.content", "icononly", 0.0); + set_state(PART:"sizer.content", "icononly", 0.0); + } + } + } + program { name: "icon_hide"; + signal: "elm,state,icon,hidden"; + source: "elm"; + action: STATE_SET "default" 0.00; + target: "elm.swallow.content"; + target: "sizer.content"; + } + program { name: "disable"; + signal: "elm,state,disabled"; + source: "elm"; + script { + + + new st[31]; + new Float:vl; + set_state(PART:"over2", "disabled", 0.0); + set_state(PART:"disabler", "disabled", 0.0); + get_state(PART:"elm.text", st, 30, vl); + if (!strcmp(st, "visible") || !strcmp(st, "disabled_visible")) + set_state(PART:"elm.text", "disabled_visible", 0.0); + else + set_state(PART:"elm.text", "disabled", 0.0); + } + } + program { name: "enable"; + signal: "elm,state,enabled"; + source: "elm"; + script { + + + new st[31]; + new Float:vl; + set_state(PART:"over2", "visible", 0.0); + set_state(PART:"disabler", "visible", 0.0); + get_state(PART:"elm.text", st, 30, vl); + if (!strcmp(st, "visible") || !strcmp(st, "disabled_visible")) + set_state(PART:"elm.text", "visible", 0.0); + else + set_state(PART:"elm.text", "default", 0.0); + } + } + } +} + group { name: "elm/button/base/hoversel_vertical_entry/entry"; data { item: "focus_highlight" "on"; diff --git a/data/themes/tizen/widgets/combobox.edc b/data/themes/tizen/widgets/combobox.edc index a942220..3c85e3a 100644 --- a/data/themes/tizen/widgets/combobox.edc +++ b/data/themes/tizen/widgets/combobox.edc @@ -614,6 +614,7 @@ group { name: "elm/button/base/combobox_vertical/color_class"; /* TODO: remove scripts, remake hover */ group { name: "elm/hover/base/combobox_vertical/default"; alias: "elm/hover/base/combobox_vertical/color_class"; + alias: "elm/hover/base/hoversel_vertical/history"; data.item: "dismiss" "on"; // max_size limits the maximum size of expanded hoversel // when it's scrollable. diff --git a/data/themes/tizen/widgets/scroller.edc b/data/themes/tizen/widgets/scroller.edc index 6439248..ae29c16 100644 --- a/data/themes/tizen/widgets/scroller.edc +++ b/data/themes/tizen/widgets/scroller.edc @@ -1,4 +1,5 @@ group { name: "elm/scroller/base/default"; + alias: "elm/scroller/base/popup/no_inset_shadow"; /* that's for hoversel */ images { image: "scroll_down_icon_dim.png" COMP; image: "scroll_up_icon_sel.png" COMP; --
