From 2d4a14cae001eff0c4f57e827f2adc7faa17040e Mon Sep 17 00:00:00 2001 From: Tae-Hwan Kim Date: Mon, 20 Aug 2012 21:47:35 +0900 Subject: [PATCH] [Genlist] Fix for giant font Set min as 0 1 for main text for Giant font (it should scale the item's height) PS. Check other groups... gogo! Change-Id: I8f4d322de17647498961031ddb806768a910a524 --- themes/widgets/genlist/genlist_normal.edc | 63 +++++++++++++------------------ 1 file changed, 27 insertions(+), 36 deletions(-) diff --git a/themes/widgets/genlist/genlist_normal.edc b/themes/widgets/genlist/genlist_normal.edc index 7a9653a..8a3df44 100644 --- a/themes/widgets/genlist/genlist_normal.edc +++ b/themes/widgets/genlist/genlist_normal.edc @@ -287,7 +287,7 @@ text { font: "SLP:style=Roman"; size: GENLIST_LIST_MAIN_TEXT_SIZE; - max: 1 1; + min: 0 1; align: 0 0.5; text_class: "list_item"; } @@ -314,21 +314,17 @@ inherit: "elm/genlist/item/1text/default"; parts { part { name: "elm.text"; + clip_to: "disclip"; type: TEXTBLOCK; - description { state: "default" 0.0; - rel1 { - relative: 1.0 0.0; - to_x: "elm.padding.left"; - } - rel2 { - relative: 0.0 1.0; - to_x: "elm.padding.right"; - } + mouse_events: 0; + scale: 1; + GENLIST_DESCRIPTION_LR("elm.padding.left", "elm.padding.right", align: 0.0 0.5; text { + min: 0 1; style: "genlist_style_list_main_text_unread"; } - } + ) description { state: "selected" 0.0; inherit: "default" 0.0; // FIXME: Why color textblock of is not changed by text.style? @@ -565,7 +561,6 @@ font: "SLP:style=Roman"; size: GENLIST_LIST_MAIN_TEXT_SIZE; min: 0 1; - max: 1 0; align: 0.0 0.5; text_class: "list_item"; } @@ -1299,6 +1294,7 @@ description { state: "default" 0.0; align: 0.0 0.5; color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR; + min: 0 1; rel1 { relative: 1.0 0.0; to_x: "elm.padding.left"; @@ -2628,14 +2624,14 @@ } align: 0.0 0.5; text { - style: "genlist_style_list_main_text_unread"; + style: "genlist_style_list_sub_text_default"; min: 0 1; align: 0.0 0.5; } } description { state: "selected" 0.0; inherit: "default" 0.0; - text.style: "genlist_style_list_main_text_focus"; + text.style: "genlist_style_list_sub_text_focus"; } GENLIST_DESCRIPTION_FLIP_ENABLED } @@ -3469,14 +3465,14 @@ } align: 0.0 0.5; text { - style: "genlist_style_list_main_text_unread"; + style: "genlist_style_list_sub_text_default"; min: 0 1; align: 0.0 0.5; } } description { state: "selected" 0.0; inherit: "default" 0.0; - text.style: "genlist_style_list_main_text_focus"; + text.style: "genlist_style_list_sub_text_focus"; } GENLIST_DESCRIPTION_FLIP_ENABLED } @@ -4394,14 +4390,14 @@ } align: 0.0 0.5; text { - style: "genlist_style_list_main_text_unread"; + style: "genlist_style_list_sub_text_default"; min: 0 1; align: 0.0 0.5; } } description { state: "selected" 0.0; inherit: "default" 0.0; - text.style: "genlist_style_list_main_text_focus"; + text.style: "genlist_style_list_sub_text_focus"; } GENLIST_DESCRIPTION_FLIP_ENABLED } @@ -4521,7 +4517,7 @@ color: GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR; text { font: "SLP:style=Medium"; - size: GENLIST_FONT_32_INC; + size: GENLIST_LIST_SUB_TEXT_SIZE; min: 0 1; align: 0.0 0.5; text_class: "slp_medium"; @@ -4676,9 +4672,6 @@ mouse_events: 0; scale: 1; description { state: "default" 0.0; - min: 0 0; - max: GENLIST_SIZE_576_INC 0; - fixed: 1 0; rel1 { relative: 1.0 1.0; to_x: "elm.padding.left"; @@ -4693,8 +4686,8 @@ color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR; text { font: "SLP:style=Medium"; - size: GENLIST_FONT_32_INC; - min: 1 1; + size: GENLIST_LIST_SUB_TEXT_SIZE; + min: 0 1; align: 0.0 0.5; text_class: "slp_medium"; } @@ -5010,7 +5003,7 @@ } align: 0.0 0.5; text { - style: "genlist_style_list_main_text_unread"; + style: "genlist_style_list_sub_text_default"; size: GENLIST_FONT_32_INC; min: 0 1; align: 0.0 0.5; @@ -5018,7 +5011,7 @@ } description { state: "selected" 0.0; inherit: "default" 0.0; - text.style: "genlist_style_list_main_text_focus"; + text.style: "genlist_style_list_sub_text_focus"; } GENLIST_DESCRIPTION_INVISIBLE_SELECTED GENLIST_DESCRIPTION_FLIP_ENABLED @@ -5641,7 +5634,7 @@ } align: 0.0 0.5; text { - style: "genlist_style_list_main_text_unread"; + style: "genlist_style_list_sub_text_default"; min: 0 1; align: 0.0 0.5; } @@ -5650,7 +5643,7 @@ inherit: "default" 0.0; // FIXME: Why color textblock of is not changed by text.style? color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR; - text.style: "genlist_style_list_main_text_focus"; + text.style: "genlist_style_list_sub_text_focus"; } GENLIST_DESCRIPTION_FLIP_ENABLED } @@ -23189,9 +23182,9 @@ GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT ) GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT ) - GENLIST_PADDING("elm.icon.right", GENLIST_DESCRIPT_LINE_RIGHT("default", "elm.text.4", "elm.padding.top", "elm.padding.bottom", min:16 0; visible: 0;)) - GENLIST_PADDING("elm.text.1.right", GENLIST_DESCRIPT_LINE_RIGHT("default", "elm.icon.1", "elm.padding.top", "elm.padding.bottom", min:16 0; visible: 0;)) - GENLIST_PADDING("elm.text.3.right", GENLIST_DESCRIPT_LINE_RIGHT("default", "elm.text.2", "elm.padding.top", "elm.padding.bottom", min:16 0; visible: 0;)) + GENLIST_PADDING("elm.icon.right", GENLIST_DESCRIPT_LINE_RIGHT("default", "elm.text.4", "elm.padding.top", "elm.padding.bottom", fixed: 1 0; min:16 0; visible: 0;)) + GENLIST_PADDING("elm.text.1.right", GENLIST_DESCRIPT_LINE_RIGHT("default", "elm.icon.1", "elm.padding.top", "elm.padding.bottom", fixed: 1 0; min:16 0; visible: 0;)) + GENLIST_PADDING("elm.text.3.right", GENLIST_DESCRIPT_LINE_RIGHT("default", "elm.text.2", "elm.padding.top", "elm.padding.bottom", fixed: 1 0; min:16 0; visible: 0;)) part { name: "elm.bubble"; type: IMAGE; description{ state: "default" 0.0; @@ -23272,13 +23265,12 @@ scale: 1; GENLIST_DESCRIPTION("elm.padding.left", "elm.text.1.right", "elm.padding.top", "elm.text.2", color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR; - fixed: 0 1; min: 0 60; - max: -1 60; text { font: "SLP:style=Roman"; size: GENLIST_LIST_MAIN_TEXT_SIZE; align: 0.0 0.5; + min: 0 1; text_class: "list_item"; } ) @@ -23523,7 +23515,6 @@ scale: 1; description { state: "default" 0.0; color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR; - fixed: 0 1; min: 0 GENLIST_SIZE_SLIDE_60_INC; rel1 { relative: 1.0 1.0; to_x: "elm.padding.left"; @@ -23605,7 +23596,7 @@ part { name: "elm.bubble"; type: IMAGE; description{ state: "default" 0.0; - fixed: 0 1; + fixed: 1 1; min: GENLIST_SIZE_48_INC GENLIST_SIZE_48_INC; rel1 { relative: 0 0; to_x: "elm.padding.bubble.text4.left"; @@ -23666,7 +23657,7 @@ scale: 1; description { state: "default" 0.0; color: GENLIST_LIST_BUBBLE_TEXT_COLOR; - fixed: 0 1; + fixed: 1 1; align: 1.0 0.0; min: GENLIST_SIZE_28_INC GENLIST_SIZE_48_INC; rel1 { relative: 0 1; -- 2.7.4