From fecfcd3ab5e6361e9a59172ec48d04c9dd10a67f Mon Sep 17 00:00:00 2001 From: Tae-Hwan Kim Date: Wed, 5 Jun 2013 17:27:21 +0900 Subject: [PATCH] [Genlist] Fix focus frame for dialogue / reorder, etc. Change-Id: Ifadc19f2eaa3a2accf3d90212e42f2d8c78a947e --- themes/widgets/genlist/genlist_decorate.edc | 4 + themes/widgets/genlist/genlist_email.edc | 8 +- themes/widgets/genlist/genlist_groupindex.edc | 4 + themes/widgets/genlist/genlist_macro.edc | 80 +++++++++++--- themes/widgets/genlist/genlist_normal.edc | 148 +++++++++++++------------- 5 files changed, 155 insertions(+), 89 deletions(-) diff --git a/themes/widgets/genlist/genlist_decorate.edc b/themes/widgets/genlist/genlist_decorate.edc index 506a6d3..b696af8 100644 --- a/themes/widgets/genlist/genlist_decorate.edc +++ b/themes/widgets/genlist/genlist_decorate.edc @@ -47,11 +47,13 @@ GENLIST_PART_LISTITEM_("elm.text", 80, "elm.padding.icon.right", "elm.padding.right", "elm.padding.top", "elm.padding.bottom", ) + GENLIST_PART_FOCUS } programs { GENLIST_PROGRAM_SOUND("elm.text") GENLIST_PROGRAM_DISABLED( target: "elm.icon"; target: "elm.text"; ) GENLIST_PROGRAM_SOUND("bg") + GENLIST_PROGRAM_FOCUS } } @@ -134,6 +136,7 @@ align: 0 0.5; } ) + GENLIST_PART_FOCUS_NORMAL } programs { GENLIST_PROGRAM_DISABLED( @@ -190,5 +193,6 @@ } } } + GENLIST_PROGRAM_FOCUS_NORMAL } } diff --git a/themes/widgets/genlist/genlist_email.edc b/themes/widgets/genlist/genlist_email.edc index 24ea72d..ab4a46f 100755 --- a/themes/widgets/genlist/genlist_email.edc +++ b/themes/widgets/genlist/genlist_email.edc @@ -287,7 +287,7 @@ target: "bottom_line2"; \ target: "bg_reorder"; \ ) \ - GENLIST_PROGRAM_FOCUS \ + GENLIST_PROGRAM_FOCUS_NORMAL \ GENLIST_PROGRAM_SELECT( TARGET \ target: "bg"; \ target: "bottom_line"; \ @@ -575,7 +575,7 @@ ) DESCRIPTION_EMAIL_CONTENTS_OTHERS ) - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_EMAIL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; @@ -739,7 +739,7 @@ fixed: 1 1; ) ) - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_EMAIL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4"; @@ -985,7 +985,7 @@ GENLIST_DESCRIPTION_ENVELOP("elm.check", ) ) - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_EMAIL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; diff --git a/themes/widgets/genlist/genlist_groupindex.edc b/themes/widgets/genlist/genlist_groupindex.edc index 6f8cc1a..5d1d38d 100644 --- a/themes/widgets/genlist/genlist_groupindex.edc +++ b/themes/widgets/genlist/genlist_groupindex.edc @@ -216,6 +216,7 @@ */ GENLIST_PART_PADDING_GROUPINDEX_LEFT GENLIST_PART_PADDING_GROUPINDEX_RIGHT + GENLIST_PART_FOCUS } program { name: "default"; signal: "elm,state,default"; @@ -271,6 +272,7 @@ } } } + GENLIST_PROGRAM_FOCUS } } @@ -314,9 +316,11 @@ GENLIST_DESCRIPTION_INDEX_LIST ) GENLIST_PART_INDEX_LINE("elm.padding.icon.right", "elm.padding.right", "elm.text", "elm.padding.bottom") + GENLIST_PART_FOCUS } programs { GENLIST_PROGRAM_DISABLED( target: "elm.text"; target: "index_line"; ) GENLIST_PROGRAM_SELECT( target: "elm.text"; target: "index_line"; target: "bg"; ) + GENLIST_PROGRAM_FOCUS } } diff --git a/themes/widgets/genlist/genlist_macro.edc b/themes/widgets/genlist/genlist_macro.edc index 83c996e..42db8e7 100755 --- a/themes/widgets/genlist/genlist_macro.edc +++ b/themes/widgets/genlist/genlist_macro.edc @@ -419,6 +419,7 @@ } \ ) \ GENLIST_PART_IMAGE("elm.thumb", \ + insert_before: "focus_part"; \ clip_to: "elm.thumb.clip"; \ mouse_events: 0; \ GENLIST_DESCRIPTION_ENVELOP(PARENT, \ @@ -446,7 +447,6 @@ inherit: "reorder" 0.0; \ } \ ) \ - GENLIST_PART_FLIP \ } #define GENLIST_INHERIT_THUMB_SQUARE(SIZE_PREFIX, MASK_SIZE, PARENT) \ @@ -465,6 +465,7 @@ } \ ) \ GENLIST_PART_IMAGE("elm.thumb", \ + insert_before: "focus_part"; \ clip_to: "elm.thumb.clip"; \ mouse_events: 0; \ GENLIST_DESCRIPTION_ENVELOP(PARENT, \ @@ -492,7 +493,6 @@ inherit: "reorder" 0.0; \ } \ ) \ - GENLIST_PART_FLIP \ } @@ -511,6 +511,7 @@ } \ ) \ GENLIST_PART_IMAGE("elm.thumb", \ + insert_before: "focus_part_dialogue"; \ clip_to: "elm.thumb.clip"; \ mouse_events: 0; \ GENLIST_DESCRIPTION_ENVELOP(PARENT, \ @@ -555,6 +556,7 @@ } \ ) \ GENLIST_PART_IMAGE("elm.thumb", \ + insert_before: "focus_part_dialogue"; \ clip_to: "elm.thumb.clip"; \ mouse_events: 0; \ GENLIST_DESCRIPTION_ENVELOP(PARENT, \ @@ -918,23 +920,53 @@ visible: 0; \ image { \ normal: "00_focus.png"; \ - border: 7 7 7 7; \ + border: 6 6 6 6; \ + border_scale: 1; \ } \ } \ description { state: "focused" 0.0; \ inherit: "default" 0.0; \ visible: 1; \ } \ + ) \ + GENLIST_PART_ICON("elm.icon.focus", \ + repeat_events: 1; \ + GENLIST_DESCRIPTION_ENVELOP("focus_part", \ + fixed: 1 1; \ + ) \ + ) + +#define GENLIST_PART_FOCUS_REORDER \ + GENLIST_PART_IMAGE("focus_part_reorder", \ + mouse_events: 0; \ + GENLIST_DESCRIPTION_LR("bg_reorder_left", "bg_reorder_right", \ + visible: 0; \ + image { \ + normal: "00_focus.png"; \ + border: 6 6 6 6; \ + border_scale: 1; \ + } \ + ) \ + description { state: "focused" 0.0; \ + inherit: "default" 0.0; \ + visible: 1; \ + } \ ) +#define GENLIST_PART_FOCUS_NORMAL \ + GENLIST_PART_FOCUS \ + GENLIST_PART_FOCUS_REORDER + + #define GENLIST_PART_FOCUS_DIALOGUE \ - GENLIST_PART_IMAGE("focus_part", \ + GENLIST_PART_IMAGE("focus_part_dialogue", \ mouse_events: 0; \ GENLIST_DESCRIPTION_LR("bg_dialogue_left", "bg_dialogue_right", \ visible: 0; \ image { \ normal: "00_focus.png"; \ - border: 7 7 7 7; \ + border: 6 6 6 6; \ + border_scale: 1; \ } \ ) \ description { state: "focused" 0.0; \ @@ -968,7 +1000,7 @@ ) \ GENLIST_PART_ICON("elm.icon.focus", \ repeat_events: 1; \ - GENLIST_DESCRIPTION_ENVELOP("focus_part", \ + GENLIST_DESCRIPTION_ENVELOP("focus_part_dialogue", \ fixed: 1 1; \ ) \ ) @@ -1746,6 +1778,28 @@ target: "focus_part"; \ } +#define GENLIST_PROGRAM_FOCUS_NORMAL \ + program { name: "focused"; \ + signal: "elm,state,focused"; \ + source: "elm"; \ + script { \ + new st[31]; \ + new Float:vl; \ + get_state(PART:"bg_reorder_clip", st, 30, vl); \ + if (!strcmp(st, "reorder") || !strcmp(st, "decorate_reorder")) \ + set_state(PART:"focus_part_reorder", "focused", 0.0); \ + else \ + set_state(PART:"focus_part", "focused", 0.0); \ + } \ + } \ + program { name: "unfocused"; \ + signal: "elm,state,unfocused"; \ + source: "elm"; \ + action: STATE_SET "default" 0.0; \ + target: "focus_part_reorder"; \ + target: "focus_part"; \ + } + #define GENLIST_PROGRAM_FOCUS_DIALOGUE \ program { name: "focused"; \ signal: "elm,state,focused"; \ @@ -1755,20 +1809,20 @@ new Float:vl; \ get_state(PART:"bg_dialogue", st, 30, vl); \ if (!strcmp(st, "top") || !strcmp(st, "top_selected")) \ - set_state(PART:"focus_part", "top_focused", 0.0); \ + set_state(PART:"focus_part_dialogue", "top_focused", 0.0); \ else if (!strcmp(st, "center") || !strcmp(st, "center_selected")) \ - set_state(PART:"focus_part", "center_focused", 0.0); \ + set_state(PART:"focus_part_dialogue", "center_focused", 0.0); \ else if (!strcmp(st, "bottom") || !strcmp(st, "bottom_selected")) \ - set_state(PART:"focus_part", "bottom_focused", 0.0); \ + set_state(PART:"focus_part_dialogue", "bottom_focused", 0.0); \ else if (!strcmp(st, "default") || !strcmp(st, "selected")) \ - set_state(PART:"focus_part", "focused", 0.0); \ + set_state(PART:"focus_part_dialogue", "focused", 0.0); \ } \ } \ program { name: "unfocused"; \ signal: "elm,state,unfocused"; \ source: "elm"; \ action: STATE_SET "default" 0.0; \ - target: "focus_part"; \ + target: "focus_part_dialogue"; \ } #define GENLIST_PROGRAM_SOUND( SRC ) \ @@ -2166,7 +2220,7 @@ target: "bottom_line2"; \ target: "bg_reorder"; \ ) \ - GENLIST_PROGRAM_FOCUS \ + GENLIST_PROGRAM_FOCUS_NORMAL \ GENLIST_PROGRAM_SELECT( TARGET \ target: "bg"; \ target: "bottom_line"; \ @@ -2251,7 +2305,7 @@ target: "elm.padding.right"; \ ) \ GENLIST_PROGRAM_DISABLED( TARGET ) \ - GENLIST_PROGRAM_FOCUS \ + GENLIST_PROGRAM_FOCUS_NORMAL \ GENLIST_PROGRAM_DECORATE_REORDER("editfield", TARGET \ target: "bg_clip"; \ target: "bg_reorder_clip"; \ diff --git a/themes/widgets/genlist/genlist_normal.edc b/themes/widgets/genlist/genlist_normal.edc index 50358b0..8cf236a 100644 --- a/themes/widgets/genlist/genlist_normal.edc +++ b/themes/widgets/genlist/genlist_normal.edc @@ -54,7 +54,7 @@ ) ) GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.swallow.icon"; target: "elm.swallow.end"; ) GENLIST_PROGRAM_SOUND("elm.text") @@ -88,7 +88,7 @@ ) ) GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_ENTRY( target: "elm.icon.entry"; ) } @@ -133,7 +133,7 @@ ) ) GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_ENTRY( target: "elm.text"; target: "elm.icon.entry"; ) } @@ -173,13 +173,13 @@ ) ) GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAM_DEFAULT( target: "elm.icon"; ) GENLIST_PROGRAM_DISABLED( target: "elm.icon"; ) GENLIST_PROGRAM_SELECT( target: "elm.icon"; ) GENLIST_PROGRAM_FLIP - GENLIST_PROGRAM_FOCUS + GENLIST_PROGRAM_FOCUS_NORMAL } group { GENLIST_NAME("1icon/with_no_line/default") @@ -246,7 +246,7 @@ "elm.padding.top", "elm.padding.bottom", ) GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text"; ) GENLIST_PROGRAM_SOUND("elm.text") @@ -269,7 +269,7 @@ "elm.padding.top", "elm.padding.bottom", ) GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text"; ) GENLIST_PROGRAM_SOUND("elm.text") @@ -297,7 +297,7 @@ "elm.padding.top", "elm.padding.bottom" ) GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; ) GENLIST_PROGRAM_SOUND("elm.text.1") @@ -343,7 +343,7 @@ GENLIST_PART_ICON_BTN_01_RTB("elm.icon", "elm.padding.right", "elm.padding.top", "elm.padding.bottom") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon"; ) GENLIST_PROGRAM_SOUND("elm.text") @@ -382,6 +382,7 @@ parts { GENLIST_PART_ICON_THUMBNAIL1_R("elm.icon", "elm.padding.right") + GENLIST_PART_FOCUS_NORMAL } } @@ -433,7 +434,7 @@ GENLIST_PART_PADDING_R("elm.padding.icon1.left", "elm.icon.1") GENLIST_PART_ICON_THUMBNAIL1_R("elm.icon.1", "elm.padding.right") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.1"; target: "elm.icon.2"; ) GENLIST_PROGRAM_SOUND("elm.text") @@ -469,7 +470,7 @@ GENLIST_PART_PADDING_R("elm.padding.icon1.left", "elm.icon.1") GENLIST_PART_ICON_THUMBNAIL1_R("elm.icon.1", "elm.padding.right") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.1"; target: "elm.icon.2"; ) GENLIST_PROGRAM_SOUND("elm.text") @@ -512,7 +513,7 @@ GENLIST_PART_LISTITEM_LR("elm.text", GENLIST_HEIGHT_1LINE, "elm.padding.icon.right", "elm.padding.right", ) GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon"; ) GENLIST_PROGRAM_SOUND("elm.text") @@ -555,7 +556,7 @@ GENLIST_PART_PADDING_L("elm.padding.icon.right", "elm.icon") GENLIST_PART_LISTITEM_LR_TB("elm.text", GENLIST_HEIGHT_1LINE, "elm.padding.icon.right", "elm.padding.right",) GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon"; ) GENLIST_PROGRAM_SOUND("elm.text") @@ -581,7 +582,7 @@ GENLIST_PART_LISTITEM_LR("elm.text.1", GENLIST_HEIGHT_1LINE, "elm.padding.icon.right", "elm.text.2",) GENLIST_PART_SUBITEM_R("elm.text.2", GENLIST_HEIGHT_1LINE, "elm.padding.right") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; ) GENLIST_PROGRAM_SOUND("elm.text.1") @@ -623,7 +624,7 @@ GENLIST_PART_PADDING_R("elm.padding.icon2.left", "elm.icon.2") GENLIST_PART_ICON_BTN_01_RTB("elm.icon.2", "elm.padding.right", "elm.padding.top", "elm.padding.bottom") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.1"; target: "elm.icon.2"; ) GENLIST_PROGRAM_SOUND("elm.text") @@ -650,7 +651,7 @@ GENLIST_PART_PADDING_R("elm.padding.icon2.left", "elm.icon.2") GENLIST_PART_ICON_BTN_01_RTB("elm.icon.2", "elm.padding.right", "elm.padding.top", "elm.padding.bottom") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.1"; target: "elm.icon.2"; ) GENLIST_PROGRAM_SOUND("elm.text") @@ -746,7 +747,7 @@ GENLIST_PART_PADDING_L("elm.padding.icon2.right", "elm.icon.2") GENLIST_PART_LISTITEM_LR("elm.text", GENLIST_HEIGHT_1LINE, "elm.padding.icon2.right", "elm.padding.right",) GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.1"; target: "elm.icon.2"; ) GENLIST_PROGRAM_SOUND("elm.text") @@ -777,7 +778,7 @@ GENLIST_PART_PADDING_R("elm.padding.icon3.left", "elm.icon.3") GENLIST_PART_ICON_BTN_02_RTB("elm.icon.3", "elm.padding.right", "elm.padding.top", "elm.padding.bottom") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; ) GENLIST_PROGRAM_SOUND("elm.text") @@ -827,7 +828,7 @@ GENLIST_PART_PADDING_R("elm.padding.icon3.left", "elm.icon.3") GENLIST_PART_ICON_BTN_02_RTB("elm.icon.3", "elm.padding.right", "elm.padding.top", "elm.padding.bottom") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; ) GENLIST_PROGRAM_SOUND("elm.text") @@ -856,7 +857,7 @@ GENLIST_PART_SUBITEM_R_FIXED("elm.text.2", 200, GENLIST_HEIGHT_1LINE, "elm.padding.right") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; @@ -887,7 +888,7 @@ GENLIST_PART_SUBITEM_R_FIXED_TB("elm.text.2", 206, GENLIST_HEIGHT_1LINE, "elm.padding.right") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.divider1"; target: "elm.divider2"; ) @@ -917,7 +918,7 @@ GENLIST_PART_SUBITEM_LR("elm.text.1", GENLIST_HEIGHT_1LINE, "elm.divider.right", "elm.padding.right", ) GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.divider1"; target: "elm.divider2"; ) GENLIST_PROGRAM_SOUND("elm.text.1") @@ -976,7 +977,7 @@ GENLIST_PART_SUBITEM_LRB("elm.text.2", GENLIST_HEIGHT_2LINE_SUB, "elm.padding.left", "elm.padding.right", "elm.padding.bottom") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; ) GENLIST_PROGRAM_SOUND("elm.text.1") @@ -1005,7 +1006,7 @@ "elm.padding.left", "elm.padding.right", "elm.padding.bottom" ) GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; ) GENLIST_PROGRAM_SOUND("elm.text.1") @@ -1034,7 +1035,7 @@ "elm.text.2", "elm.padding.bottom", ) GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; ) GENLIST_PROGRAM_SOUND("elm.text.1") @@ -1065,7 +1066,7 @@ GENLIST_PART_SUBITEM_LRB("elm.text.2", GENLIST_HEIGHT_2LINE_SUB, "elm.padding.left", "elm.padding.right", "elm.padding.bottom") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; ) GENLIST_PROGRAM_SOUND("elm.text.1") @@ -1098,7 +1099,7 @@ "elm.padding.left", "elm.padding.right", "elm.padding.bottom" ) GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; ) GENLIST_PROGRAM_SOUND("elm.text.1") @@ -1130,7 +1131,7 @@ GENLIST_PART_PADDING_R("elm.padding.icon.left", "elm.icon") GENLIST_PART_ICON_BTN_01_RTB("elm.icon", "elm.padding.right", "elm.padding.top", "elm.padding.bottom") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; ) GENLIST_PROGRAM_SOUND("elm.text.1") @@ -1161,7 +1162,7 @@ GENLIST_PART_PADDING_R("elm.padding.icon.left", "elm.icon") GENLIST_PART_ICON_BTN_01_RTB("elm.icon", "elm.padding.right", "elm.padding.top", "elm.padding.bottom") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; ) GENLIST_PROGRAM_SOUND("elm.text.1") @@ -1203,7 +1204,7 @@ GENLIST_PART_PADDING_R("elm.padding.icon.left", "elm.icon") GENLIST_PART_ICON_BTN_02_RTB("elm.icon", "elm.padding.right", "elm.padding.top", "elm.padding.bottom") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; ) GENLIST_PROGRAM_SOUND("elm.text.1") @@ -1246,7 +1247,7 @@ GENLIST_PART_ICON_STAR_RTB("elm.icon.1", "elm.padding.right", "elm.padding.top", "elm.text.2") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; target: "elm.icon.4"; target: "elm.icon.5";) @@ -1286,7 +1287,7 @@ GENLIST_PART_SUBITEM_RB("elm.text.3", GENLIST_HEIGHT_2LINE_SUB, "elm.padding.right", "elm.padding.bottom") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.icon"; ) @@ -1328,7 +1329,7 @@ GENLIST_PART_SUBITEM_RTB_TB("elm.text.3", GENLIST_HEIGHT_2LINE_SUB, "elm.padding.right", "elm.text.1", "elm.padding.bottom") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.icon"; ) @@ -1369,7 +1370,7 @@ fixed: 1 1; ) GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon.1"; target: "elm.icon.2"; ) @@ -1431,7 +1432,7 @@ GENLIST_PART_PADDING_R("elm.padding.icon.left", "elm.icon") GENLIST_PART_ICON_BTN_ONOFF_R("elm.icon", "elm.padding.right") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; ) GENLIST_PROGRAM_SOUND("elm.text.1") @@ -1490,7 +1491,7 @@ GENLIST_PART_PADDING_R("elm.padding.icon1.left", "elm.icon.1") GENLIST_PART_ICON_BIG_R("elm.icon.1", "elm.padding.right") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon.1"; target: "elm.icon.2"; ) @@ -1522,7 +1523,7 @@ GENLIST_PART_PADDING_R("elm.padding.icon.left", "elm.icon") GENLIST_PART_ICON_BIG_R("elm.icon", "elm.padding.right") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; ) @@ -1553,7 +1554,7 @@ GENLIST_PART_SUBITEM_LRB("elm.text.2", GENLIST_HEIGHT_2LINE_SUB, "elm.padding.icon.right", "elm.padding.right", "elm.padding.bottom") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; ) @@ -1604,7 +1605,7 @@ GENLIST_PART_SUBITEM_LRB_TB("elm.text.2", GENLIST_HEIGHT_2LINE_SUB, "elm.padding.icon.right", "elm.padding.right", "elm.padding.bottom") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; ) @@ -1637,7 +1638,7 @@ GENLIST_PART_SUBITEM_LRB("elm.text.2", GENLIST_HEIGHT_2LINE_SUB, "elm.padding.icon.right", "elm.padding.right", "elm.padding.bottom") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.icon"; ) @@ -1698,7 +1699,7 @@ GENLIST_PART_ICON_STAR_RTB("elm.icon.1", "elm.padding.right", "elm.padding.top", "elm.text.2") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; target: "elm.icon.4"; target: "elm.icon.5"; target: "elm.icon.6"; ) @@ -1744,7 +1745,7 @@ GENLIST_PART_ICON_STAR_RTB("elm.icon.1", "elm.padding.right", "elm.padding.top", "elm.text.2") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; target: "elm.icon.4"; target: "elm.icon.5"; target: "elm.icon.6"; ) @@ -1778,7 +1779,7 @@ GENLIST_PART_PADDING_R("elm.padding.icon2.left", "elm.icon.2") GENLIST_PART_ICON_BTN_02_RTB("elm.icon.2", "elm.padding.right", "elm.padding.top", "elm.padding.bottom") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon.1"; target: "elm.icon.2"; ) @@ -1813,7 +1814,7 @@ GENLIST_PART_PADDING_R("elm.padding.icon2.left", "elm.icon.2") GENLIST_PART_ICON_BTN_02_RTB("elm.icon.2", "elm.padding.right", "elm.padding.top", "elm.padding.bottom") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon.1"; target: "elm.icon.2";) @@ -1848,7 +1849,7 @@ GENLIST_PART_ICON_SMALL_RTB("elm.icon.2", "elm.padding.right", "elm.text.1", "elm.padding.bottom") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon.1"; target: "elm.icon.2";) @@ -1883,7 +1884,7 @@ GENLIST_PART_ICON_SMALL_RTB("elm.icon.2", "elm.padding.right", "elm.text.1", "elm.padding.bottom") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; @@ -1918,7 +1919,7 @@ GENLIST_PART_PADDING_R("elm.padding.icon2.left", "elm.icon.2") GENLIST_PART_ICON_BTN_01_RTB("elm.icon.2", "elm.padding.right", "elm.padding.top", "elm.padding.bottom") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon.1"; target: "elm.icon.2"; ) @@ -1952,7 +1953,7 @@ GENLIST_PART_PADDING_R("elm.padding.icon2.left", "elm.icon.2") GENLIST_PART_ICON_BTN_01_RTB("elm.icon.2", "elm.padding.right", "elm.padding.top", "elm.padding.bottom") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon.1"; target: "elm.icon.2";) @@ -1998,7 +1999,7 @@ fixed: 1 1;) ) GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon.1"; target: "elm.swallow.progress";) @@ -2064,7 +2065,7 @@ max: 156 GENLIST_BTN_01_HEIGHT;) ) GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.swallow.progress"; ) @@ -2099,7 +2100,7 @@ GENLIST_PART_PADDING_R_SIZE("elm.padding.icon.left", "elm.icon", 26) GENLIST_PART_ICON_BTN_ONOFF_R("elm.icon", "elm.padding.right") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; target: "elm.divider1"; target: "elm.divider2"; ) @@ -2148,7 +2149,7 @@ GENLIST_PART_PADDING_R("elm.padding.icon1.left", "elm.icon.1") GENLIST_PART_ICON_THUMBNAIL1_R("elm.icon.1", "elm.padding.right") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; ) @@ -2161,6 +2162,7 @@ inherit: "elm/genlist/item/2text.1icon.2/default"; parts { GENLIST_PART_ICON_THUMBNAIL1_R("elm.icon", "elm.padding.right") + GENLIST_PART_FOCUS_NORMAL } } @@ -2189,6 +2191,7 @@ inherit: "elm/genlist/item/2text.1icon.2.tb/default"; parts { GENLIST_PART_ICON_THUMBNAIL1_R("elm.icon", "elm.padding.right") + GENLIST_PART_FOCUS_NORMAL } } @@ -2257,7 +2260,7 @@ GENLIST_PART_SUBITEM_LRB("elm.text.2", GENLIST_HEIGHT_2LINE_SUB, "elm.padding.icon2.right", "elm.padding.right", "elm.padding.bottom") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon.1"; target: "elm.icon.2";) @@ -2293,7 +2296,7 @@ GENLIST_PART_PADDING_R("elm.padding.icon3.left", "elm.icon.3") GENLIST_PART_ICON_BTN_02_RTB("elm.icon.3", "elm.padding.right", "elm.padding.top", "elm.padding.bottom") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; ) GENLIST_PROGRAM_SOUND("elm.text.1") @@ -2337,7 +2340,7 @@ GENLIST_PART_SUBITEM_RTB("elm.text.2", GENLIST_HEIGHT_2LINE_SUB, "elm.padding.right", "elm.text.1", "elm.padding.bottom") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4"; target: "elm.icon.1"; target: "elm.bubble"; ) @@ -2387,7 +2390,7 @@ "elm.padding.right", "elm.text.1", "elm.padding.bottom" ) GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4"; target: "elm.icon.1"; target: "elm.bubble"; ) @@ -2429,7 +2432,7 @@ GENLIST_PART_SUBITEM_RTB("elm.text.2", GENLIST_HEIGHT_2LINE_SUB, "elm.padding.right", "elm.text.1", "elm.padding.bottom") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4"; target: "elm.icon.1";) @@ -2477,7 +2480,7 @@ "elm.padding.right", "elm.text.1", "elm.padding.bottom" ) GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4"; target: "elm.icon.1";) @@ -2518,7 +2521,7 @@ GENLIST_PART_SUBITEM_RTB("elm.text.2", GENLIST_HEIGHT_2LINE_SUB, "elm.padding.right", "elm.text.1", "elm.padding.bottom") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4"; target: "elm.bubble"; ) @@ -2572,7 +2575,7 @@ GENLIST_PART_SUBITEM_RTB("elm.text.2", GENLIST_HEIGHT_2LINE_SUB, "elm.padding.right", "elm.text.1", "elm.padding.bottom") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.icon.1";) @@ -2610,7 +2613,7 @@ GENLIST_PART_SUBITEM_RTB_TB("elm.text.2", GENLIST_HEIGHT_2LINE_SUB, "elm.padding.right", "elm.text.1", "elm.padding.bottom") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.icon.1";) @@ -2654,7 +2657,7 @@ GENLIST_PART_PADDING_R("elm.padding.icon1.left", "elm.icon.1") GENLIST_PART_ICON_BIG_R("elm.icon.1", "elm.padding.right") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; target: "elm.icon.4";) @@ -2701,7 +2704,7 @@ "elm.padding.right", "elm.text.1", "elm.padding.bottom" ) GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4"; target: "elm.swallow.colorbar"; target: "elm.icon.1"; target: "elm.bubble"; ) @@ -2736,7 +2739,7 @@ GENLIST_PART_SUBITEM_RTB("elm.text.3", GENLIST_HEIGHT_2LINE_SUB, "elm.padding.right", "elm.text.1", "elm.padding.bottom") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.icon"; ) @@ -2771,7 +2774,7 @@ GENLIST_PART_PADDING_R("elm.padding.icon2.left", "elm.icon.2") GENLIST_PART_ICON_THUMBNAIL1_R("elm.icon.2", "elm.padding.right") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon.1"; target: "elm.icon.2";) @@ -2831,7 +2834,7 @@ ) GENLIST_PART_CENTER_LINE_LT("elm.divider2", "elm.text.1") GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.title"; target: "elm.text.1"; target: "elm.text.2"; target: "elm.divider1"; target:"elm.divider2"; @@ -2875,7 +2878,7 @@ GENLIST_DESCRIPTION_LISTITEM_OTHERS_TB_WRAP ) GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.title"; target: "elm.text"; @@ -2915,7 +2918,7 @@ GENLIST_DESCRIPTION_SUBITEM_DEFAULT_OTHERS_TB_WRAP ) GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; ) GENLIST_PROGRAM_SOUND("elm.text.1") @@ -2970,7 +2973,7 @@ GENLIST_DESCRIPTION_SUBITEM_DEFAULT_OTHERS_TB_WRAP ) GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; ) GENLIST_PROGRAM_SOUND("elm.text.1") @@ -3008,7 +3011,7 @@ GENLIST_DESCRIPTION_SUBITEM_DEFAULT_OTHERS_TB_WRAP ) GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; ) GENLIST_PROGRAM_SOUND("elm.text.1") @@ -4012,7 +4015,6 @@ min: 0 GENLIST_HEIGHT_GROUPTITLE; ) ) - GENLIST_PART_ICON("elm.icon", GENLIST_DESCRIPTION_RTB("elm.padding.right", "elm.padding.top", "elm.padding.bottom", @@ -4021,8 +4023,10 @@ ) ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAM_DISABLED( target: "elm.text"; target: "elm.icon"; ) + GENLIST_PROGRAM_FOCUS_NORMAL } // 2.4.4.2 Help Text @@ -4049,7 +4053,7 @@ min: 0 38; ) GENLIST_PART_FLIP - GENLIST_PART_FOCUS + GENLIST_PART_FOCUS_NORMAL } GENLIST_PROGRAM_DISABLED( target: "elm.text"; ) GENLIST_PROGRAM_FOCUS -- 2.7.4