From ae812e215f931e140bcc6eafabd551d7a376b956 Mon Sep 17 00:00:00 2001 From: Oleksander Kostenko Date: Wed, 28 Sep 2016 18:54:27 +0300 Subject: [PATCH] TizenRefApp-7303 Fixed use case with Back softkey Change-Id: I5c3d56978789a32f318f0981ffbee7a7033ed108 Signed-off-by: Oleksander Kostenko --- src/excepted-apps-efl.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/src/excepted-apps-efl.c b/src/excepted-apps-efl.c index 39c3190..d3f9474 100755 --- a/src/excepted-apps-efl.c +++ b/src/excepted-apps-efl.c @@ -103,8 +103,6 @@ static void _done_button_cb(void *data, Evas_Object *obj, void *event_info) ug_data *u_data = data; - elm_naviframe_item_pop(u_data->naviframe); - EVAS_OBJECT_DELIF(u_data->done_button); EVAS_OBJECT_DELIF(u_data->cancel_button); EVAS_OBJECT_DELIF(u_data->list_sub); @@ -114,27 +112,34 @@ static void _done_button_cb(void *data, Evas_Object *obj, void *event_info) update_do_not_disturb_application_list(); elm_genlist_clear(u_data->list_main); do_not_disturb_append_items_in_list(u_data->list_main); + is_need_to_update = false; } remove_state_list(); + elm_naviframe_item_pop(u_data->naviframe); } - void _cancel_button_cb(void *data, Evas_Object *obj, void *event_info) { - ug_data* u_data = data; - ret_if(!data); - - if(is_need_to_update) - cancel_changes(); + NOTISET_TRACE_BEGIN; + ug_data* u_data = data; + ret_if(!data); - EVAS_OBJECT_DELIF(u_data->done_button); - EVAS_OBJECT_DELIF(u_data->cancel_button); - EVAS_OBJECT_DELIF(u_data->list_sub); + EVAS_OBJECT_DELIF(u_data->done_button); + EVAS_OBJECT_DELIF(u_data->cancel_button); + EVAS_OBJECT_DELIF(u_data->list_sub); elm_naviframe_item_pop(u_data->naviframe); } +static Eina_Bool _back_button_cb(void *data, Elm_Object_Item *it) +{ + NOTISET_TRACE_BEGIN; + if(is_need_to_update) + cancel_changes(); + return EINA_TRUE; +} + void exception_application_clicked_cb(void *data, Evas_Object *obj, void *event_info) { NOTISET_TRACE_BEGIN; @@ -149,6 +154,7 @@ void exception_application_clicked_cb(void *data, Evas_Object *obj, void *event_ /* Push to naviframe */ navi_item = elm_naviframe_item_push(u_data->naviframe, APP_STRING("IDS_ST_HEADER_MANAGE_ALLOWED_NOTI_ABB2"), NULL, NULL, u_data->list_sub, NULL); + elm_naviframe_item_pop_cb_set(navi_item, _back_button_cb, u_data); /* Title Cancel Button */ cancel_btn = elm_button_add(u_data->naviframe); -- 2.7.4