appmgr: fix application sorting 21/235521/1
authorLukasz Stanislawski <lukasz.stanislawski@gmail.com>
Fri, 5 Jun 2020 07:32:59 +0000 (09:32 +0200)
committerLukasz Stanislawski <lukasz.stanislawski@gmail.com>
Fri, 5 Jun 2020 08:00:11 +0000 (10:00 +0200)
Change-Id: I14aa4190f18783fd4fabcc33498aba067b9e5a9f

setting-appmgr/src/setting-appmgr-main.c

index 730f5dc14e68773080d7e95606d4d32058b6e367..eabb8bf5efc2d8bc7075fd4cbd7d338d89f68e67 100644 (file)
@@ -72,35 +72,8 @@ void appmgr_main_init(SettingAppMgr *ad)
 
 static void _more_menu_move_ctxpopup(SettingAppMgr *ad)
 {
-       Evas_Coord w = 0;
-       Evas_Coord h = 0;
-       int pos = -1;
-
        ret_if(!ad);
-
-       elm_win_screen_size_get(ad->md.window, NULL, NULL, &w, &h);
-       pos = elm_win_rotation_get(ad->md.window);
-
-       switch (pos) {
-       case 0:
-       case 180:
-               evas_object_move(ad->popup, (w / 2), h);
-               evas_object_size_hint_min_set(ad->grid, APPMGR_TAB_DISABLED * (w - (MARGIN * 2)), 0);
-               evas_object_size_hint_max_set(ad->grid, APPMGR_TAB_DISABLED * (w - (MARGIN * 2)), 0);
-               break;
-       case 90:
-               evas_object_move(ad->popup, (h / 2), w);
-               evas_object_size_hint_min_set(ad->grid, APPMGR_TAB_DISABLED * (h - (MARGIN * 2)), 0);
-               evas_object_size_hint_max_set(ad->grid, APPMGR_TAB_DISABLED * (h - (MARGIN * 2)), 0);
-               break;
-       case 270:
-               evas_object_move(ad->popup, (h / 2), w);
-               evas_object_size_hint_min_set(ad->grid, APPMGR_TAB_DISABLED * (h - (MARGIN * 2)), 0);
-               evas_object_size_hint_max_set(ad->grid, APPMGR_TAB_DISABLED * (h - (MARGIN * 2)), 0);
-               break;
-       }
-
-       elm_scroller_page_show(ad->scroller, ad->tabtype, 0);
+       evas_object_move(ad->popup, 1280, 86);
 }
 
 static void naviframe_resize_cb(void *data, Evas *e, Evas_Object *obj,
@@ -170,19 +143,19 @@ static void appmgr_main_sort_popup(void *data, Evas_Object *obj,
        ad->sort_rdg = rdg;
 
        setting_create_Gendial_field_1radio(menu_glist, &(itc_1text_1icon),
-                       appmgr_main_sort_sel, ad, SWALLOW_Type_1RADIO_RIGHT,
+                       appmgr_main_sort_sel, ad, SWALLOW_Type_1RADIO,
                        rdg, 0,
                        MGRAPP_STR_A_TO_Z,
                        NULL);
 
        setting_create_Gendial_field_1radio(menu_glist, &(itc_1text_1icon),
-                       appmgr_main_sort_sel, ad, SWALLOW_Type_1RADIO_RIGHT,
+                       appmgr_main_sort_sel, ad, SWALLOW_Type_1RADIO,
                        rdg, 1,
                        MGRAPP_STR_Z_TO_A,
                        NULL);
 
        setting_create_Gendial_field_1radio(menu_glist, &(itc_1text_1icon),
-                       appmgr_main_sort_sel, ad, SWALLOW_Type_1RADIO_RIGHT,
+                       appmgr_main_sort_sel, ad, SWALLOW_Type_1RADIO,
                        rdg, 2,
                        MGRAPP_STR_SIZE,
                        NULL);
@@ -714,8 +687,8 @@ static int appmgr_main_create(void *data)
                                        _click_softkey_back_cb, ad);
        elm_layout_content_set(ad->md.naviframe, "prev_btn", back_btn);
 
-       more_btn = setting_create_button(ad->md.naviframe, NULL, "naviframe/more/default", appmgr_main_create_more_popup, ad);
-       elm_object_item_part_content_set(ad->md.naviframe_it, "toolbar_more_btn", more_btn);
+       more_btn = setting_create_button(ad->md.naviframe, NULL, "naviframe/more", appmgr_main_create_more_popup, ad);
+       elm_object_item_part_content_set(ad->md.naviframe_it, "title_content", more_btn);
 
        _bottom_tabbar_layout_add(ad);
        _add_scroller(ad);