bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=7b113171591b5dfedaf6332915b5701600cddfd7
commit 7b113171591b5dfedaf6332915b5701600cddfd7 Author: Marcel Hollerbach <[email protected]> Date: Mon Sep 25 17:44:08 2017 +0200 efl_ui_box: remove old api! --- src/lib/elementary/efl_ui_box.c | 68 ---------------------------------------- src/lib/elementary/efl_ui_box.eo | 4 --- 2 files changed, 72 deletions(-) diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c index a03bac5cb6..aeab3b9477 100644 --- a/src/lib/elementary/efl_ui_box.c +++ b/src/lib/elementary/efl_ui_box.c @@ -15,14 +15,6 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { {NULL, NULL} }; -static void * -_efl_ui_box_list_data_get(const Eina_List *list) -{ - Evas_Object_Box_Option *opt = eina_list_data_get(list); - - return opt->obj; -} - static void _child_added_cb_proxy(void *data, const Efl_Event *event) { @@ -41,66 +33,6 @@ _child_removed_cb_proxy(void *data, const Efl_Event *event) efl_event_callback_legacy_call(box, EFL_CONTAINER_EVENT_CONTENT_REMOVED, child); } -EOLIAN static Eina_Bool -_efl_ui_box_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Efl_Ui_Box_Data *_pd EINA_UNUSED) -{ - return EINA_TRUE; -} - -EOLIAN static Eina_Bool -_efl_ui_box_elm_widget_focus_next(Eo *obj, Efl_Ui_Box_Data *_pd EINA_UNUSED, Elm_Focus_Direction dir, Evas_Object **next, Elm_Object_Item **next_item) -{ - const Eina_List *items; - void *(*list_data_get)(const Eina_List *list); - - /* 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; - else - { - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); - Evas_Object_Box_Data *bd = - evas_object_smart_data_get(wd->resize_obj); - - items = bd->children; - list_data_get = _efl_ui_box_list_data_get; - - if (!items) return EINA_FALSE; - } - - return elm_widget_focus_list_next_get(obj, items, list_data_get, dir, next, next_item); -} - -EOLIAN static Eina_Bool -_efl_ui_box_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Efl_Ui_Box_Data *_pd EINA_UNUSED) -{ - return EINA_TRUE; -} - -EOLIAN static Eina_Bool -_efl_ui_box_elm_widget_focus_direction(Eo *obj EINA_UNUSED, Efl_Ui_Box_Data *_pd EINA_UNUSED, const Evas_Object *base, double degree, Evas_Object **direction, Elm_Object_Item **direction_item, double *weight) -{ - const Eina_List *items; - void *(*list_data_get)(const Eina_List *list); - - if ((items = elm_obj_widget_focus_custom_chain_get(obj))) - list_data_get = eina_list_data_get; - else - { - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); - Evas_Object_Box_Data *bd = - evas_object_smart_data_get(wd->resize_obj); - - items = bd->children; - list_data_get = _efl_ui_box_list_data_get; - - if (!items) return EINA_FALSE; - } - return elm_widget_focus_list_direction_get - (obj, base, items, list_data_get, degree, direction, direction_item, weight); -} - static void _sizing_eval(Evas_Object *obj, Efl_Ui_Box_Data *sd) { diff --git a/src/lib/elementary/efl_ui_box.eo b/src/lib/elementary/efl_ui_box.eo index b3440ac86e..812c1bc640 100644 --- a/src/lib/elementary/efl_ui_box.eo +++ b/src/lib/elementary/efl_ui_box.eo @@ -18,10 +18,6 @@ class Efl.Ui.Box (Elm.Widget, Efl.Pack.Linear, 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; Efl.Container.content_iterate; Efl.Container.content_count; Efl.Ui.Direction.direction { get; set; } --
