discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=f90366595736b568f1c15bb7810f5c3e38260157
commit f90366595736b568f1c15bb7810f5c3e38260157 Author: Mike Blumenkrantz <[email protected]> Date: Wed Feb 14 21:14:52 2018 -0500 evas: move smart_objects_calculating to Efl_Canvas --- src/lib/efl/interfaces/efl_canvas.eo | 8 ++++++++ src/lib/evas/Evas_Legacy.h | 10 ++++++++++ src/lib/evas/canvas/evas_canvas.eo | 1 + src/lib/evas/canvas/evas_main.c | 8 +++++++- 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/lib/efl/interfaces/efl_canvas.eo b/src/lib/efl/interfaces/efl_canvas.eo index 30d5bc133b..c7657e9db2 100644 --- a/src/lib/efl/interfaces/efl_canvas.eo +++ b/src/lib/efl/interfaces/efl_canvas.eo @@ -28,6 +28,14 @@ interface Efl.Canvas () 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.]] + } + } objects_at_xy_get { [[Retrieve a list of objects lying over a given position in a canvas. diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h index 1542728e21..7532020f05 100644 --- a/src/lib/evas/Evas_Legacy.h +++ b/src/lib/evas/Evas_Legacy.h @@ -6260,6 +6260,16 @@ EAPI void evas_object_polygon_points_clear(Evas_Object *obj); */ EAPI void evas_smart_objects_calculate(Eo *obj); +/** + * @brief Get if the canvas is currently calculating smart objects. + * + * @param[in] obj The object. + * + * @return @c true if currently calculating smart objects. + * + * @ingroup Evas_Canvas + */ +EAPI Eina_Bool evas_smart_objects_calculating_get(const 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 4c793234ff..ef5d4ebe88 100644 --- a/src/lib/evas/canvas/evas_canvas.eo +++ b/src/lib/evas/canvas/evas_canvas.eo @@ -997,5 +997,6 @@ class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface, Efl.Canvas.objects_in_rectangle_get; Efl.Canvas.object_top_in_rectangle_get; Efl.Canvas.smart_objects_calculate; + Efl.Canvas.smart_objects_calculating { get; } } } diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c index 5c48c03534..d83c53c188 100644 --- a/src/lib/evas/canvas/evas_main.c +++ b/src/lib/evas/canvas/evas_main.c @@ -1818,11 +1818,17 @@ evas_smart_objects_calculate(Eo *eo_e) } EOLIAN Eina_Bool -_evas_canvas_smart_objects_calculating_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) +_evas_canvas_efl_canvas_smart_objects_calculating_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) { return !!e->in_smart_calc; } +EAPI Eina_Bool +evas_smart_objects_calculating_get(const Eo *obj) +{ + return efl_canvas_smart_objects_calculating_get(obj); +} + EOLIAN int _evas_canvas_smart_objects_calculate_count_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) { --
