From: Tae-Hwan Kim Date: Mon, 1 Apr 2013 04:42:47 +0000 (+0900) Subject: [Genlist] Fix decoreate/reordmode for edit/reorder/flip mode with X-Git-Tag: 2.1b_release~54 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5b7e4483d0412e58fe159927c16c74e07d40ab44;p=platform%2Fcore%2Fuifw%2Fefl-theme-tizen.git [Genlist] Fix decoreate/reordmode for edit/reorder/flip mode with thumbnail styles Change-Id: Ic1123b742b04c52dd236fca8ccfb8790193a90ff --- diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc index 7e4af64..9a1f895 100644 --- a/themes/inc/tizen-hd-inc.edc +++ b/themes/inc/tizen-hd-inc.edc @@ -223,7 +223,6 @@ // List bg color #define GENLIST_LIST_BG_COLOR 248 246 239 255 -#define GENLIST_DIALOGUE_BG_COLOR 248 246 239 255 #define GENLIST_LIST_PRESS_COLOR 87 135 194 255 #define GENLIST_LIST_DIM_COLOR 219 217 212 255 #define GENLIST_LIST_LINE1_COLOR 211 209 203 255 diff --git a/themes/widgets/entry.edc b/themes/widgets/entry.edc index eb0faf5..ab48f7b 100644 --- a/themes/widgets/entry.edc +++ b/themes/widgets/entry.edc @@ -106,11 +106,13 @@ group { name: "elm/entry/base/default"; source4: "elm/entry/cursor/default"; // cursorover source5: "elm/entry/anchor/default"; // anchor under //source6: "X"; // anchor over + /* source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection + */ description { state: "default" 0.0; fixed: 1 0; text { @@ -247,11 +249,13 @@ group { name: "elm/entry/base-charwrap/default"; source4: "elm/entry/cursor/default"; // cursorover source5: "elm/entry/anchor/default"; // anchor under //source6: "X"; // anchor over + /* source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection + */ description { state: "default" 0.0; fixed: 1 0; text { @@ -342,11 +346,13 @@ group { name: "elm/entry/base-nowrap/default"; //source3: "X"; // cursor under source4: "elm/entry/cursor/default"; // cursorover source5: "elm/entry/anchor/default"; // anchor under + /* source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection + */ description { state: "default" 0.0; text { style: "entry_textblock_style"; @@ -488,11 +494,13 @@ group { name: "elm/entry/base/editfield"; source4: "elm/entry/cursor/default"; // cursorover source5: "elm/entry/anchor/default"; // anchor under //source6: "X"; // anchor over + /* source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection + */ description { state: "default" 0.0; fixed: 1 0; text { @@ -634,11 +642,13 @@ group { name: "elm/entry/base-charwrap/editfield"; source4: "elm/entry/cursor/default"; // cursorover source5: "elm/entry/anchor/default"; // anchor under //source6: "X"; // anchor over + /* source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection + */ description { state: "default" 0.0; fixed: 1 0; text { @@ -778,11 +788,13 @@ group { name: "elm/entry/base-single/editfield"; //source3: ; // cursor under source4: "elm/entry/cursor/default"; // cursorover source5: "elm/entry/anchor/default"; // anchor under + /* source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection + */ description { state: "default" 0.0; text { style: "editfield_single_textblock_style"; @@ -871,11 +883,13 @@ group { name: "elm/entry/base-single/editfield/searchbar/default"; //source3: "X"; // cursor under source4: "elm/entry/cursor/default"; // cursorover source5: "elm/entry/anchor/default"; // anchor under + /* source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection + */ description { state: "default" 0.0; text { style: "editfield_single_textblock_style"; @@ -1009,11 +1023,13 @@ group { name: "elm/entry/base-single/default"; //source3: "X"; // cursor under source4: "elm/entry/cursor/default"; // cursorover source5: "elm/entry/anchor/default"; // anchor under + /* source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection + */ description { state: "default" 0.0; text { style: "entry_single_textblock_style"; @@ -1102,11 +1118,13 @@ group { name: "elm/entry/base-single-noedit/default"; //source2: "X"; // selection over //source3: "X"; // cursor under source5: "elm/entry/anchor/default"; // anchor under + /* source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection + */ description { state: "default" 0.0; text { style: "entry_single_textblock_style"; @@ -1194,11 +1212,13 @@ group { name: "elm/entry/base-noedit/default"; //source2: "X"; // selection over //source3: "X"; // cursor under source5: "elm/entry/anchor/default"; // anchor under + /* source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection + */ description { state: "default" 0.0; fixed: 1 0; text { @@ -1287,11 +1307,13 @@ group { name: "elm/entry/base-noedit/default"; //source2: "X"; // selection over //source3: "X"; // cursor under source5: "elm/entry/anchor/default"; // anchor under + /* source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection + */ description { state: "default" 0.0; fixed: 1 0; text { @@ -1380,11 +1402,13 @@ group { name: "elm/entry/base-noedit/default"; //source2: "X"; // selection over //source3: "X"; // cursor under source5: "elm/entry/anchor/default"; // anchor under + /* source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection + */ description { state: "default" 0.0; text { style: "entry_textblock_style"; @@ -1473,11 +1497,13 @@ group { name: "elm/entry/base-noedit/default"; //source3: "X"; // cursor under source4: "elm/entry/cursor/default"; // cursorover source5: "elm/entry/anchor/default"; // anchor under + /* source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection + */ description { state: "default" 0.0; text { style: "entry_single_textblock_style"; @@ -1612,11 +1638,13 @@ group { name: "elm/entry/base-password/popup"; //source3: "X"; // cursor under source4: "elm/entry/cursor/default"; // cursorover source5: "elm/entry/anchor/default"; // anchor under + /* source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection + */ description { state: "default" 0.0; text { style: "entry_single_textblock_popup_style"; @@ -2681,7 +2709,7 @@ group { name: "elm/entry/base-password/popup"; /* Entry's bubble style */ styles { - style { + style { name: "entry_bubble_date_area_textblock_style"; base: "font=Tizen:style=Roman font_size="ENTRY_BUBBLE_DATE_AREA_TEXT_SIZE_INC" color="ENTRY_TEXT_COLOR_INC" left_margin=2 right_margin=2 wrap=mixed text_class=entry"; tag: "br" "\n"; @@ -2810,11 +2838,13 @@ styles { //source3: "X"; // cursor under source4: "elm/entry/cursor/default"; // cursorover source5: "elm/entry/anchor/default"; // anchor under + /* source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection + */ // source6: "X"; // anchor over description { state: "default" 0.0; fixed: 1 0; @@ -3106,11 +3136,13 @@ styles { //source2: "X"; // selection over //source3: "X"; // cursor under source5: "elm/entry/anchor/default"; // anchor under + /* source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection + */ description { state: "default" 0.0; fixed: 1 0; @@ -3484,11 +3516,13 @@ styles { //source2: "X"; // selection over //source3: "X"; // cursor under source5: "elm/entry/anchor/default"; // anchor under + /* source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection + */ description { state: "default" 0.0; fixed: 1 0; align: 0.0 0.0; @@ -3619,11 +3653,13 @@ styles { source4: "elm/entry/cursor/default"; // cursorover source5: "elm/entry/anchor/default"; // anchor under // source6: "X"; // anchor over + /* source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection + */ description { state: "default" 0.0; fixed: 1 0; align: 1.0 0.0; @@ -3912,11 +3948,13 @@ styles { //source2: "X"; // selection over //source3: "X"; // cursor under source5: "elm/entry/anchor/default"; // anchor under + /* source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection + */ description { state: "default" 0.0; fixed: 1 0; @@ -4307,11 +4345,13 @@ styles { //source2: "X"; // selection over //source3: "X"; // cursor under source5: "elm/entry/anchor/default"; // anchor under + /* source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection + */ description { state: "default" 0.0; fixed: 1 0; align: 1.0 0.0; @@ -4446,11 +4486,13 @@ group { name: "elm/entry/base/font_color_black"; source4: "elm/entry/cursor/default"; // cursorover source5: "elm/entry/anchor/default"; // anchor under //source6: "X"; // anchor over + /* source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection + */ description { state: "default" 0.0; fixed: 1 0; text { @@ -4541,11 +4583,13 @@ group { name: "elm/entry/base-noedit/font_color_black"; source4: "elm/entry/cursor/default"; // cursorover source5: "elm/entry/anchor/default"; // anchor under //source6: "X"; // anchor over + /* source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection + */ description { state: "default" 0.0; fixed: 1 0; text { @@ -4689,11 +4733,13 @@ group { name: "elm/entry/base-charwrap/font_color_black"; source4: "elm/entry/cursor/default"; // cursorover source5: "elm/entry/anchor/default"; // anchor under //source6: "X"; // anchor over + /* source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection + */ description { state: "default" 0.0; fixed: 1 0; text { @@ -4836,11 +4882,13 @@ group { name: "elm/entry/base-single/font_color_black"; //source3: "X"; // cursor under source4: "elm/entry/cursor/default"; // cursorover source5: "elm/entry/anchor/default"; // anchor under + /* source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection + */ description { state: "default" 0.0; text { style: "font_color_black_single_textblock_style"; @@ -4929,11 +4977,13 @@ group { name: "elm/entry/base-single-noedit/font_color_black"; //source3: "X"; // cursor under source4: "elm/entry/cursor/default"; // cursorover source5: "elm/entry/anchor/default"; // anchor under + /* source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection + */ description { state: "default" 0.0; text { style: "font_color_black_single_textblock_style"; @@ -5101,11 +5151,13 @@ group { name: "elm/entry/base-password/font_color_black"; //source3: "X"; // cursor under source4: "elm/entry/cursor/default"; // cursorover source5: "elm/entry/anchor/default"; // anchor under + /* source7: ENTRY_BLOCK_HANDLE_SOURCE7; // start selection handler source8: ENTRY_BLOCK_HANDLE_SOURCE8; // end selection handler source9: ENTRY_CURSOR_HANDLE_SOURCE9; // cursor handler source10: ENTRY_BLOCK_HANDLE_SOURCE10; // start edge selection source11: ENTRY_BLOCK_HANDLE_SOURCE11; // end edge selection + */ description { state: "default" 0.0; text { style: "font_color_black_single_textblock_style"; diff --git a/themes/widgets/genlist/genlist_decorate.edc b/themes/widgets/genlist/genlist_decorate.edc index 91b0d7b..37b5ed5 100644 --- a/themes/widgets/genlist/genlist_decorate.edc +++ b/themes/widgets/genlist/genlist_decorate.edc @@ -92,9 +92,12 @@ rel2.to: "base"; rel1.relative: 1 0; } + description { state: "reorder" 0.0; + inherit: "default" 0.0; + min: 32 0; + max: 32 -1; + } ) - GENLIST_PART_BOTTOM_LINE - GENLIST_PART_RECT("sound_left", description { state: "default" 0.0; color: 0 0 0 0; @@ -118,7 +121,7 @@ inherit: "default" 0.0; align: 0 0.5; } - description { state: "flip_enabled" 0.0; + description { state: "flipped" 0.0; inherit: "default" 0.0; rel1.relative: 0 0; rel2.relative: 0 1; @@ -131,6 +134,7 @@ min: 0 GENLIST_HEIGHT_1LINE; ) ) + GENLIST_PART_BOTTOM_LINE GENLIST_PART_ICON("elm.edit.icon.2", GENLIST_DESCRIPTION_R("elm.padding.right", align: 0 0.5; @@ -140,7 +144,7 @@ inherit: "default" 0.0; align: 1 0.5; } - description { state: "flip_enabled" 0.0; + description { state: "flipped" 0.0; inherit: "default" 0.0; rel1.relative: 1 0; rel2.relative: 1 1; @@ -171,8 +175,8 @@ GENLIST_PROGRAM_CHECK("elm.edit.icon.1") GENLIST_PROGRAM_REORDER( target: "bg_clip"; - target: "bottom_line_clip"; target: "bg_reorder_clip"; + target: "bottom_line_clip"; target: "elm.padding.left"; target: "elm.padding.right"; ) @@ -180,11 +184,34 @@ target: "elm.edit.icon.1"; target: "elm.edit.icon.2"; ) - GENLIST_PROGRAM_FLIP_TARGET( + GENLIST_PROGRAM_FLIP_EFFECT_TARGET( target: "elm.edit.icon.1"; - target: "elm.edit.icon.2";, - target: "bg_reorder_clip"; + target: "elm.edit.icon.2"; ) + program { name: "flip_enabled"; + signal: "elm,state,flip,enabled"; + source: "elm"; + script { + new st[31]; + new Float:vl; + get_state(PART:"bg_reorder_clip", st, 30, vl); + if (!strcmp(st, "reorder") || !strcmp(st, "reorder_flip")) { + set_state(PART:"bg_reorder_clip", "reorder_flip", 0.0); + } + } + } + program { name: "flip_disabled"; + signal: "elm,state,flip,disabled"; + source: "elm"; + script { + new st[31]; + new Float:vl; + get_state(PART:"bg_reorder_clip", st, 30, vl); + if (!strcmp(st, "reorder") || !strcmp(st, "reorder_flip")) { + set_state(PART:"bg_reorder_clip", "reorder", 0.0); + } + } + } } } @@ -324,7 +351,7 @@ inherit: "default" 0.0; visible: 0; } - description { state: "flip_enabled" 0.0; + description { state: "flipped" 0.0; inherit: "default" 0.0; rel1 { relative: 0.0 1.0; diff --git a/themes/widgets/genlist/genlist_expandable.edc b/themes/widgets/genlist/genlist_expandable.edc index e8de732..72c1082 100644 --- a/themes/widgets/genlist/genlist_expandable.edc +++ b/themes/widgets/genlist/genlist_expandable.edc @@ -310,7 +310,6 @@ programs { GENLIST_PROGRAM_DISABLED GENLIST_PROGRAM_SELECT_BOTTOMLINE( target: "elm.text"; ) - GENLIST_PROGRAM_EXPAND_FADE( target: "elm.text"; target: "elm.icon"; ) } } @@ -345,7 +344,6 @@ programs { GENLIST_PROGRAM_DISABLED GENLIST_PROGRAM_SELECT_BOTTOMLINE( target: "elm.text"; ) - GENLIST_PROGRAM_EXPAND_FADE( target: "elm.text"; target: "elm.icon"; target: "bottom_line"; target: "bottom_line2";) } } diff --git a/themes/widgets/genlist/genlist_groupindex.edc b/themes/widgets/genlist/genlist_groupindex.edc index 5aebfd3..895e483 100644 --- a/themes/widgets/genlist/genlist_groupindex.edc +++ b/themes/widgets/genlist/genlist_groupindex.edc @@ -27,9 +27,18 @@ #define GENLIST_PART_INDEX_BG \ - GENLIST_PART_BG(GENLIST_GROUPINDEX_LIST_BG_COLOR, \ - GENLIST_GROUPINDEX_LIST_PRESS_COLOR, \ - GENLIST_GROUPINDEX_LIST_BG_COLOR \ + GENLIST_PART_RECT("bg", \ + description { state: "default" 0.0; \ + color: GENLIST_GROUPINDEX_LIST_BG_COLOR; \ + } \ + description { state: "selected" 0.0; \ + inherit: "default" 0.0; \ + color: GENLIST_GROUPINDEX_LIST_PRESS_COLOR; \ + } \ + description { state: "disabled" 0.0; \ + inherit: "default" 0.0; \ + color: GENLIST_GROUPINDEX_LIST_BG_COLOR; \ + } \ ) // group index diff --git a/themes/widgets/genlist/genlist_macro.edc b/themes/widgets/genlist/genlist_macro.edc index 85fafa8..ca1f86d 100644 --- a/themes/widgets/genlist/genlist_macro.edc +++ b/themes/widgets/genlist/genlist_macro.edc @@ -405,12 +405,24 @@ image: "thumbnail/"SIZE_PREFIX"/00_list_circle_thumbnail_normal.png" COMP; \ image: "thumbnail/"SIZE_PREFIX"/00_list_circle_thumbnail_press.png" COMP; \ image: "thumbnail/"SIZE_PREFIX"/00_list_circle_thumbnail_dim.png" COMP; \ + image: "thumbnail/"SIZE_PREFIX"/00_dialogue_circle_thumbnail_normal.png" COMP; \ + image: "thumbnail/"SIZE_PREFIX"/00_dialogue_circle_thumbnail_press.png" COMP; \ + image: "thumbnail/"SIZE_PREFIX"/00_dialogue_circle_thumbnail_dim.png" COMP; \ } \ parts { \ + GENLIST_PART_RECT("elm.thumb.clip", \ + description { state: "default"; \ + } \ + description { state: "flipped"; \ + color: 0 0 0 0; \ + } \ + ) \ GENLIST_PART_IMAGE("elm.thumb", \ + clip_to: "elm.thumb.clip"; \ GENLIST_DESCRIPTION_ENVELOP(PARENT, \ image.normal: "thumbnail/"SIZE_PREFIX"/00_list_circle_thumbnail_normal.png"; \ min: MASK_SIZE MASK_SIZE; \ + max: MASK_SIZE MASK_SIZE; \ fixed:1 1; \ ) \ description { state: "selected" 0.0; \ @@ -421,7 +433,26 @@ inherit: "default" 0.0; \ image.normal: "thumbnail/"SIZE_PREFIX"/00_list_circle_thumbnail_dim.png"; \ } \ + description { state: "reorder" 0.0; \ + inherit: "default" 0.0; \ + image.normal: "thumbnail/"SIZE_PREFIX"/00_dialogue_circle_thumbnail_normal.png"; \ + } \ + description { state: "reorder_selected" 0.0; \ + inherit: "default" 0.0; \ + image.normal: "thumbnail/"SIZE_PREFIX"/00_dialogue_circle_thumbnail_press.png"; \ + } \ + description { state: "reorder_disabled" 0.0; \ + inherit: "default" 0.0; \ + image.normal: "thumbnail/"SIZE_PREFIX"/00_dialogue_circle_thumbnail_dim.png"; \ + } \ + description { state: "decorate" 0.0; \ + inherit: "default" 0.0; \ + } \ + description { state: "decorate_reorder" 0.0; \ + inherit: "reorder" 0.0; \ + } \ ) \ + GENLIST_PART_FLIP \ } #define GENLIST_INHERIT_THUMB_SQUARE(SIZE_PREFIX, MASK_SIZE, PARENT) \ @@ -429,9 +460,20 @@ image: "thumbnail/"SIZE_PREFIX"/00_list_square_thumbnail_normal.png" COMP; \ image: "thumbnail/"SIZE_PREFIX"/00_list_square_thumbnail_press.png" COMP; \ image: "thumbnail/"SIZE_PREFIX"/00_list_square_thumbnail_dim.png" COMP; \ + image: "thumbnail/"SIZE_PREFIX"/00_dialogue_square_thumbnail_normal.png" COMP; \ + image: "thumbnail/"SIZE_PREFIX"/00_dialogue_square_thumbnail_press.png" COMP; \ + image: "thumbnail/"SIZE_PREFIX"/00_dialogue_square_thumbnail_dim.png" COMP; \ } \ parts { \ + GENLIST_PART_RECT("elm.thumb.clip", \ + description { state: "default"; \ + } \ + description { state: "flipped"; \ + color: 0 0 0 0; \ + } \ + ) \ GENLIST_PART_IMAGE("elm.thumb", \ + clip_to: "elm.thumb.clip"; \ GENLIST_DESCRIPTION_ENVELOP(PARENT, \ image.normal: "thumbnail/"SIZE_PREFIX"/00_list_square_thumbnail_normal.png"; \ min: MASK_SIZE MASK_SIZE; \ @@ -446,7 +488,26 @@ inherit: "default" 0.0; \ image.normal: "thumbnail/"SIZE_PREFIX"/00_list_square_thumbnail_dim.png"; \ } \ + description { state: "reorder" 0.0; \ + inherit: "default" 0.0; \ + image.normal: "thumbnail/"SIZE_PREFIX"/00_dialogue_square_thumbnail_normal.png"; \ + } \ + description { state: "reorder_selected" 0.0; \ + inherit: "default" 0.0; \ + image.normal: "thumbnail/"SIZE_PREFIX"/00_dialogue_square_thumbnail_press.png"; \ + } \ + description { state: "reorder_disabled" 0.0; \ + inherit: "default" 0.0; \ + image.normal: "thumbnail/"SIZE_PREFIX"/00_dialogue_square_thumbnail_dim.png"; \ + } \ + description { state: "decorate" 0.0; \ + inherit: "default" 0.0; \ + } \ + description { state: "decorate_reorder" 0.0; \ + inherit: "reorder" 0.0; \ + } \ ) \ + GENLIST_PART_FLIP \ } @@ -457,7 +518,15 @@ image: "thumbnail/"SIZE_PREFIX"/00_dialogue_circle_thumbnail_dim.png" COMP; \ } \ parts { \ + GENLIST_PART_RECT("elm.thumb.clip", \ + description { state: "default"; \ + } \ + description { state: "flipped"; \ + color: 0 0 0 0; \ + } \ + ) \ GENLIST_PART_IMAGE("elm.thumb", \ + clip_to: "elm.thumb.clip"; \ GENLIST_DESCRIPTION_ENVELOP(PARENT, \ image.normal: "thumbnail/"SIZE_PREFIX"/00_dialogue_circle_thumbnail_normal.png"; \ min: MASK_SIZE MASK_SIZE; \ @@ -468,6 +537,20 @@ inherit: "default" 0.0; \ image.normal: "thumbnail/"SIZE_PREFIX"/00_dialogue_circle_thumbnail_press.png"; \ } \ + description { state: "reorder" 0.0; \ + inherit: "default" 0.0; \ + image.normal: "thumbnail/"SIZE_PREFIX"/00_dialogue_circle_thumbnail_normal.png"; \ + } \ + description { state: "reorder_selected" 0.0; \ + inherit: "default" 0.0; \ + image.normal: "thumbnail/"SIZE_PREFIX"/00_dialogue_circle_thumbnail_press.png"; \ + } \ + description { state: "decorate" 0.0; \ + inherit: "default" 0.0; \ + } \ + description { state: "decorate_reorder" 0.0; \ + inherit: "reorder" 0.0; \ + } \ ) \ } @@ -478,16 +561,39 @@ image: "thumbnail/"SIZE_PREFIX"/00_dialogue_square_thumbnail_dim.png" COMP; \ } \ parts { \ + GENLIST_PART_RECT("elm.thumb.clip", \ + description { state: "default"; \ + } \ + description { state: "flipped"; \ + color: 0 0 0 0; \ + } \ + ) \ GENLIST_PART_IMAGE("elm.thumb", \ + clip_to: "elm.thumb.clip"; \ GENLIST_DESCRIPTION_ENVELOP(PARENT, \ image.normal: "thumbnail/"SIZE_PREFIX"/00_dialogue_square_thumbnail_normal.png"; \ min: MASK_SIZE MASK_SIZE; \ + max: MASK_SIZE MASK_SIZE; \ fixed:1 1; \ ) \ description { state: "selected" 0.0; \ inherit: "default" 0.0; \ image.normal: "thumbnail/"SIZE_PREFIX"/00_dialogue_square_thumbnail_press.png"; \ } \ + description { state: "reorder" 0.0; \ + inherit: "default" 0.0; \ + image.normal: "thumbnail/"SIZE_PREFIX"/00_dialogue_square_thumbnail_normal.png"; \ + } \ + description { state: "reorder_selected" 0.0; \ + inherit: "default" 0.0; \ + image.normal: "thumbnail/"SIZE_PREFIX"/00_dialogue_square_thumbnail_press.png"; \ + } \ + description { state: "decorate" 0.0; \ + inherit: "default" 0.0; \ + } \ + description { state: "decorate_reorder" 0.0; \ + inherit: "reorder" 0.0; \ + } \ ) \ } @@ -535,9 +641,10 @@ //****************************************************************************// // ****************************** BG Image **********************************// //****************************************************************************// -#define GENLIST_PART_BG(DEFAULT_COLOR, SELECT_COLOR, DISABLE_COLOR) \ +#define GENLIST_PART_BG_NORMAL \ GENLIST_PART_RECT("bg_clip", \ description { state: "default" 0.0; \ + color: 255 255 255 255; \ } \ description { state: "decorate" 0.0; \ inherit: "default" 0.0; \ @@ -547,6 +654,10 @@ inherit: "default" 0.0; \ color: 0 0 0 0; \ } \ + description { state: "decorate_reorder" 0.0; \ + inherit: "default" 0.0; \ + color: 0 0 0 0; \ + } \ ) \ GENLIST_PART_RECT("bg", \ clip_to: "bg_clip"; \ @@ -555,101 +666,102 @@ } \ description { state: "selected" 0.0; \ inherit: "default" 0.0; \ - color: SELECT_COLOR; \ + color: GENLIST_LIST_PRESS_COLOR; \ } \ description { state: "disabled" 0.0; \ inherit: "default" 0.0; \ - color: DISABLE_COLOR; \ + color: GENLIST_LIST_DIM_COLOR; \ + } \ + ) \ + GENLIST_PART_RECT("bg_reorder_clip", \ + description { state: "default" 0.0; \ + color: 0 0 0 0; \ + } \ + description { state: "reorder" 0.0; \ + inherit: "default" 0.0; \ + color: 255 255 255 255; \ + } \ + description { state: "decorate_reorder" 0.0; \ + inherit: "default" 0.0; \ } \ description { state: "decorate" 0.0; \ inherit: "default" 0.0; \ + } \ + description { state: "reorder_flip" 0.0; \ + inherit: "default" 0.0; \ + } \ + ) \ + GENLIST_PART_SPACER("bg_reorder_left", \ + description { state: "default" 0.0; \ + min: 16 0; \ + max: 16 -1; \ + fixed: 1 0; \ + align: 0 0.5; \ + rel2.relative: 0 1; \ + } \ + ) \ + GENLIST_PART_SPACER("bg_reorder_right", \ + description { state: "default" 0.0; \ + min: 16 0; \ + max: 16 -1; \ + fixed: 1 0; \ + align: 1.0 0.5; \ + rel1.relative: 1 0; \ + } \ + ) \ + GENLIST_PART_IMAGE("bg_reorder", \ + clip_to: "bg_reorder_clip"; \ + GENLIST_DESCRIPTION_LR("bg_reorder_left", "bg_reorder_right", \ + image { \ + normal: "00_list_group_bg.png"; \ + border: 17 17 8 8; \ + border_scale: 1; \ + } \ + ) \ + description { state: "selected" 0.0; \ + inherit: "default"; \ + image { \ + normal: "00_list_group_bg_press.png"; \ + border: 17 17 8 8; \ + border_scale: 1; \ + } \ + } \ + description { state: "flipped" 0.0; \ + inherit: "default"; \ visible: 0; \ } \ - GENLIST_DESCRIPTION_FADE \ ) -#define GENLIST_PART_BG_NORMAL \ - GENLIST_PART_BG(GENLIST_LIST_BG_COLOR, \ - GENLIST_LIST_PRESS_COLOR, \ - GENLIST_LIST_DIM_COLOR \ - ) \ - GENLIST_PART_BG_REORDER - #define GENLIST_PART_BG_NORMAL_OFF \ - GENLIST_PART_BG_OFF \ - GENLIST_PART_BG_REORDER_OFF - -#define GENLIST_PART_BG_OFF \ - GENLIST_PART_RECT("bg", \ - mouse_events: 0; \ + GENLIST_PART_RECT("bg_clip", \ description { state: "default" 0.0; \ visible: 0; \ } \ - description { state: "selected" 0.0; \ - visible: 0; \ - } \ - description { state: "disabled" 0.0; \ - visible: 0; \ - } \ description { state: "decorate" 0.0; \ + inherit: "default" 0.0; \ visible: 0; \ } \ - ) - -#define GENLIST_PART_BG_REORDER \ - GENLIST_PART_RECT("bg_reorder_clip", \ - description { state: "default" 0.0; \ - color: 0 0 0 0; \ - } \ description { state: "reorder" 0.0; \ inherit: "default" 0.0; \ - color: 255 255 255 255; \ + visible: 0; \ } \ - description { state: "flip" 0.0; \ + description { state: "decorate_reorder" 0.0; \ inherit: "default" 0.0; \ - color: 0 0 0 0; \ - } \ - ) \ - GENLIST_PART_SPACER("bg_reorder_left", \ - description { state: "default" 0.0; \ - min: 16 0; \ - max: 16 -1; \ - fixed: 1 0; \ - align: 0 0.5; \ - rel2.relative: 0 1; \ + visible: 0; \ } \ ) \ - GENLIST_PART_SPACER("bg_reorder_right", \ + GENLIST_PART_RECT("bg", \ + mouse_events: 0; \ description { state: "default" 0.0; \ - min: 16 0; \ - max: 16 -1; \ - fixed: 1 0; \ - align: 1.0 0.5; \ - rel1.relative: 1 0; \ + visible: 0; \ } \ - ) \ - GENLIST_PART_IMAGE("bg_reorder", \ - clip_to: "bg_reorder_clip"; \ - mouse_events: 0; \ - GENLIST_DESCRIPTION_LR("bg_reorder_left", "bg_reorder_right", \ - image { \ - normal: "00_list_group_bg.png"; \ - border: 17 17 8 8; \ - border_scale: 1; \ - } \ - ) \ description { state: "selected" 0.0; \ - inherit: "default"; \ - image { \ - normal: "00_list_group_bg_press.png"; \ - border: 17 17 8 8; \ - border_scale: 1; \ - } \ + visible: 0; \ } \ - GENLIST_DESCRIPTION_FADE \ - ) - -#define GENLIST_PART_BG_REORDER_OFF \ + description { state: "disabled" 0.0; \ + visible: 0; \ + } \ + ) \ GENLIST_PART_IMAGE("bg_reorder", \ description {state: "default" 0.0;\ visible: 0;\ @@ -658,7 +770,7 @@ inherit: "default" 0.0; \ visible: 0; \ } \ - ) \ + ) #define GENLIST_PART_BG_DIALOGUE \ GENLIST_PART_RECT("bg_dialogue_clip", \ @@ -758,54 +870,64 @@ border_scale: 1; \ } \ } \ - GENLIST_DESCRIPTION_FADE \ ) //****************************************************************************// // ****************************** BASE ********************************// //****************************************************************************// -#define GENLIST_PART_BASE \ +#define GENLIST_PART_BASE_SIZE(HEIGHT) \ part { name: "base"; \ type: RECT; \ mouse_events: 0; \ scale: 1; \ description { state: "default" 0.0; \ - align: 0.5 0.5; \ color: 0 0 0 0; \ + min: 0 HEIGHT; \ } \ description { state: "disabled" 0.0; \ inherit: "default"; \ } \ } \ - GENLIST_PART_PERSPECTIVE_POINT - -#define GENLIST_PART_BASE_SIZE(HEIGHT) \ - part { name: "base"; \ + part { name: "state"; \ type: RECT; \ - repeat_events: 1; \ + mouse_events: 0; \ scale: 1; \ description { state: "default" 0.0; \ - align: 0.5 0.5; \ color: 0 0 0 0; \ - min: 0 HEIGHT; \ } \ - } \ - GENLIST_PART_PERSPECTIVE_POINT + description { state: "decorate" 0.0; \ + inherit: "default"; \ + } \ + description { state: "reorder" 0.0; \ + inherit: "default"; \ + } \ + description { state: "decorate_reorder" 0.0; \ + inherit: "default"; \ + } \ + } + +#define GENLIST_PART_BASE \ + GENLIST_PART_BASE_SIZE(0) //****************************************************************************// // ****************************** LINE ********************************// //****************************************************************************// #define GENLIST_PART_BOTTOM_LINE \ GENLIST_PART_RECT("bottom_line_clip", \ - mouse_events: 0; \ description { state: "default" 0.0; \ - visible: 1; \ + color: 255 255 255 255; \ } \ description { state: "decorate" 0.0; \ - visible: 0; \ + inherit: "default" 0.0; \ + color: 0 0 0 0; \ } \ description { state: "reorder" 0.0; \ - visible: 0; \ + inherit: "default" 0.0; \ + color: 0 0 0 0; \ + } \ + description { state: "decorate_reorder" 0.0; \ + inherit: "default" 0.0; \ + color: 0 0 0 0; \ } \ ) \ GENLIST_PART_RECT("bottom_line", \ @@ -830,11 +952,10 @@ inherit: "default" 0.0; \ color: GENLIST_LIST_DIM_COLOR; \ } \ - description { state: "decorate" 0.0; \ + description { state: "flipped" 0.0; \ inherit: "default" 0.0; \ visible: 0; \ } \ - GENLIST_DESCRIPTION_FADE \ ) \ GENLIST_PART_RECT("bottom_line2", \ mouse_events: 0; \ @@ -859,11 +980,10 @@ inherit: "default" 0.0; \ color: GENLIST_LIST_DIM_COLOR; \ } \ - description { state: "decorate" 0.0; \ + description { state: "flipped" 0.0; \ inherit: "default" 0.0; \ visible: 0; \ } \ - GENLIST_DESCRIPTION_FADE \ ) #define GENLIST_PART_BOTTOM_LINE_OFF \ @@ -930,7 +1050,6 @@ rel2.offset: 0 0; \ color: GENLIST_LIST_DIVIDER1_COLOR; \ ) \ - GENLIST_DESCRIPTION_FADE \ ) \ GENLIST_PART_RECT("elm.divider2", \ mouse_events: 0; \ @@ -942,7 +1061,6 @@ rel2.offset: 0 0; \ color: GENLIST_LIST_DIVIDER2_COLOR; \ ) \ - GENLIST_DESCRIPTION_FADE \ ) #define GENLIST_PART_DIVIDER_R(RIGHT) \ @@ -956,7 +1074,6 @@ rel1.offset: -1 0;\ color: GENLIST_LIST_DIVIDER1_COLOR; \ ) \ - GENLIST_DESCRIPTION_FADE \ ) \ GENLIST_PART_RECT("elm.divider2", \ mouse_events: 0; \ @@ -967,7 +1084,6 @@ rel1.offset: -1 0;\ color: GENLIST_LIST_DIVIDER2_COLOR; \ ) \ - GENLIST_DESCRIPTION_FADE \ ) #define GENLIST_PART_CENTER_LINE_LT(LEFT, TOP) \ @@ -995,7 +1111,6 @@ fixed: 0 1; \ color: GENLIST_LIST_DIVIDER1_COLOR; \ ) \ - GENLIST_DESCRIPTION_FADE \ ) \ GENLIST_PART_RECT("center_line2", \ GENLIST_DESCRIPTION_LRT("elm.padding.divider.left", "elm.padding.divider.right", "center_line", \ @@ -1004,7 +1119,6 @@ fixed: 0 1; \ color: GENLIST_LIST_DIVIDER2_COLOR; \ ) \ - GENLIST_DESCRIPTION_FADE \ ) #define GENLIST_PART_COLORBAR \ @@ -1035,7 +1149,6 @@ rel1.relative: 0 1; \ rel2.relative: 0 0; \ ) \ - GENLIST_DESCRIPTION_FADE \ ) //****************************************************************************// @@ -1082,6 +1195,13 @@ max: 0 0; \ } +#define GENLIST_DESCRIPTION_DECORATE_REORDER_PADDING \ + description { state: "decorate_reorder" 0.0; \ + inherit: "default" 0.0; \ + min: 0 0; \ + max: 0 0; \ + } + #define GENLIST_DESCRIPTION_REORDER_PADDING \ description { state: "reorder" 0.0; \ inherit: "default" 0.0; \ @@ -1099,6 +1219,7 @@ ) \ GENLIST_DESCRIPTION_DECORATE_PADDING \ GENLIST_DESCRIPTION_REORDER_PADDING \ + GENLIST_DESCRIPTION_DECORATE_REORDER_PADDING \ ) #define GENLIST_PART_PADDING_LEFT_SIZE( SIZE ) \ @@ -1111,6 +1232,7 @@ ) \ GENLIST_DESCRIPTION_DECORATE_PADDING \ GENLIST_DESCRIPTION_REORDER_PADDING \ + GENLIST_DESCRIPTION_DECORATE_REORDER_PADDING \ ) #define GENLIST_PART_EDITBTN \ @@ -1149,6 +1271,7 @@ } \ GENLIST_DESCRIPTION_DECORATE_PADDING \ GENLIST_DESCRIPTION_REORDER_PADDING \ + GENLIST_DESCRIPTION_DECORATE_REORDER_PADDING \ ) #define GENLIST_PART_PADDING_RIGHT_SIZE( SIZE ) \ @@ -1164,6 +1287,7 @@ } \ GENLIST_DESCRIPTION_DECORATE_PADDING \ GENLIST_DESCRIPTION_REORDER_PADDING \ + GENLIST_DESCRIPTION_DECORATE_REORDER_PADDING \ ) // FIXME: Use RECT instead of SPACER if this group is used on layout @@ -1177,6 +1301,7 @@ ) \ GENLIST_DESCRIPTION_DECORATE_PADDING \ GENLIST_DESCRIPTION_REORDER_PADDING \ + GENLIST_DESCRIPTION_DECORATE_REORDER_PADDING \ ) \ GENLIST_PART_SPACER("elm.padding.right.edit", \ description { state: "default" 0.0; \ @@ -1384,158 +1509,6 @@ } \ ) -#define GENLIST_PART_PERSPECTIVE_POINT \ - GENLIST_PART_RECT("point", \ - description { \ - state: "default" 0.0; \ - color: 0 0 0 0; \ - rel1 { relative: 0.0 0.0; } \ - rel2 { relative: 1.0 0.0; } \ - } \ - ) - -#define GENLIST_DESCRIPTION_ROTATE( param_x, param_y, param_z ) \ - description { state: "map_contracted" 0.0; \ - inherit: "default" 0.0; \ - map { \ - perspective: "point"; \ - on: 1; \ - smooth: 1; \ - perspective_on: 1; \ - backface_cull: 1; \ - rotation { \ - center: "point"; \ - x: param_x; \ - y: param_y; \ - z: param_z; \ - } \ - } \ - } \ - description { state: "map_expanded" 0.0; \ - inherit: "default" 0.0; \ - map { \ - perspective: "point"; \ - on: 1; \ - smooth: 1; \ - perspective_on: 1; \ - backface_cull: 1; \ - rotation { \ - center: "point"; \ - x: 0; \ - y: 0; \ - z: 0; \ - } \ - } \ - } \ - description { \ - state: "hide" 0.0; \ - inherit: "default" 0.0; \ - visible: 0; \ - } - -// Genlist expandable rotation -#define GENLIST_PROGRAM_ROTATE( TARGET ) \ - program { name: "map_expand_start"; \ - signal: "flip_item"; \ - action: STATE_SET "map_contracted" 0.0; \ - target: "bg"; \ - TARGET \ - after: "map_expanding"; \ - } \ - program { name: "map_expanding"; \ - action: STATE_SET "hide" 0.0; \ - transition: LINEAR 0.2; \ - target: "bg"; \ - TARGET \ - after: "map_expand_end"; \ - } \ - program { name: "map_expand_end"; \ - action: STATE_SET "default" 0.0; \ - target: "bg"; \ - TARGET \ - } \ - program { name: "map_contract_start"; \ - signal: "elm,state,contract_flip"; \ - action: STATE_SET "map_expanded" 0.0; \ - target: "bg"; \ - TARGET \ - after: "map_contracting"; \ - } \ - program { name: "map_contracting"; \ - action: STATE_SET "map_contracted" 0.0; \ - transition: LINEAR 0.3; \ - target: "bg"; \ - TARGET \ - after: "map_contract_end"; \ - } \ - program { name: "map_contract_end"; \ - action: STATE_SET "hide" 0.0; \ - target: "bg"; \ - TARGET \ - } - -// FIXME: swallow part cannot be fade out ??? -#define GENLIST_DESCRIPTION_FADE_ICON \ - description { state: "fadeout" 0.0; \ - inherit: "default" 0.0; \ - color: 0 0 0 10; \ - visible: 0; \ - } \ - description { state: "fadein" 0.0; \ - inherit: "default" 0.0; \ - } \ - -#define GENLIST_DESCRIPTION_FADE \ - description { state: "fadeout" 0.0; \ - inherit: "default" 0.0; \ - color: 255 255 255 10; \ - } \ - description { state: "fadein" 0.0; \ - inherit: "default" 0.0; \ - } \ - -#define GENLIST_PROGRAM_EXPAND_FADE( TARGET ) \ - program { name: "expand_start"; \ - signal: "flip_item"; \ - source: "elm"; \ - action: STATE_SET "fadeout" 0.0; \ - TARGET \ - after: "expand_end"; \ - } \ - program { name: "expand_end"; \ - transition: DECELERATE 0.3; \ - action: STATE_SET "default" 0.0; \ - TARGET \ - } \ - program { name: "contract_start"; \ - signal: "elm,state,contract_flip"; \ - source: "elm"; \ - action: STATE_SET "fadein" 0.0; \ - TARGET \ - after: "contract_end"; \ - } \ - program { name: "contract_end"; \ - transition: ACCELERATE 0.3; \ - action: STATE_SET "fadeout" 0.0; \ - TARGET \ - } - -// FIXME: This do need now. I should find why this is used in genlist -#if 0 - program { \ - name: "show"; \ - signal: "elm,state,show"; \ - action: STATE_SET "default" 0.0; \ - TARGET \ - } \ - program { \ - name: "hide"; \ - signal: "elm,state,hide"; \ - action: STATE_SET "hide" 0.0; \ - TARGET \ - } -#endif - #define GENLIST_PROGRAM_EXPAND_ROOT( TARGET ) \ program { \ name: "go_expanded"; \ @@ -1552,14 +1525,6 @@ TARGET \ } \ -#define GENLIST_PROGRAM_EXPANDABLE( SRC ) \ - program { \ - name: "expand"; \ - signal: "mouse,up,1"; \ - SRC \ - action: SIGNAL_EMIT "elm,action,expand,toggle" "elm"; \ - } \ - // 2.2.7 Genlist_Edit mode (Rename) // FIXME: padding is not needed when swallow content is NULL. // But how can edje know existence of swallow content? @@ -1567,11 +1532,10 @@ GENLIST_PART_RECT("elm.flip.bg", \ mouse_events: 0; \ description { state: "default" 0.0;\ - visible: 0; \ + color: 0 0 0 0;\ } \ - description { state: "flip_enabled" 0.0; \ + description { state: "flipped" 0.0; \ inherit: "default" 0.0; \ - visible: 1; \ color: GENLIST_LIST_BG_COLOR;\ }\ ) \ @@ -1599,7 +1563,7 @@ visible: 0; \ aspect: 1 1; \ ) \ - description { state: "flip_enabled" 0.0; \ + description { state: "flipped" 0.0; \ inherit: "default" 0.0; \ visible: 1; \ } \ @@ -1627,7 +1591,7 @@ align: 1 0.5; \ max: 154 74; \ ) \ - description { state: "flip_enabled" 0.0; \ + description { state: "flipped" 0.0; \ inherit: "default" 0.0; \ visible: 1; \ } \ @@ -1866,12 +1830,118 @@ TARGET \ } +#define GENLIST_PROGRAM_DECORATE_REORDER( NAME, TARGET ) \ + program { name: "reorder_enabled"NAME; \ + signal: "elm,state,reorder,mode_set"; \ + source: "elm"; \ + script { \ + new st[31]; \ + new Float:vl; \ + get_state(PART:"state", st, 30, vl); \ + if (!strcmp(st, "decorate") || !strcmp(st, "decorate_reorder")) { \ + run_program(PROGRAM:"decorate_reorder_set"NAME); \ + } else { \ + run_program(PROGRAM:"reorder_set"NAME); \ + } \ + } \ + } \ + program { name: "reorder_disabled"NAME; \ + signal: "elm,state,reorder,mode_unset"; \ + source: "elm"; \ + script { \ + new st[31]; \ + new Float:vl; \ + get_state(PART:"state", st, 30, vl); \ + if (!strcmp(st, "decorate") || !strcmp(st, "decorate_reorder")) { \ + run_program(PROGRAM:"decorate_set"NAME); \ + } else { \ + run_program(PROGRAM:"default_set"NAME); \ + } \ + } \ + } \ + program { name: "decorate_enabled_effect"NAME; \ + signal: "elm,state,decorate,enabled,effect";\ + source: "elm";\ + script { \ + new st[31]; \ + new Float:vl; \ + get_state(PART:"state", st, 30, vl); \ + if (!strcmp(st, "reorder") || !strcmp(st, "decorate_reorder")) { \ + run_program(PROGRAM:"decorate_reorder_set"NAME); \ + } else { \ + run_program(PROGRAM:"decorate_set"NAME); \ + } \ + } \ + }\ + program { name: "decorate_disabled_effect"NAME;\ + signal: "elm,state,decorate,disabled,effect";\ + source: "elm";\ + script { \ + new st[31]; \ + new Float:vl; \ + get_state(PART:"state", st, 30, vl); \ + if (!strcmp(st, "reorder") || !strcmp(st, "decorate_reorder")) { \ + run_program(PROGRAM:"reorder_set"NAME); \ + } else { \ + run_program(PROGRAM:"default_set"NAME); \ + } \ + } \ + }\ + program { name: "decorate_enabled"NAME;\ + signal: "elm,state,decorate,enabled";\ + source: "elm";\ + script { \ + new st[31]; \ + new Float:vl; \ + get_state(PART:"state", st, 30, vl); \ + if (!strcmp(st, "reorder") || !strcmp(st, "decorate_reorder")) { \ + run_program(PROGRAM:"decorate_reorder_set"NAME); \ + } else { \ + run_program(PROGRAM:"decorate_set"NAME); \ + } \ + } \ + }\ + program { name: "decorate_disabled"NAME;\ + signal: "elm,state,decorate,disabled";\ + source: "elm";\ + script { \ + new st[31]; \ + new Float:vl; \ + get_state(PART:"state", st, 30, vl); \ + if (!strcmp(st, "reorder") || !strcmp(st, "decorate_reorder")) { \ + run_program(PROGRAM:"reorder_set"NAME); \ + } else { \ + run_program(PROGRAM:"default_set"NAME); \ + } \ + } \ + } \ + program { name: "default_set"NAME; \ + action: STATE_SET "default" 0.0;\ + target: "state"; \ + TARGET \ + } \ + program { name: "decorate_set"NAME; \ + action: STATE_SET "decorate" 0.0;\ + target: "state"; \ + TARGET \ + } \ + program { name: "reorder_set"NAME; \ + action: STATE_SET "reorder" 0.0;\ + target: "state"; \ + TARGET \ + } \ + program { name: "decorate_reorder_set"NAME; \ + action: STATE_SET "decorate_reorder" 0.0;\ + target: "state"; \ + TARGET \ + } + #define GENLIST_PROGRAM_FLIP \ program { name: "flip_enabled"; \ signal: "elm,state,flip,enabled"; \ source: "elm"; \ transition: DECELERATE 0.5; \ - action: STATE_SET "flip_enabled" 0.0; \ + action: STATE_SET "flipped" 0.0; \ target: "elm.flip.content"; \ target: "elm.flip.icon"; \ } \ @@ -1886,7 +1956,7 @@ program { name: "flip_enabled_bg"; \ signal: "elm,state,flip,enabled"; \ source: "elm"; \ - action: STATE_SET "flip_enabled" 0.0; \ + action: STATE_SET "flipped" 0.0; \ target: "elm.flip.bg"; \ } \ program { name: "flip_disabled_bg"; \ @@ -1906,32 +1976,34 @@ target: "elm.flip.eraser"; \ } -#define GENLIST_PROGRAM_FLIP_TARGET( TARGET, BG ) \ - program { name: "flip_enabled"; \ +#define GENLIST_PROGRAM_FLIP_TARGET( TARGET ) \ + program { name: "flip_enabled_target"; \ signal: "elm,state,flip,enabled"; \ source: "elm"; \ - action: STATE_SET "flip_enabled" 0.0; \ - transition: DECELERATE 0.5; \ - TARGET; \ + action: STATE_SET "flipped" 0.0; \ + TARGET \ } \ - program { name: "flip_disabled"; \ + program { name: "flip_disabled_target"; \ signal: "elm,state,flip,disabled"; \ source: "elm"; \ action: STATE_SET "default" 0.0; \ - transition: DECELERATE 0.5; \ TARGET \ - } \ - program { name: "flip_enabled_noeffect"; \ + } + +#define GENLIST_PROGRAM_FLIP_EFFECT_TARGET( TARGET ) \ + program { name: "flip_enabled_effect"; \ signal: "elm,state,flip,enabled"; \ source: "elm"; \ - action: STATE_SET "flip_enabled" 0.0; \ - BG; \ + transition: DECELERATE 0.5; \ + action: STATE_SET "flipped" 0.0; \ + TARGET \ } \ - program { name: "flip_disabled_noeffect"; \ + program { name: "flip_disabled_effect"; \ signal: "elm,state,flip,disabled"; \ source: "elm"; \ + transition: DECELERATE 0.5; \ action: STATE_SET "default" 0.0; \ - BG; \ + TARGET \ } #define GENLIST_PROGRAM_EDITMODE \ @@ -1952,14 +2024,17 @@ target: "bg_dialogue_right"; \ } +/***************************************************************************/ +/***************************************************************************/ + #define GENLIST_PROGRAMS_NORMAL( TARGET ) \ programs { \ GENLIST_PROGRAM_DEFAULT( TARGET \ - target: "bg_clip"; \ - target: "bottom_line_clip"; \ target: "bg"; \ + target: "bg_clip"; \ target: "bottom_line"; \ target: "bottom_line2"; \ + target: "bottom_line_clip"; \ target: "bg_reorder"; \ target: "elm.padding.left"; \ target: "elm.padding.right"; \ @@ -1976,22 +2051,11 @@ target: "bottom_line2"; \ target: "bg_reorder"; \ ) \ - GENLIST_PROGRAM_SOUND("bg") \ - GENLIST_PROGRAM_EXPAND_FADE( TARGET \ - target: "bg"; \ - target: "bottom_line"; \ - target: "bottom_line2"; \ - target: "bg_reorder"; \ - ) \ - GENLIST_PROGRAM_REORDER( \ + GENLIST_PROGRAM_SOUND( "bg" ) \ + GENLIST_PROGRAM_SOUND( "bg_reorder" ) \ + GENLIST_PROGRAM_DECORATE_REORDER("normal", TARGET \ target: "bg_clip"; \ - target: "bottom_line_clip"; \ - target: "elm.padding.left"; \ - target: "elm.padding.right"; \ target: "bg_reorder_clip"; \ - ) \ - GENLIST_PROGRAM_DECORATE( \ - target: "bg_clip"; \ target: "bottom_line_clip"; \ target: "elm.padding.left"; \ target: "elm.padding.right"; \ @@ -2005,8 +2069,8 @@ #define GENLIST_PROGRAMS_DIALOGUE( TARGET ) \ programs { \ GENLIST_PROGRAM_DEFAULT( TARGET \ - target: "bg_dialogue_clip"; \ target: "bg_dialogue"; \ + target: "bg_dialogue_clip"; \ target: "elm.padding.left"; \ target: "elm.padding.right"; \ ) \ @@ -2019,11 +2083,7 @@ target: "bg_dialogue_clip"; \ } \ GENLIST_PROGRAM_SOUND("bg_dialogue") \ - GENLIST_PROGRAM_EXPAND_FADE( TARGET \ - target: "bg_dialogue"; \ - ) \ - GENLIST_PROGRAM_DECORATE( TARGET \ - target: "bg_dialogue_clip"; \ + GENLIST_PROGRAM_DECORATE_REORDER( "normal", TARGET \ target: "elm.padding.left"; \ target: "elm.padding.right"; \ ) \ @@ -2034,46 +2094,31 @@ #define GENLIST_PROGRAMS_READ_TEXT( TARGET ) \ programs { \ GENLIST_PROGRAM_DEFAULT( TARGET \ - target: "bg_clip"; \ - target: "bottom_line_clip"; \ target: "bg"; \ + target: "bg_clip"; \ target: "bottom_line"; \ target: "bottom_line2"; \ + target: "bottom_line_clip"; \ target: "bg_reorder"; \ target: "elm.padding.left"; \ target: "elm.padding.right"; \ ) \ - GENLIST_PROGRAM_DISABLED( \ + GENLIST_PROGRAM_DISABLED( TARGET \ target: "bg"; \ target: "bottom_line"; \ target: "bottom_line2"; \ target: "bg_reorder"; \ - TARGET \ ) \ - GENLIST_PROGRAM_SELECT( \ + GENLIST_PROGRAM_SELECT( TARGET \ target: "bg"; \ target: "bottom_line"; \ target: "bottom_line2"; \ target: "bg_reorder"; \ - TARGET \ ) \ GENLIST_PROGRAM_SOUND("bg") \ - GENLIST_PROGRAM_EXPAND_FADE( \ - target: "bg"; \ - target: "bottom_line"; \ - target: "bottom_line2"; \ - target: "bg_reorder"; \ - TARGET \ - ) \ - GENLIST_PROGRAM_REORDER( \ + GENLIST_PROGRAM_DECORATE_REORDER( "normal", \ target: "bg_clip"; \ - target: "bottom_line_clip"; \ - target: "elm.padding.left"; \ - target: "elm.padding.right"; \ target: "bg_reorder_clip"; \ - ) \ - GENLIST_PROGRAM_DECORATE( \ - target: "bg_clip"; \ target: "bottom_line_clip"; \ target: "elm.padding.left"; \ target: "elm.padding.right"; \ @@ -2119,27 +2164,27 @@ } #define GENLIST_PROGRAMS_DECORATE_EFFECT( TARGET ) \ - program { name: "decorate_enabled_effect"; \ + program { name: "decorate_enabled_effect_ef"; \ signal: "elm,state,decorate,enabled,effect";\ source: "elm";\ transition: DECELERATE 0.5;\ action: STATE_SET "decorate" 0.0;\ TARGET \ }\ - program { name: "decorate_disabled_effect";\ + program { name: "decorate_disabled_effect_ef";\ signal: "elm,state,decorate,disabled,effect";\ source: "elm";\ transition: ACCELERATE 0.5;\ action: STATE_SET "default" 0.0;\ TARGET \ } \ - program { name: "decorate_enabled";\ + program { name: "decorate_enabled_ef";\ signal: "elm,state,decorate,enabled";\ source: "elm";\ action: STATE_SET "decorate" 0.0;\ TARGET \ }\ - program { name: "decorate_disabled";\ + program { name: "decorate_disabled_ef";\ signal: "elm,state,decorate,disabled";\ source: "elm";\ action: STATE_SET "default" 0.0;\ @@ -2168,6 +2213,50 @@ target: "elm.image.rename"; \ } +#define GENLIST_PROGRAMS_THUMB \ + GENLIST_PROGRAM_DECORATE_REORDER( "thumb", target: "elm.thumb"; ) \ + GENLIST_PROGRAM_FLIP_TARGET( target: "elm.thumb.clip"; ) \ + program { name: "enabled_thumb"; \ + signal: "elm,state,enabled"; \ + source: "elm"; \ + action: STATE_SET "default" 0.0; \ + target: "base"; \ + target: "elm.thumb"; \ + } \ + program { name: "disabled_thumb"; \ + signal: "elm,state,disabled"; \ + source: "elm"; \ + action: STATE_SET "disabled" 0.0; \ + target: "base"; \ + target: "elm.thumb"; \ + } \ + program { name: "selected_thumb"; \ + signal: "elm,state,selected"; \ + source: "elm"; \ + script { \ + new st[31]; \ + new Float:vl; \ + get_state(PART:"elm.thumb", st, 30, vl); \ + if (!strcmp(st, "reorder") || !strcmp(st, "decorate_reorder")) \ + set_state(PART:"elm.thumb", "reorder_selected", 0.0); \ + else \ + set_state(PART:"elm.thumb", "selected", 0.0); \ + } \ + } \ + program { name: "unselected_thumb"; \ + signal: "elm,state,unselected"; \ + source: "elm"; \ + script { \ + new st[31]; \ + new Float:vl; \ + get_state(PART:"elm.thumb", st, 30, vl); \ + if (!strcmp(st, "reorder_selected")) \ + set_state(PART:"elm.thumb", "reorder", 0.0); \ + else \ + set_state(PART:"elm.thumb", "default", 0.0); \ + } \ + } + //****************************************************************************// // ******************************* Icon Part ******************************// //***************************************************************************// @@ -2176,7 +2265,6 @@ scale: 1; \ type: SWALLOW; \ DESCRIPION \ - GENLIST_DESCRIPTION_FADE_ICON \ } #define GENLIST_PARAM_ICON_BIG \ @@ -2323,7 +2411,6 @@ scale: 1; \ type: IMAGE; \ DESCRIPION \ - GENLIST_DESCRIPTION_FADE \ } #define GENLIST_PARAM_PASSWORD_IMAGE \ @@ -2346,7 +2433,6 @@ GENLIST_PART_ICON("touch_arrow", \ ignore_flags: ON_HOLD; \ GENLIST_DESCRIPTION_ENVELOP("arrow", ) \ - GENLIST_DESCRIPTION_FADE \ ) \ GENLIST_PART_RECT("arrow_clip", \ GENLIST_DESCRIPTION_ENVELOP("arrow", \ @@ -2384,7 +2470,6 @@ inherit: "expand_opened" 0.0; \ image.normal: "00_button_expand_opened_press.png"; \ } \ - GENLIST_DESCRIPTION_FADE \ ) /*****************************************************************************/ /******************************* Genlist RECT ********************************/ @@ -2402,7 +2487,6 @@ scale: 1; \ type: RECT; \ DESCRIPION \ - GENLIST_DESCRIPTION_FADE \ } /*****************************************************************************/ @@ -2414,7 +2498,6 @@ mouse_events: 0; \ type: TEXT; \ DESCRIPION \ - GENLIST_DESCRIPTION_FADE \ } #define GENLIST_PART_TEXTBLOCK(NAME, DESCRIPION) \ @@ -2423,7 +2506,6 @@ mouse_events: 0; \ type: TEXTBLOCK; \ DESCRIPION \ - GENLIST_DESCRIPTION_FADE \ } /*************************** parameters **********************************/ @@ -3017,7 +3099,6 @@ max: -1 38; \ fixed: 0 1; \ ) \ - GENLIST_DESCRIPTION_FADE \ ) \ GENLIST_PART_TEXT(NAME, \ GENLIST_DESCRIPTION_RTB(RIGHT, TOP, BOTTOM, \ @@ -3112,10 +3193,10 @@ } #define GENLIST_PROGRAM_FLIP_1TEXT \ - program { name: "flip_enabled"; \ + program { name: "flipped"; \ signal: "elm,state,flip,enabled"; \ source: "elm"; \ - action: STATE_SET "flip_enabled" 0.0; \ + action: STATE_SET "flipped" 0.0; \ target: "elm.text"; \ target: "elm.flip.content"; \ } \ @@ -3128,10 +3209,10 @@ } #define GENLIST_PROGRAM_FLIP_2TEXT \ - program { name: "flip_enabled"; \ + program { name: "flipped"; \ signal: "elm,state,flip,enabled"; \ source: "elm"; \ - action: STATE_SET "flip_enabled" 0.0; \ + action: STATE_SET "flipped" 0.0; \ target: "elm.text.1"; \ target: "elm.text.2"; \ target: "elm.flip.content"; \ @@ -3146,10 +3227,10 @@ } #define GENLIST_PROGRAM_FLIP_2TEXT_1ICON \ - program { name: "flip_enabled"; \ + program { name: "flipped"; \ signal: "elm,state,flip,enabled"; \ source: "elm"; \ - action: STATE_SET "flip_enabled" 0.0; \ + action: STATE_SET "flipped" 0.0; \ target: "elm.text.1"; \ target: "elm.text.2"; \ target: "elm.icon"; \ @@ -3166,10 +3247,10 @@ } #define GENLIST_PROGRAM_FLIP_2TEXT_2ICON \ - program { name: "flip_enabled"; \ + program { name: "flipped"; \ signal: "elm,state,flip,enabled"; \ source: "elm"; \ - action: STATE_SET "flip_enabled" 0.0; \ + action: STATE_SET "flipped" 0.0; \ target: "elm.text.1"; \ target: "elm.text.2"; \ target: "elm.icon.1"; \ @@ -3188,10 +3269,10 @@ } #define GENLIST_PROGRAM_FLIP_3TEXT_2ICON \ - program { name: "flip_enabled"; \ + program { name: "flipped"; \ signal: "elm,state,flip,enabled"; \ source: "elm"; \ - action: STATE_SET "flip_enabled" 0.0; \ + action: STATE_SET "flipped" 0.0; \ target: "elm.text.1"; \ target: "elm.text.2"; \ target: "elm.text.3"; \ @@ -3219,7 +3300,7 @@ } #define GENLIST_DESCRIPTION_FLIP_ENABLED \ - description { state: "flip_enabled" 0.0; \ + description { state: "flipped" 0.0; \ inherit: "default" 0.0; \ visible: 0; \ } @@ -3230,7 +3311,7 @@ new Float:vl; \ get_state(PART:"elm.text", st, 30, vl); \ set_state(PART:"bg", "selected", 0.0); \ - if (!strcmp(st, "flip_enabled")) \ + if (!strcmp(st, "flipped")) \ set_state(PART:"elm.text", "selected", 1.0); \ else \ set_state(PART:"elm.text", "selected", 0.0); \ diff --git a/themes/widgets/genlist/genlist_normal.edc b/themes/widgets/genlist/genlist_normal.edc index 5de6f29..eb77a75 100644 --- a/themes/widgets/genlist/genlist_normal.edc +++ b/themes/widgets/genlist/genlist_normal.edc @@ -271,8 +271,8 @@ data.item: "texts" "elm.text"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -314,8 +314,8 @@ GENLIST_PROLOG_NORMAL data.item: "texts" "elm.text.1 elm.text.2"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -358,8 +358,8 @@ data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -396,7 +396,6 @@ } } - // 2.2.1.7 group { GENLIST_NAME("1text.1icon.7/default") inherit: "elm/genlist/item/1text.1icon/default"; @@ -420,7 +419,8 @@ inherit: "elm/genlist/item/1text.1icon.5/default"; GENLIST_INHERIT_THUMB_CIRCLE_LARGE("elm.icon") - GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon"; target: "elm.thumb"; ) + GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon"; ) + GENLIST_PROGRAMS_THUMB } // 2.2.1.8.1 (Square) @@ -428,7 +428,8 @@ inherit: "elm/genlist/item/1text.1icon.5/default"; GENLIST_INHERIT_THUMB_SQUARE_LARGE("elm.icon") - GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon"; target: "elm.thumb"; ) + GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon"; ) + GENLIST_PROGRAMS_THUMB } // 2.2.1.9 @@ -438,8 +439,8 @@ data.item: "contents" "elm.icon.1 elm.icon.2"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -472,8 +473,8 @@ data.item: "contents" "elm.icon.1 elm.icon.2"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -523,8 +524,8 @@ data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -545,7 +546,8 @@ inherit: "elm/genlist/item/1text.1icon.2/default"; GENLIST_INHERIT_THUMB_CIRCLE_MEDIUM("elm.icon") - GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon"; target: "elm.thumb"; ) + GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon"; ) + GENLIST_PROGRAMS_THUMB } // 2.2.1.10.1 (square) @@ -553,7 +555,8 @@ inherit: "elm/genlist/item/1text.1icon.2/default"; GENLIST_INHERIT_THUMB_SQUARE_MEDIUM("elm.icon") - GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon"; target: "elm.thumb"; ) + GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon"; ) + GENLIST_PROGRAMS_THUMB } // 2.2.1.10 (textblock) @@ -563,8 +566,8 @@ data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -586,8 +589,8 @@ data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -624,8 +627,8 @@ data.item: "contents" "elm.icon.1 elm.icon.2"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -649,8 +652,8 @@ data.item: "contents" "elm.icon.1 elm.icon.2"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -747,8 +750,8 @@ data.item: "contents" "elm.icon.1 elm.icon.2"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -774,8 +777,8 @@ data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -825,8 +828,8 @@ data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -853,8 +856,8 @@ data.item: "texts" "elm.text.1 elm.text.2"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -882,8 +885,8 @@ data.item: "texts" "elm.text.1 elm.text.2"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -909,8 +912,8 @@ data.item: "texts" "elm.text.1 elm.text.2"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -966,8 +969,8 @@ data.item: "texts" "elm.text.1 elm.text.2"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -991,8 +994,8 @@ data.item: "texts" "elm.text.1 elm.text.2"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -1017,8 +1020,8 @@ data.item: "texts" "elm.text.1 elm.text.2"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -1043,8 +1046,8 @@ data.item: "texts" "elm.text.1 elm.text.2 elm.text.3"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -1071,8 +1074,8 @@ data.item: "texts" "elm.text.1 elm.text.2 elm.text.3"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -1101,8 +1104,8 @@ data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -1129,8 +1132,8 @@ data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -1167,8 +1170,8 @@ data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -1196,8 +1199,8 @@ data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4 elm.icon.5"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -1237,8 +1240,8 @@ data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -1274,8 +1277,8 @@ data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -1312,8 +1315,8 @@ data.item: "contents" "elm.icon.1 elm.icon.2"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -1378,8 +1381,8 @@ data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -1421,8 +1424,8 @@ data.item: "contents" "elm.icon.1 elm.icon.2"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -1464,8 +1467,8 @@ data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -1493,8 +1496,8 @@ data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -1520,7 +1523,8 @@ GENLIST_INHERIT_THUMB_CIRCLE_MEDIUM("elm.icon") GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; - target: "elm.icon"; target: "elm.thumb"; ) + target: "elm.icon"; ) + GENLIST_PROGRAMS_THUMB } // 2.2.2.14.1 (square) @@ -1529,7 +1533,8 @@ GENLIST_INHERIT_THUMB_SQUARE_MEDIUM("elm.icon") GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; - target: "elm.icon"; target: "elm.thumb"; ) + target: "elm.icon"; ) + GENLIST_PROGRAMS_THUMB } // 2.2.2.14 (textblock) @@ -1539,8 +1544,8 @@ data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -1567,8 +1572,8 @@ data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -1611,8 +1616,8 @@ data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4 elm.icon.5 elm.icon.6"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -1654,8 +1659,8 @@ data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4 elm.icon.5 elm.icon.6"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -1697,8 +1702,8 @@ data.item: "contents" "elm.icon.1 elm.icon.2"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -1729,8 +1734,8 @@ data.item: "contents" "elm.icon.1 elm.icon.2"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -1760,8 +1765,8 @@ data.item: "contents" "elm.icon.1 elm.icon.2"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -1792,8 +1797,8 @@ data.item: "contents" "elm.icon.1 elm.icon.2"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -1825,8 +1830,8 @@ data.item: "contents" "elm.icon.1 elm.icon.2"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -1856,8 +1861,8 @@ data.item: "contents" "elm.icon.1 elm.icon.2"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -1893,8 +1898,8 @@ data.item: "contents" "elm.icon.1 elm.swallow.progress "; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -1936,8 +1941,8 @@ data.item: "contents" "elm.icon.1 elm.icon.2 elm.swallow.progress"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -1993,8 +1998,8 @@ data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -2024,8 +2029,8 @@ data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -2077,7 +2082,8 @@ GENLIST_INHERIT_THUMB_CIRCLE_LARGE("elm.icon") GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; - target: "elm.icon"; target: "elm.thumb"; ) + target: "elm.icon"; ) + GENLIST_PROGRAMS_THUMB } // 2.2.2.31.1 (square) @@ -2086,7 +2092,8 @@ GENLIST_INHERIT_THUMB_SQUARE_LARGE("elm.icon") GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; - target: "elm.icon"; target: "elm.thumb"; ) + target: "elm.icon"; ) + GENLIST_PROGRAMS_THUMB } // 2.2.2.32 @@ -2125,8 +2132,8 @@ data.item: "contents" "elm.icon.1 elm.icon.2"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -2156,8 +2163,8 @@ data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -2193,8 +2200,8 @@ image: "00_list_bubble_bg.png" COMP; } parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -2235,8 +2242,8 @@ } parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -2276,8 +2283,8 @@ data.item: "contents" "elm.icon.1 "; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -2312,8 +2319,8 @@ data.item: "contents" "elm.icon.1"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -2351,8 +2358,8 @@ image: "00_list_bubble_bg.png" COMP; } parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -2399,8 +2406,8 @@ data.item: "contents" "elm.icon.1"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -2430,8 +2437,8 @@ data.item: "contents" "elm.icon.1"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -2465,8 +2472,8 @@ data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -2507,8 +2514,8 @@ image: "00_list_bubble_bg.png" COMP; } parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_TOP_2LINE GENLIST_PART_PADDING_BOTTOM_2LINE @@ -2548,8 +2555,8 @@ data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -2578,8 +2585,8 @@ data.item: "contents" "elm.icon.1 elm.icon.2"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -2617,8 +2624,8 @@ data.item: "texts" "elm.title elm.text.1 elm.text.2"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -2667,8 +2674,8 @@ data.item: "texts" "elm.title elm.text"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -2709,8 +2716,8 @@ data.item: "texts" "elm.text.1 elm.text.2"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -2751,8 +2758,8 @@ data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4 elm.icon.5"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -2797,8 +2804,8 @@ data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -2859,7 +2866,6 @@ data.item: "selectraise" "on"; parts { - GENLIST_PART_BG(0 0 0 0, 0 0 0 0, 0 0 0 0) GENLIST_PART_BASE GENLIST_PART_SPACER("separator", description { state: "default" 0.0; @@ -2879,7 +2885,6 @@ data.item: "selectraise" "on"; parts { - GENLIST_PART_BG(0 0 0 0, 0 0 0 0, 0 0 0 0) GENLIST_PART_BASE GENLIST_PART_SPACER("separator", description { state: "default" 0.0; @@ -2955,7 +2960,8 @@ inherit: "elm/genlist/item/dialogue/1text.1icon.2/default"; GENLIST_INHERIT_THUMB_CIRCLE_MEDIUM_DIALOGUE("elm.icon") - GENLIST_PROGRAMS_DIALOGUE( target: "elm.text"; target: "elm.icon"; target: "elm.thumb"; ) + GENLIST_PROGRAMS_DIALOGUE( target: "elm.text"; target: "elm.icon"; ) + GENLIST_PROGRAMS_THUMB } // 2.4.1.3.1 (square) @@ -2963,7 +2969,8 @@ inherit: "elm/genlist/item/dialogue/1text.1icon.2/default"; GENLIST_INHERIT_THUMB_SQUARE_MEDIUM_DIALOGUE("elm.icon") - GENLIST_PROGRAMS_DIALOGUE( target: "elm.text"; target: "elm.icon"; target: "elm.thumb"; ) + GENLIST_PROGRAMS_DIALOGUE( target: "elm.text"; target: "elm.icon"; ) + GENLIST_PROGRAMS_THUMB } // 2.4.1.3 (TEXTBLOCK) @@ -3745,8 +3752,8 @@ data.item: "texts" "elm.text"; data.item: "contents" "elm.icon"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_LEFT_SIZE( DIALOGUE_PADDING_SIZE_LEFT ) GENLIST_PART_PADDING_TOP_SIZE( 0 ) GENLIST_PART_PADDING_BOTTOM_SIZE( 0 ) @@ -3783,8 +3790,8 @@ data.item: "texts" "elm.text"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_PADDING_LEFT_SIZE(38) GENLIST_PART_PADDING_RIGHT_SIZE(38) GENLIST_PART_PADDING_TOP_SIZE(0) @@ -3974,7 +3981,8 @@ GENLIST_INHERIT_THUMB_CIRCLE_THUMB_DIALOGUE("elm.icon.1") GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4"; target: "elm.text.5"; target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; target: "elm.icon.4"; target: "elm.icon.5"; target: "elm.icon.6"; - target: "elm.thumb"; ) + ) + GENLIST_PROGRAMS_THUMB } // 2.4.4.4.1 (Square) @@ -3984,7 +3992,8 @@ GENLIST_INHERIT_THUMB_SQUARE_THUMB_DIALOGUE("elm.icon.1") GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4"; target: "elm.text.5"; target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; target: "elm.icon.4"; target: "elm.icon.5"; target: "elm.icon.6"; - target: "elm.thumb"; ) + ) + GENLIST_PROGRAMS_THUMB } #if 0 @@ -4992,7 +5001,7 @@ rel1.to: "elm.title"; rel2.to: "elm.title"; } - description { state: "flip_enabled" 0.0; + description { state: "flipped" 0.0; inherit: "default" 0.0; visible: 1; } @@ -5071,7 +5080,7 @@ } visible: 0; } - description { state: "flip_enabled" 0.0; + description { state: "flipped" 0.0; inherit: "default" 0.0; visible: 1; } @@ -5112,7 +5121,7 @@ program { name: "flip_enabled"; signal: "elm,state,flip,enabled"; source: "elm"; - action: STATE_SET "flip_enabled" 0.0; + action: STATE_SET "flipped" 0.0; target: "elm.title"; target: "elm.text"; target: "elm.flip.content.title"; @@ -5281,7 +5290,7 @@ } visible: 0; } - description { state: "flip_enabled" 0.0; + description { state: "flipped" 0.0; inherit: "default" 0.0; visible: 1; } @@ -5375,7 +5384,7 @@ rel1.to: "elm.title"; rel2.to: "elm.title"; } - description { state: "flip_enabled" 0.0; + description { state: "flipped" 0.0; inherit: "default" 0.0; visible: 1; } @@ -5503,7 +5512,7 @@ } visible: 0; } - description { state: "flip_enabled" 0.0; + description { state: "flipped" 0.0; inherit: "default" 0.0; visible: 1; } @@ -5544,7 +5553,7 @@ program { name: "flip_enabled"; signal: "elm,state,flip,enabled"; source: "elm"; - action: STATE_SET "flip_enabled" 0.0; + action: STATE_SET "flipped" 0.0; target: "elm.title"; target: "elm.text"; target: "elm.flip.content.title"; @@ -8652,7 +8661,7 @@ rel1.to: "elm.title"; rel2.to: "elm.title"; } - description { state: "flip_enabled" 0.0; + description { state: "flipped" 0.0; inherit: "default" 0.0; visible: 1; } @@ -8708,7 +8717,7 @@ rel1.to: "elm.text.1"; rel2.to: "elm.text.1"; } - description { state: "flip_enabled" 0.0; + description { state: "flipped" 0.0; inherit: "default" 0.0; visible: 1; } @@ -8748,7 +8757,7 @@ rel1.to: "elm.text.2"; rel2.to: "elm.text.2"; } - description { state: "flip_enabled" 0.0; + description { state: "flipped" 0.0; inherit: "default" 0.0; visible: 1; } @@ -8788,7 +8797,7 @@ rel1.to: "elm.text.3"; rel2.to: "elm.text.3"; } - description { state: "flip_enabled" 0.0; + description { state: "flipped" 0.0; inherit: "default" 0.0; visible: 1; } @@ -8828,7 +8837,7 @@ rel1.to: "elm.text.4"; rel2.to: "elm.text.4"; } - description { state: "flip_enabled" 0.0; + description { state: "flipped" 0.0; inherit: "default" 0.0; visible: 1; } @@ -8868,7 +8877,7 @@ rel1.to: "elm.text.5"; rel2.to: "elm.text.5"; } - description { state: "flip_enabled" 0.0; + description { state: "flipped" 0.0; inherit: "default" 0.0; visible: 1; } @@ -8909,7 +8918,7 @@ program { name: "flip_enabled"; signal: "elm,state,flip,enabled"; source: "elm"; - action: STATE_SET "flip_enabled" 0.0; + action: STATE_SET "flipped" 0.0; target: "elm.title"; target: "elm.text.1"; target: "elm.text.2"; @@ -9086,7 +9095,7 @@ } visible: 0; } - description { state: "flip_enabled" 0.0; + description { state: "flipped" 0.0; inherit: "default" 0.0; visible: 1; } @@ -9124,10 +9133,10 @@ action: STATE_SET "default" 0.0; target: "disclip"; } - program { name: "flip_enabled"; + program { name: "flipped"; signal: "elm,state,flip,enabled"; source: "elm"; - action: STATE_SET "flip_enabled" 0.0; + action: STATE_SET "flipped" 0.0; target: "elm.text"; target: "elm.flip.content"; } @@ -9391,7 +9400,7 @@ rel1.to: "elm.text.1"; rel2.to: "elm.text.1"; } - description { state: "flip_enabled" 0.0; + description { state: "flipped" 0.0; inherit: "default" 0.0; visible: 1; } @@ -9451,7 +9460,7 @@ rel1.to: "elm.text.2"; rel2.to: "elm.text.2"; } - description { state: "flip_enabled" 0.0; + description { state: "flipped" 0.0; inherit: "default" 0.0; visible: 1; } @@ -9513,7 +9522,7 @@ program { name: "flip_enabled"; signal: "elm,state,flip,enabled"; source: "elm"; - action: STATE_SET "flip_enabled" 0.0; + action: STATE_SET "flipped" 0.0; target: "elm.text.1"; target: "elm.text.2"; target: "elm.flip.content.1"; @@ -9773,7 +9782,7 @@ rel1.to: "elm.text.1"; rel2.to: "elm.text.1"; } - description { state: "flip_enabled" 0.0; + description { state: "flipped" 0.0; inherit: "default" 0.0; visible: 1; } @@ -9831,7 +9840,7 @@ rel1.to: "elm.text.2"; rel2.to: "elm.text.2"; } - description { state: "flip_enabled" 0.0; + description { state: "flipped" 0.0; inherit: "default" 0.0; visible: 1; } @@ -9893,7 +9902,7 @@ program { name: "flip_enabled"; signal: "elm,state,flip,enabled"; source: "elm"; - action: STATE_SET "flip_enabled" 0.0; + action: STATE_SET "flipped" 0.0; target: "elm.text.1"; target: "elm.text.2"; target: "elm.flip.content.1"; @@ -10178,8 +10187,8 @@ data.item: "flips" "elm.flip.icon elm.flip.content"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT_EDIT @@ -11210,7 +11219,7 @@ program { name: "flip_enabled"; signal: "elm,state,flip,enabled"; source: "elm"; - action: STATE_SET "flip_enabled" 0.0; + action: STATE_SET "flipped" 0.0; target: "elm.text.1"; target: "elm.icon.1"; target: "elm.icon.2"; @@ -11586,7 +11595,7 @@ program { name: "flip_enabled"; signal: "elm,state,flip,enabled"; source: "elm"; - action: STATE_SET "flip_enabled" 0.0; + action: STATE_SET "flipped" 0.0; target: "elm.text.1"; target: "elm.icon.1"; target: "elm.swallow.progress"; @@ -11862,7 +11871,7 @@ program { name: "flip_enabled"; signal: "elm,state,flip,enabled"; source: "elm"; - action: STATE_SET "flip_enabled" 0.0; + action: STATE_SET "flipped" 0.0; target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; @@ -12706,8 +12715,8 @@ data.item: "contents" "elm.swallow.colorbar elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4 elm.icon.5"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -12769,8 +12778,8 @@ data.item: "contents" "elm.swallow.colorbar elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -12828,8 +12837,8 @@ data.item: "contents" "elm.swallow.colorbar elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT @@ -12886,8 +12895,8 @@ data.item: "contents" "elm.swallow.colorbar elm.icon.1 elm.icon.2 elm.icon.3"; parts { - GENLIST_PART_BG_NORMAL GENLIST_PART_BASE + GENLIST_PART_BG_NORMAL GENLIST_PART_BOTTOM_LINE GENLIST_PART_PADDING_LEFT GENLIST_PART_PADDING_RIGHT