From 0e278d1de8fddcb510a19010fa829dcc1e7f393c Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Wed, 26 Dec 2018 19:32:18 +0900 Subject: [PATCH] Revert "efl gfx_path: remove EFL_GFX_PATH_EVENT_CHANGED" This reverts commit 7c38c0c9154b0971ccb8ecf5ea8f15467cfb6662. Oops, didn't intend this patch. --- .../ector/cairo/ector_renderer_cairo_shape.c | 24 +++++---- .../ector/cairo/ector_renderer_cairo_shape.eo | 1 - src/lib/ector/gl/ector_renderer_gl_shape.c | 21 +++++--- src/lib/ector/gl/ector_renderer_gl_shape.eo | 1 - .../software/ector_renderer_software_shape.c | 43 +++++++++++----- .../software/ector_renderer_software_shape.eo | 2 +- src/lib/efl/interfaces/efl_gfx_path.c | 49 +++++++++++++----- src/lib/efl/interfaces/efl_gfx_path.eo | 13 ++--- src/lib/efl/interfaces/efl_gfx_shape.c | 3 ++ src/lib/elementary/efl_ui_textpath.c | 16 ++++-- src/lib/elementary/efl_ui_textpath.eo | 1 - src/lib/evas/canvas/efl_canvas_vg_shape.c | 51 +++++++------------ src/lib/evas/canvas/efl_canvas_vg_shape.eo | 1 - 13 files changed, 132 insertions(+), 94 deletions(-) diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.c b/src/lib/ector/cairo/ector_renderer_cairo_shape.c index 87fe2a0778..2605623466 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 7c958441ee..b76dd29879 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 cf2266da2f..79e029d1fd 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 6323ef6f1f..21ef655d7c 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 b9cf1faaed..396e47283e 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 04f19ba7e3..abe8344f3f 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; } diff --git a/src/lib/efl/interfaces/efl_gfx_path.c b/src/lib/efl/interfaces/efl_gfx_path.c index c40d33a187..7278216647 100644 --- a/src/lib/efl/interfaces/efl_gfx_path.c +++ b/src/lib/efl/interfaces/efl_gfx_path.c @@ -173,6 +173,7 @@ _efl_gfx_path_path_set(Eo *obj, Efl_Gfx_Path_Data *pd, return; } + Efl_Gfx_Path_Change_Event ev = { EFL_GFX_CHANGE_FLAG_PATH }; Efl_Gfx_Path_Command *cmds; double *pts; unsigned int cmds_length = 0, pts_length = 0; @@ -201,6 +202,8 @@ _efl_gfx_path_path_set(Eo *obj, Efl_Gfx_Path_Data *pd, _efl_gfx_path_current_search(pd->commands, pd->points, &pd->current.x, &pd->current.y, &pd->current_ctrl.x, &pd->current_ctrl.y); + + efl_event_callback_call(obj, EFL_GFX_PATH_EVENT_CHANGED, &ev); } EOLIAN static void @@ -290,6 +293,7 @@ EOLIAN static Eina_Bool _efl_gfx_path_interpolate(Eo *obj, Efl_Gfx_Path_Data *pd, const Eo *from, const Eo *to, double pos_map) { + Efl_Gfx_Path_Change_Event ev = { EFL_GFX_CHANGE_FLAG_PATH }; Efl_Gfx_Path_Data *from_pd, *to_pd; Efl_Gfx_Path_Command *cmds; double interv; //interpolated value @@ -370,6 +374,8 @@ _efl_gfx_path_interpolate(Eo *obj, Efl_Gfx_Path_Data *pd, } + efl_event_callback_legacy_call(obj, EFL_GFX_PATH_EVENT_CHANGED, &ev); + return EINA_TRUE; } @@ -405,8 +411,10 @@ _efl_gfx_path_reserve(Eo *obj EINA_UNUSED, Efl_Gfx_Path_Data *pd, } EOLIAN static void -_efl_gfx_path_reset(Eo *obj EINA_UNUSED, Efl_Gfx_Path_Data *pd) +_efl_gfx_path_reset(Eo *obj, Efl_Gfx_Path_Data *pd) { + Efl_Gfx_Path_Change_Event ev = { EFL_GFX_CHANGE_FLAG_PATH }; + free(pd->commands); pd->reserved_cmd_cnt = 0; pd->commands = NULL; @@ -425,13 +433,15 @@ _efl_gfx_path_reset(Eo *obj EINA_UNUSED, Efl_Gfx_Path_Data *pd) pd->current_ctrl.x = 0; pd->current_ctrl.y = 0; pd->convex = EINA_FALSE; + + efl_event_callback_legacy_call(obj, EFL_GFX_PATH_EVENT_CHANGED, &ev); } EOLIAN static void -_efl_gfx_path_append_move_to(Eo *obj EINA_UNUSED, - Efl_Gfx_Path_Data *pd, - double x, double y) +_efl_gfx_path_append_move_to(Eo *obj, Efl_Gfx_Path_Data *pd, + double x, double y) { + Efl_Gfx_Path_Change_Event ev = { EFL_GFX_CHANGE_FLAG_PATH }; double *offset_point; if (!efl_gfx_path_grow(EFL_GFX_PATH_COMMAND_TYPE_MOVE_TO, pd, &offset_point)) @@ -442,13 +452,15 @@ _efl_gfx_path_append_move_to(Eo *obj EINA_UNUSED, pd->current.x = x; pd->current.y = y; + + efl_event_callback_legacy_call(obj, EFL_GFX_PATH_EVENT_CHANGED, &ev); } EOLIAN static void -_efl_gfx_path_append_line_to(Eo *obj EINA_UNUSED, - Efl_Gfx_Path_Data *pd, - double x, double y) +_efl_gfx_path_append_line_to(Eo *obj, Efl_Gfx_Path_Data *pd, + double x, double y) { + Efl_Gfx_Path_Change_Event ev = { EFL_GFX_CHANGE_FLAG_PATH }; double *offset_point; if (!efl_gfx_path_grow(EFL_GFX_PATH_COMMAND_TYPE_LINE_TO, pd, &offset_point)) @@ -459,15 +471,17 @@ _efl_gfx_path_append_line_to(Eo *obj EINA_UNUSED, pd->current.x = x; pd->current.y = y; + + efl_event_callback_legacy_call(obj, EFL_GFX_PATH_EVENT_CHANGED, &ev); } EOLIAN static void -_efl_gfx_path_append_cubic_to(Eo *obj EINA_UNUSED, - Efl_Gfx_Path_Data *pd, - double ctrl_x0, double ctrl_y0, - double ctrl_x1, double ctrl_y1, - double x, double y) +_efl_gfx_path_append_cubic_to(Eo *obj, Efl_Gfx_Path_Data *pd, + double ctrl_x0, double ctrl_y0, + double ctrl_x1, double ctrl_y1, + double x, double y) { + Efl_Gfx_Path_Change_Event ev = { EFL_GFX_CHANGE_FLAG_PATH }; double *offset_point; if (!efl_gfx_path_grow(EFL_GFX_PATH_COMMAND_TYPE_CUBIC_TO, @@ -485,6 +499,8 @@ _efl_gfx_path_append_cubic_to(Eo *obj EINA_UNUSED, pd->current.y = y; pd->current_ctrl.x = ctrl_x1; pd->current_ctrl.y = ctrl_y1; + + efl_event_callback_legacy_call(obj, EFL_GFX_PATH_EVENT_CHANGED, &ev); } EOLIAN static void @@ -1068,10 +1084,14 @@ _efl_gfx_path_append_arc(Eo *obj, Efl_Gfx_Path_Data *pd, } EOLIAN static void -_efl_gfx_path_append_close(Eo *obj EINA_UNUSED, Efl_Gfx_Path_Data *pd) +_efl_gfx_path_append_close(Eo *obj, Efl_Gfx_Path_Data *pd) { + Efl_Gfx_Path_Change_Event ev = { EFL_GFX_CHANGE_FLAG_PATH }; double *offset_point; + efl_gfx_path_grow(EFL_GFX_PATH_COMMAND_TYPE_CLOSE, pd, &offset_point); + + efl_event_callback_legacy_call(obj, EFL_GFX_PATH_EVENT_CHANGED, &ev); } static void @@ -1518,6 +1538,7 @@ error: EOLIAN static void _efl_gfx_path_copy_from(Eo *obj, Efl_Gfx_Path_Data *pd, const Eo *dup_from) { + Efl_Gfx_Path_Change_Event ev = { EFL_GFX_CHANGE_FLAG_PATH }; Efl_Gfx_Path_Data *from; if (obj == dup_from) return; @@ -1527,6 +1548,8 @@ _efl_gfx_path_copy_from(Eo *obj, Efl_Gfx_Path_Data *pd, const Eo *dup_from) pd->convex = from->convex; _efl_gfx_path_path_set(obj, pd, from->commands, from->points); + + efl_event_callback_legacy_call(obj, EFL_GFX_PATH_EVENT_CHANGED, &ev); } #include "interfaces/efl_gfx_path.eo.c" diff --git a/src/lib/efl/interfaces/efl_gfx_path.eo b/src/lib/efl/interfaces/efl_gfx_path.eo index d60886e499..c1ec7aacc4 100644 --- a/src/lib/efl/interfaces/efl_gfx_path.eo +++ b/src/lib/efl/interfaces/efl_gfx_path.eo @@ -292,15 +292,8 @@ mixin Efl.Gfx.Path @in pts_count: uint; [[Pointers count to reserve]] } } - commit @pure_virtual { - [[Request to update the path object. - - One path object may get appending several path calls (such as - append_cubic, append_rect, etc) to construct the final path data. - Here commit means all path data is prepared and now object - could update its own internal status based on the last path - information. - ]] - } + } + events { + changed: Efl.Gfx.Path_Change_Event; [[Graphics path was changed.]] } } diff --git a/src/lib/efl/interfaces/efl_gfx_shape.c b/src/lib/efl/interfaces/efl_gfx_shape.c index bdebbfaf27..a9327c354c 100644 --- a/src/lib/efl/interfaces/efl_gfx_shape.c +++ b/src/lib/efl/interfaces/efl_gfx_shape.c @@ -161,7 +161,10 @@ _efl_gfx_shape_stroke_color_get(const Eo *obj EINA_UNUSED, Efl_Gfx_Shape_Data *p EOLIAN static void _efl_gfx_shape_stroke_width_set(Eo *obj, Efl_Gfx_Shape_Data *pd, double w) { + Efl_Gfx_Path_Change_Event ev = { EFL_GFX_CHANGE_FLAG_PATH }; + pd->public.stroke.width = w; + efl_event_callback_legacy_call(obj, EFL_GFX_PATH_EVENT_CHANGED, &ev); } EOLIAN static double diff --git a/src/lib/elementary/efl_ui_textpath.c b/src/lib/elementary/efl_ui_textpath.c index 095c7a3891..192478e276 100644 --- a/src/lib/elementary/efl_ui_textpath.c +++ b/src/lib/elementary/efl_ui_textpath.c @@ -544,10 +544,17 @@ _ellipsis_set(Efl_Ui_Textpath_Data *pd) } static void -_efl_ui_textpath_efl_gfx_path_commit(Eo *obj, Efl_Ui_Textpath_Data *pd) +_path_changed_cb(void *data, const Efl_Event *event) { - _path_data_get(obj, pd, EINA_TRUE); - _sizing_eval(pd); + Efl_Gfx_Path_Change_Event *ev = event->info; + EFL_UI_TEXTPATH_DATA_GET(data, sd); + + if (ev && !((ev->what & EFL_GFX_CHANGE_FLAG_MATRIX) || + (ev->what & EFL_GFX_CHANGE_FLAG_PATH))) + return; + + _path_data_get(data, sd, EINA_TRUE); + _sizing_eval(sd); } static Eina_Bool @@ -587,6 +594,8 @@ _efl_ui_textpath_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Textpath_Data *priv) evas_object_smart_member_add(priv->text_obj, obj); elm_widget_sub_object_add(obj, priv->text_obj); + + efl_event_callback_add(obj, EFL_GFX_PATH_EVENT_CHANGED, _path_changed_cb, obj); } EOLIAN static Efl_Object * @@ -705,7 +714,6 @@ _efl_ui_textpath_circle_set(Eo *obj, Efl_Ui_Textpath_Data *pd, double x, double radius * 2, start_angle, 360); } - _path_data_get(obj, pd, EINA_TRUE); _sizing_eval(pd); } diff --git a/src/lib/elementary/efl_ui_textpath.eo b/src/lib/elementary/efl_ui_textpath.eo index bc25a0bb4d..917621cc10 100644 --- a/src/lib/elementary/efl_ui_textpath.eo +++ b/src/lib/elementary/efl_ui_textpath.eo @@ -40,7 +40,6 @@ class Efl.Ui.Textpath (Efl.Ui.Layout, Efl.Text, Efl.Gfx.Path) implements { Efl.Object.constructor; Efl.Object.destructor; - Efl.Gfx.Path.commit; Efl.Canvas.Group.group_calculate; Efl.Text.text {get; set;} Efl.Part.part_get; diff --git a/src/lib/evas/canvas/efl_canvas_vg_shape.c b/src/lib/evas/canvas/efl_canvas_vg_shape.c index d1c41fa8aa..728afb5c4e 100644 --- a/src/lib/evas/canvas/efl_canvas_vg_shape.c +++ b/src/lib/evas/canvas/efl_canvas_vg_shape.c @@ -17,6 +17,11 @@ struct _Efl_Canvas_Vg_Shape_Data }; // FIXME: Use the renderer bounding box when it has been created instead of an estimation +static void +_efl_canvas_vg_shape_path_changed(void *data, const Efl_Event *event) +{ + efl_canvas_vg_node_change(event->object); +} static void _efl_canvas_vg_shape_fill_set(Eo *obj EINA_UNUSED, @@ -27,6 +32,8 @@ _efl_canvas_vg_shape_fill_set(Eo *obj EINA_UNUSED, pd->fill = efl_ref(f); efl_unref(tmp); + + efl_canvas_vg_node_change(obj); } static Efl_Canvas_Vg_Node * @@ -44,6 +51,8 @@ _efl_canvas_vg_shape_stroke_fill_set(Eo *obj EINA_UNUSED, pd->stroke.fill = efl_ref(f); efl_unref(tmp); + + efl_canvas_vg_node_change(obj); } static Efl_Canvas_Vg_Node * @@ -62,6 +71,8 @@ _efl_canvas_vg_shape_stroke_marker_set(Eo *obj EINA_UNUSED, pd->stroke.marker = efl_ref(m); efl_unref(tmp); + + efl_canvas_vg_node_change(obj); } static Efl_Canvas_Vg_Shape * @@ -108,9 +119,9 @@ _efl_canvas_vg_shape_render_pre(Evas_Object_Protected_Data *vg_pd, ector_renderer_shape_stroke_fill_set(nd->renderer, stroke_fill ? stroke_fill->renderer : NULL); ector_renderer_shape_stroke_marker_set(nd->renderer, stroke_marker ? stroke_marker->renderer : NULL); efl_gfx_path_copy_from(nd->renderer, obj); - efl_gfx_path_commit(nd->renderer); ector_renderer_prepare(nd->renderer); ector_renderer_mask_set(nd->renderer, mask, mask_op); + } static Eo * @@ -129,6 +140,9 @@ _efl_canvas_vg_shape_efl_object_constructor(Eo *obj, Efl_Canvas_Vg_Shape_Data *p nd->render_pre = _efl_canvas_vg_shape_render_pre; nd->data = pd; + efl_event_callback_add(obj, EFL_GFX_PATH_EVENT_CHANGED, + _efl_canvas_vg_shape_path_changed, pd); + return obj; } @@ -139,6 +153,9 @@ _efl_canvas_vg_shape_efl_object_destructor(Eo *obj, Efl_Canvas_Vg_Shape_Data *pd if (pd->stroke.fill) efl_unref(pd->stroke.fill); if (pd->stroke.marker) efl_unref(pd->stroke.marker); + efl_event_callback_del(obj, EFL_GFX_PATH_EVENT_CHANGED, + _efl_canvas_vg_shape_path_changed, pd); + efl_gfx_path_reset(obj); efl_destructor(efl_super(obj, MY_CLASS)); } @@ -180,12 +197,6 @@ _efl_canvas_vg_shape_efl_gfx_path_interpolate(Eo *obj, return r; } -EOLIAN static void -_efl_canvas_vg_shape_efl_gfx_path_commit(Eo *obj, - Efl_Canvas_Vg_Shape_Data *pd EINA_UNUSED) -{ - efl_canvas_vg_node_change(obj); -} EOLIAN static Efl_Canvas_Vg_Node * _efl_canvas_vg_shape_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_Vg_Shape_Data *pd) @@ -230,7 +241,6 @@ EAPI void evas_vg_shape_stroke_scale_set(Eo *obj, double s) { efl_gfx_shape_stroke_scale_set(obj, s); - efl_canvas_vg_node_change(obj); } EAPI void @@ -243,7 +253,6 @@ EAPI void evas_vg_shape_stroke_color_set(Eo *obj, int r, int g, int b, int a) { efl_gfx_shape_stroke_color_set(obj, r, g, b, a); - efl_canvas_vg_node_change(obj); } EAPI double @@ -256,7 +265,6 @@ EAPI void evas_vg_shape_stroke_width_set(Eo *obj, double w) { efl_gfx_shape_stroke_width_set(obj, w); - efl_canvas_vg_node_change(obj); } EAPI double @@ -269,7 +277,6 @@ EAPI void evas_vg_shape_stroke_location_set(Eo *obj, double centered) { efl_gfx_shape_stroke_location_set(obj, centered); - efl_canvas_vg_node_change(obj); } EAPI void @@ -282,7 +289,6 @@ EAPI void evas_vg_shape_stroke_dash_set(Eo *obj, const Efl_Gfx_Dash *dash, unsigned int length) { efl_gfx_shape_stroke_dash_set(obj, dash, length); - efl_canvas_vg_node_change(obj); } EAPI Efl_Gfx_Cap @@ -295,7 +301,6 @@ EAPI void evas_vg_shape_stroke_cap_set(Eo *obj, Efl_Gfx_Cap c) { efl_gfx_shape_stroke_cap_set(obj, c); - efl_canvas_vg_node_change(obj); } EAPI Efl_Gfx_Join @@ -308,14 +313,12 @@ EAPI void evas_vg_shape_stroke_join_set(Eo *obj, Efl_Gfx_Join j) { efl_gfx_shape_stroke_join_set(obj, j); - efl_canvas_vg_node_change(obj); } EAPI void evas_vg_shape_path_set(Eo *obj, const Efl_Gfx_Path_Command *op, const double *points) { efl_gfx_path_set(obj, op, points); - efl_canvas_vg_node_change(obj); } EAPI void @@ -346,106 +349,90 @@ EAPI void evas_vg_shape_dup(Eo *obj, Eo *dup_from) { efl_gfx_path_copy_from(obj, dup_from); - efl_canvas_vg_node_change(obj); } EAPI void evas_vg_shape_reset(Eo *obj) { efl_gfx_path_reset(obj); - efl_canvas_vg_node_change(obj); } EAPI void evas_vg_shape_append_move_to(Eo *obj, double x, double y) { efl_gfx_path_append_move_to(obj, x, y); - efl_canvas_vg_node_change(obj); } EAPI void evas_vg_shape_append_line_to(Eo *obj, double x, double y) { efl_gfx_path_append_line_to(obj, x, y); - efl_canvas_vg_node_change(obj); } EAPI void evas_vg_shape_append_quadratic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y) { efl_gfx_path_append_quadratic_to(obj, x, y, ctrl_x, ctrl_y); - efl_canvas_vg_node_change(obj); } EAPI void evas_vg_shape_append_squadratic_to(Eo *obj, double x, double y) { efl_gfx_path_append_squadratic_to(obj, x, y); - efl_canvas_vg_node_change(obj); } EAPI void evas_vg_shape_append_cubic_to(Eo *obj, double x, double y, double ctrl_x0, double ctrl_y0, double ctrl_x1, double ctrl_y1) { efl_gfx_path_append_cubic_to(obj, x, y, ctrl_x0, ctrl_y0, ctrl_x1, ctrl_y1); - efl_canvas_vg_node_change(obj); } EAPI void evas_vg_shape_append_scubic_to(Eo *obj, double x, double y, double ctrl_x, double ctrl_y) { efl_gfx_path_append_scubic_to(obj, x, y, ctrl_x, ctrl_y); - efl_canvas_vg_node_change(obj); } EAPI void evas_vg_shape_append_arc_to(Eo *obj, double x, double y, double rx, double ry, double angle, Eina_Bool large_arc, Eina_Bool sweep) { efl_gfx_path_append_arc_to(obj, x, y, rx, ry, angle, large_arc, sweep); - efl_canvas_vg_node_change(obj); } EAPI void evas_vg_shape_append_arc(Eo *obj, double x, double y, double w, double h, double start_angle, double sweep_length) { efl_gfx_path_append_arc(obj, x, y, w, h, start_angle, sweep_length); - efl_canvas_vg_node_change(obj); } EAPI void evas_vg_shape_append_close(Eo *obj) { efl_gfx_path_append_close(obj); - efl_canvas_vg_node_change(obj); } EAPI void evas_vg_shape_append_circle(Eo *obj, double x, double y, double radius) { efl_gfx_path_append_circle(obj, x, y, radius); - efl_canvas_vg_node_change(obj); } EAPI void evas_vg_shape_append_rect(Eo *obj, double x, double y, double w, double h, double rx, double ry) { efl_gfx_path_append_rect(obj, x, y, w, h, rx, ry); - efl_canvas_vg_node_change(obj); } EAPI void evas_vg_shape_append_svg_path(Eo *obj, const char *svg_path_data) { efl_gfx_path_append_svg_path(obj, svg_path_data); - efl_canvas_vg_node_change(obj); } EAPI Eina_Bool evas_vg_shape_interpolate(Eo *obj, const Eo *from, const Eo *to, double pos_map) { - Eina_Bool ret = efl_gfx_path_interpolate(obj, from, to, pos_map); - efl_canvas_vg_node_change(obj); - return ret; + return efl_gfx_path_interpolate(obj, from, to, pos_map); } EAPI Eina_Bool diff --git a/src/lib/evas/canvas/efl_canvas_vg_shape.eo b/src/lib/evas/canvas/efl_canvas_vg_shape.eo index 2997071da0..c51df0b9ea 100644 --- a/src/lib/evas/canvas/efl_canvas_vg_shape.eo +++ b/src/lib/evas/canvas/efl_canvas_vg_shape.eo @@ -36,7 +36,6 @@ class Efl.Canvas.Vg.Shape (Efl.Canvas.Vg.Node, Efl.Gfx.Shape) } implements { Efl.Gfx.Path.interpolate; - Efl.Gfx.Path.commit; Efl.Duplicate.duplicate; Efl.Object.constructor; Efl.Object.destructor;