hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=bbfc4464555fb0c61a4b495a3f4b6daac5d5cf42
commit bbfc4464555fb0c61a4b495a3f4b6daac5d5cf42 Author: ChunEon Park <[email protected]> Date: Wed Aug 13 17:16:07 2014 +0900 menu: revise previous commit 06c7aac63df803a30335d6e48102e4883e516780 --- data/themes/default/layout_common.edc | 12 ++++++------ src/bin/menu.c | 11 ++--------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/data/themes/default/layout_common.edc b/data/themes/default/layout_common.edc index 190de0c..bc78420 100644 --- a/data/themes/default/layout_common.edc +++ b/data/themes/default/layout_common.edc @@ -983,12 +983,11 @@ group { name: "menu_layout"; type: SPACER; scale: 1; description { state: "default" 0.0; - rel1.to: "elm.swallow.exit_btn"; - rel2.to: "elm.swallow.exit_btn"; rel1.relative: 1 1; - min: 40 23; + rel2.offset: -10 -1; + min: 20 20; fixed: 1 1; - align: 1 0; + align: 1 1; } } part { name: "elm.swallow.prev_btn"; @@ -996,10 +995,11 @@ group { name: "menu_layout"; scale: 1; clip_to: "clipper"; description { state: "default" 0.0; + rel1.relative: 0 0; + rel2.relative: 1 0; rel1.to: "padding7"; rel2.to: "padding7"; - rel2.relative: 1 0; - align: 0.5 0; + align: 1 1; min: 40 40; fixed: 1 1; } diff --git a/src/bin/menu.c b/src/bin/menu.c index 027e44f..1bafb16 100644 --- a/src/bin/menu.c +++ b/src/bin/menu.c @@ -320,16 +320,11 @@ exit_btn_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, } static void -prev_btn_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, +prev_btn_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { menu_data *md = data; - if (search_is_opened() || goto_is_opened()) - { - goto_close(); - search_close(); - edit_focus_set(md->ed); - } + edit_focus_set(md->ed); menu_toggle(); } @@ -667,9 +662,7 @@ menu_open(menu_data *md) elm_object_style_set(btn, "anchor"); evas_object_smart_callback_add(btn, "clicked", prev_btn_cb, md); elm_object_text_set(btn, "Back"); - evas_object_show(btn); elm_object_part_content_set(layout, "elm.swallow.prev_btn", btn); - ecore_timer_add(0.15, btn_effect_timer_cb, btn); md->menu_layout = layout; md->active_request++; --
