Fix bugs to exit font view

- removed old codes used for popup style

Change-Id: Id07d37611ba0f61976e39e235216498422e3a3c6
Signed-off-by: Kiseok Chang <kiso.chang@samsung.com>

diff --git a/setting-font/include/setting-font.h b/setting-font/include/setting-font.h
index 4c35f0b13bf96e45456b99a5aa67e9550f2a09f0..eb35776d1489152ad2f7e3b27bea7b90c509953b 100644 (file)
--- a/setting-font/include/setting-font.h
+++ b/setting-font/include/setting-font.h
@@ -66,9 +66,6 @@ struct _SettingFontData {
        /* add more variables here (move your appdata to here) */
        Elm_Object_Item *navi_it_font_size;
 
-       Evas_Object *btn_done;
-       Evas_Object *btn_cancel;
-
        Elm_Theme *theme;
 
        /* font setting */

diff --git a/setting-font/src/setting-font-main.c b/setting-font/src/setting-font-main.c
index dbb2fe308420ce13b077b594a09a9c922665b637..d9c2d7f14fb73ae8d7ad030981e0074b6870ffbf 100755 (executable)
--- a/setting-font/src/setting-font-main.c
+++ b/setting-font/src/setting-font-main.c
@@ -75,6 +75,23 @@ static void setting_font_rot_changed_cb(void *data, Evas_Object *obj,
 
 static Eina_Bool _view_pop_cb(void *data, Elm_Object_Item *it)
 {
+       SETTING_TRACE_BEGIN;
+
+       retm_if(data == NULL, "Data parameter is NULL");
+       SettingFontData *ad = (SettingFontData *)data;
+
+       if (ad->size_change_flag) {
+               int ret = system_settings_set_value_int(SYSTEM_SETTINGS_KEY_FONT_SIZE, ad->ret_font_size);
+               if (ret != SYSTEM_SETTINGS_ERROR_NONE)
+                       SETTING_TRACE("SYSTEM_SETTINGS_KEY_FONT_SIZE error : %s", get_error_message(ret));
+       }
+
+       if (ad->type_change_flag) {
+               int ret = system_settings_set_value_string(SYSTEM_SETTINGS_KEY_FONT_TYPE, ad->font_name);
+               if (ret != SYSTEM_SETTINGS_ERROR_NONE)
+                       SETTING_TRACE("SYSTEM_SETTINGS_KEY_FONT_TYPE error : %s", get_error_message(ret));
+       }
+
        ui_app_exit();
        return EINA_TRUE;
 }
@@ -709,33 +726,13 @@ static void _slider_mouse_cb(void *data, Evas_Object *obj, void *event_info)
        return;
 }
 
-static void setting_font_done_click_cb(void *data, Evas_Object *obj,
+static void _click_softkey_back_cb(void *data, Evas_Object *obj,
                void *event_info)
 {
-       int ret = SYSTEM_SETTINGS_ERROR_NONE;
        SETTING_TRACE_BEGIN;
-
-       retm_if(data == NULL, "Data parameter is NULL");
-       SettingFontData *ad = (SettingFontData *)data;
-
-       if (ad->size_change_flag) {
-               ret = system_settings_set_value_int(SYSTEM_SETTINGS_KEY_FONT_SIZE, ad->ret_font_size);
-               if (ret != SYSTEM_SETTINGS_ERROR_NONE)
-                       SETTING_TRACE("SYSTEM_SETTINGS_KEY_FONT_SIZE error : %s", get_error_message(ret));
-       }
-
-       if (ad->type_change_flag) {
-               ret = system_settings_set_value_string(SYSTEM_SETTINGS_KEY_FONT_TYPE, ad->font_name);
-               if (ret != SYSTEM_SETTINGS_ERROR_NONE)
-                       SETTING_TRACE("SYSTEM_SETTINGS_KEY_FONT_TYPE error : %s", get_error_message(ret));
-       }
-       ui_app_exit();
-}
-
-static void setting_font_cancel_click_cb(void *data, Evas_Object *obj,
-               void *event_info)
-{
-       ui_app_exit();
+       MainData *md = (MainData *)data;
+       setting_retm_if(!md, "[Setting>Display>Font] Data parameter is NULL");
+       elm_naviframe_item_pop(md->naviframe);
 }
 
 static void __setting_get_font_size_str(void *data, int size)
@@ -822,6 +819,11 @@ static int setting_font_main_create(void *cb)
 
        ret = view_init(&ad->md, _("IDS_ST_BODY_FONT"));
        retv_if(ret != SETTING_RETURN_SUCCESS, ret);
+
+       Evas_Object *back_button  = setting_create_button(ad->md.naviframe,
+                       NULL, NAVI_BACK_ARROW_BUTTON_STYLE,
+                       _click_softkey_back_cb, ad);
+       elm_layout_content_set(ad->md.naviframe, "prev_btn", back_button);
        elm_naviframe_item_pop_cb_set(ad->md.naviframe_it, _view_pop_cb, ad);
 
        setting_create_Gendial_itc(SETTING_GENLIST_ICON_1LINE_STYLE,
@@ -839,19 +841,6 @@ static int setting_font_main_create(void *cb)
                        "md.layout is NULL");
        ad->font_change_status = SELECTED_FONT_CHANGE_NONE;
 
-       /* Title Cancel Button */
-       ad->btn_cancel = setting_create_button(ad->md.naviframe,
-                       "IDS_MSG_ACBUTTON_CANCEL_ABB", "naviframe/title_cancel",
-                       setting_font_cancel_click_cb, ad);
-       elm_object_item_part_content_set(ad->md.naviframe_it, "title_left_btn",
-                       ad->btn_cancel);
-       /* Title Done Button */
-       ad->btn_done = setting_create_button(ad->md.naviframe,
-                       NULL, NAVI_BACK_ARROW_BUTTON_STYLE,
-                       setting_font_done_click_cb, ad);
-       elm_object_item_part_content_set(ad->md.naviframe_it, "elm.swallow.prev_btn",
-                       ad->btn_done);
-
        elm_genlist_mode_set(ad->md.genlist, ELM_LIST_COMPRESS);
        evas_object_smart_callback_add(ad->md.genlist, "realized",
                        __gl_realized_cb, ad);