discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=1813c2084c3ee253fca7e10f4f5afa292cf40f3e
commit 1813c2084c3ee253fca7e10f4f5afa292cf40f3e Author: Mike Blumenkrantz <[email protected]> Date: Wed Feb 14 21:14:52 2018 -0500 evas: move more canvas method implementations into evas_main.c --- src/lib/evas/canvas/evas_main.c | 17 +++++++++++++++++ src/lib/evas/canvas/evas_object_smart.c | 18 ------------------ 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c index 4899b754d0..c32e79ebf4 100644 --- a/src/lib/evas/canvas/evas_main.c +++ b/src/lib/evas/canvas/evas_main.c @@ -1805,6 +1805,23 @@ evas_font_available_list_free(Evas *eo_e, Eina_List *available) } +EOLIAN void +_evas_canvas_smart_objects_calculate(Eo *eo_e, Evas_Public_Data *o EINA_UNUSED) +{ + evas_call_smarts_calculate(eo_e); +} + +EOLIAN Eina_Bool +_evas_canvas_smart_objects_calculating_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) +{ + return !!e->in_smart_calc; +} + +EOLIAN int +_evas_canvas_smart_objects_calculate_count_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) +{ + return e->smart_calc_count; +} /* Legacy EAPI */ EAPI Eina_Bool diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c index f5f5c25fe9..b0eed523cd 100644 --- a/src/lib/evas/canvas/evas_object_smart.c +++ b/src/lib/evas/canvas/evas_object_smart.c @@ -1154,24 +1154,6 @@ _efl_canvas_group_group_calculate(Eo *eo_obj, Evas_Smart_Data *o) obj->smart.smart->smart_class->calculate(eo_obj); } -EOLIAN void -_evas_canvas_smart_objects_calculate(Eo *eo_e, Evas_Public_Data *o EINA_UNUSED) -{ - evas_call_smarts_calculate(eo_e); -} - -EOLIAN Eina_Bool -_evas_canvas_smart_objects_calculating_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) -{ - return !!e->in_smart_calc; -} - -EOLIAN int -_evas_canvas_smart_objects_calculate_count_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) -{ - return e->smart_calc_count; -} - /** * Call calculate() on all smart objects that need_recalculate. * --
