From c208e1b8bf27e79fe7af8a6106f2776df6563e71 Mon Sep 17 00:00:00 2001 From: Jeonghyun Yun Date: Fri, 11 Aug 2017 13:55:22 +0900 Subject: [PATCH] elm_scroller: focus_direction should not be called when scroller focusable and no focusable child Summary: when scroller can have focus and scroller's child can't have focus, there is a problem that scroller is always selected to next focus object. In this case, it should not enter into _elm_scroller_elm_widget_focus_direction() Reviewers: woohyun Subscribers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D5085 --- src/lib/elementary/elm_scroller.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c index d0593b55ed..417d84e4aa 100644 --- a/src/lib/elementary/elm_scroller.c +++ b/src/lib/elementary/elm_scroller.c @@ -487,8 +487,11 @@ _elm_scroller_elm_widget_focus_next(Eo *obj EINA_UNUSED, Elm_Scroller_Data *sd, } EOLIAN static Eina_Bool -_elm_scroller_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Elm_Scroller_Data *_pd EINA_UNUSED) +_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; }