From b6c5c3a339552f717824327348275e0e14090ef0 Mon Sep 17 00:00:00 2001 From: Tae-Hwan Kim Date: Fri, 31 Aug 2012 22:37:58 +0900 Subject: [PATCH] Fix for giant font Change-Id: I4614c1019a1236bd11e50ccb053b85284f1ad4cf --- themes/widgets/genlist/genlist_normal.edc | 128 ++++-------------------------- 1 file changed, 15 insertions(+), 113 deletions(-) diff --git a/themes/widgets/genlist/genlist_normal.edc b/themes/widgets/genlist/genlist_normal.edc index 8782818..a573560 100644 --- a/themes/widgets/genlist/genlist_normal.edc +++ b/themes/widgets/genlist/genlist_normal.edc @@ -11494,7 +11494,7 @@ } } -// 3.4.2 +// 2.2.3.2 group { name: "elm/genlist/item/multiline/3text.2icon.2/default"; alias: "elm/genlist/item_odd/multiline/3text.2icon.2/default"; alias: "elm/genlist/item_compress/multiline/3text.2icon.2/default"; @@ -11519,71 +11519,21 @@ clip_to: "disclip"; type: SWALLOW; scale: 1; - description { state: "default" 0.0; + GENLIST_DESCRIPTION_RTB("elm.padding.right", "elm.padding.top", "elm.padding.bottom", min: GENLIST_HEIGHT_164_INC GENLIST_HEIGHT_164_INC; max: GENLIST_HEIGHT_164_INC GENLIST_HEIGHT_164_INC; fixed: 1 1; - rel1 { - relative: 0.0 1.0; - to_x: "elm.padding.right"; - to_y: "elm.padding.top"; - } - rel2 { - relative: 0.0 0.0; - to_x: "elm.padding.right"; - to_y: "elm.padding.bottom"; - } - align: 1.0 0.5; - } + ) GENLIST_DESCRIPTION_FLIP_ENABLED } - part { name: "elm.padding.icon2.left"; - clip_to: "disclip"; - type: RECT; - scale: 1; - description { state: "default" 0.0; - min: GENLIST_PADDING_16_INC 0; - fixed: 1 0; - rel1.to_x: "elm.icon.2"; - rel2 { - relative: 0.0 1.0; - to_x: "elm.icon.2"; - } - align: 1.0 0.0; - visible: 0; - } - } - part { name: "elm.text.1.rect"; - clip_to: "disclip"; - type: RECT; - scale: 1; - description { state: "default" 0.0; - min: 0 GENLIST_SIZE_48_INC; - fixed: 0 1; - rel1 { - relative: 1.0 1.0; - to_x: "elm.padding.left"; - to_y: "elm.padding.top"; - } - rel2 { - relative: 0.0 1.0; - to_x: "elm.padding.icon2.left"; - to_y: "elm.padding.top"; - } - align: 0.0 0.0; - visible: 0; - } - } + GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon2.left", "elm.icon.2", GENLIST_PADDING_SIZE_DEFAULT) part { name: "elm.text.1"; clip_to: "disclip"; type: TEXT; mouse_events: 0; scale: 1; - description { state: "default" 0.0; - fixed: 1 1; - rel1.to: "elm.text.1.rect"; - rel2.to: "elm.text.1.rect"; - align: 0.0 0.0; + GENLIST_DESCRIPTION_LRT("elm.padding.left", "elm.padding.icon2.left", "elm.padding.top", + fixed: 0 1; color: GENLIST_3LINE_MAIN_TEXT_01_READ_COLOR; text { font: "SLP:style=Roman"; @@ -11592,7 +11542,7 @@ align: 0.0 0.5; text_class: "list_item"; } - } + ) description { state: "selected" 0.0; inherit: "default" 0.0; color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR; @@ -11604,20 +11554,9 @@ type: TEXT; mouse_events: 0; scale: 1; - description { state: "default" 0.0; + GENLIST_DESCRIPTION_LRT("elm.padding.left", "elm.padding.icon2.left", "elm.text.1", min: 0 GENLIST_SIZE_48_INC; fixed: 0 1; - rel1 { - relative: 1.0 1.0; - to_x: "elm.padding.left"; - to_y: "elm.text.1.rect"; - } - rel2 { - relative: 0.0 1.0; - to_x: "elm.padding.icon2.left"; - to_y: "elm.text.1.rect"; - } - align: 0.0 0.0; color: GENLIST_3LINE_MAIN_TEXT_02_COLOR; text { font: "SLP:style=Roman"; @@ -11626,7 +11565,7 @@ align: 0.0 0.5; text_class: "slp_roman"; } - } + ) description { state: "selected" 0.0; inherit: "default" 0.0; color: GENLIST_3LINE_MAIN_TEXT_02_COLOR_FOCUS; @@ -11638,20 +11577,9 @@ type: TEXT; mouse_events: 0; scale: 1; - description { state: "default" 0.0; + GENLIST_DESCRIPTION("elm.padding.icon1.right", "elm.padding.icon2.left", "elm.text.2", "elm.padding.bottom", min: 0 GENLIST_SIZE_35_INC; - fixed: 0 1; - rel1 { - relative: 1.0 0.0; - to_x: "elm.padding.icon1.right"; - to_y: "elm.padding.bottom"; - } - rel2 { - relative: 0.0 0.0; - to_x: "elm.padding.icon2.left"; - to_y: "elm.padding.bottom"; - } - align: 0.0 1.0; + fixed: 0 0; color: GENLIST_3LINE_MAIN_TEXT_03_COLOR; text { font: "SLP:style=Medium"; @@ -11660,7 +11588,7 @@ align: 0.0 0.5; text_class: "slp_medium"; } - } + ) description { state: "selected" 0.0; inherit: "default" 0.0; color: GENLIST_3LINE_MAIN_TEXT_03_FOCUS_COLOR; @@ -11671,40 +11599,14 @@ clip_to: "disclip"; type: SWALLOW; scale: 1; - description { state: "default" 0.0; + GENLIST_DESCRIPTION_LTB("elm.padding.left", "elm.text.2", "elm.padding.bottom", min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; fixed: 1 1; - rel1 { - relative: 1.0 1.0; - to_x: "elm.padding.left"; - to_y: "elm.text.2"; - } - rel2 { - relative: 1.0 0.0; - to_x: "elm.padding.left"; - to_y: "elm.padding.bottom"; - } - align: 0.0 0.5; - } + ) GENLIST_DESCRIPTION_FLIP_ENABLED } - part { name: "elm.padding.icon1.right"; - clip_to: "disclip"; - type: RECT; - scale: 1; - description { state: "default" 0.0; - min: GENLIST_PADDING_16_INC 0; - fixed: 1 0; - rel1 { - relative: 1.0 0.0; - to_x: "elm.icon.1"; - } - rel2.to_x: "elm.icon.1"; - align: 0.0 0.0; - visible: 0; - } - } + GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon1.right", "elm.icon.1", GENLIST_PADDING_SIZE_DEFAULT) GENLIST_PART_FLIP GENLIST_PART_DISCLIP } -- 2.7.4