From: Hyojung Jo Date: Tue, 8 Sep 2015 05:48:01 +0000 (+0900) Subject: Fix the browser app thumbnail color as Apps guide X-Git-Tag: accepted/tizen/tv/20150909.140316~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2823b0f01df1980e06f883c67cbd268cc67d0b89;p=profile%2Ftv%2Fapps%2Fnative%2Fair_favorite.git Fix the browser app thumbnail color as Apps guide Change-Id: Ieffd1d7cb965dc2f8dfc7c73d51e269c5c8ba951 Signed-off-by: Hyojung Jo --- diff --git a/include/define.h b/include/define.h index b8b3263..f0c3675 100644 --- a/include/define.h +++ b/include/define.h @@ -47,6 +47,7 @@ #define PART_TEXT_BG "part.text.bg" #define PART_THUMB_ICON "part.thumb.icon" #define PART_THUMB_TEXT "part.thumb.text" +#define PART_THUMB_TEXT_BR "part.thumb.text.browser" #define PART_THUMB_SUBTEXT1 "part.thumb.subtext1" #define PART_THUMB_SUBTEXT2 "part.thumb.subtext2" #define PART_THUMB_PLAY_ICON "part.thumb.play.icon" @@ -117,6 +118,10 @@ #define COLOR_TEXT_BG 113 128 147 255 #define COLOR_ITEM_FOCUS 0 119 246 255 #define COLOR_ITEM_FOCUS_0 0 119 246 0 +#define COLOR_BR_R 255 +#define COLOR_BR_G 255 +#define COLOR_BR_B 255 +#define COLOR_BR_A 255 /* Size */ #define SIZE_BOX_PAD_H (40 + 40) diff --git a/res/widgets/gengrid_apps.edc b/res/widgets/gengrid_apps.edc index de5ddc5..b4e2062 100644 --- a/res/widgets/gengrid_apps.edc +++ b/res/widgets/gengrid_apps.edc @@ -17,8 +17,9 @@ group { name, "elm/gengrid/item/style.apps/default"; data.item, "focus_highlight" "on"; - data.item, "texts" "part.thumb.text"; + data.item, "texts" "part.thumb.text part.thumb.text.browser"; data.item, "contents" "part.thumb.icon part.thumb.bg part.text.bg"; + data.item, "states" "is_browser"; parts { part { name, "padding.bottom.right"; @@ -75,12 +76,9 @@ group { state, "default" 0.0; rel1.to, "part.bg"; rel2 { - to, "part.bg"; + to, PART_TEXT_BG; relative, 1.0 0.0; } - min, 0 212; - align, 0.5 0.0; - fixed, 0 1; map { perspective_on, 1; perspective, "map"; @@ -99,13 +97,13 @@ group { scale, 1; description { state, "default" 0.0; + min, 0 82; rel1 { - to, PART_THUMB_BG; + to, "part.bg"; relative, 0.0 1.0; } - rel2.to, PART_THUMB_BG; - min, 0 82; - align, 0.5 0.0; + rel2.to, "part.bg"; + align, 0.5 1.0; fixed, 0 1; map { perspective_on, 1; @@ -149,6 +147,132 @@ group { } part { + name, "part.inside.line.up"; + type, RECT; + scale, 1; + description { + state, "default" 0.0; + color, 194 194 194 255; + min, 0 1; + rel1.to, "part.bg"; + rel2 { + to, "part.bg"; + relative, 1.0 0.0; + } + align, 0.5 0.0; + fixed, 0 1; + visible, 0; + } + description { + state, "visible" 0.0; + inherit, "default" 0.0; + visible, 1; + } + } + + part { + name, "part.inside.line.left"; + type, RECT; + scale, 1; + description { + state, "default" 0.0; + color, 194 194 194 255; + min, 1 0; + rel1 { + to, "part.inside.line.up"; + relative, 0.0 1.0; + } + rel2 { + to, "part.bg"; + relative, 0.0 1.0; + } + align, 0.0 0.5; + fixed, 1 0; + visible, 0; + } + description { + state, "visible" 0.0; + inherit, "default" 0.0; + visible, 1; + } + } + + part { + name, "part.inside.line.right"; + type, RECT; + scale, 1; + description { + state, "default" 0.0; + color, 194 194 194 255; + min, 1 0; + rel1 { + to, "part.inside.line.up"; + relative, 1.0 1.0; + } + rel2.to, "part.bg"; + align, 1.0 0.5; + fixed, 1 0; + visible, 0; + } + description { + state, "visible" 0.0; + inherit, "default" 0.0; + visible, 1; + } + } + + part { + name, "part.inside.line.down"; + type, RECT; + scale, 1; + description { + state, "default" 0.0; + color, 194 194 194 255; + min, 0 1; + rel1 { + to, "part.inside.line.left"; + relative, 1.0 1.0; + } + rel2 { + to, "part.inside.line.right"; + relative, 0.0 1.0; + } + align, 0.5 1.0; + fixed, 0 1; + visible, 0; + } + description { + state, "visible" 0.0; + inherit, "default" 0.0; + visible, 1; + } + } + + part { + name, "part.divide.line"; + type, RECT; + scale, 1; + description { + state, "default" 0.0; + color, 194 194 194 255; + min, 0 1; + rel1.to, PART_TEXT_BG; + rel2 { + to, PART_TEXT_BG; + relative, 1.0 0.0; + } + align, 0.5 0.0; + fixed, 0 1; + visible, 0; + } + description { + state, "visible" 0.0; + inherit, "default" 0.0; + visible, 1; + } + } + + part { name, "part.focus.up"; type, RECT; scale, 1; @@ -295,7 +419,7 @@ group { } part { - name, "padding.thumb.text"; + name, "padding.thumb.text.left"; type, SPACER; scale, 1; description { @@ -312,23 +436,73 @@ group { } part { + name, "padding.thumb.text.right"; + type, SPACER; + scale, 1; + description { + state, "default" 0.0; + min, 18 0; + rel1 { + to, "part.focus.down"; + relative, 1.0 0.0; + } + rel2.to, "part.focus.down"; + align, 1.0 0.5; + fixed, 1 0; + } + } + + part { name, PART_THUMB_TEXT; type, TEXT; scale, 1; description { state, "default" 0.0; color, 255 255 255 255; - min, 176 82; rel1 { - to, "padding.thumb.text"; + to, "padding.thumb.text.left"; relative, 1.0 0.0; } rel2 { - to, "padding.thumb.text"; + to, "padding.thumb.text.right"; + relative, 0.0 1.0; + } + text { + font, FONT_TIZENSANS_LIGHT; + size, 28; + align, 0.0 0.5; + } + map { + perspective_on, 1; + perspective, "map"; + } + } + description { + state, "focused" 0.0; + inherit, "default" 0.0; + map.on, 1; + } + description { + state, "focused_0" 0.0; + inherit, "focused" 0.0; + } + } + + part { + name, PART_THUMB_TEXT_BR; + type, TEXT; + scale, 1; + description { + state, "default" 0.0; + color, 92 92 92 255; + rel1 { + to, "padding.thumb.text.left"; relative, 1.0 0.0; } - align, 0.0 0.0; - fixed, 1 1; + rel2 { + to, "padding.thumb.text.right"; + relative, 0.0 1.0; + } text { font, FONT_TIZENSANS_LIGHT; size, 28; @@ -343,6 +517,7 @@ group { state, "focused" 0.0; inherit, "default" 0.0; map.on, 1; + color, 255 255 255 255; } description { state, "focused_0" 0.0; @@ -362,6 +537,7 @@ group { target, "part.focus.down"; target, "part.focus.right"; target, PART_THUMB_TEXT; + target, PART_THUMB_TEXT_BR; after, "focus.in.anim"; } @@ -385,6 +561,7 @@ group { source, "elm"; action, STATE_SET "default" 0.0; target, PART_THUMB_TEXT; + target, PART_THUMB_TEXT_BR; after, "focus.out.anim"; } @@ -438,5 +615,16 @@ group { name, "item_selected"; action, SIGNAL_EMIT SIG_ITEM_SELECTED SRC_EDC; } + + program { + signal, "elm,state,is_browser,active"; + source, "elm"; + action, STATE_SET "visible" 0.0; + target, "part.inside.line.up"; + target, "part.inside.line.left"; + target, "part.inside.line.down"; + target, "part.inside.line.right"; + target, "part.divide.line"; + } } } diff --git a/src/grid/grid_apps.c b/src/grid/grid_apps.c index 8cc220d..a69b923 100644 --- a/src/grid/grid_apps.c +++ b/src/grid/grid_apps.c @@ -45,7 +45,13 @@ static char *_text_get(void *data, Evas_Object *obj, const char *part) if (!name) return NULL; - return strdup(name); + if ((!strcmp(name, STR_BROWSER) + && !strcmp(part, PART_THUMB_TEXT_BR)) + || (strcmp(name, STR_BROWSER) + && !strcmp(part, PART_THUMB_TEXT))) + return strdup(name); + + return NULL; } static Evas_Object *_content_get(void *data, Evas_Object *obj, const char *part) @@ -97,6 +103,12 @@ static Evas_Object *_content_get(void *data, Evas_Object *obj, const char *part) return NULL; } + if (!strcmp(name, STR_BROWSER)) { + evas_object_color_set(rect, COLOR_BR_R, COLOR_BR_G, + COLOR_BR_B, COLOR_BR_A); + return rect; + } + app_contents_get_color(name, &bright, &dark); evas_object_color_set(rect, bright.r, bright.g, bright.b, bright.a); @@ -111,6 +123,12 @@ static Evas_Object *_content_get(void *data, Evas_Object *obj, const char *part) return NULL; } + if (!strcmp(name, STR_BROWSER)) { + evas_object_color_set(rect, COLOR_BR_R, COLOR_BR_G, + COLOR_BR_B, COLOR_BR_A); + return rect; + } + app_contents_get_color(name, &bright, &dark); evas_object_color_set(rect, dark.r, dark.g, dark.b, dark.a); @@ -120,11 +138,35 @@ static Evas_Object *_content_get(void *data, Evas_Object *obj, const char *part) return NULL; } +static Eina_Bool _state_get(void *data, Evas_Object *obj, const char *part) +{ + struct datamgr *dmgr; + char *name; + + if (!data) { + _ERR("Data is NULL."); + return EINA_FALSE; + } + + dmgr = get_apps_datamgr(); + if (!dmgr || !dmgr->get_data) + return EINA_FALSE; + + name = dmgr->get_data(data, DATA_NAME); + if (!name) + return EINA_FALSE; + + if (!strcmp(name, STR_BROWSER)) + return EINA_TRUE; + + return EINA_FALSE; +} + static struct grid_class _gclass = { .item_style = STYLE_APPS, .text_get = _text_get, .content_get = _content_get, - .state_get = NULL, + .state_get = _state_get, .del = NULL, };