From 651fc515e335dc62d18e3d3040611c865cd0d692 Mon Sep 17 00:00:00 2001 From: Soohye Shin Date: Thu, 13 Aug 2015 10:56:57 +0900 Subject: [PATCH] set different color to mask Change-Id: I22b72e674f689ea7ddb4864d4eac4154b5e4e947 Signed-off-by: Soohye Shin --- edje/images/mask_user_foc.png | Bin 0 -> 662 bytes edje/view/baritem.edc | 43 ++++------------------ {edje/images => images}/mask_user_nor.png | Bin include/defs.h | 2 + src/view/view_home.c | 12 ++++-- src/view/view_user.c | 9 ++++- 6 files changed, 26 insertions(+), 40 deletions(-) create mode 100644 edje/images/mask_user_foc.png rename {edje/images => images}/mask_user_nor.png (100%) diff --git a/edje/images/mask_user_foc.png b/edje/images/mask_user_foc.png new file mode 100644 index 0000000000000000000000000000000000000000..5d165fb26614be635c872d7ab9aba20b3b94a37e GIT binary patch literal 662 zcmV;H0%`q;P)Px#0%A)?L;(MXkIcUS000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2j2({0VXki zWPWb|00J6GL_t(&-p$%SY63wN2JlZ=8@II*0|uMe+NIfE3&{<(Q&D&@?B~x3-vI3WFJzSYd-t zIB=0e9wn4f!85W^9-9gonKz6u#_QG3d8pzAPa!oDy!FKsgzBF3Lp)!CVmeX?3DI7V zPMny&6eB{k7lTFU8pcTNMu_&BnA{D9RL6T07*qoM6N<$g7M`T5&!@I literal 0 HcmV?d00001 diff --git a/edje/view/baritem.edc b/edje/view/baritem.edc index 5ab27ea..1ef471a 100644 --- a/edje/view/baritem.edc +++ b/edje/view/baritem.edc @@ -18,10 +18,7 @@ group { name, GRP_BAR_ITEM; images { - image, "mask_user_nor.png" COMP; - } - script { - public mask_on; + image, "mask_user_foc.png" COMP; } parts { part { @@ -170,7 +167,7 @@ group { state, "default" 0.0; rel1.to, PART_BAR_ITEM_ICON; rel2.to, PART_BAR_ITEM_ICON; - image.normal, "mask_user_nor.png"; + image.normal, "mask_user_foc.png"; visible, 0; } description { @@ -180,22 +177,15 @@ group { } } part { - name, "mask_focus"; - type, IMAGE; - scale, 1; + name, PART_BAR_ITEM_MASK; + type, SWALLOW; clip_to, "clip"; + scale, 1; description { state, "default" 0.0; - image.normal, "mask_user_nor.png"; - color, 0 119 245 255; - rel1.to, PART_BAR_ITEM_ICON; - rel2.to, PART_BAR_ITEM_ICON; - visible, 0; - } - description { - state, "show" 0.0; - inherit, "default" 0.0; - visible, 1; + rel1.to, "mask"; + rel2.to, "mask"; + fixed, 1 1; } } part { @@ -288,26 +278,9 @@ group { name, "sig,show,mask"; signal, SIG_SHOW_MASK; source, SRC_PROG; - script { - set_int(mask_on, 1); - } - after, "sig,show,mask,after"; - } - program { - name, "sig,show,mask,after"; - source, SRC_PROG; action, STATE_SET "show" 0.0; target, "mask"; } - program { - name, "sig,focus,mask"; - signal, SIG_FOCUS; - source, SRC_PROG; - script { - if (get_int(mask_on) == 1) - set_state(PART:"mask_focus", "show", 0.0); - } - } program { name, "item,clicked"; source, "click_item"; diff --git a/edje/images/mask_user_nor.png b/images/mask_user_nor.png similarity index 100% rename from edje/images/mask_user_nor.png rename to images/mask_user_nor.png diff --git a/include/defs.h b/include/defs.h index 57f84d8..3d76b6c 100644 --- a/include/defs.h +++ b/include/defs.h @@ -91,6 +91,7 @@ #define PART_BAR_ITEM_BADGE_COUNT "part.bar.item.badge.count" #define PART_BAR_ITEM_LOCK "part.bar.item.lock" #define PART_BAR_ITEM_LOCK_FOCUS "part.bar.item.lock.focus" +#define PART_BAR_ITEM_MASK "part.bar.item.mask" #define PART_USER_BAR "part.user.bar" #define PART_PHOTO_LIST "part.photo.list" #define PART_PHOTO_VIEWER "part.photo.viewer" @@ -143,6 +144,7 @@ #define IMAGE_SWITCH_ON IMAGEDIR"/btn_switch_on_nor.png" #define IMAGE_SWITCH_OFF IMAGEDIR"/btn_switch_off_nor.png" +#define IMAGE_MASK IMAGEDIR"/mask_user_nor.png" #define IMAGE_BADGE IMAGEDIR"/badge_bg.png" #define IMAGE_USER_ADD IMAGEDIR"/btn_user_add_nor.png" #define IMAGE_USER_ADD_FOCUS IMAGEDIR"/btn_user_add_foc.png" diff --git a/src/view/view_home.c b/src/view/view_home.c index 676ea45..1851199 100644 --- a/src/view/view_home.c +++ b/src/view/view_home.c @@ -215,7 +215,7 @@ static struct bar_item *_pack_bar_item(struct _priv *priv, Evas_Object *box, { struct bar_item *bi; struct color_data bright_bg; - Evas_Object *eo, *ic, *focus_ic, *lbl, *focus_lbl, *bg; + Evas_Object *eo, *ic, *focus_ic, *lbl, *focus_lbl, *bg, *mask; char buf[BUF_MAX_UID] = {0}; if (!priv || !box || !di) { @@ -244,9 +244,6 @@ static struct bar_item *_pack_bar_item(struct _priv *priv, Evas_Object *box, if (!focus_ic) goto err; - if (!strcmp(di->icon, di->focus_icon)) - elm_object_signal_emit(eo, SIG_SHOW_MASK, SRC_PROG); - lbl = utils_add_label(eo, di->title, STYLE_LABEL_TITLE, PART_BAR_ITEM_TITLE); if (!lbl) @@ -265,6 +262,13 @@ static struct bar_item *_pack_bar_item(struct _priv *priv, Evas_Object *box, if (!bg) goto err; + if (!strcmp(di->icon, di->focus_icon)) { + elm_object_signal_emit(eo, SIG_SHOW_MASK, SRC_PROG); + mask = utils_add_icon(eo, IMAGE_MASK, PART_BAR_ITEM_MASK); + evas_object_color_set(mask, bright_bg.r, bright_bg.g, + bright_bg.b, bright_bg.a); + } + if (di->noti) bi->badge = _add_notification_badge(eo, di->subtitle); diff --git a/src/view/view_user.c b/src/view/view_user.c index 70b84cc..108c124 100644 --- a/src/view/view_user.c +++ b/src/view/view_user.c @@ -324,7 +324,7 @@ static struct _bar_item *_pack_bar_item(struct _priv *priv, Evas_Object *box, { struct _bar_item *bi; struct color_data bright_bg; - Evas_Object *eo, *ic, *focus_ic, *lbl, *focus_lbl, *bg; + Evas_Object *eo, *ic, *focus_ic, *lbl, *focus_lbl, *bg, *mask; char buf[BUF_MAX_UID] = {0}; bi = calloc(1, sizeof(*bi)); @@ -382,6 +382,13 @@ static struct _bar_item *_pack_bar_item(struct _priv *priv, Evas_Object *box, if (!bg) goto err; + if (!strcmp(di->icon, di->focus_icon)) { + elm_object_signal_emit(eo, SIG_SHOW_MASK, SRC_PROG); + mask = utils_add_icon(eo, IMAGE_MASK, PART_BAR_ITEM_MASK); + evas_object_color_set(mask, bright_bg.r, bright_bg.g, + bright_bg.b, bright_bg.a); + } + evas_object_size_hint_align_set(eo, 0.5, 0.0); inputmgr_add_callback(eo, INPUT_HANDLER_TYPE_EO, &handler, bi); elm_object_signal_callback_add(eo, SIG_CLICK_ITEM, SRC_EDJE, -- 2.34.1