From: Kamil Lipiszko Date: Mon, 11 Apr 2016 13:08:46 +0000 (+0200) Subject: res/edje: Match icon label to its parent layout X-Git-Tag: submit/tizen_mobile/20160419.065059~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0dfa655acdec3a38810d74c44e0e06bd3ec771d9;p=profile%2Fmobile%2Fapps%2Fnative%2Fhomescreen-efl.git res/edje: Match icon label to its parent layout Change-Id: I0db58faff4210ec5f17abf8a23fd1b5428b197b9 --- diff --git a/inc/conf.h b/inc/conf.h index 2efe836..50baf66 100644 --- a/inc/conf.h +++ b/inc/conf.h @@ -400,7 +400,7 @@ #define _ICON_NAME_X_MIN 6 #define _ICON_NAME_X_MAX 126 -#define _ICON_NAME_Y_MIN 101 +#define _ICON_NAME_Y_MIN 98 #define _ICON_NAME_Y_MAX 156 #define _ICON_NAME_EDIT_Y_MAX 144 @@ -518,7 +518,7 @@ #define _SEPARATOR_Y_MIN 62 #define _SEPARATOR_Y_MAX 64 -#define _CONTENT_Y_MIN 69 +#define _CONTENT_Y_MIN 53 #define _CONTENT_Y_MAX 569 #define _INDEX_Y_MIN 355 @@ -567,7 +567,7 @@ #define FOLDER_POPUP_X_REL 0.0441 #define FOLDER_GRID_W_REL 0.9 -#define FOLDER_GRID_H_REL 0.5 +#define FOLDER_GRID_H_REL 0.58 #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 27e155c..8a07f77 100644 --- a/res/edje/icon.edc +++ b/res/edje/icon.edc @@ -126,7 +126,7 @@ collections { description { state: "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";} color: 255 255 255 255; text { style: "icon_label"; @@ -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 1.0; to: "icon_bg";} + rel2{relative: ICON_NAME_X_MAX ICON_NAME_Y_MAX; to: "icon_bg";} text { style: "icon_label_edit"; }