evas: remove Evas_Canvas.smart_objects_calculate

also implement Efl_Canvas method

diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index 8fdf23d..0ea9d8c 100755 (executable)
--- a/src/lib/evas/Evas_Legacy.h
+++ b/src/lib/evas/Evas_Legacy.h
@@ -6289,6 +6289,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 2c3db51..4c79323 100644 (file)
--- 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 f8aa15c..3a1a7a6 100644 (file)
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -1800,8 +1800,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);
 }