bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=21ff1ae349ac2d6190923c24cd45db6841aac449
commit 21ff1ae349ac2d6190923c24cd45db6841aac449 Author: Marcel Hollerbach <[email protected]> Date: Wed Sep 27 01:27:12 2017 +0200 elm_grid: remove old api! --- src/lib/elementary/elm_grid.c | 82 ------------------------------------------ src/lib/elementary/elm_grid.eo | 4 --- 2 files changed, 86 deletions(-) diff --git a/src/lib/elementary/elm_grid.c b/src/lib/elementary/elm_grid.c index 7c85648882..90d310262d 100644 --- a/src/lib/elementary/elm_grid.c +++ b/src/lib/elementary/elm_grid.c @@ -22,88 +22,6 @@ _focus_order_flush(Eo *obj) efl_ui_focus_manager_calc_update_order(wpd->focus.manager, obj, order); } - -EOLIAN static Eina_Bool -_elm_grid_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED) -{ - return EINA_TRUE; -} - -EOLIAN static Eina_Bool -_elm_grid_elm_widget_focus_next(Eo *obj, void *_pd EINA_UNUSED, Elm_Focus_Direction dir, Evas_Object **next, Elm_Object_Item **next_item) -{ - const Eina_List *items; - Eina_List *(*list_free)(Eina_List *list); - void *(*list_data_get)(const Eina_List *list); - - Eina_Bool int_ret; - - 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_grid_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 -_elm_grid_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED) -{ - return EINA_TRUE; -} - -EOLIAN static Eina_Bool -_elm_grid_elm_widget_focus_direction(Eo *obj, void *_pd EINA_UNUSED, const Evas_Object *base, double degree, Evas_Object **direction, Elm_Object_Item **direction_item, double *weight) -{ - const Eina_List *items; - Eina_List *(*list_free)(Eina_List *list); - void *(*list_data_get)(const Eina_List *list); - - Eina_Bool int_ret; - - 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_grid_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/elm_grid.eo b/src/lib/elementary/elm_grid.eo index b635fad7e9..92604eb7b1 100644 --- a/src/lib/elementary/elm_grid.eo +++ b/src/lib/elementary/elm_grid.eo @@ -55,10 +55,6 @@ class Elm.Grid (Elm.Widget) implements { class.constructor; Efl.Object.constructor; - Elm.Widget.focus_direction; - Elm.Widget.focus_next_manager_is; - Elm.Widget.focus_next; - Elm.Widget.focus_direction_manager_is; Elm.Widget.theme_apply; } } --
