From 4a568d2bff5b2601b2f3b5a12b0cbb387dc14c7d Mon Sep 17 00:00:00 2001 From: Shinwoo Kim Date: Fri, 3 May 2013 20:01:58 +0900 Subject: [PATCH] [access][genlist] do not append NULL to genlist focus list --- legacy/elementary/ChangeLog | 1 + legacy/elementary/NEWS | 1 + legacy/elementary/src/lib/elm_genlist.c | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog index 1c1752885c..d167428afe 100644 --- a/legacy/elementary/ChangeLog +++ b/legacy/elementary/ChangeLog @@ -1331,3 +1331,4 @@ 2012-05-03 Shinwoo Kim * Fix gengrid does not work under the accessibility. + * Fix do not append NULL to genlist focus list. diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS index 2d1ea7d882..91fe03d4d6 100644 --- a/legacy/elementary/NEWS +++ b/legacy/elementary/NEWS @@ -224,6 +224,7 @@ Fixes: * Elm_entry_filter_accept_set function now can recognize tags. * Don't be dead even if a ctxpopup item callback is null. * Fix gengrid does not work under the accessibility. + * Fix do not append NULL to genlist focus list. Removals: diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c index d1ca36ac26..abdcd6cdaa 100644 --- a/legacy/elementary/src/lib/elm_genlist.c +++ b/legacy/elementary/src/lib/elm_genlist.c @@ -2616,7 +2616,8 @@ _elm_genlist_smart_focus_next(Eo *obj, void *_pd EINA_UNUSED, va_list *list) evas_object_geometry_get(it->base.view, &x, &y, &w, &h); /* check item which displays more than half of its size */ - if (ELM_RECTS_INTERSECT + 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);