summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSoohye Shin <soohye.shin@samsung.com>2015-12-10 14:08:39 +0900
committerSoohye Shin <soohye.shin@samsung.com>2015-12-10 14:08:39 +0900
commitff5b1c631c50317b6cd226bacf640844efdcbe9c (patch)
treedc02a445c27b1b0d7a4cb62676e4623ed3ebfa2c
parent9632c0406270de0d9b0c142e5e3525d629ecafb1 (diff)
downloadair_home-ff5b1c631c50317b6cd226bacf640844efdcbe9c.tar.gz
air_home-ff5b1c631c50317b6cd226bacf640844efdcbe9c.tar.bz2
air_home-ff5b1c631c50317b6cd226bacf640844efdcbe9c.zip
remove recent button
Change-Id: Ie83843a6cf41056db7d8b676cf0dd3e49e38ca1e Signed-off-by: Soohye Shin <soohye.shin@samsung.com>
-rw-r--r--src/view/view_home.c50
1 files changed, 2 insertions, 48 deletions
diff --git a/src/view/view_home.c b/src/view/view_home.c
index f078fd5..b9eb206 100644
--- a/src/view/view_home.c
+++ b/src/view/view_home.c
@@ -26,14 +26,12 @@
#include "utils.h"
enum input_handler_type {
- INPUT_HANDLER_TYPE_EO,
- INPUT_HANDLER_TYPE_DOWN
+ INPUT_HANDLER_TYPE_EO
};
struct _priv {
Evas_Object *win;
Evas_Object *base;
- Evas_Object *down;
Evas_Object *scr;
Eina_List *list;
@@ -63,8 +61,6 @@ static void _focused(int id, void *data, Evas_Object *obj,
bi = data;
priv = bi->priv;
priv->foc = bi;
- /* fallthrough */
- case INPUT_HANDLER_TYPE_DOWN:
elm_object_signal_emit(obj, SIG_FOCUS, SRC_PROG);
break;
default:
@@ -77,7 +73,6 @@ static void _unfocused(int id, void *data, Evas_Object *obj,
{
switch (id) {
case INPUT_HANDLER_TYPE_EO:
- case INPUT_HANDLER_TYPE_DOWN:
elm_object_signal_emit(obj, SIG_UNFOCUS, SRC_PROG);
break;
default:
@@ -98,9 +93,7 @@ static void _key_down(int id, void *data, Evas *e, Evas_Object *obj,
case INPUT_HANDLER_TYPE_EO:
bi = data;
priv = bi->priv;
- if (!strcmp(ev->keyname, KEY_DOWN)) {
- viewmgr_push_view(VIEW_RECENT);
- } else if (!strcmp(ev->keyname, KEY_ENTER)) {
+ if (!strcmp(ev->keyname, KEY_ENTER)) {
if (priv->foc->di->action == ITEM_SELECT_ACTION_PUSH)
elm_object_signal_emit(priv->base, SIG_HIDE,
SRC_PROG);
@@ -108,13 +101,6 @@ static void _key_down(int id, void *data, Evas *e, Evas_Object *obj,
datamgr_select_item(priv->dm, priv->foc->di);
}
break;
- case INPUT_HANDLER_TYPE_DOWN:
- priv = data;
- if (!strcmp(ev->keyname, KEY_UP))
- elm_object_focus_set(priv->foc->eo, EINA_TRUE);
- else if (!strcmp(ev->keyname, KEY_ENTER))
- viewmgr_push_view(VIEW_RECENT);
- break;
default:
return;
}
@@ -138,9 +124,6 @@ static void _mouse_down(int id, void *data, Evas *e, Evas_Object *obj,
else
datamgr_select_item(priv->dm, priv->foc->di);
break;
- case INPUT_HANDLER_TYPE_DOWN:
- viewmgr_push_view(VIEW_RECENT);
- break;
default:
return;
}
@@ -150,7 +133,6 @@ static void _mouse_move(int id, void *data, Evas *e, Evas_Object *obj,
Evas_Event_Mouse_Move *ev)
{
switch (id) {
- case INPUT_HANDLER_TYPE_DOWN:
case INPUT_HANDLER_TYPE_EO:
if (!elm_object_focus_get(obj))
elm_object_focus_set(obj, EINA_TRUE);
@@ -168,23 +150,6 @@ static input_handler handler = {
.mouse_move = _mouse_move
};
-static bool _add_navigations(struct _priv *priv, Evas_Object *base)
-{
- Evas_Object *ly;
-
- ly = utils_add_layout(base, GRP_HOME_DOWN_ARROW, true,
- PART_HOME_DOWN_ARROW);
- if (!ly) {
- _ERR("failed to add layout");
- return false;
- }
-
- inputmgr_add_callback(ly, INPUT_HANDLER_TYPE_DOWN, &handler, priv);
- priv->down = ly;
-
- return true;
-}
-
static struct bar_item *_pack_bar_item(struct _priv *priv, Evas_Object *box,
struct datamgr_item *di)
{
@@ -345,14 +310,6 @@ static Evas_Object *_create(Evas_Object *win, void *data)
priv->base = base;
priv->dm = dm;
- if (!_add_navigations(priv, base)) {
- _ERR("failed to load home");
- datamgr_fini(dm);
- evas_object_del(base);
- free(priv);
- return NULL;
- }
-
viewmgr_set_view_data(VIEW_HOME, priv);
elm_object_signal_callback_add(base, SIG_HIDE_DONE, SRC_EDJE,
_hide_done, priv);
@@ -377,7 +334,6 @@ static void _show(void *data)
}
evas_object_show(priv->base);
- elm_object_signal_emit(priv->base, SIG_SHOW_NAVIGATION, SRC_PROG);
elm_object_signal_emit(priv->base, SIG_SHOW, SRC_PROG);
if (!priv->foc)
@@ -415,7 +371,6 @@ static void _hide(void *data)
_unload_home(priv);
- elm_object_signal_emit(priv->base, SIG_HIDE_NAVIGATION, SRC_PROG);
evas_object_hide(priv->base);
}
@@ -432,7 +387,6 @@ static void _destroy(void *data)
datamgr_fini(priv->dm);
inputmgr_remove_callback(priv->base, &handler);
- inputmgr_remove_callback(priv->down, &handler);
evas_object_del(priv->base);
free(priv);