diff options
author | Minkyu Kang <mk7.kang@samsung.com> | 2015-09-03 17:20:04 +0900 |
---|---|---|
committer | Minkyu Kang <mk7.kang@samsung.com> | 2015-09-03 17:20:04 +0900 |
commit | b498144f8d41fa28bae6562072206a7fef36e5d3 (patch) | |
tree | 8537ed5f61d0d0f0bdfc97346f9423ad1ab2a37c | |
parent | 980652cd0c3096ce73c0dbfe312ad30cedd669cb (diff) | |
download | air_mediahub-b498144f8d41fa28bae6562072206a7fef36e5d3.tar.gz air_mediahub-b498144f8d41fa28bae6562072206a7fef36e5d3.tar.bz2 air_mediahub-b498144f8d41fa28bae6562072206a7fef36e5d3.zip |
zoom: add notify widget
Change-Id: I5c6eb265ad06b846dc7cf8543e2cab324ab979e8
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
-rw-r--r-- | include/define.h | 3 | ||||
-rw-r--r-- | include/view/base.h | 1 | ||||
-rw-r--r-- | res/edc/widgets/notify.edc | 4 | ||||
-rw-r--r-- | src/view/base.c | 10 | ||||
-rw-r--r-- | src/view/zoom.c | 28 |
5 files changed, 37 insertions, 9 deletions
diff --git a/include/define.h b/include/define.h index a169928..a299ea1 100644 --- a/include/define.h +++ b/include/define.h @@ -93,6 +93,9 @@ #define SIG_TIMEOUT "timeout" #define SIG_SCROLL "scroll" +/* style */ +#define STYLE_TOAST "base_toast" + /* transition */ #define TRANSITION_FOCUS DECELERATE 0.20 #define TRANSITION_CLICK DECELERATE 0 diff --git a/include/view/base.h b/include/view/base.h index 95dda2e..1872b55 100644 --- a/include/view/base.h +++ b/include/view/base.h @@ -52,7 +52,6 @@ #define STYLE_BTN_VIEW_MODE "base_btn_view_mode" #define STYLE_BTN_VIEW_OPTION "base_btn_view_option" #define STYLE_BASE_PROGRESS "base_recent_progress" -#define STYLE_TOAST_FAVORITE "base_toast_favorite" #define STYLE_CTXPOPUP_VIEW_MODE "base_ctxpopup_view_mode" #endif /* __AIR_MEDIAHUB_VIEW_BASE_H__ */ diff --git a/res/edc/widgets/notify.edc b/res/edc/widgets/notify.edc index 20bf305..7b22d91 100644 --- a/res/edc/widgets/notify.edc +++ b/res/edc/widgets/notify.edc @@ -15,7 +15,7 @@ */ group { - name: "elm/notify/bottom_left/base_toast_favorite"; + name: "elm/notify/bottom_left/base_toast"; parts { part { name: "padding.bottom.left"; @@ -140,7 +140,7 @@ group { } group { - name: "elm/label/base/base_toast_favorite"; + name: "elm/label/base/base_toast"; parts { part { name: "elm.text"; diff --git a/src/view/base.c b/src/view/base.c index 39d8d3a..a24ad90 100644 --- a/src/view/base.c +++ b/src/view/base.c @@ -639,13 +639,11 @@ static void _show_toast_favorite(struct _priv *priv, const char *id) } if (favorite) - notify = util_add_notify(priv->base, STYLE_TOAST_FAVORITE, - STYLE_TOAST_FAVORITE, TEXT_FAVORITE_ADDED, - TIME_TOAST_FAVORITE); + notify = util_add_notify(priv->base, STYLE_TOAST, STYLE_TOAST, + TEXT_FAVORITE_ADDED, TIME_TOAST_FAVORITE); else - notify = util_add_notify(priv->base, STYLE_TOAST_FAVORITE, - STYLE_TOAST_FAVORITE, TEXT_FAVORITE_REMOVED, - TIME_TOAST_FAVORITE); + notify = util_add_notify(priv->base, STYLE_TOAST, STYLE_TOAST, + TEXT_FAVORITE_REMOVED, TIME_TOAST_FAVORITE); if (!notify) { _ERR("failed to add notify object"); diff --git a/src/view/zoom.c b/src/view/zoom.c index afcc0fc..da4db9f 100644 --- a/src/view/zoom.c +++ b/src/view/zoom.c @@ -26,6 +26,7 @@ #include "define.h" #include "view.h" #include "util/controller.h" +#include "util/util.h" #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) @@ -37,6 +38,9 @@ #define ZOOM_RATIO_X4 0.25 #define MOVE_SIZE 10 +#define TOAST_MESSAGE "Press Back to Escape from Zoom mode" +#define TOAST_TIMEOUT 3.0 + enum { DIR_UP = 0, DIR_DOWN, @@ -51,6 +55,7 @@ struct _priv { Evas_Object *photo; Evas_Object *thumb; Evas_Object *navi[DIR_NUM]; + Evas_Object *notify; app_media_info *mi; struct controller *ctl; double image_ratio; @@ -81,6 +86,25 @@ static struct _btn_info btn_arrow[DIR_NUM] = { }, }; +static void _hide_toast(struct _priv *priv) +{ + if (priv->notify) + evas_object_hide(priv->notify); +} + +static void _show_toast(struct _priv *priv) +{ + Evas_Object *notify; + + notify = util_add_notify(priv->base, STYLE_TOAST, STYLE_TOAST, + TOAST_MESSAGE, TOAST_TIMEOUT); + if (!notify) { + _ERR("failed to add notify object"); + return; + } + + priv->notify = notify; +} static app_media_info *_get_media_info(Eina_List *list, int cur) { @@ -490,6 +514,8 @@ static void _show(void *view_data) _draw_contents(priv); + _show_toast(priv); + ctl = priv->ctl; ctl->ops->show(ctl->handle); ctl->ops->focus(ctl->handle, DIR_UP, true); @@ -521,6 +547,8 @@ static void _hide(void *view_data) evas_object_del(priv->navi[i]); } + _hide_toast(priv); + ctl = priv->ctl; ctl->ops->hide(ctl->handle); } |