rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=981efe276af413caaae49f0411584d04592b76bc
commit 981efe276af413caaae49f0411584d04592b76bc Author: Mykyta Biliavskyi <[email protected]> Date: Thu Jun 9 22:44:47 2016 +0300 Tizen theme: update style for button. --- data/themes/tizen/widgets/button.edc | 423 ++++++++++++++++++++--------------- src/bin/ui/workspace/workspace.c | 2 + 2 files changed, 246 insertions(+), 179 deletions(-) diff --git a/data/themes/tizen/widgets/button.edc b/data/themes/tizen/widgets/button.edc index f8b6f6d..d0dfca8 100644 --- a/data/themes/tizen/widgets/button.edc +++ b/data/themes/tizen/widgets/button.edc @@ -2,260 +2,262 @@ #define FN_COL_DISABLE 21 21 21 255; color3: 255 255 255 25 group { name: "elm/button/base/default"; - alias: "elm/button/base/colorselector/default"; + images { + image: "border_1.png" COMP; + image: "border_2.png" COMP; + } alias: "elm/button/base/fileselector/default"; alias: "elm/button/base/fileselector/actions/default"; alias: "elm/button/base/hoversel_vertical/fileselector/actions/default"; - images { - image: "btn_widget.png" COMP; - image: "btn_widget_push.png" COMP; - image: "btn_widget_disable.png" COMP; - image: "btn_widget_hover.png" COMP; + alias: "elm/button/base/colorselector/default"; + data { + item: "focus_highlight" "on"; } parts { part { name: "button_image"; - mouse_events: 1; + type: RECT; description { state: "default" 0.0; - min: 9 9; - image { - normal: "btn_widget.png"; - border: 3 3 3 3; - } + color: 225 225 225 255; } - description { state: "visible" 0.0; - inherit: "default" 0.0; + description { state: "focused" 0.0; + inherit: "default" 0.00; + color: 238 238 238 255; + } + description { state: "hovered" 0.0; + inherit: "default" 0.00; + color: 205 233 255 255; } description { state: "clicked" 0.0; - inherit: "default" 0.0; - image { - normal: "btn_widget_push.png"; - border: 3 3 3 3; - } + inherit: "default" 0.00; + color: 0 138 238 255; } description { state: "disabled" 0.0; - inherit: "default" 0.0; + inherit: "default" 0.00; + color: 204 204 204 255; + } + description { state: "visible" 0.0; + inherit: "default" 0.00; + } + } + part { name: "border"; + type: IMAGE; + description { state: "default" 0.0; + color_class: "border"; image { - normal: "btn_widget_disable.png"; - border: 3 3 3 3; + normal: "border_1.png"; + border: 1 1 1 1; + middle: NONE; } + fill.smooth: 0; + } + description { state: "visible" 0.0; + inherit: "default" 0.00; + image.normal: "border_2.png"; + } + description { state: "clicked" 0.0; + inherit: "visible" 0.00; + visible: 0; + color_class: "border_focused"; + image.border: 2 2 2 2; } description { state: "hovered" 0.0; - inherit: "default" 0.0; - image { - normal: "btn_widget_hover.png"; - border: 3 3 3 3; - } + inherit: "clicked" 0.00; + visible: 1; + } + description { state: "focused" 0.0; + inherit: "hovered" 0.00; + } + description { state: "disabled" 0.0; + inherit: "hovered" 0.00; + color_class: ""; + color: 191 191 191 255; + image.normal: "border_1.png"; } } part { name: "elm.swallow.content"; type: SWALLOW; description { state: "default" 0.0; - fixed: 1 0; visible: 0; align: 0.0 0.5; + fixed: 1 0; rel1.offset: 4 4; - rel2.offset: 3 -5; - rel2.relative: 0.0 1.0; + rel2 { + relative: 0.0 1.0; + offset: 3 -5; + } } description { state: "visible" 0.0; - inherit: "default" 0.0; - fixed: 1 0; + inherit: "default" 0.00; visible: 1; aspect: 1.0 1.0; - // aspect_preference: VERTICAL; rel2.offset: 4 -5; } description { state: "icononly" 0.0; - inherit: "default" 0.0; - fixed: 0 0; - visible: 1; + inherit: "visible" 0.00; align: 0.5 0.5; - // aspect: 1.0 1.0; - rel2.offset: -5 -5; - rel2.relative: 1.0 1.0; - // aspect_preference: VERTICAL; + fixed: 0 0; + aspect: 0.0 0.0; + rel2 { + relative: 1.0 1.0; + offset: -5 -5; + } } } - part { - name: "elm.text"; + part { name: "elm.text"; type: TEXT; mouse_events: 0; scale: 1; description { state: "default" 0.0; visible: 0; - rel1.to_x: "elm.swallow.content"; - rel1.relative: 1.0 0.0; - rel1.offset: 0 4; - rel2.offset: -5 -5; - color_class: genlist_text_tree; + color_class: "genlist_text_tree"; text { - font: FN; + font: "PT"; size: 11; - min: 0 0; - align: 0.5 0.5; text_class: "button"; } + 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.0; + inherit: "default" 0.00; visible: 1; text.min: 1 1; + text.ellipsis: -1; } description { state: "disabled" 0.0; - inherit: "default" 0.0; + inherit: "default" 0.00; + visible: 0; } description { state: "disabled_visible" 0.0; - inherit: "default" 0.0; + inherit: "visible" 0.00; color: 128 128 128 255; - visible: 1; - text.min: 1 1; + text.ellipsis: -1; } } part { name: "over2"; - mouse_events: 1; + type: RECT; repeat_events: 1; - ignore_flags: ON_HOLD; + ignore_flags: "ON_HOLD"; description { state: "default" 0.0; color: 0 0 0 0; } description { state: "visible" 0.0; - inherit: "default" 0.0; + inherit: "default" 0.00; } description { state: "disabled" 0.0; - inherit: "default" 0.0; + inherit: "default" 0.00; visible: 0; } } part { name: "over3"; - mouse_events: 1; + type: RECT; repeat_events: 1; description { state: "default" 0.0; color: 0 0 0 0; } description { state: "clicked" 0.0; - inherit: "default" 0.0; + inherit: "default" 0.00; } } part { name: "disabler"; type: RECT; description { state: "default" 0.0; - color: 0 0 0 0; visible: 0; + color: 0 0 0 0; } description { state: "visible" 0.0; - inherit: "default" 0.0; + inherit: "default" 0.00; + visible: 0; } description { state: "disabled" 0.0; - inherit: "default" 0.0; + inherit: "default" 0.00; visible: 1; } } - // used to force sizing of icon to follow label sizing nearby - part { name: "sizer.content"; type: TEXT; - mouse_events: 0; + part { name: "sizer.content"; + type: TEXT; + mouse_events: 0; scale: 1; description { state: "default" 0.0; visible: 0; text { - font: FN; + font: "PT"; size: 11; - min: 0 0; text_class: "button"; } } description { state: "visible" 0.0; - inherit: "default" 0.0; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; + visible: 0; text { - min: 1 1; text: "M"; + font: "PT"; + size: 11; + text_class: "button"; + min: 1 1; + ellipsis: -1; } - } - description { state: "icononly" 0.0; - inherit: "default" 0.0; rel1.to: "elm.swallow.content"; rel2.to: "elm.swallow.content"; - text { - min: 1 1; - text: "M"; - } + } + description { state: "icononly" 0.0; + inherit: "visible" 0.00; + visible: 0; } } - // end sizer } programs { - program { - name: "button_mouse_in"; + program { name: "button_mouse_in"; signal: "mouse,in"; source: "over2"; - action: STATE_SET "hovered" 0.0; + action: STATE_SET "hovered" 0.00; target: "button_image"; + target: "border"; } - program { - name: "button_mouse_out"; + program { name: "button_mouse_out"; signal: "mouse,out"; source: "over2"; - action: STATE_SET "default" 0.0; + action: STATE_SET "default" 0.00; target: "button_image"; + target: "border"; } - program { - name: "button_click"; + program { name: "button_click"; signal: "mouse,down,1"; source: "over2"; action: SIGNAL_EMIT "elm,action,press" ""; after: "button_click_anim"; } - program { - name: "button_click_anim"; - action: STATE_SET "clicked" 0.0; - target: "button_image"; - } - program { - name: "button_unclick"; + program { name: "button_unclick"; signal: "mouse,up,1"; source: "over3"; action: SIGNAL_EMIT "elm,action,unpress" ""; after: "button_unclick_anim"; } - program { - name: "button_pressed_anim"; + program { name: "button_pressed_anim"; signal: "elm,anim,activate"; source: "elm"; - action: STATE_SET "clicked" 0.0; + action: STATE_SET "clicked" 0.00; target: "button_image"; target: "over3"; after: "button_unpressed_anim"; } - program { - name: "button_unpressed_anim"; - action: STATE_SET "default" 0.0; - transition: DECELERATE 0.5; - target: "button_image"; - target: "over3"; - } - program { - name: "button_unclick_anim"; - action: STATE_SET "default" 0.0; - target: "button_image"; - } - program { - name: "button_click2"; + program { name: "button_click2"; signal: "mouse,down,1"; source: "over3"; - action: STATE_SET "clicked" 0.0; + action: STATE_SET "clicked" 0.00; target: "over3"; } - program { - name: "button_unclick2"; + program { name: "button_unclick2"; signal: "mouse,up,1"; source: "over3"; - action: STATE_SET "default" 0.0; - transition: DECELERATE 0.5; + action: STATE_SET "default" 0.00; + transition: DECELERATE 0.50000; target: "over3"; } - program { - name: "button_unclick3"; + program { name: "button_unclick3"; signal: "mouse,clicked,1"; source: "over2"; action: SIGNAL_EMIT "elm,action,click" ""; @@ -264,60 +266,66 @@ group { name: "elm/button/base/default"; 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); + + + 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); + + + 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); - } + + + 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.0; + action: STATE_SET "default" 0.00; target: "elm.swallow.content"; target: "sizer.content"; } @@ -325,33 +333,68 @@ group { name: "elm/button/base/default"; signal: "elm,state,disabled"; source: "elm"; script { - new st[31]; - new Float:vl; - set_state(PART:"button_image", "disabled", 0.0); - 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); - } + + + new st[31]; + new Float:vl; + set_state(PART:"button_image", "disabled", 0.0); + 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:"button_image", "visible", 0.0); - 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); - } + + + new st[31]; + new Float:vl; + set_state(PART:"button_image", "visible", 0.0); + 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); + } + } + program { name: "focused"; + signal: "elm,state,focused"; + source: "elm"; + action: STATE_SET "focused" 0.00; + target: "button_image"; + target: "border"; + } + program { name: "unfocused"; + signal: "elm,state,unfocused"; + source: "elm"; + action: STATE_SET "default" 0.00; + target: "button_image"; + target: "border"; + } + program { name: "button_click_anim"; + action: STATE_SET "clicked" 0.00; + target: "button_image"; + target: "border"; + } + program { name: "button_unpressed_anim"; + action: STATE_SET "default" 0.00; + transition: DECELERATE 0.50000; + target: "button_image"; + target: "over3"; + target: "border"; + } + program { name: "button_unclick_anim"; + action: STATE_SET "default" 0.00; + target: "button_image"; + target: "border"; } } } @@ -1819,10 +1862,12 @@ group { name: "elm/button/base/fit"; } parts { part { name: "button_image"; + type: IMAGE; mouse_events: 1; description { state: "default" 0.0; min: 28 20; max: 28 20; + color: 255 255 255 255; image { normal: "tool_autofit_nor.png"; border: 3 3 3 3; @@ -1853,5 +1898,25 @@ group { name: "elm/button/base/fit"; } } } + part { name: "border"; + description { state: "default"; + visible: 0; + } + description { state: "visible" 0.0; + inherit: "default" 0.00; + } + description { state: "clicked" 0.0; + inherit: "visible" 0.00; + } + description { state: "hovered" 0.0; + inherit: "clicked" 0.00; + } + description { state: "focused" 0.0; + inherit: "hovered" 0.00; + } + description { state: "disabled" 0.0; + inherit: "hovered" 0.00; + } + } } } diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c index af0fa02..98b888c 100644 --- a/src/bin/ui/workspace/workspace.c +++ b/src/bin/ui/workspace/workspace.c @@ -681,7 +681,9 @@ _menu_add(Workspace_Data *wd) elm_menu_item_separator_add(wd->menu.obj, NULL); MENU_ITEM_ADD(wd->menu.obj, NULL, NULL, _("Show rulers"), _menu_rulers_visible, NULL, NULL, NULL); +#if !HAVE_TIZEN elm_menu_item_separator_add(wd->menu.obj, NULL); +#endif wd->menu.scale_abs = _radio_switcher_add(wd, NULL, NULL, 0, NULL); MENU_ITEM_ADD(wd->menu.obj, NULL, NULL, _("Absolute scale"), _menu_ruler_abs, NULL, wd->menu.scale_abs, wd); wd->menu.scale_rel = _radio_switcher_add(wd, NULL, NULL, 1, wd->menu.scale_abs); --
