diff options
| author | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2019-03-19 16:31:55 -0400 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@samsung.com> | 2019-03-19 16:31:55 -0400 |
| commit | 6dec272d31ca61940f144e50338468fc629aa0c9 (patch) | |
| tree | 7c2a443eea67d911b2e481d35a06132941092c14 | |
| parent | 60384a4d4017609656bc1572ac8d523fd7ab48b0 (diff) | |
| download | efl-6dec272d31ca61940f144e50338468fc629aa0c9.tar.gz | |
efl_ui_focus_object: apply new event calling convention
Summary:
ref T7758
Depends on D8408
Reviewers: cedric, zmike, segfaultxavi
Reviewed By: zmike
Subscribers: #reviewers, #committers
Tags: #efl
Maniphest Tasks: T7758
Differential Revision: https://phab.enlightenment.org/D8409
| -rw-r--r-- | src/lib/elementary/efl_ui_focus_manager_calc.c | 10 | ||||
| -rw-r--r-- | src/lib/elementary/efl_ui_focus_object.c | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/lib/elementary/efl_ui_focus_manager_calc.c b/src/lib/elementary/efl_ui_focus_manager_calc.c index 2c489a0a93..3ccb48e8a6 100644 --- a/src/lib/elementary/efl_ui_focus_manager_calc.c +++ b/src/lib/elementary/efl_ui_focus_manager_calc.c @@ -1566,10 +1566,16 @@ _efl_ui_focus_manager_calc_efl_ui_focus_manager_manager_focus_set(Eo *obj, Efl_U } while (eina_array_count(chain) > 1) - efl_event_callback_call(eina_array_pop(chain), EFL_UI_FOCUS_OBJECT_EVENT_CHILD_FOCUS_CHANGED , (void*)EINA_TRUE); + { + Eina_Bool child_focus_changed = EINA_TRUE; + efl_event_callback_call(eina_array_pop(chain), EFL_UI_FOCUS_OBJECT_EVENT_CHILD_FOCUS_CHANGED , &child_focus_changed); + } while (eina_array_count(old_chain) > 1) - efl_event_callback_call(eina_array_pop(old_chain), EFL_UI_FOCUS_OBJECT_EVENT_CHILD_FOCUS_CHANGED, (void*)EINA_FALSE); + { + Eina_Bool child_focus_changed = EINA_FALSE; + efl_event_callback_call(eina_array_pop(old_chain), EFL_UI_FOCUS_OBJECT_EVENT_CHILD_FOCUS_CHANGED, &child_focus_changed); + } end: eina_array_free(old_chain); diff --git a/src/lib/elementary/efl_ui_focus_object.c b/src/lib/elementary/efl_ui_focus_object.c index 1dc19a6b44..92f857897d 100644 --- a/src/lib/elementary/efl_ui_focus_object.c +++ b/src/lib/elementary/efl_ui_focus_object.c @@ -24,7 +24,7 @@ _efl_ui_focus_object_focus_set(Eo *obj, Efl_Ui_Focus_Object_Data *pd, Eina_Bool parent = efl_ui_focus_object_focus_parent_get(obj); if (parent) efl_ui_focus_object_child_focus_set(parent, focus); - efl_event_callback_call(obj, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED , (void*) (uintptr_t) focus); + efl_event_callback_call(obj, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED , &focus); } EOLIAN static Eina_Bool |