diff options
| author | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2019-03-19 16:31:50 -0400 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@samsung.com> | 2019-03-19 16:31:50 -0400 |
| commit | 60384a4d4017609656bc1572ac8d523fd7ab48b0 (patch) | |
| tree | 5498eabe67013be66a3732d5ec033676aedabcdf | |
| parent | 158336d19eadbfd7ffd958a68bfdb32450d7caed (diff) | |
| download | efl-60384a4d4017609656bc1572ac8d523fd7ab48b0.tar.gz | |
evas: apply new event calling convention
Summary:
ref T7758
Depends on D8407
Reviewers: cedric, zmike, segfaultxavi
Reviewed By: zmike
Subscribers: #reviewers, #committers
Tags: #efl
Maniphest Tasks: T7758
Differential Revision: https://phab.enlightenment.org/D8408
| -rw-r--r-- | src/lib/elementary/efl_ui_stack.c | 4 | ||||
| -rw-r--r-- | src/lib/evas/canvas/evas_object_inform.c | 6 | ||||
| -rw-r--r-- | src/tests/elementary/suite_helpers.c | 3 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/lib/elementary/efl_ui_stack.c b/src/lib/elementary/efl_ui_stack.c index fed3e0802c..e7edcdaf57 100644 --- a/src/lib/elementary/efl_ui_stack.c +++ b/src/lib/elementary/efl_ui_stack.c @@ -265,9 +265,9 @@ static void _pop_content_hide_cb(void *data, const Efl_Event *event) { Content_Data *cd = data; - + Eina_Bool *visible = event->info; /* object is being shown */ - if (event->info) return; + if (*visible) return; cd->popped_hidden = EINA_TRUE; diff --git a/src/lib/evas/canvas/evas_object_inform.c b/src/lib/evas/canvas/evas_object_inform.c index f13b3bfbae..7422d3634e 100644 --- a/src/lib/evas/canvas/evas_object_inform.c +++ b/src/lib/evas/canvas/evas_object_inform.c @@ -15,8 +15,9 @@ void evas_object_inform_call_show(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj) { int event_id = _evas_object_event_new(); + Eina_Bool vis = EINA_TRUE; - evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_SHOW, (void*)1, event_id, EFL_GFX_ENTITY_EVENT_SHOW); + evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_SHOW, &vis, event_id, EFL_GFX_ENTITY_EVENT_SHOW); _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id); } @@ -24,8 +25,9 @@ void evas_object_inform_call_hide(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj) { int event_id = _evas_object_event_new(); + Eina_Bool vis = EINA_FALSE; - evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_HIDE, NULL, event_id, EFL_GFX_ENTITY_EVENT_HIDE); + evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_HIDE, &vis, event_id, EFL_GFX_ENTITY_EVENT_HIDE); _evas_post_event_callback_call(obj->layer->evas->evas, obj->layer->evas, event_id); } diff --git a/src/tests/elementary/suite_helpers.c b/src/tests/elementary/suite_helpers.c index 2427ccfcaf..873e467ab2 100644 --- a/src/tests/elementary/suite_helpers.c +++ b/src/tests/elementary/suite_helpers.c @@ -161,7 +161,8 @@ _win_hide(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *e static void _ui_win_visibility_change(void *data EINA_UNUSED, const Efl_Event *ev) { - if (ev->info) + Eina_Bool *visible = ev->info; + if (*visible) _win_show(NULL, NULL, ev->object, NULL); else { |