From 03b0d1f279f547da2cdb0922eb72d0dde0885510 Mon Sep 17 00:00:00 2001 From: Tae-Hwan Kim Date: Sat, 1 Sep 2012 14:29:01 +0900 Subject: [PATCH] Fix passwor style for giant font Change-Id: I5dc84ec7a1f809d786ec9b56dfb13e119506bf86 --- themes/inc/tizen-hd-inc.edc | 4 ++- themes/widgets/genlist/genlist_macro.edc | 23 ++++++++++-- themes/widgets/genlist/genlist_normal.edc | 58 ++++++++++++++----------------- 3 files changed, 51 insertions(+), 34 deletions(-) diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc index 370e114..052e6e6 100644 --- a/themes/inc/tizen-hd-inc.edc +++ b/themes/inc/tizen-hd-inc.edc @@ -364,6 +364,9 @@ #define GENLIST_PART_MATCH_TAG_COLOR_INC "+ color=#3F8DAD" +#define DIALOGUE_PASSWORD_TITLE_COLOR 153 153 153 255 +#define DIALOGUE_PASSWORD_TITLE_SIZE 32 + #define GENLIST_DIALOGUE_GT_TEXT_COLOR 102 102 102 255 #define GENLIST_DIALOGUE_FONT_EDIT_MODE_TEXT_01_COLOR_INC 153 153 153 255 #define GENLIST_DIALOGUE_FONT_EDIT_MODE_TEXT_01_FOCUS_COLOR_INC 249 249 249 255 @@ -378,7 +381,6 @@ #define GENLIST_DIALOGUE_FONT_APPS_PRICE_ORIGINAL_COLOR_INC 0 140 210 255 #define GENLIST_DIALOGUE_FONT_APPS_PRICE_SALE_COLOR_INC 221 134 21 255 #define GENLIST_DIALOGUE_FONT_APPS_PRICE_FREE_COLOR_INC 0 140 210 255 -#define GENLIST_DIALOGUE_FONT_PASSWORD_TITLE_COLOR_INC 153 153 153 255 #define GENLIST_DIALOGUE_FONT_PASSWORD_INPUT_TEXT_COLOR_INC 249 249 249 255 #define GENLIST_DIALOGUE_FONT_DETAIL_WORD_COLOR_INC 249 249 249 255 #define GENLIST_DIALOGUE_FONT_DETAIL_PRONUNCIATION_COLOR_INC 152 89 0 255 diff --git a/themes/widgets/genlist/genlist_macro.edc b/themes/widgets/genlist/genlist_macro.edc index 853f676..fc277be 100644 --- a/themes/widgets/genlist/genlist_macro.edc +++ b/themes/widgets/genlist/genlist_macro.edc @@ -278,6 +278,25 @@ param\ } +// | top | +// ---------- +// | HERE | +// ---------- +// | bottom | +#define GENLIST_DESCRIPTION_TB( top, bottom, param ) \ + description { state: "default" 0.0;\ + align: 0.5 0.5;\ + rel1 { \ + relative: 0 1; \ + to_y: top; \ + }\ + rel2 {\ + relative: 1 0;\ + to_y: bottom;\ + }\ + param\ + } + #define GENLIST_PADDING(NAME, DESCRIPT) \ part { name: NAME; \ type: RECT; \ @@ -586,11 +605,11 @@ visible: 0; \ align: 0.5 0; \ rel1 { \ - relative: 0.5 1; \ + relative: 0 1; \ to: TOP; \ } \ rel2 { \ - relative: 0.5 1; \ + relative: 1 1; \ to: TOP; \ } \ } \ diff --git a/themes/widgets/genlist/genlist_normal.edc b/themes/widgets/genlist/genlist_normal.edc index a573560..4e51f5e 100644 --- a/themes/widgets/genlist/genlist_normal.edc +++ b/themes/widgets/genlist/genlist_normal.edc @@ -15587,10 +15587,10 @@ GENLIST_PART_BASE( GENLIST_HEIGHT_207_INC ) GENLIST_PART_DIALOGUE_BG_IMAGE GENLIST_PART_BOTTOM_LINE - GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC ) + GENLIST_PART_PADDING_TOP( 10 ) GENLIST_PART_PADDING_BOTTOM( 23 ) GENLIST_PART_PADDING_LEFT( 42 ) - GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT ) + GENLIST_PART_PADDING_RIGHT( 17 ) GENLIST_PART_DIALOGUE_ITEM GENLIST_PART_DIALOGUE_RIGHT_LINE part { name: "elm.text.1"; @@ -15598,37 +15598,33 @@ type: TEXT; mouse_events: 0; scale: 1; - description { state: "default" 0.0; + GENLIST_DESCRIPTION_LRT("elm.padding.left", "elm.padding.right", "elm.padding.top", fixed: 1 1; - rel1.relative: 42/720 10/206; - rel2.relative: 703/720 58/206; - color: GENLIST_DIALOGUE_FONT_PASSWORD_TITLE_COLOR_INC; + color: DIALOGUE_PASSWORD_TITLE_COLOR; + min: 0 48; text { font: "SLP:style=Medium"; - size: GENLIST_FONT_32_INC; - min: 0 0; + size: DIALOGUE_PASSWORD_TITLE_SIZE; + min: 0 1; align: 0.0 0; text_class: "list_item"; } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR; - } + ) } + GENLIST_PART_PADDING_TOP_TO("elm.padding.text1.bottom", "elm.text.1", 11); part { name: "elm.icon1.bg"; clip_to: "disclip"; type: IMAGE; scale: 1; - description { state: "default" 0.0; + GENLIST_DESCRIPTION_TB("elm.padding.text1.bottom", "elm.padding.bottom", min: GENLIST_SIZE_PASSWORD_ICON GENLIST_SIZE_PASSWORD_ICON; - fixed: 1 1; - rel1.relative: 146/720 126/206; - rel2.relative: 146/720 126/206; + fixed: 1 0; + rel1.relative: 146/720 1; + rel2.relative: 146/720 0; image.normal: "00_search_input_field_bg.png"; image.border: 5 5 5 5; image.border_scale: 1; - } + ) } part { name: "elm.icon.1"; clip_to: "disclip"; @@ -15650,15 +15646,15 @@ clip_to: "disclip"; type: IMAGE; scale: 1; - description { state: "default" 0.0; + GENLIST_DESCRIPTION_TB("elm.padding.text1.bottom", "elm.padding.bottom", min: GENLIST_SIZE_PASSWORD_ICON GENLIST_SIZE_PASSWORD_ICON; - fixed: 1 1; - rel1.relative: 294/720 126/206; - rel2.relative: 294/720 126/206; + fixed: 1 0; + rel1.relative: 294/720 1; + rel2.relative: 294/720 0; image.normal: "00_search_input_field_bg.png"; image.border: 5 5 5 5; image.border_scale: 1; - } + ) } part { name: "elm.icon.2"; clip_to: "disclip"; @@ -15680,15 +15676,15 @@ clip_to: "disclip"; type: IMAGE; scale: 1; - description { state: "default" 0.0; + GENLIST_DESCRIPTION_TB("elm.padding.text1.bottom", "elm.padding.bottom", min: GENLIST_SIZE_PASSWORD_ICON GENLIST_SIZE_PASSWORD_ICON; fixed: 1 1; - rel1.relative: 442/720 126/206; - rel2.relative: 442/720 126/206; + rel1.relative: 442/720 1; + rel2.relative: 442/720 0; image.normal: "00_search_input_field_bg.png"; image.border: 5 5 5 5; image.border_scale: 1; - } + ) } part { name: "elm.icon.3"; clip_to: "disclip"; @@ -15710,15 +15706,15 @@ clip_to: "disclip"; type: IMAGE; scale: 1; - description { state: "default" 0.0; + GENLIST_DESCRIPTION_TB("elm.padding.text1.bottom", "elm.padding.bottom", min: GENLIST_SIZE_PASSWORD_ICON GENLIST_SIZE_PASSWORD_ICON; fixed: 1 1; - rel1.relative: 590/720 126/206; - rel2.relative: 590/720 126/206; + rel1.relative: 590/720 1; + rel2.relative: 590/720 0; image.normal: "00_search_input_field_bg.png"; image.border: 5 5 5 5; image.border_scale: 1; - } + ) } part { name: "elm.icon.4"; clip_to: "disclip"; -- 2.7.4