summaryrefslogtreecommitdiff
path: root/src/lib/elementary/elm_focus_legacy.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/elementary/elm_focus_legacy.c')
-rw-r--r--src/lib/elementary/elm_focus_legacy.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/elementary/elm_focus_legacy.c b/src/lib/elementary/elm_focus_legacy.c
index f11c705d08..30f8c09e2c 100644
--- a/src/lib/elementary/elm_focus_legacy.c
+++ b/src/lib/elementary/elm_focus_legacy.c
@@ -121,7 +121,7 @@ elm_object_focus_next_object_set(Evas_Object *obj,
121 #define MAP(direction, field) if ((Efl_Ui_Focus_Direction)dir == EFL_UI_FOCUS_DIRECTION_ ##direction) pd->legacy_focus.field = next; 121 #define MAP(direction, field) if ((Efl_Ui_Focus_Direction)dir == EFL_UI_FOCUS_DIRECTION_ ##direction) pd->legacy_focus.field = next;
122 MAPPING() 122 MAPPING()
123 #undef MAP 123 #undef MAP
124 dir = efl_ui_focus_util_direction_complement(dir); 124 dir = (Elm_Focus_Direction)efl_ui_focus_util_direction_complement((Efl_Ui_Focus_Direction)dir);
125 #define MAP(direction, field) if ((Efl_Ui_Focus_Direction)dir == EFL_UI_FOCUS_DIRECTION_ ##direction) next_pd->legacy_focus.field = obj; 125 #define MAP(direction, field) if ((Efl_Ui_Focus_Direction)dir == EFL_UI_FOCUS_DIRECTION_ ##direction) next_pd->legacy_focus.field = obj;
126 MAPPING() 126 MAPPING()
127 #undef MAP 127 #undef MAP
@@ -247,7 +247,7 @@ elm_object_focus_next(Evas_Object *obj,
247 if (!legacy_target) 247 if (!legacy_target)
248 { 248 {
249 Eina_Array *old_chain = _focus_parent_chain_gen(logical); 249 Eina_Array *old_chain = _focus_parent_chain_gen(logical);
250 Eina_Array *new_chain = _focus_parent_chain_gen(efl_ui_focus_manager_request_move(top, dir, NULL, EINA_FALSE)); 250 Eina_Array *new_chain = _focus_parent_chain_gen(efl_ui_focus_manager_request_move(top, (Efl_Ui_Focus_Direction)dir, NULL, EINA_FALSE));
251 251
252 //first pop off all elements that are the same 252 //first pop off all elements that are the same
253 while (eina_array_count(new_chain) > 0 && eina_array_count(old_chain) > 0 && 253 while (eina_array_count(new_chain) > 0 && eina_array_count(old_chain) > 0 &&
@@ -286,7 +286,7 @@ elm_object_focus_next(Evas_Object *obj,
286 } 286 }
287 287
288 if (!legacy_focus_move) 288 if (!legacy_focus_move)
289 o = efl_ui_focus_manager_move(top, dir); 289 o = efl_ui_focus_manager_move(top, (Efl_Ui_Focus_Direction)dir);
290 if (!o) 290 if (!o)
291 { 291 {
292 if ((Efl_Ui_Focus_Direction)dir == EFL_UI_FOCUS_DIRECTION_NEXT || (Efl_Ui_Focus_Direction)dir == EFL_UI_FOCUS_DIRECTION_PREVIOUS) 292 if ((Efl_Ui_Focus_Direction)dir == EFL_UI_FOCUS_DIRECTION_NEXT || (Efl_Ui_Focus_Direction)dir == EFL_UI_FOCUS_DIRECTION_PREVIOUS)
@@ -294,7 +294,7 @@ elm_object_focus_next(Evas_Object *obj,
294 Efl_Ui_Focus_Object *root; 294 Efl_Ui_Focus_Object *root;
295 295
296 root = efl_ui_focus_manager_root_get(top); 296 root = efl_ui_focus_manager_root_get(top);
297 efl_ui_focus_manager_setup_on_first_touch(top, dir, root); 297 efl_ui_focus_manager_setup_on_first_touch(top, (Efl_Ui_Focus_Direction)dir, root);
298 } 298 }
299 } 299 }
300} 300}
@@ -310,7 +310,7 @@ elm_object_focus_next_object_get(const Evas_Object *obj,
310 MAPPING() 310 MAPPING()
311 #undef MAP 311 #undef MAP
312 312
313 return efl_ui_focus_manager_request_move(efl_ui_focus_util_active_manager(top), dir, NULL, EINA_FALSE); 313 return efl_ui_focus_manager_request_move(efl_ui_focus_util_active_manager(top), (Efl_Ui_Focus_Direction)dir, NULL, EINA_FALSE);
314} 314}
315 315
316EAPI Elm_Object_Item * 316EAPI Elm_Object_Item *