From: Sohyun Kim Date: Mon, 14 Mar 2011 04:57:21 +0000 (+0900) Subject: [bubble] add top/bottom padding, change width to relative position X-Git-Tag: submit/2.0alpha-wayland/20121130.000903~928^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=54aecf88deb291dba38abfde431c23fc25ee33c3;p=profile%2Fivi%2Fefl-theme-tizen.git [bubble] add top/bottom padding, change width to relative position --- diff --git a/themes/groups/entry.edc b/themes/groups/entry.edc index b6ec944..1526dc4 100644 --- a/themes/groups/entry.edc +++ b/themes/groups/entry.edc @@ -1325,7 +1325,8 @@ } } -#define BUBBLE_PAD 15 +#define BUBBLE_X_PAD 15 +#define BUBBLE_Y_PAD 10 group { name: "elm/entry/base/readmessage"; data.item: "default_font_size" "24"; @@ -1341,7 +1342,7 @@ scale: 1; description { state: "default" 0.0; - min: BUBBLE_PAD 0; + min: BUBBLE_X_PAD 0; fixed: 1 0; align: 0.0 0.0; color: 0 0 0 0; @@ -1354,7 +1355,7 @@ scale: 1; description { state: "default" 0.0; - min: BUBBLE_PAD 0; + min: BUBBLE_X_PAD 0; fixed: 1 0; align: 0.0 0.0; color: 0 0 0 0; @@ -1362,14 +1363,39 @@ rel2.to: "elm.text"; } } + part { + name: "elm.rect.top.pad"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + min: 0 BUBBLE_Y_PAD; + fixed: 0 1; + align: 0.0 0.0; + color: 0 0 0 0; + rel2.relative: 1.0 0.0; + } + } + part { + name: "elm.rect.bottom.pad"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + min: 0 BUBBLE_Y_PAD; + fixed: 0 1; + align: 0.0 1.0; + color: 0 0 0 0; + rel1.relative: 0.0 1.0; + } + } part { name: "elm.image.bg"; type: IMAGE; scale: 1; description { state: "default" 0.0; - rel1.to: "elm.rect.left.pad"; - rel2.to: "elm.rect.right.pad"; + rel2.to_x: "elm.rect.right.pad"; image { normal: "07_message_bubble_readmessage.png"; border: 1 11 7 12; @@ -1394,11 +1420,12 @@ description { state: "default" 0.0; fixed: 1 0; align: 0.0 0.0; - rel1 { relative: 1.0 1.0; to: "elm.rect.left.pad"; } + rel1 { relative: 1.0 1.0; to: "elm.rect.left.pad"; to_y: "elm.rect.top.pad"; } + rel2 { relative: 1.0 0.0; to_y: "elm.rect.bottom.pad"; } text { style: "entry_textblock_style"; min: 0 1; - max: 1 1; + max: 1 0; } } description { state: "disabled" 0.0; @@ -1445,7 +1472,7 @@ scale: 1; description { state: "default" 0.0; - min: BUBBLE_PAD 0; + min: BUBBLE_X_PAD 0; fixed: 1 0; align: 0.0 0.0; color: 0 0 0 0; @@ -1458,7 +1485,7 @@ scale: 1; description { state: "default" 0.0; - min: BUBBLE_PAD 0; + min: BUBBLE_X_PAD 0; fixed: 1 0; align: 0.0 0.0; color: 0 0 0 0; @@ -1466,14 +1493,39 @@ rel2.to: "elm.text"; } } + part { + name: "elm.rect.top.pad"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + min: 0 BUBBLE_Y_PAD; + fixed: 0 1; + align: 0.0 0.0; + color: 0 0 0 0; + rel2.relative: 1.0 0.0; + } + } + part { + name: "elm.rect.bottom.pad"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + min: 0 BUBBLE_Y_PAD; + fixed: 0 1; + align: 0.0 1.0; + color: 0 0 0 0; + rel1.relative: 0.0 1.0; + } + } part { name: "elm.image.bg"; type: IMAGE; scale: 1; description { state: "default" 0.0; - rel1.to: "elm.rect.left.pad"; - rel2.to: "elm.rect.right.pad"; + rel2.to_x: "elm.rect.right.pad"; image { normal: "07_message_bubble_readmessage.png"; border: 1 11 7 12; @@ -1496,11 +1548,12 @@ description { state: "default" 0.0; fixed: 1 0; align: 0.0 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.left.pad"; } + rel1 { relative: 1.0 1.0; to_x: "elm.rect.left.pad"; to_y: "elm.rect.top.pad"; } + rel2 { relative: 1.0 0.0; to_y: "elm.rect.bottom.pad"; } text { style: "entry_textblock_style"; min: 0 1; - max: 1 1; + max: 1 0; } } description { state: "disabled" 0.0; @@ -1547,7 +1600,7 @@ scale: 1; description { state: "default" 0.0; - min: BUBBLE_PAD 0; + min: BUBBLE_X_PAD 0; fixed: 1 0; align: 0.0 0.0; color: 0 0 0 0; @@ -1560,7 +1613,7 @@ scale: 1; description { state: "default" 0.0; - min: BUBBLE_PAD 0; + min: BUBBLE_X_PAD 0; fixed: 1 0; align: 0.0 0.0; color: 0 0 0 0; @@ -1568,14 +1621,39 @@ rel2.to_x: "elm.text"; } } + part { + name: "elm.rect.top.pad"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + min: 0 BUBBLE_Y_PAD; + fixed: 0 1; + align: 0.0 0.0; + color: 0 0 0 0; + rel2.relative: 1.0 0.0; + } + } + part { + name: "elm.rect.bottom.pad"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + min: 0 BUBBLE_Y_PAD; + fixed: 0 1; + align: 0.0 1.0; + color: 0 0 0 0; + rel1.relative: 0.0 1.0; + } + } part { name: "elm.image.bg"; type: IMAGE; scale: 1; description { state: "default" 0.0; - rel1.to: "elm.rect.left.pad"; - rel2.to: "elm.rect.right.pad"; + rel2.to_x: "elm.rect.right.pad"; image { normal: "07_message_bubble_readmessage.png"; border: 1 11 7 12; @@ -1598,11 +1676,12 @@ description { state: "default" 0.0; fixed: 1 0; align: 0.0 0.0; - rel1 { relative: 1.0 0.0; to: "elm.rect.left.pad"; } + rel1 { relative: 1.0 1.0; to_x: "elm.rect.left.pad"; to_y: "elm.rect.top.pad"; } + rel2 { relative: 1.0 0.0; to_y: "elm.rect.bottom.pad"; } text { style: "entry_textblock_style_charwrap"; min: 0 1; - max: 1 1; + max: 1 0; } } description { state: "disabled" 0.0; @@ -1649,7 +1728,7 @@ scale: 1; description { state: "default" 0.0; - min: BUBBLE_PAD 0; + min: BUBBLE_X_PAD 0; fixed: 1 0; align: 1.0 0.0; color: 0 0 0 0; @@ -1662,7 +1741,7 @@ scale: 1; description { state: "default" 0.0; - min: BUBBLE_PAD 0; + min: BUBBLE_X_PAD 0; fixed: 1 0; align: 1.0 0.0; color: 0 0 0 0; @@ -1670,14 +1749,39 @@ rel2 { relative: 0.0 1.0; to: "elm.text"; } } } + part { + name: "elm.rect.top.pad"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + min: 0 BUBBLE_Y_PAD; + fixed: 0 1; + align: 0.0 0.0; + color: 0 0 0 0; + rel2.relative: 1.0 0.0; + } + } + part { + name: "elm.rect.bottom.pad"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + min: 0 BUBBLE_Y_PAD; + fixed: 0 1; + align: 0.0 1.0; + color: 0 0 0 0; + rel1.relative: 0.0 1.0; + } + } part { name: "elm.image.bg"; type: IMAGE; scale: 1; description { state: "default" 0.0; - rel1.to: "elm.rect.left.pad"; - rel2.to: "elm.rect.right.pad"; + rel1.to_x: "elm.rect.left.pad"; image { normal: "07_message_bubble_sentmessage.png"; border: 11 1 7 12; @@ -1702,11 +1806,12 @@ description { state: "default" 0.0; fixed: 1 0; align: 1.0 0.0; - rel2 { relative: 0.0 1.0; to: "elm.rect.right.pad"; } + rel1 { relative: 0.0 1.0; to_y: "elm.rect.top.pad";} + rel2 { relative: 0.0 0.0; to_x: "elm.rect.right.pad"; to_y: "elm.rect.bottom.pad"; } text { style: "entry_textblock_style"; min: 0 1; - max: 1 1; + max: 1 0; } } description { state: "disabled" 0.0; @@ -1753,7 +1858,7 @@ scale: 1; description { state: "default" 0.0; - min: BUBBLE_PAD 0; + min: BUBBLE_X_PAD 0; fixed: 1 0; align: 1.0 0.0; color: 0 0 0 0; @@ -1766,7 +1871,7 @@ scale: 1; description { state: "default" 0.0; - min: BUBBLE_PAD 0; + min: BUBBLE_X_PAD 0; fixed: 1 0; align: 1.0 0.0; color: 0 0 0 0; @@ -1774,14 +1879,39 @@ rel2 { relative: 0.0 1.0; to: "elm.text"; } } } + part { + name: "elm.rect.top.pad"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + min: 0 BUBBLE_Y_PAD; + fixed: 0 1; + align: 0.0 0.0; + color: 0 0 0 0; + rel2.relative: 1.0 0.0; + } + } + part { + name: "elm.rect.bottom.pad"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + min: 0 BUBBLE_Y_PAD; + fixed: 0 1; + align: 0.0 1.0; + color: 0 0 0 0; + rel1.relative: 0.0 1.0; + } + } part { name: "elm.image.bg"; type: IMAGE; scale: 1; description { state: "default" 0.0; - rel1.to: "elm.rect.left.pad"; - rel2.to: "elm.rect.right.pad"; + rel1.to_x: "elm.rect.left.pad"; image { normal: "07_message_bubble_sentmessage.png"; border: 11 1 7 12; @@ -1804,11 +1934,12 @@ description { state: "default" 0.0; fixed: 1 0; align: 1.0 0.0; - rel2 { relative: 0.0 1.0; to: "elm.rect.right.pad"; } + rel1 { relative: 0.0 1.0; to_y: "elm.rect.top.pad";} + rel2 { relative: 0.0 0.0; to_x: "elm.rect.right.pad"; to_y: "elm.rect.bottom.pad"; } text { style: "entry_textblock_style"; min: 0 1; - max: 1 1; + max: 1 0; } } description { state: "disabled" 0.0; @@ -1855,7 +1986,7 @@ scale: 1; description { state: "default" 0.0; - min: BUBBLE_PAD 0; + min: BUBBLE_X_PAD 0; fixed: 1 0; align: 1.0 0.0; color: 0 0 0 0; @@ -1868,7 +1999,7 @@ scale: 1; description { state: "default" 0.0; - min: BUBBLE_PAD 0; + min: BUBBLE_X_PAD 0; fixed: 1 0; align: 1.0 0.0; color: 0 0 0 0; @@ -1876,14 +2007,39 @@ rel2 { relative: 0.0 1.0; to: "elm.text"; } } } + part { + name: "elm.rect.top.pad"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + min: 0 BUBBLE_Y_PAD; + fixed: 0 1; + align: 0.0 0.0; + color: 0 0 0 0; + rel2.relative: 1.0 0.0; + } + } + part { + name: "elm.rect.bottom.pad"; + type: RECT; + scale: 1; + description { + state: "default" 0.0; + min: 0 BUBBLE_Y_PAD; + fixed: 0 1; + align: 0.0 1.0; + color: 0 0 0 0; + rel1.relative: 0.0 1.0; + } + } part { name: "elm.image.bg"; type: IMAGE; scale: 1; description { state: "default" 0.0; - rel1.to: "elm.rect.left.pad"; - rel2.to: "elm.rect.right.pad"; + rel1.to_x: "elm.rect.left.pad"; image { normal: "07_message_bubble_sentmessage.png"; border: 11 1 7 12; @@ -1906,11 +2062,12 @@ description { state: "default" 0.0; fixed: 1 0; align: 1.0 0.0; - rel2 { relative: 0.0 1.0; to: "elm.rect.right.pad"; } + rel1 { relative: 0.0 1.0; to_y: "elm.rect.top.pad";} + rel2 { relative: 0.0 0.0; to_x: "elm.rect.right.pad"; to_y: "elm.rect.bottom.pad"; } text { style: "entry_textblock_style_charwrap"; min: 0 1; - max: 1 1; + max: 1 0; } } description { state: "disabled" 0.0; diff --git a/themes/groups/genlist/genlist_styles.edc b/themes/groups/genlist/genlist_styles.edc index de54eff..9be81da 100644 --- a/themes/groups/genlist/genlist_styles.edc +++ b/themes/groups/genlist/genlist_styles.edc @@ -4600,6 +4600,264 @@ } } + group { name: "elm/genlist/item_compress/multiline.2text/default"; + alias: "elm/genlist/item_compress_odd/multiline.2text/default"; + + data.item: "stacking" "above"; + data.item: "selectraise" "on"; + data.item: "labels" "elm.text.1 elm.text.2"; + styles { + style { name: "genlist_textblock_sub_style"; + base: "font=SLP:style=Medium font_size=20 color=#6C6C6C wrap=char text_class=list_item"; + tag: "br" "\n"; + tag: "ps" "ps"; + tag: "tab" "\t"; + } + style { name: "genlist_textblock_sub_selected_style"; + base: "font=SLP:style=Medium font_size=20 color=#FFFFFF wrap=char text_class=list_item"; + tag: "br" "\n"; + tag: "ps" "ps"; + tag: "tab" "\t"; + } + } + parts { + BEAT_GENLIST_PART_BASE( 80 ) + BEAT_GENLIST_PART_BG_IMAGE + BEAT_GENLIST_PART_BOTTOM_LINE + BEAT_GENLIST_PART_PADDING_TOP( 6 ) + BEAT_GENLIST_PART_PADDING_BOTTOM( 6 ) + BEAT_GENLIST_PART_PADDING_LEFT( 10 ) + BEAT_GENLIST_PART_PADDING_RIGHT( 10 ) + + part { name: "elm.text.1"; + clip_to: "disclip"; + type: TEXT; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + min: 0 38; + fixed: 0 1; + align: 0 0; + rel1 { + relative: 1.0 1.0; + to_x: "elm.padding.left"; + to_y: "elm.padding.top"; + } + rel2 { + relative: 0.0 1.0; + offset: 0 0; + to_x: "elm.padding.right"; + to_y: "elm.padding.top"; + } + color: GENLIST_PART_TEXT_COLOR_INC; + text { + font: "SLP:style=Roman"; + size: 28; + min: 0 1; + align: 0.0 0.5; + } + } + description { state: "selected" 0.0; + inherit: "default" 0.0; + color: GENLIST_PART_TEXT_SELECTED_COLOR_INC; + } + } + part { name: "elm.text.2"; + clip_to: "disclip"; + type: TEXTBLOCK; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + rel1 { + relative: 1.0 1.0; + to_x: "elm.padding.left"; + to_y: "elm.text.1"; + } + rel2 { + relative: 0.0 0.0; + offset: 0 0; + to_x: "elm.padding.right"; + to_y: "elm.padding.bottom"; + } + text { + style: "genlist_textblock_sub_style"; + min: 0 1; + align: 0.0 0.5; + } + } + description { state: "selected" 0.0; + inherit: "default" 0.0; + text.style: "genlist_textblock_sub_selected_style"; + } + } + BEAT_GENLIST_PART_DISCLIP + } + programs { + // signal: elm,state,%s,active + // a "check" item named %s went active + // signal: elm,state,%s,passive + // a "check" item named %s went passive + // default is passive + program { name: "go_active"; + signal: "elm,state,selected"; + source: "elm"; + action: STATE_SET "selected" 0.0; + target: "bg_image"; + target: "elm.text.1"; + target: "elm.text.2"; + } + program { name: "go_passive"; + signal: "elm,state,unselected"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "bg_image"; + target: "elm.text.1"; + target: "elm.text.2"; + transition: LINEAR 0.1; + } + program { name: "go_disabled"; + signal: "elm,state,disabled"; + source: "elm"; + action: STATE_SET "disabled" 0.0; + target: "disclip"; + } + program { name: "go_enabled"; + signal: "elm,state,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "disclip"; + } + } + } + group { name: "elm/genlist/item_compress/multiline.2text.2/default"; + alias: "elm/genlist/item_compress_odd/multiline.2text.2/default"; + + data.item: "stacking" "above"; + data.item: "selectraise" "on"; + data.item: "labels" "elm.text.1 elm.text.2"; + styles { + style { name: "genlist_textblock_style"; + base: "font=SLP:style=Roman font_size=28 color=#000000 wrap=char text_class=list_item"; + tag: "br" "\n"; + tag: "ps" "ps"; + tag: "tab" "\t"; + } + style { name: "genlist_textblock_selected_style"; + base: "font=SLP:style=Roman font_size=28 color=#FFFFFF wrap=char text_class=list_item"; + tag: "br" "\n"; + tag: "ps" "ps"; + tag: "tab" "\t"; + } + } + parts { + BEAT_GENLIST_PART_BASE( 80 ) + BEAT_GENLIST_PART_BG_IMAGE + BEAT_GENLIST_PART_BOTTOM_LINE + BEAT_GENLIST_PART_PADDING_TOP( 6 ) + BEAT_GENLIST_PART_PADDING_BOTTOM( 6 ) + BEAT_GENLIST_PART_PADDING_LEFT( 10 ) + BEAT_GENLIST_PART_PADDING_RIGHT( 10 ) + + part { name: "elm.text.1"; + clip_to: "disclip"; + type: TEXTBLOCK; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + rel1 { + relative: 1.0 1.0; + to_x: "elm.padding.left"; + to_y: "elm.padding.top"; + } + rel2 { + relative: 0.0 0.0; + offset: 0 0; + to_x: "elm.padding.right"; + to_y: "elm.text.2"; + } + text { + style: "genlist_textblock_style"; + min: 0 1; + align: 0.0 0.5; + } + } + description { state: "selected" 0.0; + inherit: "default" 0.0; + text.style: "genlist_textblock_selected_style"; + } + } + part { name: "elm.text.2"; + clip_to: "disclip"; + type: TEXT; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + min: 0 27; + fixed: 0 1; + align: 0 1; + rel1 { + relative: 1.0 0.0; + to_x: "elm.padding.left"; + to_y: "elm.padding.bottom"; + } + rel2 { + relative: 0.0 0.0; + offset: 0 0; + to_x: "elm.padding.right"; + to_y: "elm.padding.bottom"; + } + color: GENLIST_PART_SUB_TEXT_COLOR_INC; + text { + font: "SLP:style=Medium"; + size: 20; + min: 0 1; + align: 0.0 0.5; + } + } + description { state: "selected" 0.0; + inherit: "default" 0.0; + color: GENLIST_PART_TEXT_SELECTED_COLOR_INC; + } + } + BEAT_GENLIST_PART_DISCLIP + } + programs { + // signal: elm,state,%s,active + // a "check" item named %s went active + // signal: elm,state,%s,passive + // a "check" item named %s went passive + // default is passive + program { name: "go_active"; + signal: "elm,state,selected"; + source: "elm"; + action: STATE_SET "selected" 0.0; + target: "bg_image"; + target: "elm.text.1"; + target: "elm.text.2"; + } + program { name: "go_passive"; + signal: "elm,state,unselected"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "bg_image"; + target: "elm.text.1"; + target: "elm.text.2"; + transition: LINEAR 0.1; + } + program { name: "go_disabled"; + signal: "elm,state,disabled"; + source: "elm"; + action: STATE_SET "disabled" 0.0; + target: "disclip"; + } + program { name: "go_enabled"; + signal: "elm,state,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "disclip"; + } + } + } group { name: "elm/genlist/item/readmessage/default"; alias: "elm/genlist/item_odd/readmessage/default"; alias: "elm/genlist/item_compress/readmessage/default"; @@ -4621,11 +4879,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: 380 0; - fixed: 1 0; - align: 0.0 0.0; rel1.relative: 0.0 0.0; - rel2.relative: 0.0 1.0; + rel2.relative: 0.76 1.0; } } BEAT_GENLIST_PART_DISCLIP @@ -4695,11 +4950,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: 380 0; - fixed: 1 0; - align: 0.0 0.0; rel1 { relative: 0.0 1.0; to_y: "elm.rect.top.pad"; } - rel2.relative: 0.0 1.0; + rel2.relative: 0.76 1.0; } } BEAT_GENLIST_PART_DISCLIP @@ -4759,10 +5011,7 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: 380 0; - fixed: 1 0; - align: 1.0 0.0; - rel1.relative: 1.0 0.0; + rel1.relative: 0.24 0.0; rel2.relative: 1.0 1.0; } } @@ -4833,10 +5082,7 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: 380 0; - fixed: 1 0; - align: 1.0 0.0; - rel1 { relative: 1.0 1.0; to_y: "elm.rect.top.pad"; } + rel1 { relative: 0.24 1.0; to_y: "elm.rect.top.pad"; } rel2.relative: 1.0 1.0; } }