From: Marcel Hollerbach Date: Tue, 26 Sep 2017 23:10:47 +0000 (+0200) Subject: elm_box: remove old api! X-Git-Tag: submit/sandbox/upgrade/efl120/20180319.053334~2339^2~57 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aa6059abd50ce60f099b1433f9a8307996e851de;p=platform%2Fupstream%2Fefl.git elm_box: remove old api! --- diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c index b87d33c..5399663 100644 --- a/src/lib/elementary/elm_box.c +++ b/src/lib/elementary/elm_box.c @@ -31,13 +31,6 @@ _focus_order_flush(Eo *obj, Elm_Box_Data *pd EINA_UNUSED) efl_ui_focus_manager_calc_update_order(wpd->focus.manager, obj, order); } -static void * -_elm_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) { @@ -54,66 +47,6 @@ _child_removed_cb_proxy(void *data, const Efl_Event *event) efl_event_callback_legacy_call(box, ELM_BOX_EVENT_CHILD_REMOVED, child); } -EOLIAN static Eina_Bool -_elm_box_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elm_Box_Data *_pd EINA_UNUSED) -{ - return EINA_TRUE; -} - -EOLIAN static Eina_Bool -_elm_box_elm_widget_focus_next(Eo *obj, Elm_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 = _elm_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 -_elm_box_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Box_Data *_pd EINA_UNUSED) -{ - return EINA_TRUE; -} - -EOLIAN static Eina_Bool -_elm_box_elm_widget_focus_direction(Eo *obj EINA_UNUSED, Elm_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 = _elm_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); -} - EOLIAN static Efl_Ui_Theme_Apply _elm_box_elm_widget_theme_apply(Eo *obj, Elm_Box_Data *sd EINA_UNUSED) { diff --git a/src/lib/elementary/elm_box.eo b/src/lib/elementary/elm_box.eo index 93b0ca8..39c82a9 100644 --- a/src/lib/elementary/elm_box.eo +++ b/src/lib/elementary/elm_box.eo @@ -249,10 +249,6 @@ class Elm.Box (Elm.Widget) class.constructor; 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; Elm.Widget.widget_sub_object_del; Elm.Widget.focus_state_apply;