From: Tae-Hwan Kim Date: Wed, 25 Jul 2012 14:30:08 +0000 (+0900) Subject: Add dialogue separator & dialogue end separator X-Git-Tag: submit/2.0alpha-wayland/20121130.000903~78 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e15d87891a4b0bbd4b0a0e0371f279de55c7da9d;p=profile%2Fivi%2Fefl-theme-tizen.git Add dialogue separator & dialogue end separator Change-Id: I06592ef10e12aebbd91e7b8ef675e0a84424d889 --- diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc index 9f9b682..5799304 100644 --- a/themes/inc/tizen-hd-inc.edc +++ b/themes/inc/tizen-hd-inc.edc @@ -111,6 +111,13 @@ #define GENGRID_PART_REORDER_BG_COLOR_INC 0 0 0 128 #define GENGRID_PART_TEXTBLOCK_STYLE_COLOR_INC "#F9F9F9" +#define GENLIST_ICON_SMALL_SIZE 32 + +#define GENLIST_DIALOGUE_SEPARATOR_DEFAULT_HEIGHT 40 + +//FIXME: Change from GENLIST_TREESIZE_DEFAULT to below macro +#define GENLIST_TREESIZE_DEFAULT 32 + #define GENLIST_HEIGHT_1_INC 1 #define GENLIST_HEIGHT_16_INC 16 #define GENLIST_HEIGHT_33_INC 33 @@ -186,7 +193,6 @@ #define GENLIST_SIZE_18_INC 18 #define GENLIST_SIZE_21_INC 21 #define GENLIST_SIZE_28_INC 28 -#define GENLIST_SIZE_ICON_SMALL 32 #define GENLIST_SIZE_35_INC 35 #define GENLIST_SIZE_38_INC 38 #define GENLIST_SIZE_40_INC 40 @@ -239,7 +245,6 @@ #define GENLIST_TREESIZE_16_INC 16 #define GENLIST_TREESIZE_20_INC 20 -#define GENLIST_TREESIZE_32_INC 32 //new #define GENLIST_PART_FONT_LIST_MAIN_TEXT_READ_COLOR_INC 158 158 158 255 diff --git a/themes/widgets/genlist/genlist_group_index.edc b/themes/widgets/genlist/genlist_group_index.edc index a7c514a..9ea7735 100644 --- a/themes/widgets/genlist/genlist_group_index.edc +++ b/themes/widgets/genlist/genlist_group_index.edc @@ -27,7 +27,7 @@ data.item: "stacking" "above"; data.item: "selectraise" "on"; data.item: "texts" "elm.text"; - data.item: "treesize" "GENLIST_TREESIZE_32_INC"; + data.item: "treesize" "GENLIST_TREESIZE_DEFAULT"; images { image: "00_index list_bg.png" COMP; @@ -106,7 +106,7 @@ data.item: "stacking" "above"; data.item: "selectraise" "on"; data.item: "texts" "elm.text"; - data.item: "treesize" "GENLIST_TREESIZE_32_INC"; + data.item: "treesize" "GENLIST_TREESIZE_DEFAULT"; parts { part { name: "base"; @@ -165,7 +165,7 @@ data.item: "stacking" "above"; data.item: "selectraise" "on"; data.item: "texts" "elm.text"; - data.item: "treesize" "GENLIST_TREESIZE_32_INC"; + data.item: "treesize" "GENLIST_TREESIZE_DEFAULT"; parts { part { name: "base"; @@ -226,7 +226,7 @@ data.item: "stacking" "above"; data.item: "selectraise" "on"; data.item: "texts" "elm.text"; - data.item: "treesize" "GENLIST_TREESIZE_32_INC"; + data.item: "treesize" "GENLIST_TREESIZE_DEFAULT"; parts { GENLIST_PART_DIALOGUE_BASE( GENLIST_HEIGHT_65_INC ) @@ -277,7 +277,7 @@ data.item: "stacking" "above"; data.item: "selectraise" "on"; - data.item: "treesize" "GENLIST_TREESIZE_32_INC"; + data.item: "treesize" "GENLIST_TREESIZE_DEFAULT"; parts { GENLIST_PART_DIALOGUE_BASE( GENLIST_HEIGHT_33_INC ) diff --git a/themes/widgets/genlist/genlist_normal.edc b/themes/widgets/genlist/genlist_normal.edc index d7214aa..054e91e 100644 --- a/themes/widgets/genlist/genlist_normal.edc +++ b/themes/widgets/genlist/genlist_normal.edc @@ -616,7 +616,7 @@ mouse_events: 0; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL 0; + min: GENLIST_ICON_SMALL_SIZE 0; fixed: 1 0; rel1.to_x: "elm.text.2"; rel2 { @@ -754,7 +754,7 @@ mouse_events: 0; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL 0; + min: GENLIST_ICON_SMALL_SIZE 0; fixed: 1 0; rel1.to_x: "elm.text.2"; rel2 { @@ -1317,8 +1317,8 @@ clip_to: "disclip"; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; + max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; rel1 { relative: 1.0 0.0; to_x: "elm.padding.text.right"; @@ -1658,7 +1658,7 @@ mouse_events: 0; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL 0; + min: GENLIST_ICON_SMALL_SIZE 0; fixed: 1 0; rel1.to_x: "elm.text.2"; rel2 { @@ -1826,7 +1826,7 @@ mouse_events: 0; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL 0; + min: GENLIST_ICON_SMALL_SIZE 0; fixed: 1 0; rel1.to_x: "elm.text.2"; rel2 { @@ -3884,7 +3884,7 @@ mouse_events: 0; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL 0; + min: GENLIST_ICON_SMALL_SIZE 0; fixed: 1 0; rel1.to_x: "elm.text.3"; rel2 { @@ -4638,7 +4638,7 @@ mouse_events: 0; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL 0; + min: GENLIST_ICON_SMALL_SIZE 0; fixed: 1 0; rel1.to_x: "elm.text.3"; rel2 { @@ -4654,8 +4654,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; + max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; fixed: 1 1; rel1 { relative: 0.0 1.0; @@ -4823,8 +4823,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + 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; @@ -4861,8 +4861,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; + max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; fixed: 1 1; rel1 { relative: 0.0 1.0; @@ -5653,8 +5653,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + 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; @@ -6054,7 +6054,7 @@ mouse_events: 0; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL 0; + min: GENLIST_ICON_SMALL_SIZE 0; fixed: 1 0; rel1.to_x: "elm.text.3"; rel2 { @@ -7763,8 +7763,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + 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; @@ -7801,8 +7801,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + 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; @@ -7839,8 +7839,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + 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; @@ -8212,8 +8212,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; + max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; fixed: 1 1; rel1 { relative: 0.0 1.0; @@ -9142,8 +9142,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; + max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; rel1 { relative: 0.0 1.0; to_x: "elm.padding.icon3.left"; @@ -9183,8 +9183,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; + max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; rel1 { relative: 0.0 1.0; to_x: "elm.padding.icon4.left"; @@ -9224,8 +9224,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; + max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; rel1 { relative: 0.0 1.0; to_x: "elm.text.3"; @@ -9491,8 +9491,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + 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; @@ -9867,8 +9867,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; + max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; fixed: 1 1; rel1 { relative: 0.0 1.0; @@ -10639,8 +10639,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + 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 0.0; @@ -10728,8 +10728,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + 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; @@ -12260,8 +12260,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + 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; @@ -12682,8 +12682,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + 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; @@ -12939,8 +12939,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + 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; @@ -13158,8 +13158,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + 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 0.0; @@ -13377,8 +13377,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + 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 0.0; @@ -13566,8 +13566,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; + max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; fixed: 1 1; rel1 { relative: 0.0 1.0; @@ -13876,8 +13876,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; + max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; fixed: 1 1; rel1 { relative: 0.0 1.0; @@ -13954,8 +13954,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + 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; @@ -14054,8 +14054,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; + max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; fixed: 1 1; rel1 { relative: 0.0 1.0; @@ -14185,8 +14185,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; + max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; fixed: 1 1; rel1 { relative: 0.0 1.0; @@ -15013,8 +15013,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + 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; @@ -15289,7 +15289,7 @@ data.item: "selectraise" "on"; data.item: "texts" "elm.text"; data.item: "contents" "elm.icon"; - data.item: "treesize" "GENLIST_TREESIZE_32_INC"; + data.item: "treesize" "GENLIST_TREESIZE_DEFAULT"; parts { GENLIST_PART_DIALOGUE_BASE( GENLIST_HEIGHT_77_INC ) @@ -15324,8 +15324,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; + max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; fixed: 1 1; align: 1.0 1.0; rel1 { @@ -15360,10 +15360,16 @@ } } - group { name : "elm/genlist/item/dialogue/seperator/default"; - alias: "elm/genlist/item_odd/dialogue/seperator/default"; - alias: "elm/genlist/item_compress/dialogue/seperator/default"; - alias: "elm/genlist/item_compress_odd/dialogue/seperator/default"; +// Dialogue Group Separators +// default separator +// FIXME: style (dialgoue) might be moved to last words (as-is default) +// FIXME: seperator --> separator typo +// FIXME: Check whether below separators are used now.. + group { name : "elm/genlist/item/dialogue/separator/default"; + alias: "elm/genlist/item_odd/dialogue/separator/default"; + alias: "elm/genlist/item_compress/dialogue/separator/default"; + alias: "elm/genlist/item_compress_odd/dialogue/separator/default"; + //FIXME: below name should be used?? alias: "elm/genlist/item/dialogue/separator/21/with_line/default"; alias: "elm/genlist/item_odd/dialogue/separator/21/with_line/default"; alias: "elm/genlist/item_compress/dialogue/separator/21/with_line/default"; @@ -15372,15 +15378,28 @@ data.item: "stacking" "above"; data.item: "selectraise" "on"; - data.item: "treesize" "GENLIST_TREESIZE_32_INC"; + data.item: "treesize" "GENLIST_TREESIZE_DEFAULT"; parts { - GENLIST_PART_DIALOGUE_BASE( GENLIST_HEIGHT_33_INC ) + GENLIST_PART_DIALOGUE_BASE(GENLIST_DIALOGUE_SEPARATOR_DEFAULT_HEIGHT + 1) GENLIST_PART_BOTTOM_LINE GENLIST_PART_DISCLIP } } + group { name : "elm/genlist/item/dialogue/separator/end/default"; + alias: "elm/genlist/item_odd/dialogue/separator/end/default"; + alias: "elm/genlist/item_compress/dialogue/separator/end/default"; + alias: "elm/genlist/item_compress_odd/dialogue/separator/end/default"; + data.item: "stacking" "above"; + data.item: "selectraise" "on"; + data.item: "treesize" "GENLIST_TREESIZE_DEFAULT"; + parts { + GENLIST_PART_DIALOGUE_BASE(GENLIST_DIALOGUE_SEPARATOR_DEFAULT_HEIGHT) + GENLIST_PART_DISCLIP + } + } + group { name : "elm/genlist/item/dialogue/seperator.2/default"; alias: "elm/genlist/item_odd/dialogue/seperator.2/default"; alias: "elm/genlist/item_compress/dialogue/seperator.2/default"; @@ -15393,7 +15412,7 @@ data.item: "stacking" "above"; data.item: "selectraise" "on"; - data.item: "treesize" "GENLIST_TREESIZE_32_INC"; + data.item: "treesize" "GENLIST_TREESIZE_DEFAULT"; parts { GENLIST_PART_DIALOGUE_BASE( GENLIST_PADDING_18_INC ) @@ -15414,7 +15433,7 @@ data.item: "stacking" "above"; data.item: "selectraise" "on"; - data.item: "treesize" "GENLIST_TREESIZE_32_INC"; + data.item: "treesize" "GENLIST_TREESIZE_DEFAULT"; parts { GENLIST_PART_DIALOGUE_BASE( GENLIST_PADDING_32_INC ) @@ -15434,7 +15453,7 @@ data.item: "stacking" "above"; data.item: "selectraise" "on"; - data.item: "treesize" "GENLIST_TREESIZE_32_INC"; + data.item: "treesize" "GENLIST_TREESIZE_DEFAULT"; parts { GENLIST_PART_DIALOGUE_BASE( GENLIST_HEIGHT_16_INC ) @@ -15454,7 +15473,7 @@ data.item: "stacking" "above"; data.item: "selectraise" "on"; - data.item: "treesize" "GENLIST_TREESIZE_32_INC"; + data.item: "treesize" "GENLIST_TREESIZE_DEFAULT"; parts { GENLIST_PART_DIALOGUE_BASE( GENLIST_HEIGHT_1_INC ) @@ -16037,7 +16056,7 @@ mouse_events: 0; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL 0; + min: GENLIST_ICON_SMALL_SIZE 0; fixed: 1 0; rel1.to_x: "elm.text.2"; rel2 { @@ -16635,7 +16654,7 @@ mouse_events: 0; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL 0; + min: GENLIST_ICON_SMALL_SIZE 0; fixed: 1 0; rel1.to_x: "elm.text.2"; rel2 { @@ -17183,7 +17202,7 @@ type: RECT; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL 0; + min: GENLIST_ICON_SMALL_SIZE 0; fixed: 1 0; rel1 { relative: 1.0 0.0; @@ -17243,7 +17262,7 @@ type: RECT; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL 0; + min: GENLIST_ICON_SMALL_SIZE 0; fixed: 1 0; rel1 { relative: 1.0 0.0; @@ -17303,7 +17322,7 @@ type: RECT; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL 0; + min: GENLIST_ICON_SMALL_SIZE 0; fixed: 1 0; rel1 { relative: 1.0 0.0; @@ -17583,7 +17602,7 @@ mouse_events: 0; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL 0; + min: GENLIST_ICON_SMALL_SIZE 0; fixed: 1 0; rel1.to_x: "elm.text.2"; rel2 { @@ -18125,8 +18144,8 @@ mouse_events: 0; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; + max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; fixed: 1 1; rel1.to_x: "elm.padding.right"; rel2 { @@ -18345,8 +18364,8 @@ } description { state: "contact_default_number_enabled" 0.0; inherit: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; + max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; visible: 1; } } @@ -20113,8 +20132,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; + max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; fixed: 1 1; rel1 { relative: 0.0 1.0; @@ -21077,7 +21096,7 @@ type: RECT; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL 0; + min: GENLIST_ICON_SMALL_SIZE 0; fixed: 1 0; rel1 { relative: 1.0 0.0; @@ -21131,7 +21150,7 @@ type: RECT; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL 0; + min: GENLIST_ICON_SMALL_SIZE 0; fixed: 1 0; rel1 { relative: 1.0 0.0; @@ -21185,7 +21204,7 @@ type: RECT; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL 0; + min: GENLIST_ICON_SMALL_SIZE 0; fixed: 1 0; rel1 { relative: 1.0 0.0; @@ -21302,8 +21321,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + 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; @@ -21340,8 +21359,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; + max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; fixed: 1 1; rel1 { relative: 0.0 1.0; @@ -21921,8 +21940,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + 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; @@ -22011,8 +22030,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + 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; @@ -22530,7 +22549,7 @@ mouse_events: 0; scale: 1; description { state: "default" 0.0; - min: 0 GENLIST_SIZE_ICON_SMALL; + min: 0 GENLIST_ICON_SMALL_SIZE; fixed: 0 1; align: 0 1; rel1 { @@ -26032,8 +26051,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; + max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; fixed: 1 1; rel1 { relative: 0.0 1.0; @@ -26074,8 +26093,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; + max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; fixed: 1 1; rel1 { relative: 0.0 1.0; @@ -26116,8 +26135,8 @@ type: SWALLOW; scale: 1; description { state: "default" 0.0; - min: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; - max: GENLIST_SIZE_ICON_SMALL GENLIST_SIZE_ICON_SMALL; + min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; + max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE; fixed: 1 1; rel1 { relative: 0.0 1.0; @@ -27304,7 +27323,7 @@ mouse_events: 0; scale: 1; description { state: "default" 0.0; - min: 0 GENLIST_SIZE_ICON_SMALL; + min: 0 GENLIST_ICON_SMALL_SIZE; fixed: 0 1; align: 0 1; rel1 { diff --git a/themes/widgets/genlist/genlist_sweep.edc b/themes/widgets/genlist/genlist_sweep.edc index 7b6e605..036b7ee 100644 --- a/themes/widgets/genlist/genlist_sweep.edc +++ b/themes/widgets/genlist/genlist_sweep.edc @@ -28,7 +28,7 @@ data.item: "selectraise" "on"; data.item: "contents" "elm.slide.swallow.1"; data.item: "mode_part" "elm.swallow.origin"; - data.item: "treesize" "GENLIST_TREESIZE_32_INC"; + data.item: "treesize" "GENLIST_TREESIZE_DEFAULT"; parts { part { name: "base"; @@ -196,7 +196,7 @@ data.item: "selectraise" "on"; data.item: "contents" "elm.slide.swallow.1 elm.slide.swallow.2"; data.item: "mode_part" "elm.swallow.origin"; - data.item: "treesize" "GENLIST_TREESIZE_32_INC"; + data.item: "treesize" "GENLIST_TREESIZE_DEFAULT"; parts { part { name: "base"; @@ -396,7 +396,7 @@ data.item: "selectraise" "on"; data.item: "contents" "elm.slide.swallow.1 elm.slide.swallow.2 elm.slide.swallow.3"; data.item: "mode_part" "elm.swallow.origin"; - data.item: "treesize" "GENLIST_TREESIZE_32_INC"; + data.item: "treesize" "GENLIST_TREESIZE_DEFAULT"; parts { part { name: "base"; @@ -632,7 +632,7 @@ data.item: "selectraise" "on"; data.item: "contents" "elm.slide.swallow.1 elm.slide.swallow.2 elm.slide.swallow.3 elm.slide.swallow.4"; data.item: "mode_part" "elm.swallow.origin"; - data.item: "treesize" "GENLIST_TREESIZE_32_INC"; + data.item: "treesize" "GENLIST_TREESIZE_DEFAULT"; parts { part { name: "base"; @@ -903,7 +903,7 @@ data.item: "texts" "elm.slide.text.1"; data.item: "contents" "elm.slide.swallow.1"; data.item: "mode_part" "elm.swallow.origin"; - data.item: "treesize" "GENLIST_TREESIZE_32_INC"; + data.item: "treesize" "GENLIST_TREESIZE_DEFAULT"; parts { part { name: "base"; @@ -1118,7 +1118,7 @@ data.item: "texts" "elm.slide.text.1"; data.item: "contents" "elm.slide.swallow.1 elm.slide.swallow.2"; data.item: "mode_part" "elm.swallow.origin"; - data.item: "treesize" "GENLIST_TREESIZE_32_INC"; + data.item: "treesize" "GENLIST_TREESIZE_DEFAULT"; parts { part { name: "base"; @@ -1365,7 +1365,7 @@ data.item: "texts" "elm.slide.text.1"; data.item: "contents" "elm.slide.swallow.1 elm.slide.swallow.2 elm.slide.swallow.3"; data.item: "mode_part" "elm.swallow.origin"; - data.item: "treesize" "GENLIST_TREESIZE_32_INC"; + data.item: "treesize" "GENLIST_TREESIZE_DEFAULT"; parts { part { name: "base"; @@ -1643,7 +1643,7 @@ data.item: "texts" "elm.slide.text.1"; data.item: "contents" "elm.slide.swallow.1 elm.slide.swallow.2 elm.slide.swallow.3 elm.slide.swallow.4"; data.item: "mode_part" "elm.swallow.origin"; - data.item: "treesize" "GENLIST_TREESIZE_32_INC"; + data.item: "treesize" "GENLIST_TREESIZE_DEFAULT"; parts { part { name: "base";