From abfcdd34bc15ecb7b4c5385d632cabf275629eb6 Mon Sep 17 00:00:00 2001 From: Tae-Hwan Kim Date: Fri, 5 Apr 2013 11:07:42 +0900 Subject: [PATCH] [Genlist] Fix genlist bubble bubble & bubble text has now pressed color Change-Id: I377dfe9a106cbfefcf392fcc40f820d4cca374a5 --- themes/images/tizen-hd/00_list_bubble_bg.png | Bin 2937 -> 2910 bytes themes/inc/tizen-hd-inc.edc | 3 +++ themes/widgets/genlist/genlist_macro.edc | 9 +++++++++ themes/widgets/genlist/genlist_normal.edc | 9 +++++---- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/themes/images/tizen-hd/00_list_bubble_bg.png b/themes/images/tizen-hd/00_list_bubble_bg.png index 84e13869f473f7ba3a2ec821ead7a6c04658632f..ef845ca049e0d14db07794782f215b0058a37c5c 100644 GIT binary patch delta 167 zcmV;Y09gO|7Ty-HzzTnfNkldK7lD?b15x<{z3dQu;+ACzzES>2TWa{yNq VW(QWMN~r(<002ovPDHLkV1h;INb3Lq delta 194 zcmV;z06qWS7Wo#izzTn)NkltP)eCB*D7_tMftDioZoP2y{u5y!URn;eC~=fR(YE2Ae4g)dvw1* zlsjE)`?J#=YQ3yzW2;)7fT`-Gq5MhJngR6)P(6s$ANp135y3in23#UQmw-hCXc4f& wx&pGv(`5O6_7Ec+aQou;jw8l-nhfAI0LMcgby!S%-v9sr07*qoM6N<$f?AVaDF6Tf diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc index 4a1f18e..8a23be1 100644 --- a/themes/inc/tizen-hd-inc.edc +++ b/themes/inc/tizen-hd-inc.edc @@ -269,6 +269,9 @@ #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_PROGRESS_MAIN_TEXT_SIZE 32 diff --git a/themes/widgets/genlist/genlist_macro.edc b/themes/widgets/genlist/genlist_macro.edc index e36bf4b..df38b91 100644 --- a/themes/widgets/genlist/genlist_macro.edc +++ b/themes/widgets/genlist/genlist_macro.edc @@ -3118,7 +3118,12 @@ min: 48 38; \ max: -1 38; \ fixed: 0 1; \ + color: GENLIST_LIST_BUBBLE_COLOR; \ ) \ + description { state: "selected" 0.0; \ + inherit: "default" 0.0; \ + color: GENLIST_LIST_BUBBLE_PRESS_COLOR; \ + } \ ) \ GENLIST_PART_TEXT(NAME, \ GENLIST_DESCRIPTION_RTB(RIGHT, TOP, BOTTOM, \ @@ -3127,6 +3132,10 @@ rel2.offset: -10 -1; /* This maintain the text alignment with bubble text. */\ GENLIST_PARAM_LIST_BUBBLE_TEXT \ ) \ + description { state: "selected" 0.0; \ + inherit: "default" 0.0; \ + color: GENLIST_LIST_BUBBLE_TEXT_FOCUS_COLOR; \ + } \ ) #if 0 diff --git a/themes/widgets/genlist/genlist_normal.edc b/themes/widgets/genlist/genlist_normal.edc index 23c7ed9..bf55324 100644 --- a/themes/widgets/genlist/genlist_normal.edc +++ b/themes/widgets/genlist/genlist_normal.edc @@ -2249,7 +2249,7 @@ GENLIST_PART_FLIP } 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.icon.1"; target: "elm.bubble"; ) } // 2.2.2.38 textblock @@ -2294,7 +2294,7 @@ GENLIST_PART_FLIP } 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.icon.1"; target: "elm.bubble"; ) } // 2.2.2.39 @@ -2402,7 +2402,8 @@ "elm.padding.right", "elm.text.1", "elm.padding.bottom") GENLIST_PART_FLIP } - GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4"; ) + GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4"; + target: "elm.bubble"; ) } @@ -2566,7 +2567,7 @@ GENLIST_PART_FLIP } 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.swallow.colorbar"; target: "elm.icon.1"; target: "elm.bubble"; ) } // 2.2.2.45 -- 2.7.4