From a38f5c38921e16cd87d67dbd5cb3d0402edee4a3 Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Wed, 27 Sep 2017 01:26:33 +0200 Subject: [PATCH] elm_genlist: for now disable this code it will return later --- src/lib/elementary/elm_genlist.c | 65 ++------------------------------------- src/lib/elementary/elm_genlist.eo | 3 -- 2 files changed, 2 insertions(+), 66 deletions(-) diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index 9d16bc4..767b322 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -2882,6 +2882,7 @@ _elm_genlist_item_content_focus_set(Elm_Gen_Item *it, Elm_Focus_Direction dir) EINA_LIST_FOREACH(it->item_focus_chain, l, focused_obj) if (elm_object_focus_get(focused_obj)) break; + /* FOCUS-FIXME if (focused_obj && (dir != ELM_FOCUS_PREVIOUS)) { Evas_Object *nextfocus; @@ -2895,6 +2896,7 @@ _elm_genlist_item_content_focus_set(Elm_Gen_Item *it, Elm_Focus_Direction dir) return; } } + */ if (!l) l = it->item_focus_chain; @@ -3355,69 +3357,6 @@ _elm_genlist_elm_widget_on_focus_update(Eo *obj, Elm_Genlist_Data *sd, Elm_Objec static Eina_Bool _elm_genlist_smart_focus_next_enable = EINA_FALSE; -EOLIAN static Eina_Bool -_elm_genlist_elm_widget_focus_next_manager_is(Eo *obj EINA_UNUSED, Elm_Genlist_Data *_pd EINA_UNUSED) -{ - return _elm_genlist_smart_focus_next_enable; -} - -EOLIAN static Eina_Bool -_elm_genlist_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Genlist_Data *_pd EINA_UNUSED) -{ - return EINA_FALSE; -} - -EOLIAN static Eina_Bool -_elm_genlist_elm_widget_focus_next(Eo *obj, Elm_Genlist_Data *sd, Elm_Focus_Direction dir, Evas_Object **next, Elm_Object_Item **next_item) -{ - Evas_Coord x, y, w, h; - Evas_Coord sx, sy, sw, sh; - Item_Block *itb; - Eina_List *items = NULL; - Eina_Bool done = EINA_FALSE; - int ret; - - evas_object_geometry_get(sd->obj, &sx, &sy, &sw, &sh); - - EINA_INLIST_FOREACH(sd->blocks, itb) - { - if (itb->realized) - { - Eina_List *l; - Elm_Gen_Item *it; - - done = EINA_TRUE; - EINA_LIST_FOREACH(itb->items, l, it) - { - if (it->realized) - { - evas_object_geometry_get(it->base->view, &x, &y, &w, &h); - - /* check item which displays more than half of its size */ - if (it->base->access_obj && - ELM_RECTS_INTERSECT - (x + (w / 2), y + (h / 2), 0, 0, sx, sy, sw, sh)) - items = eina_list_append(items, it->base->access_obj); - - if (!it->base->access_order) continue; - - Eina_List *subl; - Evas_Object *subo; - EINA_LIST_FOREACH(it->base->access_order, subl, subo) - items = eina_list_append(items, subo); - } - } - } - else if (done) break; - } - - ret = elm_widget_focus_list_next_get - (obj, items, eina_list_data_get, dir, next, next_item); - eina_list_free(items); - - return ret; -} - static void _mirrored_set(Evas_Object *obj, Eina_Bool rtl) diff --git a/src/lib/elementary/elm_genlist.eo b/src/lib/elementary/elm_genlist.eo index 3e36efc..595fb4d 100644 --- a/src/lib/elementary/elm_genlist.eo +++ b/src/lib/elementary/elm_genlist.eo @@ -533,13 +533,10 @@ class Elm.Genlist (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, Efl.Gfx.size { set; } Efl.Canvas.Group.group_member_add; Elm.Widget.theme_apply; - Elm.Widget.focus_next_manager_is; Elm.Widget.widget_sub_object_add; Elm.Widget.on_access_update; Elm.Widget.focus_highlight_geometry { get; } - Elm.Widget.focus_next; Elm.Widget.on_focus_update; - Elm.Widget.focus_direction_manager_is; Elm.Widget.widget_sub_object_del; Elm.Widget.widget_event; Elm.Widget.focused_item { get; } -- 2.7.4