From 1e2a2d756c152c23651c663c1e0c7bed2c7366ab Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Tue, 25 Aug 2020 10:15:43 +0100 Subject: [PATCH] elm - focus legacy - fix enum implicit casts with explicit - valid these casts are valid (i checked) to make them explicit and remove warnings --- src/lib/elementary/elm_focus_legacy.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/elementary/elm_focus_legacy.c b/src/lib/elementary/elm_focus_legacy.c index d64cf95..c4c4139 100644 --- a/src/lib/elementary/elm_focus_legacy.c +++ b/src/lib/elementary/elm_focus_legacy.c @@ -123,7 +123,7 @@ elm_object_focus_next_object_set(Evas_Object *obj, #define MAP(direction, field) if ((Efl_Ui_Focus_Direction)dir == EFL_UI_FOCUS_DIRECTION_ ##direction) pd->legacy_focus.field = next; MAPPING() #undef MAP - dir = efl_ui_focus_util_direction_complement(dir); + dir = (Elm_Focus_Direction)efl_ui_focus_util_direction_complement((Efl_Ui_Focus_Direction)dir); #define MAP(direction, field) if ((Efl_Ui_Focus_Direction)dir == EFL_UI_FOCUS_DIRECTION_ ##direction) next_pd->legacy_focus.field = obj; MAPPING() #undef MAP @@ -268,7 +268,7 @@ elm_object_focus_next(Evas_Object *obj, if (!legacy_target) { Eina_Array *old_chain = _focus_parent_chain_gen(logical); - Eina_Array *new_chain = _focus_parent_chain_gen(efl_ui_focus_manager_request_move(top, dir, NULL, EINA_FALSE)); + Eina_Array *new_chain = _focus_parent_chain_gen(efl_ui_focus_manager_request_move(top, (Efl_Ui_Focus_Direction)dir, NULL, EINA_FALSE)); //first pop off all elements that are the same while (eina_array_count(new_chain) > 0 && eina_array_count(old_chain) > 0 && @@ -307,7 +307,7 @@ elm_object_focus_next(Evas_Object *obj, } if (!legacy_focus_move) - o = efl_ui_focus_manager_move(top, dir); + o = efl_ui_focus_manager_move(top, (Efl_Ui_Focus_Direction)dir); if (!o) { if ((Efl_Ui_Focus_Direction)dir == EFL_UI_FOCUS_DIRECTION_NEXT || (Efl_Ui_Focus_Direction)dir == EFL_UI_FOCUS_DIRECTION_PREVIOUS) @@ -315,7 +315,7 @@ elm_object_focus_next(Evas_Object *obj, Efl_Ui_Focus_Object *root; root = efl_ui_focus_manager_root_get(top); - efl_ui_focus_manager_setup_on_first_touch(top, dir, root); + efl_ui_focus_manager_setup_on_first_touch(top, (Efl_Ui_Focus_Direction)dir, root); } } */ @@ -337,7 +337,7 @@ elm_object_focus_next_object_get(const Evas_Object *obj, MAPPING() #undef MAP - return efl_ui_focus_manager_request_move(efl_ui_focus_util_active_manager(top), dir, NULL, EINA_FALSE); + return efl_ui_focus_manager_request_move(efl_ui_focus_util_active_manager(top), (Efl_Ui_Focus_Direction)dir, NULL, EINA_FALSE); */ EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL); return efl_ui_widget_focus_next_object_get(obj, dir); -- 2.7.4