From: Michal Skorupinski <m.skorupinsk@samsung.com>
Date: Fri, 8 May 2020 17:30:54 +0000 (+0200)
Subject: [OAPSAN-4855] Label visibility fixed
X-Git-Tag: submit/tizen/20200511.020030~1^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ed49abffead4207d4faaf56b38debb19a8c1f6d8;p=profile%2Fcommon%2Fapps%2Fnative%2Fsettings.git

[OAPSAN-4855] Label visibility fixed

Change-Id: Ib49395d7728baf05314ab0e7f411cf53835eea44
Signed-off-by: Michal Skorupinski <m.skorupinsk@samsung.com>
---

diff --git a/resource/setting-theme.edc b/resource/setting-theme.edc
index 5dcc6e9..6335203 100644
--- a/resource/setting-theme.edc
+++ b/resource/setting-theme.edc
@@ -1774,7 +1774,7 @@ collections
 		{
 			style
 			{	name: "text_style";
-				base: "color=#000000FF font=Tizen:style=Regular font_size=30 ellipsis=1.0 text_class=list_item";
+				base: "color=#000000FF font=Tizen:style=Regular font_size=30 ellipsis=1.0 text_class=list_item wrap=mixed";
 				tag: "br" "\n";
 				tag: "ps" "ps";
 				tag: "tab" "\t";
@@ -1896,6 +1896,28 @@ collections
 			}
 		}
 	}
+	
+	group
+	{	name: "gl_custom_multiline";
+		inherit: "gl_custom_item";
+		parts
+		{
+			part
+			{	name: "left_padding";
+				type: SPACER;
+				scale: 1;
+				description
+				{	state: "default" 0.0;
+					min: 48 0;
+					align: 0.0 0.0;
+					rel1
+					{	to: "base"; relative: 0.0 0.0;}
+					rel2
+					{	to: "base"; relative: 0.0 1.0;}
+				}
+			}
+		}
+	}
 
 	group
 	{	name: "gl_custom_item_display_brightness";
diff --git a/setting-storage/include/setting-storage.h b/setting-storage/include/setting-storage.h
index a72e871..cca3bed 100755
--- a/setting-storage/include/setting-storage.h
+++ b/setting-storage/include/setting-storage.h
@@ -62,6 +62,7 @@ typedef struct _SettingStorage {
 	Elm_Genlist_Item_Class itc_1text_1icon;
 	Elm_Genlist_Item_Class itc_storage_graph;
 	Elm_Genlist_Item_Class itc_color_item;
+	Elm_Genlist_Item_Class itc_full;
 
 	double sz_inter_total;
 	double sz_inter_avail;
diff --git a/setting-storage/src/setting-storage-default.c b/setting-storage/src/setting-storage-default.c
index 230788b..0f878be 100755
--- a/setting-storage/src/setting-storage-default.c
+++ b/setting-storage/src/setting-storage-default.c
@@ -278,7 +278,16 @@ 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)
+{
+	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);
 
+	return item_layout;
+}
 
 static int storage_default_create(void *data)
 {
@@ -287,6 +296,9 @@ 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;
+
 	retv_if(NULL == data, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
 
 	if (!ad->main_view->is_create) {
@@ -303,7 +315,7 @@ static int storage_default_create(void *data)
 			STORAGE_STR_SHARED_CONTENTS, NULL);
 	elm_genlist_item_select_mode_set(it->item, ELM_OBJECT_SELECT_MODE_NONE);
 
-	it = setting_create_Gendial_field_def(genlist, &itc_multiline_text,
+	it = setting_create_Gendial_field_def(genlist, &(ad->itc_full),
 			NULL, NULL, SWALLOW_Type_LAYOUT_SPECIALIZTION_X, NULL, NULL, 0,
 			_("IDS_SM_BODY_SELECT_THE_DEFAULT_STORAGE_LOCATION_FOR_CONTENT_SHARED_VIA_BLUETOOTH_OR_WI_FI_DIRECT"),
 			NULL, NULL);
@@ -321,10 +333,11 @@ static int storage_default_create(void *data)
 			grp_title, NULL);
 	elm_genlist_item_select_mode_set(it->item, ELM_OBJECT_SELECT_MODE_NONE);
 
-	it = setting_create_Gendial_field_def(genlist, &itc_multiline_text,
+	it = setting_create_Gendial_field_def(genlist, &(ad->itc_full),
 			NULL, NULL, SWALLOW_Type_LAYOUT_SPECIALIZTION_X, NULL, NULL, 0,
 			_("IDS_SM_BODY_SELECT_THE_DEFAULT_LOCATION_FOR_INSTALLING_APPS_WHERE_APPS_CAN_BE_SAVED_DEPENDS_ON_THE_TYPE_OF_APP_AND_THE_AVAILABILITY_OF_THE_LOCATION"),
 			NULL, NULL);
+
 	setting_retvm_if(NULL == it, SETTING_RETURN_FAIL, "item_data is NULL");
 	elm_genlist_item_select_mode_set(it->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 	ad->help_installapp = it;