elm_scroller: remove old api!

diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c
index b10b2b5..1f669df 100644 (file)
--- a/src/lib/elementary/elm_scroller.c
+++ b/src/lib/elementary/elm_scroller.c
@@ -401,140 +401,6 @@ _elm_scroller_elm_widget_theme_apply(Eo *obj, Elm_Scroller_Data *sd EINA_UNUSED)
    return int_ret;
 }
 
-EOLIAN static Eina_Bool
-_elm_scroller_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elm_Scroller_Data *_pd EINA_UNUSED)
-{
-   return EINA_TRUE;
-}
-
-EOLIAN static Eina_Bool
-_elm_scroller_elm_widget_focus_next(Eo *obj EINA_UNUSED, Elm_Scroller_Data *sd, Elm_Focus_Direction dir, Evas_Object **next, Elm_Object_Item **next_item)
-{
-   Evas_Object *cur;
-
-   if (!sd->content) return EINA_FALSE;
-
-   cur = sd->content;
-
-   /* access */
-   if (_elm_config->access_mode)
-     {
-        if ((elm_widget_can_focus_get(cur)) ||
-            (elm_widget_child_can_focus_get(cur)))
-          {
-             return elm_obj_widget_focus_next_get(cur, dir, next, next_item);
-          }
-
-        return EINA_FALSE;
-     }
-
-   /* Try focus cycle in subitem */
-   if ((elm_widget_can_focus_get(cur)) ||
-       (elm_widget_child_can_focus_get(cur)))
-     {
-        Eina_Bool ret = EINA_FALSE;
-
-        ret =  elm_obj_widget_focus_next_get(cur, dir, next, next_item);
-        if (*next)
-          {
-             Evas_Coord x = 0, y = 0;
-             Evas_Coord v_w = 0, v_h = 0;
-             Evas_Coord c_x = 0, c_y = 0;
-             Evas_Coord f_x = 0, f_y = 0, f_w = 0, f_h = 0;
-             Evas_Coord l_x = 0, l_y = 0, l_w = 0, l_h = 0;
-             Evas_Coord step_x = 0, step_y = 0;
-
-             elm_interface_scrollable_content_pos_get(obj, &x, &y);
-             elm_interface_scrollable_step_size_get(obj, &step_x, &step_y);
-             elm_interface_scrollable_content_viewport_geometry_get
-                (obj, NULL, NULL, &v_w, &v_h);
-             evas_object_geometry_get(sd->content, &c_x, &c_y, NULL, NULL);
-             evas_object_geometry_get(*next, &f_x, &f_y, &f_w, &f_h);
-             l_x = f_x - c_x - step_x;
-             l_y = f_y - c_y - step_y;
-             l_w = f_w + (step_x * 2);
-             l_h = f_h + (step_y * 2);
-
-             if (!ret || ELM_RECTS_INTERSECT(x, y, v_w, v_h, l_x, l_y, l_w, l_h))
-               return ret;
-          }
-     }
-
-   if (!(elm_widget_can_focus_get(obj)) &&
-       !(elm_widget_can_focus_get(cur)))
-      return EINA_FALSE;
-
-   /* Return */
-   *next = (Evas_Object *)obj;
-
-   return !elm_widget_focus_get(obj);
-}
-
-EOLIAN static Eina_Bool
-_elm_scroller_elm_widget_focus_direction_manager_is(Eo *obj, Elm_Scroller_Data *_pd EINA_UNUSED)
-{
-   if (!elm_widget_child_can_focus_get(obj))
-     return EINA_FALSE;
-
-   return EINA_TRUE;
-}
-
-EOLIAN static Eina_Bool
-_elm_scroller_elm_widget_focus_direction(Eo *obj, Elm_Scroller_Data *sd, const Evas_Object *base, double degree, Evas_Object **direction, Elm_Object_Item **direction_item, double *weight)
-{
-   Evas_Object *cur;
-
-   if (!sd->content) return EINA_FALSE;
-
-   cur = sd->content;
-
-   /* access */
-   if (_elm_config->access_mode)
-     {
-        if ((elm_widget_can_focus_get(cur)) ||
-            (elm_widget_child_can_focus_get(cur)))
-          {
-             return elm_obj_widget_focus_direction_get(cur, base, degree, direction, direction_item, weight);
-          }
-
-        return EINA_FALSE;
-     }
-
-   /* Try focus cycle in subitem */
-   if ((elm_widget_can_focus_get(cur)) ||
-       (elm_widget_child_can_focus_get(cur)))
-     {
-        Eina_Bool ret = EINA_FALSE;
-        Evas_Coord x = 0, y = 0;
-        Evas_Coord v_w = 0, v_h = 0;
-        Evas_Coord c_x = 0, c_y = 0;
-        Evas_Coord f_x = 0, f_y = 0, f_w = 0, f_h = 0;
-        Evas_Coord l_x = 0, l_y = 0, l_w = 0, l_h = 0;
-        Evas_Coord step_x = 0, step_y = 0;
-
-        ret = elm_obj_widget_focus_direction_get(cur, base, degree, direction, direction_item, weight);
-
-        elm_interface_scrollable_content_pos_get(obj, &x, &y);
-        elm_interface_scrollable_step_size_get(obj, &step_x, &step_y);
-        elm_interface_scrollable_content_viewport_geometry_get
-              (obj, NULL, NULL, &v_w, &v_h);
-        evas_object_geometry_get(sd->content, &c_x, &c_y, NULL, NULL);
-        evas_object_geometry_get(*direction, &f_x, &f_y, &f_w, &f_h);
-        l_x = f_x - c_x - step_x;
-        l_y = f_y - c_y - step_y;
-        l_w = f_w + (step_x * 2);
-        l_h = f_h + (step_y * 2);
-
-        if (!ret || ELM_RECTS_INTERSECT(x, y, v_w, v_h, l_x, l_y, l_w, l_h))
-          return ret;
-     }
-
-   /* Return */
-   *direction = (Evas_Object *)obj;
-
-   return !elm_widget_focus_get(obj);
-}
-
 static void
 _show_region_hook(void *data, Evas_Object *content_obj EINA_UNUSED, Eina_Rect r)
 {

diff --git a/src/lib/elementary/elm_scroller.eo b/src/lib/elementary/elm_scroller.eo
index 94a1159..2ba1718 100644 (file)
--- a/src/lib/elementary/elm_scroller.eo
+++ b/src/lib/elementary/elm_scroller.eo
@@ -49,10 +49,6 @@ class Elm.Scroller (Efl.Ui.Layout, Elm.Interface_Scrollable,
       Efl.Container.content_unset;
       Elm.Widget.theme_apply;
       Elm.Widget.on_access_activate;
-      Elm.Widget.focus_next_manager_is;
-      Elm.Widget.focus_direction_manager_is;
-      Elm.Widget.focus_next;
-      Elm.Widget.focus_direction;
       Elm.Widget.widget_sub_object_del;
       Elm.Widget.widget_event;
       Elm.Interface_Scrollable.page_size { set; }