From 6bc769b3175b3541fbbe7e6bc07613a5fd8e6de3 Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Wed, 27 Sep 2017 01:03:59 +0200 Subject: [PATCH] efl_ui_text: remove old api! --- src/lib/elementary/efl_ui_text.c | 20 ++++---------------- src/lib/elementary/efl_ui_text.eo | 2 -- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c index 77b022a..eca513b 100644 --- a/src/lib/elementary/efl_ui_text.c +++ b/src/lib/elementary/efl_ui_text.c @@ -2795,7 +2795,7 @@ _selection_handlers_offset_calc(Evas_Object *obj, Evas_Object *handler, Evas_Coo EFL_UI_TEXT_DATA_GET(obj, sd); evas_object_geometry_get(sd->entry_edje, &ex, &ey, NULL, NULL); - efl_text_cursor_geometry_get(obj, + efl_text_cursor_geometry_get(obj, efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN), EFL_TEXT_CURSOR_TYPE_BEFORE, &cx, &cy, &cw, &ch, @@ -4068,18 +4068,6 @@ _efl_ui_text_elm_widget_on_access_activate(Eo *obj, Efl_Ui_Text_Data *_pd EINA_U return EINA_TRUE; } -EOLIAN static Eina_Bool -_efl_ui_text_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *_pd EINA_UNUSED) -{ - return EINA_FALSE; -} - -EOLIAN static Eina_Bool -_efl_ui_text_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *_pd EINA_UNUSED) -{ - return EINA_FALSE; -} - static void _efl_ui_text_class_constructor(Efl_Class *klass) { @@ -4722,7 +4710,7 @@ _update_text_cursors(Eo *obj) x = y = w = h = -1; xx = yy = ww = hh = -1; _decoration_calc_offset(sd, &x, &y); - bidi_cursor = efl_text_cursor_geometry_get(obj, + bidi_cursor = efl_text_cursor_geometry_get(obj, efl_text_cursor_get(text_obj, EFL_TEXT_CURSOR_GET_MAIN), EFL_TEXT_CURSOR_TYPE_BEFORE, &xx, &yy, &ww, &hh, &xx2, &yy2, NULL, NULL); @@ -5006,8 +4994,8 @@ _anchors_create(Eo *obj, Efl_Ui_Text_Data *sd) Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text"); _anchors_clear_all(obj, sd); - start = efl_text_cursor_new(text_obj); - end = efl_text_cursor_new(text_obj); + start = efl_text_cursor_new(text_obj); + end = efl_text_cursor_new(text_obj); /* Retrieve all annotations in the text. */ efl_text_cursor_paragraph_first(obj, start); diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo index 27314bb..fccc359 100644 --- a/src/lib/elementary/efl_ui_text.eo +++ b/src/lib/elementary/efl_ui_text.eo @@ -359,13 +359,11 @@ class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, Efl.Canvas.Layout_Signal.signal_callback_del; Efl.Canvas.Layout_Signal.signal_emit; Elm.Widget.on_access_activate; - Elm.Widget.focus_direction_manager_is; Elm.Widget.theme_apply; Elm.Widget.on_focus_update; Elm.Widget.focus_region { get; } Elm.Widget.on_disabled_update; Elm.Widget.widget_sub_object_del; - Elm.Widget.focus_next_manager_is; Elm.Interface_Scrollable.policy { set; } Elm.Interface_Scrollable.bounce_allow { set; } Elm.Interface.Atspi_Accessible.state_set { get; } -- 2.7.4