From: Daniel Juyung Seo Date: Fri, 28 Oct 2011 09:10:49 +0000 (+0900) Subject: [*][Genlist] Fixed wrong 1text.2icon.3 edc. (CQ H0100135331) X-Git-Tag: submit/2.0alpha-wayland/20121130.000903~424^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6de7aa973d81e7c793f590652699668ac0093060;p=profile%2Fivi%2Fefl-theme-tizen.git [*][Genlist] Fixed wrong 1text.2icon.3 edc. (CQ H0100135331) This needs to be applied to other styles. - Condition 1. Text part width needs to be expanded when the text increases. 2. Text part should stop expanding when it reaches to the maximum length. --- diff --git a/themes/groups/genlist/genlist_normal.edc b/themes/groups/genlist/genlist_normal.edc index 4ec6c35..10347c9 100644 --- a/themes/groups/genlist/genlist_normal.edc +++ b/themes/groups/genlist/genlist_normal.edc @@ -1128,11 +1128,11 @@ max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC; fixed: 1 1; rel1 { - relative: 0.0 1.0; + relative: 0.0 0.0; to_x: "elm.padding.right"; } rel2 { - relative: 0.0 0.0; + relative: 0.0 1.0; to_x: "elm.padding.right"; } align: 1.0 0.5; @@ -1144,7 +1144,23 @@ clip_to: "disclip"; scale: 1; description { state: "default" 0.0; - min: GENLIST_PADDING_40_INC 0; // TODO: why 40? + min: GENLIST_PADDING_10_INC 0; + fixed: 1 0; + visible: 0; + rel1.to_x: "elm.icon.1"; + rel2 { + relative: 0.0 1.0; + to_x: "elm.icon.1"; + } + align: 1.0 0.0; + } + } + part { name: "elm.padding.icon1.left2"; + type: RECT; + clip_to: "disclip"; + scale: 1; + description { state: "default" 0.0; + min: GENLIST_PADDING_40_INC 0; fixed: 1 0; visible: 0; rel1.to_x: "elm.icon.1"; @@ -1161,23 +1177,21 @@ mouse_events: 0; scale: 1; description { state: "default" 0.0; - min: 0 0; - max: GENLIST_SIZE_360_INC 0; // TODO: 360? landscape won't work. - fixed: 1 0; rel1 { relative: 1.0 0.0; to_x: "elm.padding.left"; } rel2 { - relative: 1.0 1.0; - to_x: "elm.padding.left"; + relative: 0.0 1.0; + to_x: "elm.padding.icon1.left2"; } align: 0.0 0.5; color: GENLIST_PART_TEXT_COLOR_INC; text { font: "SLP:style=Roman"; size: GENLIST_FONT_28_INC; - min: 1 1; + min: 0 1; + max: 1 0; align: 0.0 0.5; } } @@ -1203,23 +1217,32 @@ visible: 0; } } - part { name: "elm.icon.2"; - type: SWALLOW; + part { name: "elm.icon.2.rect"; + type: RECT; clip_to: "disclip"; scale: 1; description { state: "default" 0.0; min: GENLIST_SIZE_20_INC GENLIST_SIZE_20_INC; max: GENLIST_SIZE_20_INC GENLIST_SIZE_20_INC; - fixed: 1 1; rel1 { relative: 1.0 0.0; to_x: "elm.padding.text.right"; } rel2 { - relative: 1.0 1.0; - to_x: "elm.padding.text.right"; + relative: 0.0 1.0; + to_x: "elm.padding.icon1.left"; } align: 0.0 0.5; + color: 0 0 0 0; + } + GENLIST_DESCRIPTION_RENAME_ENABLED + } + part { name: "elm.icon.2"; + type: SWALLOW; + clip_to: "disclip"; + description { state: "default" 0.0; + rel1.to: "elm.icon.2.rect"; + rel2.to: "elm.icon.2.rect"; } GENLIST_DESCRIPTION_RENAME_ENABLED }