NorwayFun
/
enventor
forked from enlightenment/enventor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

menu: revise previous commit 06c7aac63d

This commit is contained in:
ChunEon Park 2014-08-13 17:16:07 +09:00
parent 06c7aac63d
commit bbfc446455
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
data/themes/default/layout_common.edc
View File

@ -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;
}

11
src/bin/menu.c
View File

@ -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++;