storage: fix application sorting feature

Change-Id: I2e252b24b4b704dc30acad2a0f96e95fba7b7d9b

diff --git a/setting-common/src/setting-common-draw-popup.c b/setting-common/src/setting-common-draw-popup.c
index 8df037abcab10483412ce8dbe23b7397844b760e..071b46369c6e7c462ade5007cb9efb764ce6d0f2 100755 (executable)
--- a/setting-common/src/setting-common-draw-popup.c
+++ b/setting-common/src/setting-common-draw-popup.c
@@ -510,7 +510,7 @@ Evas_Object *setting_create_popup_with_list(Evas_Object **genlist, void *data,
        Evas_Object *popup = elm_popup_add(parent);
        retv_if(NULL == popup, NULL);
 
-       elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 1.0);
+       elm_popup_align_set(popup, ELM_NOTIFY_ALIGN_FILL, 0.5);
        evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND,
                        EVAS_HINT_EXPAND);
 

diff --git a/setting-storage/src/setting-storage-applications.c b/setting-storage/src/setting-storage-applications.c
index da39447587fba7bb2e02e7b9f6a3dbe0c1b2885c..882cef1a6a087458769c05914005b1cb2ace27a5 100755 (executable)
--- a/setting-storage/src/setting-storage-applications.c
+++ b/setting-storage/src/setting-storage-applications.c
@@ -197,23 +197,23 @@ static void _create_sort_by_sub_menu(SettingStorage *ad)
        ad->sort_by_radio_group = check;
 
        setting_create_Gendial_field_1radio(menu_glist, &(itc_1text_1icon),
-                       _sort_by_check_change_cb, ad, SWALLOW_Type_1RADIO_RIGHT,
+                       _sort_by_check_change_cb, ad, SWALLOW_Type_1RADIO,
                        check, 0,
                        _("IDS_ST_BODY_SIZE"),
                        NULL);
        setting_create_Gendial_field_1radio(menu_glist, &(itc_1text_1icon),
-                       _sort_by_check_change_cb, ad, SWALLOW_Type_1RADIO_RIGHT,
+                       _sort_by_check_change_cb, ad, SWALLOW_Type_1RADIO,
                        check, 1,
                        _("IDS_ST_BODY_DATE"),
                        NULL);
        setting_create_Gendial_field_1radio(menu_glist, &(itc_1text_1icon),
-                       _sort_by_check_change_cb, ad, SWALLOW_Type_1RADIO_RIGHT,
+                       _sort_by_check_change_cb, ad, SWALLOW_Type_1RADIO,
                        check, 2,
                        _("IDS_ST_BODY_NAME"),
                        NULL);
 
        setting_create_Gendial_field_1radio(menu_glist, &(itc_1text_1icon),
-                       _sort_by_check_change_cb, ad, SWALLOW_Type_1RADIO_RIGHT,
+                       _sort_by_check_change_cb, ad, SWALLOW_Type_1RADIO,
                        check, 3,
                        _("IDS_ST_BODY_FREQUENTLY_USED"),
                        NULL);
@@ -247,6 +247,7 @@ static void _show_more_menu_cb(void *data, Evas_Object *obj,
        Node_Info *node = NULL;
        Eina_List *cur = NULL;
        int removable_count = 0;
+       int y;
        SettingStorage *ad = (SettingStorage *)data;
 
        ret_if(!ad || ad->select_mode || ad->count_sz_all <= 0);
@@ -259,7 +260,8 @@ static void _show_more_menu_cb(void *data, Evas_Object *obj,
        /* Check if thre are removable items: */
        elm_object_item_disabled_set(ad->apps_uninstall_ctx_it,
                                                                (removable_count <= 0));
-
+       evas_object_geometry_get(ad->md.genlist, NULL, &y, NULL, NULL);
+       evas_object_move(ad->main_menu_popup, 1280, y);
        evas_object_show(ad->main_menu_popup);
 
        SETTING_TRACE_END;
@@ -287,9 +289,7 @@ static void _sort_by_check_change_cb(void *data, Evas_Object *obj,
        Elm_Object_Item *item = event_info;
 
        elm_ctxpopup_dismiss(ad->sort_by_sub_menu_popup);
-       evas_object_del(ad->sort_by_sub_menu_popup);
-       ad->sort_by_sub_menu_popup = NULL;
-       elm_genlist_item_selected_set(item, 0);
+       elm_genlist_item_selected_set(item, EINA_FALSE);
        Setting_GenGroupItem_Data *list_item =
                        (Setting_GenGroupItem_Data *)elm_object_item_data_get(
                                        item);
@@ -298,6 +298,8 @@ static void _sort_by_check_change_cb(void *data, Evas_Object *obj,
        _sort_apps(data);
        _update_ui_list(data);
 
+       evas_object_del(ad->sort_by_sub_menu_popup);
+       ad->sort_by_sub_menu_popup = NULL;
        SETTING_TRACE_END;
 }
 /*/////////////////////////////////////////////////////////////////////////// */
@@ -512,7 +514,7 @@ static void storage_apps_gl_append_items(SettingStorage *ad)
                        continue;
 
                item_data = setting_create_Gendial_field_def(ad->misces_genlist,
-                               &(itc_1text_1icon),
+                               &(ad->itc_1text_1icon),
                                storage_apps_genlist_sel, ad,
                                SWALLOW_Type_1CHECK_RIGHT_INVISIBLE,
                                node->l_icon, NULL,

diff --git a/setting-storage/src/setting-storage-utils.c b/setting-storage/src/setting-storage-utils.c
index 44dc61b9d72a2078a565686f6b251b8fa720acb1..7728c83b4b54f1348677b3c45b811a7e961d4bc4 100755 (executable)
--- a/setting-storage/src/setting-storage-utils.c
+++ b/setting-storage/src/setting-storage-utils.c
@@ -377,6 +377,7 @@ void storage_gl_add_button_support(
 
        SETTING_TRACE_BEGIN;
        Evas_Object *btn = NULL;
+
        /* Cancel Button */
        ad->cancel_delete_btn = setting_create_button(ad->md.naviframe,
                        _("IDS_MSG_ACBUTTON_CANCEL_ABB"), "naviframe/title_left",
@@ -391,10 +392,11 @@ void storage_gl_add_button_support(
 
        /* Add ctx popup handler */
        btn = setting_create_button(ad->md.naviframe,
-                               NULL, "naviframe/more/default",
+                               NULL, "naviframe/more",
                                more_btn_cb, ad);
-       elm_object_item_part_content_set(ad->misces_navi_it, "toolbar_more_btn",
+       elm_object_item_part_content_set(ad->misces_navi_it, "title_content",
                                        btn);
+       SETTING_TRACE_END;
 }
 
 void storage_naviframe_update_buttons(SettingStorage *ad)

diff --git a/setting-storage/src/setting-storage.c b/setting-storage/src/setting-storage.c
index 914805c7adf85c998c71347bfca867bc2669c326..f4d033208a000856c40ae1ddded1fd4abbc1d799 100755 (executable)
--- a/setting-storage/src/setting-storage.c
+++ b/setting-storage/src/setting-storage.c
@@ -122,7 +122,7 @@ static inline void storage_init_itcs(SettingStorage *ad)
                        &(ad->itc_group_item));
        setting_create_Gendial_itc(SETTING_GENLIST_ICON_1LINE_STYLE,
                        &(ad->itc_1text));
-       setting_create_Gendial_itc(SETTING_GENLIST_ICON_1LINE_STYLE,
+       setting_create_Gendial_itc(SETTING_GENLIST_2LINE_STYLE,
                        &(ad->itc_1text_1icon));
        setting_create_Gendial_itc(SETTING_GENLIST_LEFT_ICON_CONTENT_ICON_STYLE,
                        &(ad->itc_storage_graph));