From: sh10233.lee Date: Tue, 11 Jun 2013 13:25:06 +0000 (+0900) Subject: [Genlist] Genlist GUI Dark Theme ver 0.2 X-Git-Tag: submit/tizen_2.2/20130714.144922~185 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4a093db135125917ad49cb3a3d3118c7ac5396df;p=framework%2Fuifw%2Fefl-theme-tizen.git [Genlist] Genlist GUI Dark Theme ver 0.2 Change-Id: I59c8a2ab574f1e62680b51ddb12927dff99b6924 --- diff --git a/themes/images/HD/dark/Content_views/00_list_group_bg.png b/themes/images/HD/dark/Content_views/00_list_group_bg.png old mode 100644 new mode 100755 index a925ce4..358d215 Binary files a/themes/images/HD/dark/Content_views/00_list_group_bg.png and b/themes/images/HD/dark/Content_views/00_list_group_bg.png differ diff --git a/themes/images/HD/dark/Content_views/00_list_group_bg_bottom.png b/themes/images/HD/dark/Content_views/00_list_group_bg_bottom.png old mode 100644 new mode 100755 index 09109f2..77fcab7 Binary files a/themes/images/HD/dark/Content_views/00_list_group_bg_bottom.png and b/themes/images/HD/dark/Content_views/00_list_group_bg_bottom.png differ diff --git a/themes/images/HD/dark/Content_views/00_list_group_bg_bottom_press.png b/themes/images/HD/dark/Content_views/00_list_group_bg_bottom_press.png old mode 100644 new mode 100755 index efc5a41..a525170 Binary files a/themes/images/HD/dark/Content_views/00_list_group_bg_bottom_press.png and b/themes/images/HD/dark/Content_views/00_list_group_bg_bottom_press.png differ diff --git a/themes/images/HD/dark/Content_views/00_list_group_bg_center.png b/themes/images/HD/dark/Content_views/00_list_group_bg_center.png old mode 100644 new mode 100755 index 72413b8..fd61318 Binary files a/themes/images/HD/dark/Content_views/00_list_group_bg_center.png and b/themes/images/HD/dark/Content_views/00_list_group_bg_center.png differ diff --git a/themes/images/HD/dark/Content_views/00_list_group_bg_center_press.png b/themes/images/HD/dark/Content_views/00_list_group_bg_center_press.png old mode 100644 new mode 100755 index b64a79a..be656e6 Binary files a/themes/images/HD/dark/Content_views/00_list_group_bg_center_press.png and b/themes/images/HD/dark/Content_views/00_list_group_bg_center_press.png differ diff --git a/themes/images/HD/dark/Content_views/00_list_group_bg_press.png b/themes/images/HD/dark/Content_views/00_list_group_bg_press.png old mode 100644 new mode 100755 index d152cea..cc4f97b Binary files a/themes/images/HD/dark/Content_views/00_list_group_bg_press.png and b/themes/images/HD/dark/Content_views/00_list_group_bg_press.png differ diff --git a/themes/images/HD/dark/Content_views/00_list_group_bg_top.png b/themes/images/HD/dark/Content_views/00_list_group_bg_top.png old mode 100644 new mode 100755 index 965403a..9417bb6 Binary files a/themes/images/HD/dark/Content_views/00_list_group_bg_top.png and b/themes/images/HD/dark/Content_views/00_list_group_bg_top.png differ diff --git a/themes/images/HD/dark/Content_views/00_list_group_bg_top_press.png b/themes/images/HD/dark/Content_views/00_list_group_bg_top_press.png old mode 100644 new mode 100755 index f372bca..ebd9318 Binary files a/themes/images/HD/dark/Content_views/00_list_group_bg_top_press.png and b/themes/images/HD/dark/Content_views/00_list_group_bg_top_press.png differ diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc index 09d4f35..0fba683 100755 --- a/themes/inc/tizen-dark-inc.edc +++ b/themes/inc/tizen-dark-inc.edc @@ -240,52 +240,52 @@ #define BUBBLE_DISCLIP_COLOR 255 255 255 102 // opacity 40% // List bg color -#define GENLIST_LIST_BG_COLOR 248 246 239 255 -#define GENLIST_LIST_PRESS_COLOR 87 135 194 255 -#define GENLIST_LIST_DIM_COLOR 248 246 239 255 -#define GENLIST_LIST_LINE1_COLOR 211 209 203 255 -#define GENLIST_LIST_LINE2_COLOR 255 255 255 255 -#define GENLIST_LIST_DIVIDER1_COLOR 185 184 178 255 -#define GENLIST_LIST_DIVIDER2_COLOR 255 255 255 255 +#define GENLIST_LIST_BG_COLOR 0 0 0 255 +#define GENLIST_LIST_PRESS_COLOR 43 58 175 255 +#define GENLIST_LIST_DIM_COLOR 0 0 0 255 +#define GENLIST_LIST_LINE1_COLOR 0 0 0 255 +#define GENLIST_LIST_LINE2_COLOR 64 64 64 255 +#define GENLIST_LIST_DIVIDER1_COLOR 255 255 255 102 +#define GENLIST_LIST_DIVIDER2_COLOR 255 255 255 102 #define GENLIST_LIST_CENTERLINE1_COLOR 206 205 202 255 -#define GENLIST_SELECT_ALL_BG_COLOR 220 218 211 255 +#define GENLIST_SELECT_ALL_BG_COLOR 34 44 71 255 // Group Index #define GENLIST_GROUPINDEX_LIST_SIZE 32 -#define GENLIST_GROUPINDEX_LIST_COLOR 59 115 182 255 +#define GENLIST_GROUPINDEX_LIST_COLOR 10 82 138 255 #define GENLIST_GROUPINDEX_LIST_FOCUS_COLOR 255 255 255 255 #define GENLIST_GROUPINDEX_LIST_COLOR_STYLE "#3B73B6FF" #define GENLIST_GROUPINDEX_LIST_FOCUS_COLOR_STYLE "#FFFFFFFF" -#define GENLIST_GROUPINDEX_LIST_BG_COLOR 248 246 239 255 -#define GENLIST_GROUPINDEX_LIST_PRESS_COLOR 132 162 198 255 -#define GENLIST_GROUPINDEX_LINE_COLOR 59 115 182 255 -#define GENLIST_GROUPINDEX_LINE_FOCUS_COLOR 255 255 255 255 +#define GENLIST_GROUPINDEX_LIST_BG_COLOR 0 0 0 255 +#define GENLIST_GROUPINDEX_LIST_PRESS_COLOR 43 58 175 255 +#define GENLIST_GROUPINDEX_LINE_COLOR 66 87 144 255 +#define GENLIST_GROUPINDEX_LINE_FOCUS_COLOR 250 250 250 255 // Genlist Text #define GENLIST_LIST_MAIN_TEXT_SIZE 44 -#define GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR 0 0 0 255 +#define GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR 250 250 250 255 #define GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR_STYLE "#000000FF" -#define GENLIST_LIST_MAIN_TEXT_UNREAD_DIM_COLOR 0 0 0 102 +#define GENLIST_LIST_MAIN_TEXT_UNREAD_DIM_COLOR 250 250 250 102 #define GENLIST_LIST_MAIN_TEXT_UNREAD_DIM_COLOR_STYLE "#00000066" -#define GENLIST_LIST_MAIN_TEXT_READ_COLOR 128 128 128 255 -#define GENLIST_LIST_MAIN_TEXT_READ_DIM_COLOR 128 128 128 204 -#define GENLIST_LIST_TEXT_FOCUS_COLOR 255 255 255 255 +#define GENLIST_LIST_MAIN_TEXT_READ_COLOR 110 111 118 255 +#define GENLIST_LIST_MAIN_TEXT_READ_DIM_COLOR 110 111 118 204 +#define GENLIST_LIST_TEXT_FOCUS_COLOR 250 250 250 255 #define GENLIST_LIST_TEXT_FOCUS_COLOR_STYLE "#FFFFFFFF" #define GENLIST_LIST_SUB_TEXT_SIZE 32 -#define GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR 128 128 128 255 +#define GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR 110 111 118 255 #define GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR_STYLE "#808080FF" -#define GENLIST_LIST_SUB_TEXT_DEFAULT_DIM_COLOR 128 128 128 204 +#define GENLIST_LIST_SUB_TEXT_DEFAULT_DIM_COLOR 110 111 118 204 #define GENLIST_LIST_SUB_TEXT_DEFAULT_DIM_COLOR_STYLE "#808080CC" -#define GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR 59 115 182 255 +#define GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR 104 144 255 255 #define GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR_STYLE "#3B73B6FF" -#define GENLIST_LIST_SUB_TEXT_SETTINGS_DIM_COLOR 59 115 182 76 +#define GENLIST_LIST_SUB_TEXT_SETTINGS_DIM_COLOR 104 144 255 76 #define GENLIST_LIST_SUB_TEXT_SETTINGS_DIM_COLOR_STYLE "#3B73B64C" #define GENLIST_LIST_SUB_TEXT_02_SIZE 24 -#define GENLIST_LIST_SUB_TEXT_02_COLOR 194 71 71 255 +#define GENLIST_LIST_SUB_TEXT_02_COLOR 209 0 0 255 #define GENLIST_CONTENTS_TEXT_SIZE 28 #define GENLIST_CONTENTS_TEXT_COLOR 128 128 128 255 @@ -293,15 +293,15 @@ #define GENLIST_LIST_BUBBLE_TEXT_SIZE 32 #define GENLIST_LIST_BUBBLE_TEXT_COLOR 249 249 249 255 -#define GENLIST_LIST_BUBBLE_TEXT_FOCUS_COLOR 87 135 194 255 -#define GENLIST_LIST_BUBBLE_COLOR 87 135 194 255 -#define GENLIST_LIST_BUBBLE_PRESS_COLOR 255 255 255 255 +#define GENLIST_LIST_BUBBLE_TEXT_FOCUS_COLOR 43 58 175 255 +#define GENLIST_LIST_BUBBLE_COLOR 43 58 175 255 +#define GENLIST_LIST_BUBBLE_PRESS_COLOR 250 250 250 255 #define GENLIST_PROGRESS_MAIN_TEXT_SIZE 32 // Dialogue group #define GENLIST_DIALOGUE_GROUP_TITLE_SIZE 32 -#define GENLIST_DIALOGUE_GROUP_TITLE_COLOR 59 115 182 255 +#define GENLIST_DIALOGUE_GROUP_TITLE_COLOR 93 131 255 255 #define GENLIST_APPS_NAME_SIZE 30 #define GENLIST_APPS_NAME_COLOR 128 128 128 255 @@ -317,10 +317,10 @@ #define GENLIST_ENTRY_RENAME_COLOR 177 177 177 255 #define DIALOGUE_PASSWORD_TITLE_SIZE 32 -#define DIALOGUE_PASSWORD_TITLE_COLOR 128 128 128 255 +#define DIALOGUE_PASSWORD_TITLE_COLOR 249 249 249 255 #define GENLIST_DIALOGUE_GROUP_HELP_TEXT_SIZE 32 -#define GENLIST_DIALOGUE_GROUP_HELP_TEXT_COLOR_STYLE "#808080FF" +#define GENLIST_DIALOGUE_GROUP_HELP_TEXT_COLOR_STYLE "#6E6F76FF" #define GENLIST_PART_MATCH_TAG_COLOR "+ color=#1382FF" #define BUTTON_TEXT_SHADOW_NORMAL_COLOR_INC 255 255 255 255 diff --git a/themes/widgets/genlist/genlist_groupindex.edc b/themes/widgets/genlist/genlist_groupindex.edc index 5d1d38d..946f467 100644 --- a/themes/widgets/genlist/genlist_groupindex.edc +++ b/themes/widgets/genlist/genlist_groupindex.edc @@ -54,18 +54,32 @@ text.style: "genlist_style_groupindex_text_focus"; \ } -#define GENLIST_PART_INDEX_LINE(LEFT, RIGHT, TOP, BOTTOM) \ - GENLIST_PART_RECT("index_line", \ - GENLIST_DESCRIPTION(LEFT, RIGHT, TOP, BOTTOM, \ - color: GENLIST_GROUPINDEX_LINE_COLOR; \ - min: 0 4; \ - max: -1 4; \ - ) \ - description { state: "selected" 0.0; \ - inherit: "default" 0.0; \ - color: GENLIST_GROUPINDEX_LINE_FOCUS_COLOR; \ - } \ - ) +#define GENLIST_PART_INDEX_LINE(TOP, BOTTOM) \ + GENLIST_PART_RECT("index_line", \ + GENLIST_DESCRIPTION_TB(TOP, BOTTOM, \ + color: GENLIST_GROUPINDEX_LINE_COLOR; \ + min: 0 4; \ + max: -1 4; \ + ) \ + description { state: "selected" 0.0; \ + inherit: "default" 0.0; \ + color: GENLIST_GROUPINDEX_LINE_FOCUS_COLOR; \ + } \ + ) + +#define GENLIST_PART_INDEX_LINE_ICON(LEFT, TOP, BOTTOM) \ + GENLIST_PART_RECT("index_line_icon", \ + GENLIST_DESCRIPTION_LTB(LEFT, TOP, BOTTOM, \ + color: GENLIST_GROUPINDEX_LINE_COLOR; \ + min: 0 4; \ + max: -1 4; \ + rel2.to_x: "base"; \ + ) \ + description { state: "selected" 0.0; \ + inherit: "default" 0.0; \ + color: GENLIST_GROUPINDEX_LINE_FOCUS_COLOR; \ + } \ + ) // Group Index #define GENLIST_PARAM_INDEX_LIST \ @@ -87,7 +101,7 @@ } #define GENLIST_PART_PADDING_GROUPINDEX_LEFT \ - GENLIST_PART_EXPANDED_PAD \ + GENLIST_PART_EXPANDED_PAD \ GENLIST_PART_RECT("elm.padding.left", \ GENLIST_DESCRIPTION_L("elm.swallow.pad", \ color: GENLIST_LIST_BG_COLOR; \ @@ -95,6 +109,14 @@ max: GROUPINDEX_PADDING_SIZE_LEFT -1; \ fixed: 1 0; \ ) \ + 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; \ + } \ GENLIST_DESCRIPTION_DECORATE_PADDING \ GENLIST_DESCRIPTION_REORDER_PADDING \ GENLIST_DESCRIPTION_DECORATE_REORDER_PADDING \ @@ -112,6 +134,14 @@ rel2.to: "base"; \ rel1.relative: 1 0; \ } \ + 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; \ + } \ GENLIST_DESCRIPTION_DECORATE_PADDING \ GENLIST_DESCRIPTION_REORDER_PADDING \ GENLIST_DESCRIPTION_DECORATE_REORDER_PADDING \ @@ -200,7 +230,6 @@ } GENLIST_DESCRIPTION_INDEX_LIST_TB ) - GENLIST_PART_INDEX_LINE("elm.padding.left", "elm.padding.right", "elm.text", "elm.padding.bottom") /* part { name: "dbg"; type: TEXT; @@ -216,6 +245,7 @@ */ GENLIST_PART_PADDING_GROUPINDEX_LEFT GENLIST_PART_PADDING_GROUPINDEX_RIGHT + GENLIST_PART_INDEX_LINE("elm.text", "elm.padding.bottom") GENLIST_PART_FOCUS } program { name: "default"; @@ -238,6 +268,8 @@ set_state(PART:"elm.text", "selected", 0.0); set_state(PART:"index_line", "selected", 0.0); set_state(PART:"bg", "selected", 0.0); + set_state(PART:"elm.padding.left", "selected", 0.0); + set_state(PART:"elm.padding.right", "selected", 0.0); } } } @@ -249,6 +281,8 @@ set_state(PART:"elm.text", "default", 0.0); set_state(PART:"index_line", "default", 0.0); set_state(PART:"bg", "default", 0.0); + set_state(PART:"elm.padding.left", "default", 0.0); + set_state(PART:"elm.padding.right", "default", 0.0); } } } @@ -315,12 +349,12 @@ ) GENLIST_DESCRIPTION_INDEX_LIST ) - GENLIST_PART_INDEX_LINE("elm.padding.icon.right", "elm.padding.right", "elm.text", "elm.padding.bottom") + GENLIST_PART_INDEX_LINE_ICON("elm.padding.icon.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_DISABLED( target: "elm.text"; target: "index_line_icon"; ) + GENLIST_PROGRAM_SELECT( target: "elm.text"; target: "index_line_icon"; target: "bg"; ) GENLIST_PROGRAM_FOCUS } } diff --git a/themes/widgets/genlist/genlist_macro.edc b/themes/widgets/genlist/genlist_macro.edc index 722732c..ac73de8 100755 --- a/themes/widgets/genlist/genlist_macro.edc +++ b/themes/widgets/genlist/genlist_macro.edc @@ -1068,10 +1068,10 @@ fixed: 0 1; \ align: 0.5 1; \ color: GENLIST_LIST_LINE2_COLOR; \ - rel1.to_x: "elm.padding.left"; \ - rel1.relative: 1 0; \ - rel2.to_x: "elm.padding.right"; \ - rel2.relative: 0 1; \ + rel1.to_x: "base"; \ + rel1.relative: 0 0; \ + rel2.to_x: "base"; \ + rel2.relative: 1 1; \ rel1.offset: -1 -1; \ } \ description { state: "selected" 0.0; \