summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2018-07-09 16:39:30 -0400
committerMike Blumenkrantz <zmike@samsung.com>2018-07-09 16:39:30 -0400
commitfdc4925bf5fbcb171794a6b290d6ec40f95614b5 (patch)
treef8b237c793111e3e10b795d174d43403307fc4ba
parentee8d06c806f1399de1313b0e323571c74ddaf548 (diff)
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
-rw-r--r--src/lib/elementary/elm_focus_legacy.c3
1 files changed, 2 insertions, 1 deletions
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,
190 if (elm_widget_is(logical)) 190 if (elm_widget_is(logical))
191 { 191 {
192 Efl_Ui_Focus_Object *legacy_target = NULL; 192 Efl_Ui_Focus_Object *legacy_target = NULL;
193 ELM_WIDGET_DATA_GET_OR_RETURN(logical, pd_logical);
193 194
194 #define MAP(direction, field) if (dir == EFL_UI_FOCUS_DIRECTION_ ##direction && pd->legacy_focus.field) legacy_target = pd->legacy_focus.field; 195 #define MAP(direction, field) if (dir == EFL_UI_FOCUS_DIRECTION_ ##direction && pd_logical->legacy_focus.field) legacy_target = pd_logical->legacy_focus.field;
195 MAPPING() 196 MAPPING()
196 #undef MAP 197 #undef MAP
197 198