discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ee689bb00083ed9b1b2eaf3f47f534ebc3251099
commit ee689bb00083ed9b1b2eaf3f47f534ebc3251099 Author: Mike Blumenkrantz <[email protected]> Date: Wed Feb 14 21:14:52 2018 -0500 evas: remove Evas_Canvas.smart_objects_calculate also implement Efl_Canvas method --- src/lib/evas/Evas_Legacy.h | 11 +++++++++++ src/lib/evas/canvas/evas_canvas.eo | 15 +-------------- src/lib/evas/canvas/evas_main.c | 10 ++++++++-- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h index a91287da7a..1542728e21 100644 --- a/src/lib/evas/Evas_Legacy.h +++ b/src/lib/evas/Evas_Legacy.h @@ -6250,6 +6250,17 @@ EAPI void evas_object_polygon_points_clear(Evas_Object *obj); * * @{ */ + + +/** Call user-provided @c calculate smart functions and unset the flag + * signalling that the object needs to get recalculated to all smart objects in + * the canvas. + * + * @ingroup Evas_Canvas + */ +EAPI void evas_smart_objects_calculate(Eo *obj); + + /** * Instantiates a new smart object described by @p s. * diff --git a/src/lib/evas/canvas/evas_canvas.eo b/src/lib/evas/canvas/evas_canvas.eo index 2c3db51cba..4c793234ff 100644 --- a/src/lib/evas/canvas/evas_canvas.eo +++ b/src/lib/evas/canvas/evas_canvas.eo @@ -621,20 +621,6 @@ class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface, font_path_clear { [[Removes all font paths loaded into memory for the given evas.]] } - smart_objects_calculate { - [[Call user-provided $calculate smart functions and unset the - flag signalling that the object needs to get recalculated to - all smart objects in the canvas. - ]] - } - @property smart_objects_calculating { - get { - [[Get if the canvas is currently calculating smart objects.]] - } - values { - calculating: bool; [[$true if currently calculating smart objects.]] - } - } /* FIXME: The below function is only for efl.ui.win */ touch_point_list_nth_xy_get { [[This function returns the nth touch point's coordinates. @@ -1010,5 +996,6 @@ class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface, Efl.Canvas.object_top_at_xy_get; Efl.Canvas.objects_in_rectangle_get; Efl.Canvas.object_top_in_rectangle_get; + Efl.Canvas.smart_objects_calculate; } } diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c index c32e79ebf4..5c48c03534 100644 --- a/src/lib/evas/canvas/evas_main.c +++ b/src/lib/evas/canvas/evas_main.c @@ -1805,8 +1805,14 @@ 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) +EOLIAN static void +_evas_canvas_efl_canvas_smart_objects_calculate(Eo *eo_e, Evas_Public_Data *o EINA_UNUSED) +{ + evas_call_smarts_calculate(eo_e); +} + +EAPI void +evas_smart_objects_calculate(Eo *eo_e) { evas_call_smarts_calculate(eo_e); } --
