From 233bd3cdca181c3e7d9f8bca31c99fa82234398b Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Wed, 27 Sep 2017 01:13:09 +0200 Subject: [PATCH] elm_bubble: remove old api! --- src/lib/elementary/elm_bubble.c | 50 -------------------------------- src/lib/elementary/elm_bubble.eo | 4 --- 2 files changed, 54 deletions(-) diff --git a/src/lib/elementary/elm_bubble.c b/src/lib/elementary/elm_bubble.c index a39aa3d000..b761cbc5b0 100644 --- a/src/lib/elementary/elm_bubble.c +++ b/src/lib/elementary/elm_bubble.c @@ -79,44 +79,6 @@ _on_mouse_up(void *data, efl_event_callback_legacy_call(data, EFL_UI_EVENT_CLICKED, NULL); } -/* overriding layout's focus_next() in order to just cycle through the - * content's tree */ -EOLIAN static Eina_Bool -_elm_bubble_elm_widget_focus_next(Eo *obj, Elm_Bubble_Data *_pd EINA_UNUSED, Elm_Focus_Direction dir, Evas_Object **next, Elm_Object_Item **next_item) -{ - Evas_Object *content; - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); - if ((elm_widget_can_focus_get(obj)) && - (!wd->focused)) - { - // ACCESS - *next = (Evas_Object *)obj; - return EINA_TRUE; - } - else - { - content = elm_layout_content_get(obj, NULL); - if (!content) return EINA_FALSE; - - /* attempt to follow focus cycle into sub-object */ - return elm_obj_widget_focus_next_get(content, dir, next, next_item); - } -} - -EOLIAN static Eina_Bool -_elm_bubble_elm_widget_focus_direction(Eo *obj, Elm_Bubble_Data *_pd EINA_UNUSED, const Evas_Object *base, double degree, Evas_Object **direction, Elm_Object_Item **direction_item, double *weight) -{ - Evas_Object *content; - - content = elm_layout_content_get(obj, NULL); - - if (!content) return EINA_FALSE; - - /* Try Focus cycle in subitem */ - return elm_obj_widget_focus_direction_get - (content, base, degree, direction, direction_item, weight); -} - static Eina_Bool _elm_bubble_text_set(Eo *obj, Elm_Bubble_Data *_pd EINA_UNUSED, const char *part, const char *label) { @@ -262,18 +224,6 @@ _elm_bubble_pos_get(Eo *obj EINA_UNUSED, Elm_Bubble_Data *sd) return sd->pos; } -EOLIAN static Eina_Bool -_elm_bubble_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elm_Bubble_Data *_pd EINA_UNUSED) -{ - return EINA_TRUE; -} - -EOLIAN static Eina_Bool -_elm_bubble_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Bubble_Data *_pd EINA_UNUSED) -{ - return EINA_TRUE; -} - EOLIAN static void _elm_bubble_class_constructor(Efl_Class *klass) { diff --git a/src/lib/elementary/elm_bubble.eo b/src/lib/elementary/elm_bubble.eo index fe297a718b..df62e212ef 100644 --- a/src/lib/elementary/elm_bubble.eo +++ b/src/lib/elementary/elm_bubble.eo @@ -38,10 +38,6 @@ class Elm.Bubble (Efl.Ui.Layout, Efl.Ui.Clickable) 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.on_access_update; Efl.Part.part; }