change style of genlist item to add long text 30/242830/2
authorKiseok Chang <kiso.chang@samsung.com>
Tue, 1 Sep 2020 06:09:14 +0000 (15:09 +0900)
committerKiseok Chang <kiso.chang@samsung.com>
Wed, 2 Sep 2020 01:28:57 +0000 (10:28 +0900)
- "full" -> "multiline" in 'Storage > Default storage'

Change-Id: I7e54c2c0523ae3f85d3643326d9fdd981eb571ed
Signed-off-by: Kiseok Chang <kiso.chang@samsung.com>
setting-common/src/setting-common-draw-genlist.c
setting-storage/src/setting-storage-default.c

index 9fa6d5114eb76a708c21066ed7277e8ac128ebd4..85b92adb398e4a47c30b9b9ba59a5d9a4cf482ac 100755 (executable)
@@ -55,8 +55,6 @@ DEFINE_ITC1(SETTING_GENLIST_ICON_1LINE_STYLE, itc_multiline_1text_1icon);
 DEFINE_ITC1(SETTING_GENLIST_1ICON_STYLE, itc_bg_1icon);
 DEFINE_ITC1(SETTING_GENLIST_1ICON_STYLE, itc_1icon);
 
-DEFINE_ITC1("1text", itc_normal_1text);
-
 /********************************************************************/
 DEFINE_ITC1(SETTING_GENLIST_2LINE_STYLE, itc_2text_2);
 /********************************************************************/
index a15b4d31a407ab62b84621894898d188a67c5a5f..fd7fe6de044ae2e6a5ce9137ca12896632551f9c 100755 (executable)
@@ -123,9 +123,7 @@ static void storage_default_reset_vconf(Setting_GenGroupItem_Data *data_item)
 
        elm_radio_value_set(data_item->rgd, 0);
        _storage_default_set_value(data_item);
-
 #endif
-
 }
 
 static void storage_default_mmc_changed_cb(keynode_t *node, void *data)
@@ -283,17 +281,19 @@ static Elm_Object_Item *_create_genlist(SettingStorage *ad,
        return it;
 }
 
-static Evas_Object *_storage_default_gl_content_get(void *data, Evas_Object *obj,
-               const char *part)
+static char*
+_storage_default_gl_text_get_cb(void *data, Evas_Object *obj, const char *part)
 {
        Setting_GenGroupItem_Data *item_data = (Setting_GenGroupItem_Data *)data;
-       Evas_Object *item_layout = elm_layout_add(obj);
-       elm_layout_file_set(item_layout, EDJDIR"/setting-theme.edj", "gl_custom_multiline");
-       elm_object_text_set(item_layout, item_data->keyStr);
+       if (!strcmp("elm.text", part))
+               return NULL;
+       else if (!strcmp("elm.text.multiline", part))
+               return strdup(item_data->keyStr);
 
-       return item_layout;
+       return NULL;
 }
 
+
 static int storage_default_create(void *data)
 {
        int ret;
@@ -301,8 +301,8 @@ static int storage_default_create(void *data)
        Evas_Object *genlist = NULL;
        Setting_GenGroupItem_Data *it;
 
-       setting_create_Gendial_itc(SETTING_GENLIST_LEFT_ICON_CONTENT_ICON_STYLE, &(ad->itc_full));
-       ad->itc_full.func.content_get = _storage_default_gl_content_get;
+       setting_create_Gendial_itc(SETTING_GENLIST_MULTILINE_STYLE, &(ad->itc_full));
+       ad->itc_full.func.text_get = _storage_default_gl_text_get_cb;
 
        retv_if(NULL == data, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);