From: Tae-Hwan Kim Date: Sun, 14 Apr 2013 13:08:17 +0000 (+0900) Subject: [Genlst] Add focused UI X-Git-Tag: submit/tizen/20131004.114939~402 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=70518103c7f09410e93fdde95b64f8744d458cc1;p=platform%2Fcore%2Fuifw%2Fefl-theme-tizen.git [Genlst] Add focused UI Change-Id: Iea49d0ff384ab67dc0856077dd98c88fdc86be66 --- diff --git a/themes/widgets/genlist/genlist_email.edc b/themes/widgets/genlist/genlist_email.edc index c241f1a..a5d3a09 100644 --- a/themes/widgets/genlist/genlist_email.edc +++ b/themes/widgets/genlist/genlist_email.edc @@ -348,6 +348,7 @@ DESCRIPTION_EMAIL_CONTENTS_OTHERS ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_READ_TEXT( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; @@ -494,6 +495,7 @@ ) ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_READ_TEXT( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4"; diff --git a/themes/widgets/genlist/genlist_expandable.edc b/themes/widgets/genlist/genlist_expandable.edc index 72c1082..5fded47 100644 --- a/themes/widgets/genlist/genlist_expandable.edc +++ b/themes/widgets/genlist/genlist_expandable.edc @@ -52,6 +52,7 @@ GENLIST_PART_PADDING_R("elm.padding.arrow.left", "arrow") GENLIST_PART_EXPANDABLE_ARROW GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; target: "arrow_clip"; ) programs { @@ -92,6 +93,7 @@ GENLIST_PART_PADDING_R("elm.padding.arrow.left", "arrow") GENLIST_PART_EXPANDABLE_ARROW GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; target: "arrow_clip"; ) programs { @@ -131,6 +133,7 @@ GENLIST_PART_PADDING_R("elm.padding.arrow.left", "arrow") GENLIST_PART_EXPANDABLE_ARROW GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; target: "arrow_clip"; ) programs { @@ -179,6 +182,7 @@ GENLIST_PART_PADDING_R("elm.padding.arrow.left", "arrow") GENLIST_PART_EXPANDABLE_ARROW GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; target: "arrow_clip"; ) programs { @@ -231,6 +235,7 @@ GENLIST_PART_PADDING_R("elm.padding.arrow.left", "arrow") GENLIST_PART_EXPANDABLE_ARROW GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_DIALOGUE( target: "elm.icon"; target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "arrow_clip"; ) @@ -271,6 +276,7 @@ GENLIST_PART_PADDING_R("elm.padding.arrow.left", "arrow") GENLIST_PART_EXPANDABLE_ARROW GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_DIALOGUE( target: "elm.text"; target: "arrow_clip"; ) programs { diff --git a/themes/widgets/genlist/genlist_groupindex.edc b/themes/widgets/genlist/genlist_groupindex.edc index 895e483..5a573ab 100644 --- a/themes/widgets/genlist/genlist_groupindex.edc +++ b/themes/widgets/genlist/genlist_groupindex.edc @@ -102,10 +102,12 @@ GENLIST_DESCRIPTION_INDEX_LIST ) GENLIST_PART_INDEX_LINE("elm.padding.left", "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 } } @@ -149,10 +151,12 @@ 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 b8bb735..b95cf6f 100644 --- a/themes/widgets/genlist/genlist_macro.edc +++ b/themes/widgets/genlist/genlist_macro.edc @@ -909,6 +909,23 @@ #define GENLIST_PART_BASE \ GENLIST_PART_BASE_SIZE(0) + +#define GENLIST_PART_FOCUS \ + GENLIST_PART_IMAGE("focus_part", \ + mouse_events: 0; \ + description { state: "default" 0.0; \ + visible: 0; \ + image { \ + normal: "00_focus.png"; \ + border: 7 7 7 7; \ + } \ + } \ + description { state: "focused" 0.0; \ + inherit: "default" 0.0; \ + visible: 1; \ + } \ + ) + //****************************************************************************// // ****************************** LINE ********************************// //****************************************************************************// @@ -1667,6 +1684,20 @@ TARGET \ } +#define GENLIST_PROGRAM_FOCUS \ + program { name: "focused"; \ + signal: "elm,state,focused"; \ + source: "elm"; \ + action: STATE_SET "focused" 0.0; \ + target: "focus_part"; \ + } \ + program { name: "unfocused"; \ + signal: "elm,state,unfocused"; \ + source: "elm"; \ + action: STATE_SET "default" 0.0; \ + target: "focus_part"; \ + } + // If check is swallowed, genlist selected/unselected should be synched with check. #define GENLIST_PROGRAM_CHECK(CHECK) \ program { name: "selected"CHECK; \ @@ -2083,6 +2114,7 @@ target: "bottom_line2"; \ target: "bg_reorder"; \ ) \ + GENLIST_PROGRAM_FOCUS \ GENLIST_PROGRAM_SELECT( TARGET \ target: "bg"; \ target: "bottom_line"; \ @@ -2113,6 +2145,7 @@ target: "elm.padding.right"; \ ) \ GENLIST_PROGRAM_DISABLED( TARGET ) \ + GENLIST_PROGRAM_FOCUS \ GENLIST_PROGRAM_SELECT_DIALOGUE( TARGET ) \ program { name: "bg_color_change"; \ signal: "bg_color_change"; \ @@ -2147,6 +2180,7 @@ target: "bottom_line2"; \ target: "bg_reorder"; \ ) \ + GENLIST_PROGRAM_FOCUS \ GENLIST_PROGRAM_SELECT( TARGET \ target: "bg"; \ target: "bottom_line"; \ diff --git a/themes/widgets/genlist/genlist_normal.edc b/themes/widgets/genlist/genlist_normal.edc index feff176..fc290f8 100644 --- a/themes/widgets/genlist/genlist_normal.edc +++ b/themes/widgets/genlist/genlist_normal.edc @@ -54,6 +54,7 @@ ) ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.swallow.icon"; target: "elm.swallow.end"; ) } @@ -116,6 +117,7 @@ } ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_NORMAL( target: "elm.icon.entry"; target: "elm.image.rename"; ) GENLIST_PROGRAMS_ENTRY @@ -191,6 +193,7 @@ } ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.entry"; target: "elm.image.rename"; ) GENLIST_PROGRAMS_ENTRY @@ -231,11 +234,13 @@ ) ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAM_DEFAULT( target: "elm.icon"; ) GENLIST_PROGRAM_DISABLED( target: "elm.icon"; ) GENLIST_PROGRAM_SELECT( target: "elm.icon"; ) GENLIST_PROGRAM_FLIP + GENLIST_PROGRAM_FOCUS } group { GENLIST_NAME("1icon/with_no_line/default") @@ -302,6 +307,7 @@ "elm.padding.top", "elm.padding.bottom", ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_NORMAL( target: "elm.text"; ) } @@ -323,6 +329,7 @@ "elm.padding.top", "elm.padding.bottom", ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_NORMAL( target: "elm.text"; ) } @@ -349,6 +356,7 @@ "elm.padding.top", "elm.padding.bottom" ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; ) } @@ -392,6 +400,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_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon"; ) } @@ -480,6 +489,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_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.1"; target: "elm.icon.2"; ) } @@ -514,6 +524,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_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.1"; target: "elm.icon.2"; ) } @@ -555,6 +566,7 @@ GENLIST_PART_LISTITEM_LR("elm.text", GENLIST_HEIGHT_1LINE, "elm.padding.icon.right", "elm.padding.right", ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon"; ) } @@ -596,6 +608,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_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon"; ) } @@ -620,6 +633,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_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; ) } @@ -659,6 +673,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_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.1"; target: "elm.icon.2"; ) } @@ -684,6 +699,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_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.1"; target: "elm.icon.2"; ) } @@ -782,6 +798,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_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.1"; target: "elm.icon.2"; ) GENLIST_PROGRAM_CHECK("elm.icon.1") @@ -812,6 +829,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_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; ) GENLIST_PROGRAM_CHECK("elm.icon.1") @@ -863,6 +881,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_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; ) GENLIST_PROGRAM_CHECK("elm.icon.1") @@ -891,6 +910,7 @@ GENLIST_PART_SUBITEM_R_FIXED("elm.text.2", 200, GENLIST_HEIGHT_1LINE, "elm.padding.right") GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; @@ -919,6 +939,7 @@ GENLIST_PART_SUBITEM_R_FIXED_TB("elm.text.2", 206, GENLIST_HEIGHT_1LINE, "elm.padding.right") GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.divider1"; target: "elm.divider2"; ) @@ -946,6 +967,7 @@ GENLIST_PART_SUBITEM_LR("elm.text.1", GENLIST_HEIGHT_1LINE, "elm.divider.right", "elm.padding.right", ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.divider1"; target: "elm.divider2"; ) } @@ -1002,6 +1024,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_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; ) } @@ -1028,6 +1051,7 @@ "elm.padding.left", "elm.padding.right", "elm.padding.bottom" ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; ) } @@ -1054,6 +1078,7 @@ "elm.text.2", "elm.padding.bottom", ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; ) } @@ -1082,6 +1107,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_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; ) } @@ -1111,6 +1137,7 @@ "elm.padding.left", "elm.padding.right", "elm.padding.bottom" ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; ) } @@ -1139,6 +1166,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_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; ) } @@ -1167,6 +1195,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_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; ) } @@ -1206,6 +1235,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_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; ) } @@ -1246,6 +1276,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_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";) @@ -1283,6 +1314,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_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.icon"; ) @@ -1321,6 +1353,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_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.icon"; ) @@ -1358,6 +1391,7 @@ fixed: 1 1; ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon.1"; target: "elm.icon.2"; ) @@ -1417,6 +1451,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_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; ) } @@ -1473,6 +1508,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_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon.1"; target: "elm.icon.2"; ) @@ -1502,6 +1538,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_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; ) @@ -1530,6 +1567,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_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; ) @@ -1578,6 +1616,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_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; ) @@ -1608,6 +1647,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_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.icon"; ) @@ -1665,6 +1705,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_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"; ) @@ -1708,6 +1749,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_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"; ) @@ -1739,6 +1781,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_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon.1"; target: "elm.icon.2"; ) @@ -1771,6 +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_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon.1"; target: "elm.icon.2";) @@ -1803,6 +1847,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_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon.1"; target: "elm.icon.2";) @@ -1835,6 +1880,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_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; @@ -1867,6 +1913,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_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon.1"; target: "elm.icon.2"; ) @@ -1898,6 +1945,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_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon.1"; target: "elm.icon.2";) @@ -1941,6 +1989,7 @@ fixed: 1 1;) ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon.1"; target: "elm.swallow.progress";) @@ -2004,6 +2053,7 @@ max: 156 GENLIST_BTN_01_HEIGHT;) ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.swallow.progress"; ) @@ -2035,6 +2085,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_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; target: "elm.divider1"; target: "elm.divider2"; ) @@ -2081,6 +2132,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_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; ) @@ -2189,6 +2241,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_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon.1"; target: "elm.icon.2";) @@ -2223,6 +2276,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_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; ) GENLIST_PROGRAM_CHECK("elm.icon.1") @@ -2265,6 +2319,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_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"; ) @@ -2310,6 +2365,7 @@ "elm.padding.right", "elm.text.1", "elm.padding.bottom" ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } 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"; ) @@ -2347,6 +2403,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_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4"; target: "elm.icon.1";) @@ -2383,6 +2440,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_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4"; target: "elm.icon.1";) @@ -2419,6 +2477,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_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4"; target: "elm.bubble"; ) @@ -2465,6 +2524,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_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.icon.1";) @@ -2499,6 +2559,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_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.icon.1";) @@ -2539,6 +2600,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_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";) @@ -2583,6 +2645,7 @@ "elm.padding.right", "elm.text.1", "elm.padding.bottom" ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } 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"; ) @@ -2613,6 +2676,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_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.icon"; ) @@ -2644,6 +2708,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_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon.1"; target: "elm.icon.2";) @@ -2701,6 +2766,7 @@ ) GENLIST_PART_CENTER_LINE_LT("elm.divider2", "elm.text.1") GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_NORMAL( target: "elm.title"; target: "elm.text.1"; target: "elm.text.2"; target: "elm.divider1"; target:"elm.divider2"; @@ -2743,6 +2809,7 @@ GENLIST_DESCRIPTION_LISTITEM_OTHERS_TB_WRAP ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_NORMAL( target: "elm.title"; target: "elm.text"; @@ -2781,6 +2848,7 @@ GENLIST_DESCRIPTION_SUBITEM_DEFAULT_OTHERS_TB_WRAP ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; ) } @@ -2833,6 +2901,7 @@ GENLIST_DESCRIPTION_SUBITEM_DEFAULT_OTHERS_TB_WRAP ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; ) } @@ -2868,6 +2937,7 @@ GENLIST_DESCRIPTION_SUBITEM_DEFAULT_OTHERS_TB_WRAP ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; ) } @@ -2913,7 +2983,9 @@ max: -1 32; } ) + GENLIST_PART_FOCUS } + GENLIST_PROGRAM_FOCUS } // Dialogue Group Separators @@ -2932,7 +3004,9 @@ max: -1 8; } ) + GENLIST_PART_FOCUS } + GENLIST_PROGRAM_FOCUS } group { GENLIST_NAME("dialogue/1icon/default") @@ -3122,6 +3196,7 @@ GENLIST_PART_PADDING_R("elm.padding.icon3.left", "elm.icon.3") GENLIST_PART_ICON_BIG_R("elm.icon.3", "elm.padding.right") GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_DIALOGUE( target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; ) @@ -3153,6 +3228,7 @@ ) ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_DIALOGUE( target: "elm.text"; target: "elm.icon"; ) } @@ -3188,6 +3264,7 @@ ) ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; ) @@ -3224,6 +3301,7 @@ ) ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; ) @@ -3730,6 +3808,7 @@ ) ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; ) @@ -3785,6 +3864,7 @@ GENLIST_DESCRIPTION_SUBITEM_SETTINGS_OTHERS ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; ) } @@ -3850,8 +3930,10 @@ ) ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAM_DISABLED( target: "elm.text"; target: "elm.icon"; ) + GENLIST_PROGRAM_FOCUS } // 2.4.4.2 Help Text @@ -3878,8 +3960,10 @@ min: 0 38; ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAM_DISABLED( target: "elm.text"; ) + GENLIST_PROGRAM_FOCUS } // 2.4.4.3 @@ -3919,6 +4003,7 @@ ) ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; ) } @@ -3968,6 +4053,7 @@ ) ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.icon.1"; target: "elm.icon.2"; ) @@ -4052,6 +4138,7 @@ min: 0 32; fixed: 0 1;) ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } 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"; ) @@ -4417,6 +4504,7 @@ } } GENLIST_PART_FLIP + GENLIST_PART_FOCUS GENLIST_PART_DISCLIP } programs { @@ -4589,6 +4677,7 @@ GENLIST_DESCRIPTION_FLIP_ENABLED } GENLIST_PART_FLIP + GENLIST_PART_FOCUS GENLIST_PART_DISCLIP } programs { @@ -4769,6 +4858,7 @@ GENLIST_DESCRIPTION_FLIP_ENABLED } GENLIST_PART_FLIP + GENLIST_PART_FOCUS GENLIST_PART_DISCLIP } programs { @@ -5755,6 +5845,7 @@ GENLIST_DESCRIPTION_FLIP_ENABLED } GENLIST_PART_FLIP + GENLIST_PART_FOCUS GENLIST_PART_DISCLIP } programs { @@ -5916,6 +6007,7 @@ GENLIST_DESCRIPTION_FLIP_ENABLED } GENLIST_PART_FLIP + GENLIST_PART_FOCUS GENLIST_PART_DISCLIP } programs { @@ -6077,6 +6169,7 @@ GENLIST_DESCRIPTION_FLIP_ENABLED } GENLIST_PART_FLIP + GENLIST_PART_FOCUS GENLIST_PART_DISCLIP } programs { @@ -6290,6 +6383,7 @@ GENLIST_DESCRIPTION_FLIP_ENABLED } GENLIST_PART_FLIP + GENLIST_PART_FOCUS GENLIST_PART_DISCLIP } programs { @@ -6494,6 +6588,7 @@ GENLIST_DESCRIPTION_FLIP_ENABLED } GENLIST_PART_FLIP + GENLIST_PART_FOCUS GENLIST_PART_DISCLIP } programs { @@ -7011,6 +7106,7 @@ GENLIST_DESCRIPTION_FLIP_ENABLED } GENLIST_PART_FLIP + GENLIST_PART_FOCUS GENLIST_PART_DISCLIP } programs { @@ -7177,6 +7273,7 @@ GENLIST_DESCRIPTION_FLIP_ENABLED } GENLIST_PART_FLIP + GENLIST_PART_FOCUS GENLIST_PART_DISCLIP } programs { @@ -7345,6 +7442,7 @@ GENLIST_DESCRIPTION_FLIP_ENABLED } GENLIST_PART_FLIP + GENLIST_PART_FOCUS GENLIST_PART_DISCLIP } programs { @@ -10324,6 +10422,7 @@ GENLIST_DESCRIPTION_FLIP_ENABLED } GENLIST_PART_FLIP + GENLIST_PART_FOCUS GENLIST_PART_DISCLIP } programs { @@ -10691,6 +10790,7 @@ } } GENLIST_PART_FLIP + GENLIST_PART_FOCUS GENLIST_PART_DISCLIP } programs { @@ -10861,6 +10961,7 @@ GENLIST_DESCRIPTION_FLIP_ENABLED } GENLIST_PART_FLIP + GENLIST_PART_FOCUS GENLIST_PART_DISCLIP } programs { @@ -11074,6 +11175,7 @@ GENLIST_DESCRIPTION_FLIP_ENABLED } GENLIST_PART_FLIP + GENLIST_PART_FOCUS GENLIST_PART_DISCLIP } programs { @@ -11263,6 +11365,7 @@ GENLIST_DESCRIPTION_FLIP_ENABLED } GENLIST_PART_FLIP + GENLIST_PART_FOCUS GENLIST_PART_DISCLIP } programs { @@ -11486,6 +11589,7 @@ GENLIST_DESCRIPTION_FLIP_ENABLED } GENLIST_PART_FLIP + GENLIST_PART_FOCUS GENLIST_PART_DISCLIP } programs { @@ -11639,6 +11743,7 @@ GENLIST_DESCRIPTION_FLIP_ENABLED } GENLIST_PART_FLIP + GENLIST_PART_FOCUS GENLIST_PART_DISCLIP } programs { @@ -11911,6 +12016,7 @@ GENLIST_DESCRIPTION_FLIP_ENABLED } GENLIST_PART_FLIP + GENLIST_PART_FOCUS GENLIST_PART_DISCLIP } programs { @@ -12273,6 +12379,7 @@ GENLIST_DESCRIPTION_FLIP_ENABLED } GENLIST_PART_FLIP + GENLIST_PART_FOCUS GENLIST_PART_DISCLIP } programs { @@ -12619,6 +12726,7 @@ } } GENLIST_PART_FLIP + GENLIST_PART_FOCUS GENLIST_PART_DISCLIP } programs { @@ -12837,6 +12945,7 @@ min: 0 HEIGHT_EMAIL_CONTENTS; fixed:1 1;) ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_READ_TEXT( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4"; @@ -12897,6 +13006,7 @@ min: 0 HEIGHT_EMAIL_CONTENTS; fixed:1 1;) ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_READ_TEXT( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4"; @@ -12955,6 +13065,7 @@ min: 0 HEIGHT_EMAIL_CONTENTS; fixed:1 1;) ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_READ_TEXT( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4"; @@ -13011,6 +13122,7 @@ min: 0 HEIGHT_EMAIL_CONTENTS; fixed:1 1;) ) GENLIST_PART_FLIP + GENLIST_PART_FOCUS } GENLIST_PROGRAMS_READ_TEXT( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4"; diff --git a/themes/widgets/scroller.edc b/themes/widgets/scroller.edc index 6801f05..851437d 100644 --- a/themes/widgets/scroller.edc +++ b/themes/widgets/scroller.edc @@ -257,6 +257,24 @@ group { name: "elm/scroller/base/default"; } } } + part { name: "focus_part"; + type: IMAGE; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + visible: 0; + rel1.to: "clipper"; + rel2.to: "clipper"; + image { + normal: "00_focus.png"; + border: 7 7 7 7; + } + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } part { name: "disabler"; type: RECT; scale: 1; @@ -437,6 +455,18 @@ group { name: "elm/scroller/base/default"; action: STATE_SET "default" 0.0; target: "disabler"; } + program { name: "focused"; + signal: "elm,state,focused"; + source: "elm"; + action: STATE_SET "focused" 0.0; + target: "focus_part"; + } + program { name: "unfocused"; + signal: "elm,state,unfocused"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "focus_part"; + } } }