From 451d56ca1e8115d3602ca1361d907efad7e75748 Mon Sep 17 00:00:00 2001 From: Tae-Hwan Kim Date: Wed, 5 Sep 2012 12:40:55 +0900 Subject: [PATCH] Fix for giant font Change-Id: I2768bb5608599aae4fdc81096b99774e1e8550aa --- themes/widgets/genlist/genlist_macro.edc | 54 ++------- themes/widgets/genlist/genlist_normal.edc | 179 +++++++++++++----------------- 2 files changed, 92 insertions(+), 141 deletions(-) diff --git a/themes/widgets/genlist/genlist_macro.edc b/themes/widgets/genlist/genlist_macro.edc index facea11..da1f52f 100644 --- a/themes/widgets/genlist/genlist_macro.edc +++ b/themes/widgets/genlist/genlist_macro.edc @@ -1597,14 +1597,13 @@ -#define GENLIST_PART_TEXT_LISTITEM1(NAME, LEFT, RIGHT, TOP, BOTTOM) \ +#define GENLIST_PART_TEXT_LISTITEM1(NAME, LEFT, RIGHT) \ part { name: NAME; \ scale: 1; \ clip_to: "disclip"; \ type: TEXT; \ mouse_events: 0; \ - GENLIST_DESCRIPTION(LEFT, RIGHT, TOP, BOTTOM, \ - fixed: 1 1; \ + GENLIST_DESCRIPTION_LR(LEFT, RIGHT, \ color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR; \ align: 0 0.5; \ text { \ @@ -1622,14 +1621,13 @@ } \ } -#define GENLIST_PART_TEXT_LISTITEM1_TB(NAME, LEFT, RIGHT, TOP, BOTTOM) \ +#define GENLIST_PART_TEXT_LISTITEM1_TB(NAME, LEFT, RIGHT) \ part { name: NAME; \ clip_to: "disclip"; \ type: TEXTBLOCK; \ mouse_events: 0; \ scale: 1; \ - GENLIST_DESCRIPTION(LEFT, RIGHT, TOP, BOTTOM, \ - fixed: 1 1; \ + GENLIST_DESCRIPTION_LR(LEFT, RIGHT, \ align: 0 0.5; \ text { \ align: 0 0.5; \ @@ -1650,14 +1648,13 @@ clip_to: "disclip"; \ type: TEXT; \ mouse_events: 0; \ - GENLIST_DESCRIPTION("elm.padding.left", "elm.padding.right", "elm.padding.top", "elm.padding.bottom", \ + GENLIST_DESCRIPTION_LR("elm.padding.left", "elm.padding.right", \ rel1 { \ to_x: "base"; \ relative: 0.5 0; \ } \ color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR; \ fixed: 1 1; \ - align: 1 0.5; \ text { \ font: "SLP:style=Medium"; \ size: GENLIST_LIST_SUB_TEXT_SIZE; \ @@ -1673,16 +1670,15 @@ } \ } -#define GENLIST_PART_TEXT_SUBITEM1_R_FIXED(NAME, SIZE) \ +#define GENLIST_PART_TEXT_SUBITEM1_FIXED(NAME, DESCRIPT, DESCRIPT_PARAM, SIZE) \ part { name: NAME; \ scale: 1; \ clip_to: "disclip"; \ type: TEXT; \ mouse_events: 0; \ - GENLIST_DESCRIPTION_RTB("elm.padding.right", "elm.padding.top", "elm.padding.bottom", \ + DESCRIPT(DESCRIPT_PARAM, \ color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR; \ fixed: 1 1; \ - align: 1 0.5; \ min: SIZE 0; \ text { \ font: "SLP:style=Medium"; \ @@ -1698,39 +1694,13 @@ } \ } -#define GENLIST_PART_TEXT_SUBITEM1_L_FIXED(NAME, SIZE) \ - part { name: NAME; \ - scale: 1; \ - clip_to: "disclip"; \ - type: TEXT; \ - mouse_events: 0; \ - GENLIST_DESCRIPTION_LTB("elm.padding.left", "elm.padding.top", "elm.padding.bottom", \ - color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR; \ - fixed: 1 1; \ - align: 0 0.5; \ - min: SIZE 0; \ - text { \ - font: "SLP:style=Medium"; \ - size: GENLIST_LIST_SUB_TEXT_SIZE; \ - min: 0 1; \ - align: 0 0.5; \ - text_class: "slp_medium"; \ - } \ - ) \ - description { state: "selected" 0.0; \ - inherit: "default" 0.0; \ - color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR; \ - } \ - } - -#define GENLIST_PART_TEXT_CONVERTOR(NAME, LEFT, RIGHT, TOP, BOTTOM, TEXT_PARAM) \ +#define GENLIST_PART_TEXT_CONVERTOR(NAME, LEFT, RIGHT, TEXT_PARAM) \ part { name: NAME; \ scale: 1; \ clip_to: "disclip"; \ type: TEXT; \ mouse_events: 0; \ - GENLIST_DESCRIPTION(LEFT, RIGHT, TOP, BOTTOM, \ - fixed: 1 1; \ + GENLIST_DESCRIPTION_LR(LEFT, RIGHT, \ color: GENLIST_CONVERTOR_STYLE_COLOR; \ align: 0 0.5; \ text { \ @@ -1754,7 +1724,7 @@ scale: 1; \ clip_to: "disclip"; \ type: SWALLOW; \ - GENLIST_DESCRIPTION_RTB(RIGHT, "elm.padding.top", "elm.padding.bottom", \ + GENLIST_DESCRIPTION_R(RIGHT, \ fixed: 1 1; \ PARAM \ ) \ @@ -1765,7 +1735,7 @@ scale: 1; \ clip_to: "disclip"; \ type: SWALLOW; \ - GENLIST_DESCRIPTION_LTB(LEFT, "elm.padding.top", "elm.padding.bottom", \ + GENLIST_DESCRIPTION_L(LEFT, \ fixed: 1 1; \ PARAM \ ) \ @@ -1783,4 +1753,4 @@ border: 0 0 2 2;\ }\ }\ - } \ No newline at end of file + } diff --git a/themes/widgets/genlist/genlist_normal.edc b/themes/widgets/genlist/genlist_normal.edc index e207f61..95c12f7 100644 --- a/themes/widgets/genlist/genlist_normal.edc +++ b/themes/widgets/genlist/genlist_normal.edc @@ -278,8 +278,7 @@ GENLIST_PART_FLIP GENLIST_PART_TEXT_LISTITEM1("elm.text", - "elm.padding.left", "elm.padding.right", - "elm.padding.top", "elm.padding.bottom") + "elm.padding.left", "elm.padding.right") } programs { GENLIST_PROGRAM_DISCLIP @@ -302,13 +301,10 @@ GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT ) GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT ) - GENLIST_PART_PADDING_TOP( 1 ) - GENLIST_PART_PADDING_BOTTOM( 1 ) GENLIST_PART_FLIP GENLIST_PART_TEXT_LISTITEM1_TB("elm.text", - "elm.padding.left", "elm.padding.right", - "elm.padding.top", "elm.padding.bottom") + "elm.padding.left", "elm.padding.right") } programs { GENLIST_PROGRAM_DISCLIP @@ -335,14 +331,12 @@ GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT ) GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT ) - GENLIST_PART_PADDING_TOP( 1 ) - GENLIST_PART_PADDING_BOTTOM( 1 ) GENLIST_PART_FLIP GENLIST_PART_TEXT_LISTITEM1("elm.text.1", - "elm.padding.left", "elm.text.2.left", - "elm.padding.top", "elm.padding.bottom") - GENLIST_PART_PADDING_RIGHT_TO("elm.text.2.left", "elm.text.2", GENLIST_PADDING_SIZE_DEFAULT) + "elm.padding.left", "elm.text.2.left") + GENLIST_PART_PADDING_RIGHT_TO("elm.text.2.left", "elm.text.2", + GENLIST_PADDING_SIZE_DEFAULT) GENLIST_PART_TEXT_SUBITEM1_R("elm.text.2") } programs { @@ -392,8 +386,7 @@ GENLIST_PART_FLIP GENLIST_PART_TEXT_LISTITEM1("elm.text", - "elm.padding.left", "elm.padding.icon.left", - "elm.padding.top", "elm.padding.bottom") + "elm.padding.left", "elm.padding.icon.left") GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon.left", "elm.icon", GENLIST_PADDING_SIZE_DEFAULT) GENLIST_PART_ICON_R("elm.icon", "elm.padding.right", ) @@ -482,20 +475,18 @@ GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT ) GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT ) - GENLIST_PART_PADDING_TOP( 1 ) - GENLIST_PART_PADDING_BOTTOM( 1 ) GENLIST_PART_FLIP GENLIST_PART_TEXT_LISTITEM1("elm.text", - "elm.padding.left", "elm.icon2.rect", - "elm.padding.top", "elm.padding.bottom") - GENLIST_PART_PADDING_LEFT_TO("elm.padding.text.right", "elm.text", GENLIST_PADDING_SIZE_DEFAULT) + "elm.padding.left", "elm.icon2.rect") + GENLIST_PART_PADDING_LEFT_TO("elm.padding.text.right", "elm.text", + GENLIST_PADDING_SIZE_DEFAULT) // ICON for RIGHT side of the TEXT part { name: "elm.icon.2"; type: SWALLOW; clip_to: "disclip"; scale: 1; - GENLIST_DESCRIPTION_LTB("elm.padding.text.right", "elm.padding.top", "elm.padding.bottom", + GENLIST_DESCRIPTION_L("elm.padding.text.right", min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; fixed: 1 1; @@ -505,14 +496,15 @@ part { name: "elm.icon2.rect"; type: RECT; scale: 1; - GENLIST_DESCRIPTION_RTB("elm.padding.icon1.left", "elm.padding.top", "elm.padding.bottom", + GENLIST_DESCRIPTION_R("elm.padding.icon1.left", min: (GENLIST_ICON_SMALL_SIZE + GENLIST_PADDING_SIZE_DEFAULT) GENLIST_ICON_SMALL_SIZE; max: (GENLIST_ICON_SMALL_SIZE + GENLIST_PADDING_SIZE_DEFAULT) GENLIST_ICON_SMALL_SIZE; fixed: 1 1; visible: 0; ) } - GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon1.left", "elm.icon.1", GENLIST_PADDING_SIZE_DEFAULT) + GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon1.left", "elm.icon.1", + GENLIST_PADDING_SIZE_DEFAULT) GENLIST_PART_ICON_R("elm.icon.1", "elm.padding.right", rel1.offset: GENLIST_PADDING_SIZE_DEFAULT 0; rel2.offset: GENLIST_PADDING_SIZE_DEFAULT 0; @@ -540,20 +532,18 @@ GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT ) GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT ) - GENLIST_PART_PADDING_TOP( 1 ) - GENLIST_PART_PADDING_BOTTOM( 1 ) GENLIST_PART_FLIP GENLIST_PART_TEXT_LISTITEM1_TB("elm.text", - "elm.padding.left", "elm.icon2.rect", - "elm.padding.top", "elm.padding.bottom") - GENLIST_PART_PADDING_LEFT_TO("elm.padding.text.right", "elm.text", GENLIST_PADDING_SIZE_DEFAULT) + "elm.padding.left", "elm.icon2.rect") + GENLIST_PART_PADDING_LEFT_TO("elm.padding.text.right", "elm.text", + GENLIST_PADDING_SIZE_DEFAULT) // ICON for RIGHT side of the TEXT part { name: "elm.icon.2"; type: SWALLOW; clip_to: "disclip"; scale: 1; - GENLIST_DESCRIPTION_LTB("elm.padding.text.right", "elm.padding.top", "elm.padding.bottom", + GENLIST_DESCRIPTION_L("elm.padding.text.right", min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; fixed: 1 1; @@ -563,14 +553,15 @@ part { name: "elm.icon2.rect"; type: RECT; scale: 1; - GENLIST_DESCRIPTION_RTB("elm.padding.icon1.left", "elm.padding.top", "elm.padding.bottom", + GENLIST_DESCRIPTION_R("elm.padding.icon1.left", min: (GENLIST_ICON_SMALL_SIZE + GENLIST_PADDING_SIZE_DEFAULT) GENLIST_ICON_SMALL_SIZE; max: (GENLIST_ICON_SMALL_SIZE + GENLIST_PADDING_SIZE_DEFAULT) GENLIST_ICON_SMALL_SIZE; fixed: 1 1; visible: 0; ) } - GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon1.left", "elm.icon.1", GENLIST_PADDING_SIZE_DEFAULT) + GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon1.left", "elm.icon.1", + GENLIST_PADDING_SIZE_DEFAULT) GENLIST_PART_ICON_R("elm.icon.1", "elm.padding.right", rel1.offset: GENLIST_PADDING_SIZE_DEFAULT 0; rel2.offset: GENLIST_PADDING_SIZE_DEFAULT 0; @@ -605,18 +596,16 @@ GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT ) GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT ) - GENLIST_PART_PADDING_TOP( 1 ) - GENLIST_PART_PADDING_BOTTOM( 1 ) GENLIST_PART_FLIP GENLIST_PART_ICON_L("elm.icon", "elm.padding.left", min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE; max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE; ) - GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon.right", "elm.icon", GENLIST_PADDING_SIZE_DEFAULT) + GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon.right", "elm.icon", + GENLIST_PADDING_SIZE_DEFAULT) GENLIST_PART_TEXT_LISTITEM1("elm.text", - "elm.padding.icon.right", "elm.padding.right", - "elm.padding.top", "elm.padding.bottom") + "elm.padding.icon.right", "elm.padding.right") } programs { GENLIST_PROGRAM_DISCLIP @@ -640,18 +629,16 @@ GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT ) GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT ) - GENLIST_PART_PADDING_TOP( 1 ) - GENLIST_PART_PADDING_BOTTOM( 1 ) GENLIST_PART_FLIP GENLIST_PART_ICON_L("elm.icon", "elm.padding.left", min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE; max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE; ) - GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon.right", "elm.icon", GENLIST_PADDING_SIZE_DEFAULT) + GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon.right", "elm.icon", + GENLIST_PADDING_SIZE_DEFAULT) GENLIST_PART_TEXT_LISTITEM1_TB("elm.text", - "elm.padding.icon.right", "elm.padding.right", - "elm.padding.top", "elm.padding.bottom") + "elm.padding.icon.right", "elm.padding.right") } programs { GENLIST_PROGRAM_DISCLIP @@ -678,19 +665,18 @@ GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT ) GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT ) - GENLIST_PART_PADDING_TOP( 1 ) - GENLIST_PART_PADDING_BOTTOM( 1 ) GENLIST_PART_FLIP GENLIST_PART_ICON_L("elm.icon", "elm.padding.left", min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE; max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE; ) - GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon.right", "elm.icon", GENLIST_PADDING_SIZE_DEFAULT) + GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon.right", "elm.icon", + GENLIST_PADDING_SIZE_DEFAULT) GENLIST_PART_TEXT_LISTITEM1("elm.text.1", - "elm.padding.icon.right", "elm.padding.text2.left", - "elm.padding.top", "elm.padding.bottom") - GENLIST_PART_PADDING_RIGHT_TO("elm.padding.text2.left", "elm.text.2", GENLIST_PADDING_SIZE_DEFAULT) + "elm.padding.icon.right", "elm.padding.text2.left") + GENLIST_PART_PADDING_RIGHT_TO("elm.padding.text2.left", "elm.text.2", + GENLIST_PADDING_SIZE_DEFAULT) GENLIST_PART_TEXT_SUBITEM1_R("elm.text.2") } programs { @@ -745,16 +731,15 @@ GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT ) GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT ) - GENLIST_PART_PADDING_TOP( 1 ) - GENLIST_PART_PADDING_BOTTOM( 1 ) GENLIST_PART_FLIP GENLIST_PART_ICON_L("elm.icon.1", "elm.padding.left", ) - GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon1.right", "elm.icon.1", GENLIST_PADDING_SIZE_DEFAULT) + GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon1.right", "elm.icon.1", + GENLIST_PADDING_SIZE_DEFAULT) GENLIST_PART_TEXT_LISTITEM1("elm.text", - "elm.padding.icon1.right", "elm.padding.icon2.left", - "elm.padding.top", "elm.padding.bottom") - GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon2.left", "elm.icon.2", GENLIST_PADDING_SIZE_DEFAULT) + "elm.padding.icon1.right", "elm.padding.icon2.left") + GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon2.left", "elm.icon.2", + GENLIST_PADDING_SIZE_DEFAULT) GENLIST_PART_ICON_R("elm.icon.2", "elm.padding.right", ) } programs { @@ -804,16 +789,15 @@ GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT ) GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT ) - GENLIST_PART_PADDING_TOP( 1 ) - GENLIST_PART_PADDING_BOTTOM( 1 ) GENLIST_PART_FLIP GENLIST_PART_ICON_L("elm.icon.1", "elm.padding.left", ) - GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon1.right", "elm.icon.1", GENLIST_PADDING_SIZE_DEFAULT) + GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon1.right", "elm.icon.1", + GENLIST_PADDING_SIZE_DEFAULT) GENLIST_PART_TEXT_LISTITEM1_TB("elm.text", - "elm.padding.icon1.right", "elm.padding.icon2.left", - "elm.padding.top", "elm.padding.bottom") - GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon2.left", "elm.icon.2", GENLIST_PADDING_SIZE_DEFAULT) + "elm.padding.icon1.right", "elm.padding.icon2.left") + GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon2.left", "elm.icon.2", + GENLIST_PADDING_SIZE_DEFAULT) GENLIST_PART_ICON_R("elm.icon.2", "elm.padding.right", ) } programs { @@ -878,23 +862,22 @@ GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT ) GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT ) - GENLIST_PART_PADDING_TOP( 1 ) - GENLIST_PART_PADDING_BOTTOM( 1 ) GENLIST_PART_FLIP GENLIST_PART_ICON_L("elm.icon.1", "elm.padding.left", min: GENLIST_ICON_CHECK_SIZE GENLIST_ICON_CHECK_SIZE; max: GENLIST_ICON_CHECK_SIZE GENLIST_ICON_CHECK_SIZE; ) - GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon1.right", "elm.icon.1", GENLIST_PADDING_SIZE_DEFAULT) + GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon1.right", "elm.icon.1", + GENLIST_PADDING_SIZE_DEFAULT) GENLIST_PART_ICON_L("elm.icon.2", "elm.padding.icon1.right", min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE; max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE; ) - GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon2.right", "elm.icon.2", GENLIST_PADDING_SIZE_DEFAULT) + GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon2.right", "elm.icon.2", + GENLIST_PADDING_SIZE_DEFAULT) GENLIST_PART_TEXT_LISTITEM1("elm.text", - "elm.padding.icon2.right", "elm.padding.right", - "elm.padding.top", "elm.padding.bottom") + "elm.padding.icon2.right", "elm.padding.right") } programs { GENLIST_PROGRAM_DISCLIP @@ -923,24 +906,24 @@ GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT ) GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT ) - GENLIST_PART_PADDING_TOP( 1 ) - GENLIST_PART_PADDING_BOTTOM( 1 ) GENLIST_PART_FLIP GENLIST_PART_ICON_L("elm.icon.1", "elm.padding.left", min: GENLIST_ICON_CHECK_SIZE GENLIST_ICON_CHECK_SIZE; max: GENLIST_ICON_CHECK_SIZE GENLIST_ICON_CHECK_SIZE; ) - GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon1.right", "elm.icon.1", GENLIST_PADDING_SIZE_DEFAULT) + GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon1.right", "elm.icon.1", + GENLIST_PADDING_SIZE_DEFAULT) GENLIST_PART_ICON_L("elm.icon.2", "elm.padding.icon1.right", min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE; max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE; ) - GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon2.right", "elm.icon.2", GENLIST_PADDING_SIZE_DEFAULT) + GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon2.right", "elm.icon.2", + GENLIST_PADDING_SIZE_DEFAULT) GENLIST_PART_TEXT_LISTITEM1("elm.text", - "elm.padding.icon2.right", "elm.padding.icon3.left", - "elm.padding.top", "elm.padding.bottom") - GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon3.left", "elm.icon.3", GENLIST_PADDING_SIZE_DEFAULT) + "elm.padding.icon2.right", "elm.padding.icon3.left") + GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon3.left", "elm.icon.3", + GENLIST_PADDING_SIZE_DEFAULT) GENLIST_PART_ICON_R("elm.icon.3", "elm.padding.right", ) } programs { @@ -968,24 +951,24 @@ GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT ) GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT ) - GENLIST_PART_PADDING_TOP( 1 ) - GENLIST_PART_PADDING_BOTTOM( 1 ) GENLIST_PART_FLIP GENLIST_PART_ICON_L("elm.icon.1", "elm.padding.left", min: GENLIST_ICON_CHECK_SIZE GENLIST_ICON_CHECK_SIZE; max: GENLIST_ICON_CHECK_SIZE GENLIST_ICON_CHECK_SIZE; ) - GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon1.right", "elm.icon.1", GENLIST_PADDING_SIZE_DEFAULT) + GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon1.right", "elm.icon.1", + GENLIST_PADDING_SIZE_DEFAULT) GENLIST_PART_TEXT_LISTITEM1("elm.text", - "elm.padding.icon1.right", "elm.padding.icon2.left", - "elm.padding.top", "elm.padding.bottom") - GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon2.left", "elm.icon.2", GENLIST_PADDING_SIZE_DEFAULT) + "elm.padding.icon1.right", "elm.padding.icon2.left") + GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon2.left", "elm.icon.2", + GENLIST_PADDING_SIZE_DEFAULT) GENLIST_PART_ICON_R("elm.icon.2", "elm.padding.icon3.left", min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE; max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE; ) - GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon3.left", "elm.icon.3", GENLIST_PADDING_SIZE_DEFAULT) + GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon3.left", "elm.icon.3", + GENLIST_PADDING_SIZE_DEFAULT) GENLIST_PART_ICON_R("elm.icon.3", "elm.padding.right", ) } programs { @@ -1013,25 +996,25 @@ GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT ) GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT ) - GENLIST_PART_PADDING_TOP( 1 ) - GENLIST_PART_PADDING_BOTTOM( 1 ) GENLIST_PART_FLIP GENLIST_PART_TEXT_CONVERTOR("elm.text.1", - "elm.padding.left", "elm.vertical_line.left", - "elm.padding.top", "elm.padding.bottom", align: 1 0.5; ) - GENLIST_PART_PADDING_RIGHT_TO("elm.vertical_line.left", "vertical_line", GENLIST_PADDING_SIZE_DEFAULT) + "elm.padding.left", "elm.vertical_line.left", align: 1 0.5; ) + GENLIST_PART_PADDING_RIGHT_TO("elm.vertical_line.left", "vertical_line", + GENLIST_PADDING_SIZE_DEFAULT) part { name: "vertical_line"; type: RECT; mouse_events: 0; - GENLIST_DESCRIPTION_RTB("elm.text.2.left", "elm.padding.top", "elm.padding.bottom", + GENLIST_DESCRIPTION_R("elm.text.2.left", min: 1 0; fixed: 1 0; color: GENLIST_PART_LIST_LINE_COLOR_INC; ) } - GENLIST_PART_PADDING_RIGHT_TO("elm.text.2.left", "elm.text.2", GENLIST_PADDING_SIZE_DEFAULT) - GENLIST_PART_TEXT_SUBITEM1_R_FIXED("elm.text.2", 222) + GENLIST_PART_PADDING_RIGHT_TO("elm.text.2.left", "elm.text.2", + GENLIST_PADDING_SIZE_DEFAULT) + GENLIST_PART_TEXT_SUBITEM1_FIXED("elm.text.2", + GENLIST_DESCRIPTION_R, "elm.padding.right", 222) } programs { GENLIST_PROGRAM_DISCLIP @@ -1058,25 +1041,25 @@ GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT ) GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT ) - GENLIST_PART_PADDING_TOP( 1 ) - GENLIST_PART_PADDING_BOTTOM( 1 ) GENLIST_PART_FLIP - GENLIST_PART_TEXT_SUBITEM1_L_FIXED("elm.text.2", 154) - GENLIST_PART_PADDING_LEFT_TO("elm.text.2.right", "elm.text.2", GENLIST_PADDING_SIZE_DEFAULT) + GENLIST_PART_TEXT_SUBITEM1_FIXED("elm.text.2", + GENLIST_DESCRIPTION_L, "elm.padding.left", 154) + GENLIST_PART_PADDING_LEFT_TO("elm.text.2.right", "elm.text.2", + GENLIST_PADDING_SIZE_DEFAULT) part { name: "vertical_line"; type: RECT; mouse_events: 0; - GENLIST_DESCRIPTION_LTB("elm.text.2.right", "elm.padding.top", "elm.padding.bottom", + GENLIST_DESCRIPTION_L("elm.text.2.right", min: 1 0; fixed: 1 0; color: GENLIST_PART_LIST_LINE_COLOR_INC; ) } - GENLIST_PART_PADDING_LEFT_TO("elm.vertical_line.right", "vertical_line", GENLIST_PADDING_SIZE_DEFAULT) + GENLIST_PART_PADDING_LEFT_TO("elm.vertical_line.right", "vertical_line", + GENLIST_PADDING_SIZE_DEFAULT) GENLIST_PART_TEXT_CONVERTOR("elm.text.1", - "elm.vertical_line.right", "elm.padding.right", - "elm.padding.top", "elm.padding.bottom", ) + "elm.vertical_line.right", "elm.padding.right",) } programs { GENLIST_PROGRAM_DISCLIP @@ -1093,11 +1076,10 @@ parts { GENLIST_PART_TEXT_LISTITEM1("elm.text", - "elm.padding.left", "elm.padding.divider.left", - "elm.padding.top", "elm.padding.bottom") + "elm.padding.left", "elm.padding.divider.left") GENLIST_PART_PADDING_RIGHT_TO("elm.padding.divider.left", "elm.divider", GENLIST_PADDING_SIZE_DEFAULT) part { name: "elm.divider"; - GENLIST_DESCRIPTION_RTB("elm.padding.icon.left", "elm.padding.top", "elm.padding.bottom", + GENLIST_DESCRIPTION_R("elm.padding.icon.left", min: 2 72; max: 2 72; fixed: 1 1; @@ -1119,11 +1101,10 @@ parts { GENLIST_PART_TEXT_LISTITEM1("elm.text", - "elm.padding.icon1.right", "elm.padding.divider.left", - "elm.padding.top", "elm.padding.bottom") + "elm.padding.icon1.right", "elm.padding.divider.left") GENLIST_PART_PADDING_RIGHT_TO("elm.padding.divider.left", "elm.divider", GENLIST_PADDING_SIZE_DEFAULT) part { name: "elm.divider"; - GENLIST_DESCRIPTION_RTB("elm.padding.icon2.left", "elm.padding.top", "elm.padding.bottom", + GENLIST_DESCRIPTION_R("elm.padding.icon2.left", min: 2 72; max: 2 72; fixed: 1 1; -- 2.7.4