diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c index 1986b94957..65e57d8dd7 100644 --- a/src/lib/elementary/efl_ui_grid.c +++ b/src/lib/elementary/efl_ui_grid.c @@ -20,90 +20,6 @@ struct _Custom_Table_Data EFL_CALLBACKS_ARRAY_DEFINE(subobj_callbacks, { EFL_EVENT_DEL, _subobj_del_cb }); -EOLIAN static Eina_Bool -_efl_ui_grid_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Efl_Ui_Grid_Data *pd EINA_UNUSED) -{ - return EINA_TRUE; -} - -EOLIAN static Eina_Bool -_efl_ui_grid_elm_widget_focus_next(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED, Elm_Focus_Direction dir, Evas_Object **next, Elm_Object_Item **next_item) -{ - Eina_Bool int_ret; - - const Eina_List *items; - Eina_List *(*list_free)(Eina_List *list); - void *(*list_data_get)(const Eina_List *list); - - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); - - /* Focus chain */ - /* TODO: Change this to use other chain */ - if ((items = elm_obj_widget_focus_custom_chain_get(obj))) - { - list_data_get = eina_list_data_get; - list_free = NULL; - } - else - { - items = evas_object_table_children_get - (wd->resize_obj); - list_data_get = eina_list_data_get; - list_free = eina_list_free; - - if (!items) return EINA_FALSE; - } - - int_ret = elm_widget_focus_list_next_get(obj, items, list_data_get, dir, next, next_item); - - if (list_free) list_free((Eina_List *)items); - - return int_ret; -} - -EOLIAN static Eina_Bool -_efl_ui_grid_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Efl_Ui_Grid_Data *pd EINA_UNUSED) -{ - return EINA_TRUE; -} - -EOLIAN static Eina_Bool -_efl_ui_grid_elm_widget_focus_direction(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED, const Evas_Object *base, double degree, Evas_Object **direction, Elm_Object_Item **direction_item, double *weight) -{ - Eina_Bool int_ret; - - const Eina_List *items; - Eina_List *(*list_free)(Eina_List *list); - void *(*list_data_get)(const Eina_List *list); - - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); - - /* Focus chain */ - /* TODO: Change this to use other chain */ - if ((items = elm_obj_widget_focus_custom_chain_get(obj))) - { - list_data_get = eina_list_data_get; - list_free = NULL; - } - else - { - items = evas_object_table_children_get - (wd->resize_obj); - list_data_get = eina_list_data_get; - list_free = eina_list_free; - - if (!items) return EINA_FALSE; - } - - int_ret = elm_widget_focus_list_direction_get - (obj, base, items, list_data_get, degree, direction, direction_item, weight); - - if (list_free) - list_free((Eina_List *)items); - - return int_ret; -} - static void _mirrored_set(Evas_Object *obj, Eina_Bool rtl) { diff --git a/src/lib/elementary/efl_ui_grid.eo b/src/lib/elementary/efl_ui_grid.eo index bc6c98a467..2d2f809e2d 100644 --- a/src/lib/elementary/efl_ui_grid.eo +++ b/src/lib/elementary/efl_ui_grid.eo @@ -5,10 +5,6 @@ class Efl.Ui.Grid (Elm.Widget, Efl.Pack.Grid, Efl.Pack.Layout, implements { Efl.Object.constructor; Efl.Canvas.Group.group_calculate; - Elm.Widget.focus_direction; - Elm.Widget.focus_next_manager_is; - Elm.Widget.focus_direction_manager_is; - Elm.Widget.focus_next; Elm.Widget.theme_apply; Efl.Container.content_iterate; Efl.Container.content_count;