diff options
| -rw-r--r-- | include/define.h | 1 | ||||
| -rw-r--r-- | res/edc/widgets/gengrid.edc | 15 | ||||
| -rw-r--r-- | src/util/listmgr.c | 59 |
3 files changed, 5 insertions, 70 deletions
diff --git a/include/define.h b/include/define.h index 9719c5a..1e702ad 100644 --- a/include/define.h +++ b/include/define.h @@ -75,7 +75,6 @@ #define SIG_BTN_CLICKED "btn,clicked" #define SIG_BTN_SELECTED "btn,selected" #define SIG_BTN_UNSELECTED "btn,unselected" -#define SIG_ITEM_FOCUSED "item,focused" #define SIG_ITEM_SELECTED "item,selected" #define SIG_ITEM_UNSELECTED "item,unselected" #define SIG_ITEM_TOGGLED "item,toggled" diff --git a/res/edc/widgets/gengrid.edc b/res/edc/widgets/gengrid.edc index b0e3eba..04b7876 100644 --- a/res/edc/widgets/gengrid.edc +++ b/res/edc/widgets/gengrid.edc @@ -441,11 +441,6 @@ group { target: "part_focus3"; target: "defaultbg_text"; transition: TRANSITION_FOCUS; - after: "item_focused"; - } - program { - name: "item_focused"; - action: SIGNAL_EMIT SIG_ITEM_FOCUSED SIG_SOURCE_EDC; } program { name: "go_passive"; @@ -897,11 +892,6 @@ group { target: "part_focus4"; target: PART_ELM_TEXT_PLAYTIME; transition: TRANSITION_FOCUS; - after: "item_focused"; - } - program { - name: "item_focused"; - action: SIGNAL_EMIT SIG_ITEM_FOCUSED SIG_SOURCE_EDC; } program { name: "go_passive"; @@ -1556,11 +1546,6 @@ group { name: "focus,in,anim,2"; action: STATE_SET "selected" 0.0; target: "defaultbg_text"; - after: "item_focused"; - } - program { - name: "item_focused"; - action: SIGNAL_EMIT SIG_ITEM_FOCUSED SIG_SOURCE_EDC; } program { name: "go_passive"; diff --git a/src/util/listmgr.c b/src/util/listmgr.c index 857d2a0..f62d21e 100644 --- a/src/util/listmgr.c +++ b/src/util/listmgr.c @@ -188,6 +188,10 @@ static void _focused_cb(int id, void *data, Evas_Object *obj, lmgr->focused = elm_object_parent_widget_get(obj); elm_object_signal_emit(lmgr->data->menu_btn, SIG_BTN_SELECTED, SIG_SOURCE_SRC); + + if (it) + lmgr->focused_it = it; + break; default: break; @@ -243,60 +247,11 @@ static void _play_info_selected_cb(void *data, Evas_Object *obj, pops->selected_cb(pops->ops_data, obj); } -static void _item_focused_cb(void *data, Elm_Object_Item *it, - const char *emission, const char *source) -{ - struct listmgr *lmgr; - - if (!data || !it) - return; - - lmgr = data; - - lmgr->focused_it = it; -} - -static void _add_grid_item_callback(Elm_Object_Item *it, void *data) -{ - elm_object_item_signal_callback_add(it, SIG_ITEM_FOCUSED, - SIG_SOURCE_EDC, _item_focused_cb, data); -} - -static void _delete_grid_item_callback(Elm_Object_Item *it) -{ - elm_object_item_signal_callback_del(it, SIG_ITEM_FOCUSED, - SIG_SOURCE_EDC, _item_focused_cb); -} - -static void _realized_cb(int id, void *data, Evas_Object *obj, - Elm_Object_Item *it) -{ - struct listmgr *lmgr; - - if (!data || !it) - return; - - lmgr = data; - - _add_grid_item_callback(it, lmgr); -} - -static void _unrealized_cb(int id, void *data, Evas_Object *obj, - Elm_Object_Item *it) -{ - if (!it) - return; - - _delete_grid_item_callback(it); -} - static input_handler _grid_handler = { .key_down = _key_down_cb, .mouse_move = _mouse_move_cb, .focused = _focused_cb, .selected = _grid_selected_cb, - .realized = _realized_cb, - .unrealized = _unrealized_cb }; static input_handler _handler = { @@ -550,12 +505,8 @@ void _update_grid_realized_items(struct listmgr *lmgr, Eina_List *list) Eina_List *l; Elm_Object_Item *it; - EINA_LIST_FOREACH(list, l, it) { - _delete_grid_item_callback(it); - + EINA_LIST_FOREACH(list, l, it) elm_gengrid_item_update(it); - _add_grid_item_callback(it, lmgr); - } } bool listmgr_update_content_item(struct listmgr *lmgr) |