summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2018-02-14 21:14:52 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2018-02-15 13:11:00 -0500
commitf90366595736b568f1c15bb7810f5c3e38260157 (patch)
tree2e68d591e0f9ca31aa19d906b92f6bfee023ec46
parentee689bb00083ed9b1b2eaf3f47f534ebc3251099 (diff)
evas: move smart_objects_calculating to Efl_Canvas
-rw-r--r--src/lib/efl/interfaces/efl_canvas.eo8
-rw-r--r--src/lib/evas/Evas_Legacy.h10
-rw-r--r--src/lib/evas/canvas/evas_canvas.eo1
-rw-r--r--src/lib/evas/canvas/evas_main.c8
4 files changed, 26 insertions, 1 deletions
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 ()
28 all smart objects in the canvas. 28 all smart objects in the canvas.
29 ]] 29 ]]
30 } 30 }
31 @property smart_objects_calculating {
32 get {
33 [[Get if the canvas is currently calculating smart objects.]]
34 }
35 values {
36 calculating: bool; [[$true if currently calculating smart objects.]]
37 }
38 }
31 objects_at_xy_get { 39 objects_at_xy_get {
32 [[Retrieve a list of objects lying over a given position in 40 [[Retrieve a list of objects lying over a given position in
33 a canvas. 41 a canvas.
diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index 1542728..7532020 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);
6260 */ 6260 */
6261EAPI void evas_smart_objects_calculate(Eo *obj); 6261EAPI void evas_smart_objects_calculate(Eo *obj);
6262 6262
6263/**
6264 * @brief Get if the canvas is currently calculating smart objects.
6265 *
6266 * @param[in] obj The object.
6267 *
6268 * @return @c true if currently calculating smart objects.
6269 *
6270 * @ingroup Evas_Canvas
6271 */
6272EAPI Eina_Bool evas_smart_objects_calculating_get(const Eo *obj);
6263 6273
6264/** 6274/**
6265 * Instantiates a new smart object described by @p s. 6275 * 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,
997 Efl.Canvas.objects_in_rectangle_get; 997 Efl.Canvas.objects_in_rectangle_get;
998 Efl.Canvas.object_top_in_rectangle_get; 998 Efl.Canvas.object_top_in_rectangle_get;
999 Efl.Canvas.smart_objects_calculate; 999 Efl.Canvas.smart_objects_calculate;
1000 Efl.Canvas.smart_objects_calculating { get; }
1000 } 1001 }
1001} 1002}
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index 5c48c03..d83c53c 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)
1818} 1818}
1819 1819
1820EOLIAN Eina_Bool 1820EOLIAN Eina_Bool
1821_evas_canvas_smart_objects_calculating_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) 1821_evas_canvas_efl_canvas_smart_objects_calculating_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e)
1822{ 1822{
1823 return !!e->in_smart_calc; 1823 return !!e->in_smart_calc;
1824} 1824}
1825 1825
1826EAPI Eina_Bool
1827evas_smart_objects_calculating_get(const Eo *obj)
1828{
1829 return efl_canvas_smart_objects_calculating_get(obj);
1830}
1831
1826EOLIAN int 1832EOLIAN int
1827_evas_canvas_smart_objects_calculate_count_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) 1833_evas_canvas_smart_objects_calculate_count_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e)
1828{ 1834{