From d4a4bd8cfcaf58f82f8157ca960fe602bfd69375 Mon Sep 17 00:00:00 2001 From: Tae-Hwan Kim Date: Wed, 29 Aug 2012 21:34:09 +0900 Subject: [PATCH] [genlist] Fix giant font problem in email style Change-Id: Ib040ee011a8e11b8cfa072bbdd1e7e0b77eeca80 --- themes/widgets/genlist/genlist_normal.edc | 108 ++++----------------- themes/widgets/genlist/genlist_textblock_style.edc | 2 +- 2 files changed, 18 insertions(+), 92 deletions(-) diff --git a/themes/widgets/genlist/genlist_normal.edc b/themes/widgets/genlist/genlist_normal.edc index e6c3aeb..8782818 100644 --- a/themes/widgets/genlist/genlist_normal.edc +++ b/themes/widgets/genlist/genlist_normal.edc @@ -7413,7 +7413,6 @@ GENLIST_DESCRIPTION_FLIP_ENABLED } GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon.important.left", "elm.icon.important", GENLIST_PADDING_SIZE_DEFAULT) - // This part is used? part { name: "elm.icon.num"; clip_to: "disclip"; type: IMAGE; @@ -7486,7 +7485,6 @@ text { style: "genlist_style_email_unread"; min: 0 1; - max: 0 1; align: 0 0.5; } ) @@ -7504,47 +7502,25 @@ } GENLIST_DESCRIPTION_FLIP_ENABLED } - part { name: "elm.padding.intermediate"; clip_to: "disclip"; type: RECT; scale: 1; - description { state: "default" 0.0; + GENLIST_DESCRIPTION_LT("elm.padding.icon.checkbox.right", "elm.icon.attach", min: 0 GENLIST_PADDING_4_INC; fixed: 0 1; - rel1 { - relative: 1.0 1.0; - to_x: "elm.padding.icon.checkbox.right"; - to_y: "elm.icon.attach"; - } - rel2 { - relative: 1.0 1.0; - to_x: "elm.padding.icon.checkbox.right"; - to_y: "elm.icon.attach"; - } - align: 1.0 0.0; visible: 0; - } + ) } part { name: "elm.icon.priority"; clip_to: "disclip"; type: SWALLOW; scale: 1; - description { state: "default" 0.0; + GENLIST_DESCRIPTION_LT("elm.padding.icon.checkbox.right", "elm.padding.intermediate", min: 0 GENLIST_SIZE_40_INC; fixed: 1 1; - rel1 { - relative: 1.0 1.0; - to_x: "elm.padding.icon.checkbox.right"; - to_y: "elm.padding.intermediate"; - } - rel2 { - relative: 1.0 1.0; - to_x: "elm.padding.icon.checkbox.right"; - to_y: "elm.padding.intermediate"; - } align: 0.0 0.0; - } + ) description { state: "priority_enable" 0.0; inherit: "default" 0.0; min: GENLIST_SIZE_48_INC GENLIST_SIZE_40_INC; @@ -7555,21 +7531,11 @@ clip_to: "disclip"; type: SWALLOW; scale: 1; - description { state: "default" 0.0; + GENLIST_DESCRIPTION_LT("elm.padding.icon.checkbox.right", "elm.icon.priority", min: 0 GENLIST_SIZE_40_INC; fixed: 1 1; - rel1 { - relative: 1.0 1.0; - to_x: "elm.padding.icon.checkbox.right"; - to_y: "elm.icon.priority"; - } - rel2 { - relative: 1.0 1.0; - to_x: "elm.padding.icon.checkbox.right"; - to_y: "elm.icon.priority"; - } align: 0.0 0.0; - } + ) description { state: "lastverb_enable" 0.0; inherit: "default" 0.0; min: GENLIST_SIZE_48_INC GENLIST_SIZE_40_INC; @@ -7582,19 +7548,9 @@ type: TEXT; mouse_events: 0; scale: 1; - description { state: "default" 0.0; + GENLIST_DESCRIPTION_RTB("elm.padding.right", "elm.text.name", "elm.padding.bottom", min: GENLIST_SIZE_154_INC GENLIST_SIZE_40_INC; - fixed: 1 1; - rel1 { - to_x: "elm.padding.right"; - to_y: "elm.padding.bottom"; - } - rel2 { - relative: 0.0 0.0; - to_x: "elm.padding.right"; - to_y: "elm.padding.bottom"; - } - align: 1.0 1.0; + fixed: 1 0; color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR; text { font: "SLP:style=Medium"; @@ -7603,7 +7559,7 @@ align: 1.0 0.5; text_class: "slp_medium"; } - } + ) description { state: "selected" 0.0; inherit: "default" 0.0; color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR; @@ -7616,47 +7572,27 @@ type: SWALLOW; mouse_events: 0; scale: 1; - description { state: "default" 0.0; + GENLIST_DESCRIPTION_RT("elm.padding.right", "elm.padding.intermediate", min: 0 GENLIST_SIZE_40_INC; fixed: 1 1; - rel1 { - relative: 0.0 1.0; - to_x: "elm.padding.right"; - to_y: "elm.padding.intermediate"; - } - rel2 { - relative: 0.0 1.0; - to_x: "elm.padding.right"; - to_y: "elm.padding.intermediate"; - } align: 1.0 0.0; - } + ) GENLIST_DESCRIPTION_FLIP_ENABLED } part { name: "elm.text.name"; clip_to: "disclip"; type: TEXTBLOCK; scale: 1; - description { state: "default" 0.0; + GENLIST_DESCRIPTION_LT("elm.icon.priority", "elm.text.subject", min: 0 GENLIST_SIZE_40_INC; fixed: 1 1; - rel1 { - relative: 1.0 1.0; - to_x: "elm.icon.priority"; - to_y: "elm.padding.intermediate"; - } - rel2 { - relative: 0.0 1.0; - to_x: "elm.icon.appointment"; - to_y: "elm.padding.intermediate"; - } - align: 0.0 0.0; + //align: 0.0 0.0; text { style: "genlist_style_email_name"; min: 0 1; align: 0.0 0.5; } - } + ) description { state: "selected" 0.0; inherit: "default" 0.0; text.style: "genlist_style_email_name_selected"; @@ -7667,20 +7603,10 @@ clip_to: "disclip"; type: TEXT; scale: 1; - description { state: "default" 0.0; + GENLIST_DESCRIPTION("elm.icon.lastverb", "elm.text.date", "elm.text.name", "elm.padding.bottom", min: 0 GENLIST_SIZE_40_INC; fixed: 1 1; - rel1 { - relative: 1.0 0.0; - to_x: "elm.icon.lastverb"; - to_y: "elm.padding.bottom"; - } - rel2 { - relative: 0.0 0.0; - to_x: "elm.text.date"; - to_y: "elm.padding.bottom"; - } - align: 0.0 1.0; + //align: 0.0 1.0; color: GENLIST_CONTENTS_TEXT_COLOR; text { font: "SLP:style=Medium"; @@ -7689,7 +7615,7 @@ align: 0.0 0.5; text_class: "slp_medium"; } - } + ) description { state: "selected" 0.0; inherit: "default" 0.0; color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR; diff --git a/themes/widgets/genlist/genlist_textblock_style.edc b/themes/widgets/genlist/genlist_textblock_style.edc index 45dc4b7..d073d50 100644 --- a/themes/widgets/genlist/genlist_textblock_style.edc +++ b/themes/widgets/genlist/genlist_textblock_style.edc @@ -127,7 +127,7 @@ styles { STYLE_TAG_MATCH } style { name: "genlist_style_email_name"; - base: "font=SLP:style=Medium font_size="GENLIST_LIST_SUB_TEXT_SIZE" color="GENLIST_PART_TEXTBLOCK_SUB_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0"; + base: "font=SLP:style=Medium font_size="GENLIST_LIST_SUB_TEXT_SIZE" color="GENLIST_PART_TEXTBLOCK_SUB_STYLE_COLOR_INC" text_class=slp_medium ellipsis=1.0"; STYLE_TAG STYLE_TAG_MATCH } -- 2.7.4