From fdc4925bf5fbcb171794a6b290d6ec40f95614b5 Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Mon, 9 Jul 2018 16:39:30 -0400 Subject: [PATCH] elm_focus_legacy: fix focus moving for legacy Summary: elm_object_focus_next was not working correctly for objects where obj is not the focused object. fix T5940 Reviewers: devilhorns, segfaultxavi, zmike, stefan_schmidt Reviewed By: segfaultxavi Subscribers: cedric, #committers, zmike Tags: #efl Maniphest Tasks: T5940 Differential Revision: https://phab.enlightenment.org/D6531 --- src/lib/elementary/elm_focus_legacy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/elementary/elm_focus_legacy.c b/src/lib/elementary/elm_focus_legacy.c index 13d80565fb..7c8bbe7917 100644 --- a/src/lib/elementary/elm_focus_legacy.c +++ b/src/lib/elementary/elm_focus_legacy.c @@ -190,8 +190,9 @@ elm_object_focus_next(Evas_Object *obj, if (elm_widget_is(logical)) { Efl_Ui_Focus_Object *legacy_target = NULL; + ELM_WIDGET_DATA_GET_OR_RETURN(logical, pd_logical); - #define MAP(direction, field) if (dir == EFL_UI_FOCUS_DIRECTION_ ##direction && pd->legacy_focus.field) legacy_target = pd->legacy_focus.field; + #define MAP(direction, field) if (dir == EFL_UI_FOCUS_DIRECTION_ ##direction && pd_logical->legacy_focus.field) legacy_target = pd_logical->legacy_focus.field; MAPPING() #undef MAP