rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=40a5f957b48804e36ca58ea66e3a58ff81376074
commit 40a5f957b48804e36ca58ea66e3a58ff81376074 Author: Mykyta Biliavskyi <[email protected]> Date: Thu Jun 2 19:41:00 2016 +0300 Tizen theme: make look menu as in guideline. --- data/themes/tizen/widgets/menu.edc | 174 +++++++++++++-------------------- src/bin/ui/workspace/group_navigator.c | 10 ++ 2 files changed, 77 insertions(+), 107 deletions(-) diff --git a/data/themes/tizen/widgets/menu.edc b/data/themes/tizen/widgets/menu.edc index 51a314b..d4803f5 100644 --- a/data/themes/tizen/widgets/menu.edc +++ b/data/themes/tizen/widgets/menu.edc @@ -12,20 +12,20 @@ group { name: "elm/menu/item/default"; type: RECT; description { state: "default" 0.0; rel1 { - to: "base"; offset: 1 1; + to: "base"; } rel2 { - to: "base"; offset: -2 -2; + to: "base"; } } description { state: "over" 0.0; - inherit: "default" 0.0; + inherit: "default" 0.00; color_class: "over"; } description { state: "selected" 0.0; - inherit: "default" 0.0; + inherit: "default" 0.00; color_class: "text_tabs_selected"; } } @@ -33,53 +33,56 @@ group { name: "elm/menu/item/default"; type: SPACER; description { state: "default" 0.0; align: 0.0 0.5; - min: 32 0; - max: 32 -1; - rel1 { - to: "base"; - } - rel2 { - to: "base"; - } + min: 10 0; + max: 10 -1; + rel1.to: "base"; + rel2.to: "base"; + } + description { state: "noicon" 0.0; + inherit: "default" 0.00; } } part { name: "elm.swallow.content"; type: SWALLOW; clip_to: "clipper.content"; description { state: "default" 0.0; + visible: 0; fixed: 1 1; - min: 16 16; max: 16 16; - rel1 { - to: "area.content"; - } - rel2 { - to: "area.content"; - } + rel1.to: "area.content"; + rel2.to: "area.content"; } description { state: "noicon" 0.0; - inherit: "default" 0.0; + inherit: "default" 0.00; visible: 0; + max: 0 0; } } part { name: "padding.right"; type: SPACER; description { state: "default" 0.0; align: 1.0 0.5; + fixed: 1 0; min: 8 0; max: 8 -1; rel1 { + relative: 1.0 0.0; to: "base"; } - rel2 { - to: "base"; - } + rel2.to: "base"; } } part { name: "elm.text"; type: TEXT; clip_to: "clipper.text"; description { state: "default" 0.0; + text { + font: "PT"; + size: 12; + min: 1 1; + align: 0.0 0.5; + ellipsis: -1.0; + } rel1 { relative: 1.0 0.0; to_x: "area.content"; @@ -90,22 +93,17 @@ group { name: "elm/menu/item/default"; to_x: "padding.text"; to_y: "base"; } - text { - font: FN; - size: 12; - min: 1 1; - align: 0.0 0.5; - ellipsis: -1.0; - } } } part { name: "padding.text"; type: SPACER; description { state: "default" 0.0; align: 1.0 0.5; + fixed: 1 0; min: 16 0; max: 16 -1; rel1 { + relative: 1.0 0.0; to: "base"; } rel2 { @@ -119,43 +117,35 @@ group { name: "elm/menu/item/default"; type: TEXT; clip_to: "clipper.shortcut"; description { state: "default" 0.0; + visible: 0; align: 1.0 0.5; + fixed: 1 0; + text { + font: "PT"; + size: 12; + min: 1 1; + align: 0.0 0.5; + } rel1 { - to: "base"; + to_x: "padding.right"; + to_y: "base"; } rel2 { - relative: 0.0 1.0; to_x: "padding.right"; to_y: "base"; } - text { - font: FN; - size: 12; - min: 1 1; - max: 1 0; - ellipsis: -1.0; - } } } part { name: "clipper.content"; type: RECT; description { state: "default" 0.0; color_class: "genlist_text_tree"; - rel1 { - to: "area.content"; - } - rel2 { - to: "area.content"; - } + rel1.to: "area.content"; + rel2.to: "area.content"; } description { state: "disabled" 0.0; + inherit: "default" 0.00; color_class: "main_disabled"; - rel1 { - to: "area.content"; - } - rel2 { - to: "area.content"; - } } } part { name: "clipper.text"; @@ -173,15 +163,9 @@ group { name: "elm/menu/item/default"; } } description { state: "disabled" 0.0; + inherit: "default" 0.00; color_class: "main_disabled"; - rel1 { - relative: 1.0 0.0; - to_x: "area.content"; - to_y: "base"; - } - rel2 { - to: "base"; - } + rel2.to_x: "base"; } } part { name: "clipper.shortcut"; @@ -192,19 +176,11 @@ group { name: "elm/menu/item/default"; to_x: "elm.shortcut"; to_y: "base"; } - rel2 { - to: "base"; - } + rel2.to: "base"; } description { state: "disabled" 0.0; + inherit: "default" 0.00; color_class: "main_disabled"; - rel1 { - to_x: "elm.shortcut"; - to_y: "base"; - } - rel2 { - to: "base"; - } } } part { name: "event"; @@ -212,22 +188,12 @@ group { name: "elm/menu/item/default"; ignore_flags: "ON_HOLD"; description { state: "default" 0.0; color: 0 0 0 0; - rel1 { - to: "base"; - } - rel2 { - to: "base"; - } + rel1.to: "base"; + rel2.to: "base"; } description { state: "disabled" 0.0; + inherit: "default" 0.00; visible: 0; - color: 0 0 0 0; - rel1 { - to: "base"; - } - rel2 { - to: "base"; - } } } } @@ -267,7 +233,7 @@ group { name: "elm/menu/item/default"; program { name: "clicked"; signal: "mouse,up,1"; source: "event"; - action: STATE_SET "selected" 0.0; + action: STATE_SET "selected" 0.00; target: "highlight"; after: "select"; } @@ -276,27 +242,29 @@ group { name: "elm/menu/item/default"; source: "event"; action: SIGNAL_EMIT "elm,action,open" "elm"; } - program { name: "select"; - action: SIGNAL_EMIT "elm,action,click" "elm"; - after: "inactivate"; - } - program { name: "inactivate"; - action: SIGNAL_EMIT "elm,action,inactivate" "elm"; - } - program { name: "activate"; - action: SIGNAL_EMIT "elm,action,activate" "elm"; - } program { name: "icon_show"; signal: "elm,state,icon,visible"; source: "elm"; - action: STATE_SET "default" 0.0; + action: STATE_SET "default" 0.00; target: "elm.swallow.content"; + target: "area.content"; } program { name: "icon_hide"; signal: "elm,state,icon,hidden"; source: "elm"; - action: STATE_SET "noicon" 0.0; + action: STATE_SET "noicon" 0.00; target: "elm.swallow.content"; + target: "area.content"; + } + program { name: "select"; + action: SIGNAL_EMIT "elm,action,click" "elm"; + after: "inactivate"; + } + program { name: "inactivate"; + action: SIGNAL_EMIT "elm,action,inactivate" "elm"; + } + program { name: "activate"; + action: SIGNAL_EMIT "elm,action,activate" "elm"; } } } @@ -311,15 +279,7 @@ group { name: "elm/menu/item_with_submenu/default"; description { state: "default" 0.0; min: 0 21; max: -1 21; - /* - rel1 { - offset: 1 1; - } - rel2 { - offset: -2 -2; - } - */ - } + } } part { name: "highlight"; type: RECT; @@ -343,8 +303,8 @@ group { name: "elm/menu/item_with_submenu/default"; type: SPACER; description { state: "default" 0.0; align: 0.0 0.5; - min: 32 0; - max: 32 -1; + min: 10 0; + max: 10 -1; rel1 { to: "base"; } @@ -358,8 +318,8 @@ group { name: "elm/menu/item_with_submenu/default"; clip_to: "clipper.content"; description { state: "default" 0.0; fixed: 1 1; - min: 16 16; max: 16 16; + visible: 0; rel1 { to: "area.content"; } diff --git a/src/bin/ui/workspace/group_navigator.c b/src/bin/ui/workspace/group_navigator.c index fa0052d..d4dd598 100644 --- a/src/bin/ui/workspace/group_navigator.c +++ b/src/bin/ui/workspace/group_navigator.c @@ -1688,7 +1688,11 @@ _on_btn_plus_clicked(void *data, assert(pl != NULL); +#if !HAVE_TIZEN evas_object_geometry_get(obj, &x, &y, NULL, &h); +#else + evas_object_geometry_get(pl->btn_down, &x, &y, NULL, &h); +#endif elm_menu_move(pl->menu, x, y + h); evas_object_show(pl->menu); @@ -2299,7 +2303,9 @@ group_navigator_add(Evas_Object *parent, Group *group) menu_item = elm_menu_item_add(pl->menu, NULL, NULL, _("Part"), _on_menu_add_part_clicked, NULL); elm_object_part_text_set(elm_menu_item_object_get(menu_item), "elm.shortcut", "q"); +#if !HAVE_TIZEN elm_menu_item_separator_add(pl->menu, NULL); +#endif pl->add_state_menu_item = elm_menu_item_add(pl->menu, NULL, NULL, _("State"), _on_menu_add_state_clicked, NULL); elm_object_part_text_set(elm_menu_item_object_get(pl->add_state_menu_item), "elm.shortcut", "w"); @@ -2307,11 +2313,15 @@ group_navigator_add(Evas_Object *parent, Group *group) pl->add_part_item_menu_item = elm_menu_item_add(pl->menu, NULL, NULL, _("Item"), _on_menu_add_item_clicked, NULL); elm_object_part_text_set(elm_menu_item_object_get(pl->add_part_item_menu_item), "elm.shortcut", "e"); elm_object_item_disabled_set(pl->add_part_item_menu_item, true); +#if !HAVE_TIZEN elm_menu_item_separator_add(pl->menu, NULL); +#endif menu_item = elm_menu_item_add(pl->menu, NULL, NULL, _("Program"), _on_menu_add_program_clicked, NULL); elm_object_part_text_set(elm_menu_item_object_get(menu_item), "elm.shortcut", "r"); +#if !HAVE_TIZEN elm_menu_item_separator_add(pl->menu, NULL); +#endif menu_item = elm_menu_item_add(pl->menu, NULL, NULL, _("Data item"), _on_menu_add_group_data_clicked, NULL); elm_object_part_text_set(elm_menu_item_object_get(menu_item), "elm.shortcut", "t"); --
