From 4299905996dc1a26664e87a113202b9a8981ade3 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Wed, 2 Aug 2017 19:04:06 +0900 Subject: [PATCH] evas: Rename calculate property to calculating Recently introduced by @cedric I think the name is not very clear, and is clashing with the actual method of the same name. --- src/lib/evas/canvas/evas_canvas.eo | 12 ++++++------ src/lib/evas/canvas/evas_object_smart.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lib/evas/canvas/evas_canvas.eo b/src/lib/evas/canvas/evas_canvas.eo index 94dee0f..1f83790 100644 --- a/src/lib/evas/canvas/evas_canvas.eo +++ b/src/lib/evas/canvas/evas_canvas.eo @@ -757,13 +757,13 @@ class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface, all smart objects in the canvas. ]] } - @property smart_objects_calculate { + @property smart_objects_calculating { get { - [[Get if the canvas is currently calculating smart objects.]] - } - values { - calculating: bool; [[The state of computation of smart objects.]] - } + [[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 { diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c index b754320..6dfbf35 100644 --- a/src/lib/evas/canvas/evas_object_smart.c +++ b/src/lib/evas/canvas/evas_object_smart.c @@ -987,8 +987,8 @@ _evas_canvas_smart_objects_calculate(Eo *eo_e, Evas_Public_Data *o EINA_UNUSED) evas_call_smarts_calculate(eo_e); } -Eina_Bool -_evas_canvas_smart_objects_calculate_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) +EOLIAN Eina_Bool +_evas_canvas_smart_objects_calculating_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) { return !!e->in_smart_calc; } -- 2.7.4