use input handler instead of signal on grid

Change-Id: I61fdb19a2b420bbbb20c452e1f54f61c9fb2d0d1
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/include/define.h b/include/define.h
index fd9d13d..dcc97c4 100644 (file)
--- a/include/define.h
+++ b/include/define.h
@@ -72,8 +72,6 @@
 #define SIG_UNFOCUSED "unfocused"
 #define SIG_SELECTED "selected"
 #define SIG_UNSELECTED "unselected"
-#define SIG_ITEM_FOCUSED "item_focused"
-#define SIG_ITEM_SELECTED "item_selected"
 #define SIG_SOURCE_EDC "edc"
 #define SIG_FAVORITE "favorite"
 #define SIG_UNFAVORITE "unfavorite"

diff --git a/res/widget/gengrid.edc b/res/widget/gengrid.edc
index a2c1513..936e718 100644 (file)
--- a/res/widget/gengrid.edc
+++ b/res/widget/gengrid.edc
@@ -528,7 +528,6 @@ group {
                        target, "part.focus.down";
                        target, "part.focus.right";
                        transition, TRANSITION_FOCUS;
-                       after, "item_focused";
                }
 
                program {
@@ -564,18 +563,6 @@ group {
                }
 
                program {
-                       name, "item_focused";
-                       action, SIGNAL_EMIT SIG_ITEM_FOCUSED SIG_SOURCE_EDC;
-               }
-
-               program {
-                       name, "selected";
-                       signal, "elm,state,selected";
-                       source, "elm";
-                       action, SIGNAL_EMIT SIG_ITEM_SELECTED SIG_SOURCE_EDC;
-               }
-
-               program {
                        signal, "elm,state,is_browser,active";
                        source, "elm";
                        action, STATE_SET "visible" 0.0;

diff --git a/src/view/view_action_menu.c b/src/view/view_action_menu.c
index c32151d..99b971b 100644 (file)
--- a/src/view/view_action_menu.c
+++ b/src/view/view_action_menu.c
@@ -286,45 +286,19 @@ static void _grid_mouse_move_cb(int id, void *data, Evas *e, Evas_Object *obj,
                elm_object_item_focus_set(it, EINA_TRUE);
 }
 
-static void _grid_item_selected_cb(void *data, Elm_Object_Item *it,
-               const char *emission, const char *source)
+static void _grid_selected_cb(int id, void *data, Evas_Object *obj,
+               Elm_Object_Item *item)
 {
        struct app_data *adata;
 
-       if (!it) {
+       if (!item) {
                _ERR("Invalid argument.");
                return;
        }
-       adata = elm_object_item_data_get(it);
+       adata = elm_object_item_data_get(item);
 
        if (!utils_launch_app(get_app_id(adata), NULL, NULL))
                _ERR("Launch app failed.");
-
-       elm_gengrid_item_selected_set(it, EINA_FALSE);
-}
-
-static void _grid_realized_cb(int id, void *data, Evas_Object *obj,
-               Elm_Object_Item *item)
-{
-       if (!data || !item) {
-               _ERR("Invalid argument.");
-               return;
-       }
-
-       elm_object_item_signal_callback_add(item, SIG_ITEM_SELECTED,
-                       SIG_SOURCE_EDC, _grid_item_selected_cb, data);
-}
-
-static void _grid_unrealized_cb(int id, void *data, Evas_Object *obj,
-               Elm_Object_Item *item)
-{
-       if (!item) {
-               _ERR("Invalid argument.");
-               return;
-       }
-
-       elm_object_item_signal_callback_del(item, SIG_ITEM_SELECTED,
-                       SIG_SOURCE_EDC, _grid_item_selected_cb);
 }
 
 static input_handler _btn_input_handler = {
@@ -335,8 +309,7 @@ static input_handler _btn_input_handler = {
 
 static input_handler _grid_input_handler = {
        .mouse_move = _grid_mouse_move_cb,
-       .realized = _grid_realized_cb,
-       .unrealized = _grid_unrealized_cb,
+       .selected = _grid_selected_cb,
        .key_down = _key_down_cb
 };
 

diff --git a/src/view/view_base.c b/src/view/view_base.c
index e41f3ba..c4a4962 100644 (file)
--- a/src/view/view_base.c
+++ b/src/view/view_base.c
@@ -341,32 +341,21 @@ static void _grid_focused_cb(int id, void *data, Evas_Object *obj,
        priv = data;
 
        elm_object_signal_emit(priv->focused_menu, SIG_SELECTED, SRC_MENU_BTN);
-}
-
-static void _grid_item_focused_cb(void *data, Elm_Object_Item *it,
-               const char *emission, const char *source)
-{
-       struct _priv *priv;
 
-       if (!data || !it) {
-               _ERR("Invalid argument.");
-               return;
-       }
-       priv = data;
-
-       priv->focused_item = it;
+       if (item)
+               priv->focused_item = item;
 }
 
-static void _grid_item_selected_cb(void *data, Elm_Object_Item *it,
-               const char *emission, const char *source)
+static void _grid_selected_cb(int id, void *data, Evas_Object *obj,
+               Elm_Object_Item *item)
 {
        struct app_data *adata;
 
-       if (!it) {
+       if (!item) {
                _ERR("Invalid argument.");
                return;
        }
-       adata = elm_object_item_data_get(it);
+       adata = elm_object_item_data_get(item);
 
        if (!utils_launch_app(get_app_id(adata), NULL, NULL))
                _ERR("Launch app failed.");
@@ -385,30 +374,11 @@ static void _grid_realized_cb(int id, void *data, Evas_Object *obj,
 
        adata = elm_object_item_data_get(item);
 
-       elm_object_item_signal_callback_add(item, SIG_ITEM_FOCUSED,
-                       SIG_SOURCE_EDC, _grid_item_focused_cb, data);
-       elm_object_item_signal_callback_add(item, SIG_ITEM_SELECTED,
-                       SIG_SOURCE_EDC, _grid_item_selected_cb, data);
-
        if (get_app_favorite(adata, &isfavorite) && isfavorite)
                elm_object_item_signal_emit(item, SIG_FAVORITE,
                                SRC_FAVORITE_ICON);
 }
 
-static void _grid_unrealized_cb(int id, void *data, Evas_Object *obj,
-               Elm_Object_Item *item)
-{
-       if (!item) {
-               _ERR("Invalid argument.");
-               return;
-       }
-
-       elm_object_item_signal_callback_del(item, SIG_ITEM_FOCUSED,
-                       SIG_SOURCE_EDC, _grid_item_focused_cb);
-       elm_object_item_signal_callback_del(item, SIG_ITEM_SELECTED,
-                       SIG_SOURCE_EDC, _grid_item_selected_cb);
-}
-
 static void _grid_key_down_cb(int id, void *data, Evas *e, Evas_Object *obj,
                Evas_Event_Key_Down *ev)
 {
@@ -440,8 +410,8 @@ static input_handler _sort_input_handler = {
 static input_handler _grid_input_handler = {
        .mouse_move = _grid_mouse_move_cb,
        .focused = _grid_focused_cb,
+       .selected = _grid_selected_cb,
        .realized = _grid_realized_cb,
-       .unrealized = _grid_unrealized_cb,
        .key_down = _grid_key_down_cb
 };