From: Mike Blumenkrantz Date: Thu, 15 Feb 2018 02:14:52 +0000 (-0500) Subject: evas: move smart_objects_calculating to Efl_Canvas X-Git-Tag: upstream/1.21.0~1964 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=adbe22ca4a24c8d56dfbdda5d7c24379b46c6c89;p=platform%2Fupstream%2Fefl.git evas: move smart_objects_calculating to Efl_Canvas --- diff --git a/src/lib/efl/interfaces/efl_canvas.eo b/src/lib/efl/interfaces/efl_canvas.eo index 30d5bc1..c7657e9 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 0ea9d8c..a92eda1 100755 --- a/src/lib/evas/Evas_Legacy.h +++ b/src/lib/evas/Evas_Legacy.h @@ -6299,6 +6299,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 4c79323..ef5d4eb 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 3a1a7a6..3193bc7 100644 --- a/src/lib/evas/canvas/evas_main.c +++ b/src/lib/evas/canvas/evas_main.c @@ -1813,11 +1813,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) {