From: sumanth Date: Tue, 17 Jan 2012 08:11:17 +0000 (+0530) Subject: [datefield.edc] AM/PM bg image size is extended as per its text size.[CQ: Nabi/S1... X-Git-Tag: 2.0_alpha~267^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=018c011c95c620ac2039d028aa876ee906cae736;p=framework%2Fuifw%2Fefl-theme-tizen.git [datefield.edc] AM/PM bg image size is extended as per its text size.[CQ: Nabi/S1-773, S1-717] Change-Id: I355ee1e3195834d49232ab7c83bffda1f1fa52f5 --- diff --git a/themes/inc/tizen-black-hd-inc.edc b/themes/inc/tizen-black-hd-inc.edc index b524d89..1d2c5d9 100644 --- a/themes/inc/tizen-black-hd-inc.edc +++ b/themes/inc/tizen-black-hd-inc.edc @@ -1020,6 +1020,7 @@ #define DATEFIELD_SEPARATOR_MIN_WIDTH_INC 40 #define DATEFIELD_SEPARATOR_EXTENDED_MIN_WIDTH_INC 65 #define DATEFIELD_TEXT_FONT_SIZE_INC 36 +#define DATEFIELD_LEFT_PADDING_INC 10 #define DATEFIELD_TEXT_NORMAL_COLOR_INC 255 255 255 255 #define DATEFIELD_SEPARATOR_TEXT_COLOR_INC 150 150 150 255 #define DATEFIELD_TEXT_SELECTED_COLOR_INC 42 109 140 255 diff --git a/themes/inc/tizen-black-inc.edc b/themes/inc/tizen-black-inc.edc index c171da4..bf71b05 100644 --- a/themes/inc/tizen-black-inc.edc +++ b/themes/inc/tizen-black-inc.edc @@ -1007,6 +1007,7 @@ #define DATEFIELD_SEPARATOR_MIN_WIDTH_INC 24 #define DATEFIELD_SEPARATOR_EXTENDED_MIN_WIDTH_INC 40 #define DATEFIELD_TEXT_FONT_SIZE_INC 24 +#define DATEFIELD_LEFT_PADDING_INC 5 #define DATEFIELD_TEXT_NORMAL_COLOR_INC 255 255 255 255 #define DATEFIELD_SEPARATOR_TEXT_COLOR_INC 150 150 150 255 #define DATEFIELD_TEXT_SELECTED_COLOR_INC 42 109 140 255 diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc index 6ab1392..ba84b5a 100644 --- a/themes/inc/tizen-hd-inc.edc +++ b/themes/inc/tizen-hd-inc.edc @@ -1026,6 +1026,7 @@ #define DATEFIELD_SEPARATOR_MIN_WIDTH_INC 40 #define DATEFIELD_SEPARATOR_EXTENDED_MIN_WIDTH_INC 65 #define DATEFIELD_TEXT_FONT_SIZE_INC 36 +#define DATEFIELD_LEFT_PADDING_INC 10 #define DATEFIELD_TEXT_NORMAL_COLOR_INC 0 0 0 255 #define DATEFIELD_SEPARATOR_TEXT_COLOR_INC 100 100 100 255 #define DATEFIELD_TEXT_SELECTED_COLOR_INC 224 134 21 255 diff --git a/themes/inc/tizen-inc.edc b/themes/inc/tizen-inc.edc index 8076179..9a2e2f9 100644 --- a/themes/inc/tizen-inc.edc +++ b/themes/inc/tizen-inc.edc @@ -1020,6 +1020,7 @@ #define DATEFIELD_SEPARATOR_MIN_WIDTH_INC 24 #define DATEFIELD_SEPARATOR_EXTENDED_MIN_WIDTH_INC 40 #define DATEFIELD_TEXT_FONT_SIZE_INC 24 +#define DATEFIELD_LEFT_PADDING_INC 5 #define DATEFIELD_TEXT_NORMAL_COLOR_INC 0 0 0 255 #define DATEFIELD_SEPARATOR_TEXT_COLOR_INC 100 100 100 255 #define DATEFIELD_TEXT_SELECTED_COLOR_INC 224 134 21 255 diff --git a/themes/widgets/datefield.edc b/themes/widgets/datefield.edc index b84c56d..de18443 100644 --- a/themes/widgets/datefield.edc +++ b/themes/widgets/datefield.edc @@ -28,9 +28,15 @@ images { description {\ state: "default" 0.0;\ visible: 0;\ - fixed: 1 1;\ - rel1 { to: "item"#_pos; relative: 0.0 0.0; }\ - rel2 { to: "item"#_pos; relative: 1.0 1.0; }\ + fixed: 0 1;\ + rel1 {\ + relative: -0.1 0.5;\ + to: "item"#_pos;\ + }\ + rel2 {\ + relative: 1.1 0.5;\ + to: "item"#_pos;\ + }\ image {\ normal: "00_button_01_normal.png";\ border: 3 3 3 3;\ @@ -41,7 +47,6 @@ images { inherit: "default" 0.0;\ visible: 1;\ min: DATEFIELD_ITEM_BG_SIZE_INC;\ - max: DATEFIELD_ITEM_BG_SIZE_INC;\ }\ }\ part {\ @@ -228,7 +233,7 @@ group { description { state: "default" 0.0; visible: 0; - min: DATEFIELD_SEPARATOR_MIN_WIDTH_INC DATEFIELD_SEPARATOR_MIN_HEIGHT_INC; + min: DATEFIELD_LEFT_PADDING_INC DATEFIELD_SEPARATOR_MIN_HEIGHT_INC; align: 0.0 0.5; fixed: 1 0; rel1 { relative: 0.0 0.0; to: "bg"; }