From: Kamil Lipiszko <k.lipiszko@samsung.com>
Date: Wed, 13 Apr 2016 09:51:35 +0000 (+0200)
Subject: edje: Add ... to not matching icon label
X-Git-Tag: accepted/tizen/3.0/ivi/20161011.044216^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f2f1ee6337bca7e4ab2ba9c051c5f660972eb9d3;p=apps%2Fnative%2Fhome%2Fhomescreen-efl.git

edje: Add ... to not matching icon label

Change-Id: Ia020f0b3aff9c208615b2627df4f2f8127d70eac
---

diff --git a/inc/conf.h b/inc/conf.h
index 50baf66..cbd3a9b 100644
--- a/inc/conf.h
+++ b/inc/conf.h
@@ -519,7 +519,7 @@
 #define _SEPARATOR_Y_MAX 64
 
 #define _CONTENT_Y_MIN 53
-#define _CONTENT_Y_MAX 569
+#define _CONTENT_Y_MAX 635
 
 #define _INDEX_Y_MIN 355
 #define _INDEX_Y_MAX 421
@@ -567,7 +567,7 @@
 #define FOLDER_POPUP_X_REL 0.0441
 
 #define FOLDER_GRID_W_REL 0.9
-#define FOLDER_GRID_H_REL 0.58
+#define FOLDER_GRID_H_REL 0.6
 #define FOLDER_ITEM_MARGIN 0.04
 
 #define FOLDER_LEFT_MARGIN 0.07
diff --git a/res/edje/icon.edc b/res/edje/icon.edc
index 8a07f77..6fbbde2 100644
--- a/res/edje/icon.edc
+++ b/res/edje/icon.edc
@@ -29,11 +29,11 @@ images {
 styles {
 	style{
 		name: "icon_label";
-		base: "font=Samsung Condensed:style=Regular align=center color=#FFFFFFFF font_size=28 wrap=mixed";
+		base: "font=Samsung Condensed:style=Regular align=center color=#FFFFFFFF font_size=28 wrap=mixed ellipsis=1.0";
 	}
 	style{
 		name: "icon_label_edit";
-		base: "font=Samsung Condensed:style=Regular align=center color=#FFFFFFFF font_size=25 wrap=mixed";
+		base: "font=Samsung Condensed:style=Regular align=center color=#FFFFFFFF font_size=25 wrap=mixed ellipsis=1.0";
 	}
 }
 
@@ -137,7 +137,7 @@ collections {
 					state: "edit" 0.0;
 					inherit: "default" 0.0;
 					rel1{relative: ICON_NAME_X_MIN ICON_NAME_Y_MIN; to: "icon_bg";}
-					rel2{relative: ICON_NAME_X_MAX ICON_NAME_Y_MAX; to: "icon_bg";}
+					rel2{relative: ICON_NAME_X_MAX 1.0; to: "icon_bg";}
 					text {
 						style: "icon_label_edit";
 					}