6 files changed, 59 insertions, 33 deletions

diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.c b/src/lib/ector/cairo/ector_renderer_cairo_shape.c
index 87fe2a0..2605623 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_shape.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.c
@@ -75,15 +75,19 @@ struct _Ector_Renderer_Cairo_Shape_Data
    cairo_path_t *path;
 };
 
-EOLIAN static void
-_ector_renderer_cairo_shape_efl_gfx_path_commit(Eo *obj EINA_UNUSED,
-                                                Ector_Renderer_Cairo_Shape_Data *pd)
+static void
+_ector_renderer_cairo_shape_path_changed(void *data, const Efl_Event *event)
 {
-   if (pd->path)
-     {
-        cairo_path_destroy(pd->path);
-        pd->path = NULL;
-     }
+   Ector_Renderer_Cairo_Shape_Data *pd = data;
+   Efl_Gfx_Path_Change_Event *ev = event->info;
+
+   if (!pd->path) return;
+   if (ev && !((ev->what & EFL_GFX_CHANGE_FLAG_MATRIX) ||
+               (ev->what & EFL_GFX_CHANGE_FLAG_PATH)))
+     return;
+
+   cairo_path_destroy(pd->path);
+   pd->path = NULL;
 }
 
 static Eina_Bool
@@ -251,7 +255,9 @@ _ector_renderer_cairo_shape_efl_object_constructor(Eo *obj, Ector_Renderer_Cairo
    pd->shape = efl_data_xref(obj, ECTOR_RENDERER_SHAPE_MIXIN, obj);
    pd->base = efl_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
 
-   return obj;
+   efl_event_callback_add(obj, EFL_GFX_PATH_EVENT_CHANGED, _ector_renderer_cairo_shape_path_changed, pd);
+
+    return obj;
 }
 
 static Efl_Object *
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.eo b/src/lib/ector/cairo/ector_renderer_cairo_shape.eo
index 7c95844..b76dd29 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_shape.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.eo
@@ -6,7 +6,6 @@ class Ector.Renderer.Cairo.Shape (Ector.Renderer.Cairo, Ector.Renderer.Shape, Ef
       Ector.Renderer.prepare;
       Ector.Renderer.draw;
       Efl.Gfx.Path.bounds_get;
-      Efl.Gfx.Path.commit;
       Ector.Renderer.crc { get; }
       Ector.Renderer.Cairo.op_fill;
       Efl.Object.constructor;
diff --git a/src/lib/ector/gl/ector_renderer_gl_shape.c b/src/lib/ector/gl/ector_renderer_gl_shape.c
index cf2266d..79e029d 100644
--- a/src/lib/ector/gl/ector_renderer_gl_shape.c
+++ b/src/lib/ector/gl/ector_renderer_gl_shape.c
@@ -20,15 +20,18 @@ struct _Ector_Renderer_GL_Shape_Data
    GLshort *vertex;
 };
 
-EOLIAN static void
-_ector_renderer_gl_shape_efl_gfx_path_commit(Eo *obj EINA_UNUSED,
-                                             Ector_Renderer_GL_Shape_Data *pd)
+static void
+_ector_renderer_gl_shape_path_changed(void *data, const Efl_Event *event EINA_UNUSED)
 {
-   if (pd->vertex)
-     {
-        free(pd->vertex);
-        pd->vertex = NULL;
-     }
+   Ector_Renderer_GL_Shape_Data *pd = data;
+   Efl_Gfx_Path_Change_Event *ev = event->info;
+
+   if (ev && !((ev->what & EFL_GFX_CHANGE_FLAG_MATRIX) ||
+               (ev->what & EFL_GFX_CHANGE_FLAG_PATH)))
+     return;
+
+   free(pd->vertex);
+   pd->vertex = NULL;
 }
 
 static Eina_Bool
@@ -151,6 +154,8 @@ _ector_renderer_gl_shape_efl_object_constructor(Eo *obj, Ector_Renderer_GL_Shape
    pd->shape = efl_data_xref(obj, ECTOR_RENDERER_SHAPE_MIXIN, obj);
    pd->base = efl_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
 
+   efl_event_callback_add(obj, EFL_GFX_PATH_EVENT_CHANGED, _ector_renderer_gl_shape_path_changed, pd);
+
    return obj;
 }
 
diff --git a/src/lib/ector/gl/ector_renderer_gl_shape.eo b/src/lib/ector/gl/ector_renderer_gl_shape.eo
index 6323ef6..21ef655 100644
--- a/src/lib/ector/gl/ector_renderer_gl_shape.eo
+++ b/src/lib/ector/gl/ector_renderer_gl_shape.eo
@@ -8,7 +8,6 @@ class Ector.Renderer.GL.Shape (Ector.Renderer.GL, Ector.Renderer.Shape, Efl.Gfx.
       Ector.Renderer.crc { get; }
       Ector.Renderer.GL.op_fill;
       Efl.Gfx.Path.bounds_get;
-      Efl.Gfx.Path.commit;
       Efl.Object.constructor;
       Efl.Object.destructor;
    }
diff --git a/src/lib/ector/software/ector_renderer_software_shape.c b/src/lib/ector/software/ector_renderer_software_shape.c
index b9cf1fa..396e472 100644
--- a/src/lib/ector/software/ector_renderer_software_shape.c
+++ b/src/lib/ector/software/ector_renderer_software_shape.c
@@ -734,20 +734,36 @@ _ector_renderer_software_shape_ector_renderer_software_op_fill(Eo *obj EINA_UNUS
    return EINA_FALSE;
 }
 
-EOLIAN static void
-_ector_renderer_software_shape_efl_gfx_path_commit(Eo *obj EINA_UNUSED,
-                                                   Ector_Renderer_Software_Shape_Data *pd)
+static void
+_ector_renderer_software_shape_efl_gfx_path_path_set(Eo *obj,
+                                                     Ector_Renderer_Software_Shape_Data *pd,
+                                                     const Efl_Gfx_Path_Command *op,
+                                                     const double *points)
 {
-   if (pd->shape_data)
-     {
-        ector_software_rasterizer_destroy_rle_data(pd->shape_data);
-        pd->shape_data = NULL;
-     }
-   if (pd->outline_data)
-     {
-        ector_software_rasterizer_destroy_rle_data(pd->outline_data);
-        pd->outline_data = NULL;
-     }
+   if (pd->shape_data) ector_software_rasterizer_destroy_rle_data(pd->shape_data);
+   if (pd->outline_data) ector_software_rasterizer_destroy_rle_data(pd->outline_data);
+   pd->shape_data = NULL;
+   pd->outline_data = NULL;
+
+   efl_gfx_path_set(efl_super(obj, MY_CLASS), op, points);
+}
+
+
+static void
+_ector_renderer_software_shape_path_changed(void *data, const Efl_Event *event EINA_UNUSED)
+{
+   Ector_Renderer_Software_Shape_Data *pd = data;
+   Efl_Gfx_Path_Change_Event *ev = event->info;
+
+   if (ev && !((ev->what & EFL_GFX_CHANGE_FLAG_MATRIX) ||
+               (ev->what & EFL_GFX_CHANGE_FLAG_PATH)))
+     return;
+
+   if (pd->shape_data) ector_software_rasterizer_destroy_rle_data(pd->shape_data);
+   if (pd->outline_data) ector_software_rasterizer_destroy_rle_data(pd->outline_data);
+
+   pd->shape_data = NULL;
+   pd->outline_data = NULL;
 }
 
 static Eo *
@@ -761,6 +777,7 @@ _ector_renderer_software_shape_efl_object_constructor(Eo *obj, Ector_Renderer_So
    pd->public_shape = efl_data_xref(obj, EFL_GFX_SHAPE_MIXIN, obj);
    pd->shape = efl_data_xref(obj, ECTOR_RENDERER_SHAPE_MIXIN, obj);
    pd->base = efl_data_xref(obj, ECTOR_RENDERER_CLASS, obj);
+   efl_event_callback_add(obj, EFL_GFX_PATH_EVENT_CHANGED, _ector_renderer_software_shape_path_changed, pd);
 
    return obj;
 }
diff --git a/src/lib/ector/software/ector_renderer_software_shape.eo b/src/lib/ector/software/ector_renderer_software_shape.eo
index 04f19ba..abe8344 100644
--- a/src/lib/ector/software/ector_renderer_software_shape.eo
+++ b/src/lib/ector/software/ector_renderer_software_shape.eo
@@ -8,7 +8,7 @@ class Ector.Renderer.Software.Shape (Ector.Renderer.Software, Ector.Renderer.Sha
       Ector.Renderer.Software.op_fill;
       Ector.Renderer.mask { set; }
       Ector.Renderer.crc { get; }
-      Efl.Gfx.Path.commit;
+      Efl.Gfx.Path.path { set; }
       Efl.Object.constructor;
       Efl.Object.destructor;
    }