From e6931098aec90c7bb1fcea47d72e15d1ffd11c99 Mon Sep 17 00:00:00 2001 From: Michal Skorupinski Date: Tue, 2 Jun 2020 16:11:55 +0200 Subject: [PATCH] [OAPSAN-5060] "Turned off" tab disabled Change-Id: I80b4558fcebb7cd800627e48bfbb3fd434ede107 Signed-off-by: Michal Skorupinski --- setting-appmgr/src/setting-appmgr-main.c | 37 ++++++++++++------------ 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/setting-appmgr/src/setting-appmgr-main.c b/setting-appmgr/src/setting-appmgr-main.c index 2bebdd9..9e288a0 100644 --- a/setting-appmgr/src/setting-appmgr-main.c +++ b/setting-appmgr/src/setting-appmgr-main.c @@ -84,18 +84,18 @@ static void _more_menu_move_ctxpopup(SettingAppMgr *ad) case 0: case 180: evas_object_move(ad->popup, (w / 2), h); - evas_object_size_hint_min_set(ad->grid, APPMGR_TAB_MAX * (w - (MARGIN * 2)), 0); - evas_object_size_hint_max_set(ad->grid, APPMGR_TAB_MAX * (w - (MARGIN * 2)), 0); + 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_MAX * (h - (MARGIN * 2)), 0); - evas_object_size_hint_max_set(ad->grid, APPMGR_TAB_MAX * (h - (MARGIN * 2)), 0); + 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_MAX * (h - (MARGIN * 2)), 0); - evas_object_size_hint_max_set(ad->grid, APPMGR_TAB_MAX * (h - (MARGIN * 2)), 0); + 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; } @@ -484,13 +484,13 @@ static void _create_toolbar(SettingAppMgr *ad) ad->toolbar_items[APPMGR_TAB_ALL], SETTING_PACKAGE, EINA_TRUE); - ad->toolbar_items[APPMGR_TAB_DISABLED] = elm_toolbar_item_append( - ad->toolbar, NULL, - "IDS_ST_SBODY_DISABLED", - _toolbar_select_cb, ad); - elm_object_item_domain_text_translatable_set( - ad->toolbar_items[APPMGR_TAB_DISABLED], - SETTING_PACKAGE, EINA_TRUE); +// ad->toolbar_items[APPMGR_TAB_DISABLED] = elm_toolbar_item_append( +// ad->toolbar, NULL, +// "IDS_ST_SBODY_DISABLED", +// _toolbar_select_cb, ad); +// elm_object_item_domain_text_translatable_set( +// ad->toolbar_items[APPMGR_TAB_DISABLED], +// SETTING_PACKAGE, EINA_TRUE); elm_toolbar_item_selected_set(ad->toolbar_items[ad->tabtype], EINA_TRUE); @@ -631,14 +631,13 @@ static void _update_ui(SettingAppMgr *ad) elm_genlist_item_show(item_to_bring_in, ELM_GENLIST_ITEM_SCROLLTO_TOP); item_to_bring_in = elm_genlist_nth_item_get(ad->all_gl, all_item_ix); elm_genlist_item_show(item_to_bring_in, ELM_GENLIST_ITEM_SCROLLTO_TOP); - item_to_bring_in = elm_genlist_nth_item_get(ad->disabled_gl, - disabled_item_ix); + item_to_bring_in = elm_genlist_nth_item_get(ad->disabled_gl, disabled_item_ix); elm_genlist_item_show(item_to_bring_in, ELM_GENLIST_ITEM_SCROLLTO_TOP); item_to_bring_in = elm_genlist_nth_item_get(ad->running_gl, running_item_ix); elm_genlist_item_show(item_to_bring_in, ELM_GENLIST_ITEM_SCROLLTO_TOP); - for (i = APPMGR_TAB_DOWNLOAD; i < APPMGR_TAB_MAX; i++) { + for (i = APPMGR_TAB_DOWNLOAD; i < APPMGR_TAB_DISABLED; i++) { if (0 == elm_genlist_items_count(gls[i])) { evas_object_show(blank_pages[i]); elm_grid_pack(ad->grid, blank_pages[i], i, 0, 1, 1); @@ -690,10 +689,10 @@ void _add_grid(SettingAppMgr* ad) ad->grid = elm_grid_add(ad->scroller); evas_object_geometry_get(ad->md.window, NULL, NULL, &win_width, NULL); evas_object_size_hint_weight_set(ad->grid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_min_set(ad->grid, APPMGR_TAB_MAX * (win_width - (MARGIN * 2)), 0); - evas_object_size_hint_max_set(ad->grid, APPMGR_TAB_MAX * (win_width - (MARGIN * 2)), -1); + evas_object_size_hint_min_set(ad->grid, APPMGR_TAB_DISABLED * (win_width - (MARGIN * 2)), 0); + evas_object_size_hint_max_set(ad->grid, APPMGR_TAB_DISABLED * (win_width - (MARGIN * 2)), -1); elm_object_content_set(ad->scroller, ad->grid); - elm_grid_size_set(ad->grid, APPMGR_TAB_MAX, 1); + elm_grid_size_set(ad->grid, APPMGR_TAB_DISABLED, 1); } static int appmgr_main_create(void *data) -- 2.34.1