jsuya pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2a54c0505f6269e6648e1119e40b6253f6f9aca0
commit 2a54c0505f6269e6648e1119e40b6253f6f9aca0
Author: Taehyub Kim <taehyub....@samsung.com>
Date: Tue Mar 17 16:23:44 2020 +0900
evas_vg: refined the evas vector APIs set
Reviewers: jsuya, Hermet
Reviewed By: jsuya
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D11517
---
src/lib/evas/Evas_Legacy.h | 258 +++++++++++++++------
src/lib/evas/canvas/efl_canvas_vg_container.c | 4 +-
.../canvas/efl_canvas_vg_container_eo.legacy.c | 6 +-
.../canvas/efl_canvas_vg_container_eo.legacy.h | 18 +-
src/lib/evas/canvas/efl_canvas_vg_gradient.c | 14 +-
.../evas/canvas/efl_canvas_vg_gradient_eo.legacy.h | 21 ++
.../evas/canvas/efl_canvas_vg_gradient_linear.c | 12 +-
.../evas/canvas/efl_canvas_vg_gradient_radial.c | 16 +-
src/lib/evas/canvas/efl_canvas_vg_node.c | 20 +-
src/lib/evas/canvas/efl_canvas_vg_node_eo.legacy.c | 10 +-
src/lib/evas/canvas/efl_canvas_vg_node_eo.legacy.h | 24 +-
src/lib/evas/canvas/efl_canvas_vg_object.c | 6 +-
.../evas/canvas/efl_canvas_vg_object_eo.legacy.c | 12 +-
.../evas/canvas/efl_canvas_vg_object_eo.legacy.h | 16 +-
src/lib/evas/canvas/efl_canvas_vg_shape.c | 82 +++----
.../evas/canvas/efl_canvas_vg_shape_eo.legacy.h | 27 ++-
src/lib/evas/canvas/meson.build | 1 +
17 files changed, 346 insertions(+), 201 deletions(-)
diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index 7970966230..5623205355 100644
--- a/src/lib/evas/Evas_Legacy.h
+++ b/src/lib/evas/Evas_Legacy.h
@@ -3690,6 +3690,130 @@ EAPI int evas_object_vg_animated_frame_get(const
Evas_Object *obj) EINA_ARG_NONN
#include "canvas/efl_canvas_vg_node_eo.legacy.h"
#include "canvas/efl_canvas_vg_object_eo.legacy.h"
#include "canvas/efl_canvas_vg_container_eo.legacy.h"
+#include "canvas/efl_canvas_vg_shape_eo.legacy.h"
+#include "canvas/efl_canvas_vg_gradient_eo.legacy.h"
+
+/**
+ * @brief These values determine how the end of opened sub-paths are rendered
in a
+ * stroke. @ref evas_vg_shape_stroke_cap_set
+ *
+ * @since 1.24
+ *
+ * @ingroup Evas_Vg_Cap
+ */
+typedef enum Evas_Vg_Cap_Type
+{
+ EVAS_VG_CAP_BUTT = 0, /**< The end of lines is rendered as a full stop on the
+ * last point itself */
+ EVAS_VG_CAP_ROUND, /**< The end of lines is rendered as a half-circle
+ * around */
+ EVAS_VG_CAP_SQUARE, /**< The end of lines is rendered as a square around
+ * the last point */
+ EVAS_VG_CAP_LAST /**< Sentinel value to indicate last enum field during
+ * iteration */
+} Evas_Vg_Cap;
+
+
+/**
+ * @brief These values determine how two joining lines are rendered in a
stroker.
+ * @ref evas_vg_shape_stroke_join_set
+ *
+ * @since 1.24
+ *
+ * @ingroup Evas_Vg_Join
+ */
+typedef enum Evas_Vg_Join_Type
+{
+ EVAS_VG_JOIN_MITER = 0, /**< Used to render rounded line joins. Circular arcs
+ * are used to join two lines smoothly */
+ EVAS_VG_JOIN_ROUND, /**< Used to render beveled line joins. The outer
corner
+ * of the joined lines is filled by enclosing the
+ * triangular region of the corner with a straight
line
+ * between the outer corners of each stroke */
+ EVAS_VG_JOIN_BEVEL, /**< Used to render mitered line joins. The
intersection
+ * of the strokes is clipped at a line perpendicular
to
+ * the bisector of the angle between the strokes, at
the
+ * distance from the intersection of the segments
equal
+ * to the product of the miter limit value and the
border
+ * radius. This prevents long spikes being created
*/
+ EVAS_VG_JOIN_LAST /**< Sentinel value to indicate last enum field
during
+ * teration */
+} Evas_Vg_Join;
+
+/**
+ * @brief These values determine how the points are interpreted in a stream of
points.
+ *
+ * @since 1.24
+ *
+ * @ingroup Evas_Vg_Path_Command
+ */
+typedef enum Evas_Vg_Path_Command_Type
+{
+ EVAS_VG_PATH_COMMAND_END = 0, /**< The end of stream , no more points to
process */
+ EVAS_VG_PATH_COMMAND_MOVE_TO, /**< The next point is the start point of a
sub path */
+ EVAS_VG_PATH_COMMAND_LINE_TO, /**< The next point is used to draw a line
from
+ * current point */
+ EVAS_VG_PATH_COMMAND_CUBIC_TO, /**< The next three point is used to draw
+ * a cubic bezier curve from current point */
+ EVAS_VG_PATH_COMMAND_CLOSE, /**< Close the current subpath by drawing a
line
+ * between current point and the first point
of
+ * current subpath */
+ EVAS_VG_PATH_COMMAND_LAST /**< Sentinel value to indicate last enum
field
+ * during iteration */
+} Evas_Vg_Path_Command;
+
+/**
+ * @brief Type defining gradient stops. Describes the location and color of a
+ * transition point in a gradient.
+ *
+ * @since 1.24
+ *
+ * @ingroup Evas_Vg_Gradient_Stop
+ */
+typedef struct _Evas_Vg_Gradient_Stop
+{
+ double offset; /**< The location of the gradient stop within the gradient
+ * vector */
+ int r; /**< The component R color of the gradient stop */
+ int g; /**< The component G color of the gradient stop */
+ int b; /**< The component B color of the gradient stop */
+ int a; /**< The component A color of the gradient stop */
+} Evas_Vg_Gradient_Stop;
+
+/**
+ * @brief Specifies how the area outside the gradient area should be filled.
+ * @ref evas_vg_gradient_spread_set
+ *
+ * @since 1.24
+ *
+ * @ingroup Evas_Vg_Gradient_Spread
+ */
+typedef enum Evas_Vg_Gradient_Spread_Type
+{
+ EVAS_VG_GRADIENT_SPREAD_PAD = 0, /**< The area is filled with the closest
stop
+ * color. This is the default */
+ EVAS_VG_GRADIENT_SPREAD_REFLECT, /**< The gradient is reflected outside the
+ * gradient area */
+ EVAS_VG_GRADIENT_SPREAD_REPEAT, /**< The gradient is repeated outside the
+ * gradient area */
+ EVAS_VG_GRADIENT_SPREAD_LAST /**< Sentinel value to indicate last enum field
+ * during iteration */
+} Evas_Vg_Gradient_Spread;
+
+/**
+ * @brief Type describing dash.
+ * @ref evas_vg_shape_stroke_dash_set
+ *
+ * @since 1.24
+ *
+ * @ingroup Evas_Vg_Dash
+ */
+typedef struct _Evas_Vg_Dash
+{
+ double length; /**< Dash drawing length */
+ double gap; /**< Distance between two dashes */
+} Evas_Vg_Dash;
+
/**
* Creates a new vector shape object.
*
@@ -3698,7 +3822,7 @@ EAPI int evas_object_vg_animated_frame_get(const
Evas_Object *obj) EINA_ARG_NONN
*
* @since 1.14
*/
-EAPI Efl_VG* evas_vg_shape_add(Efl_VG *parent);
+EAPI Evas_Vg_Shape* evas_vg_shape_add(Evas_Vg_Container *parent);
/**
* Creates a new vector container object.
@@ -3709,7 +3833,7 @@ EAPI Efl_VG* evas_vg_shape_add(Efl_VG *parent);
* @since 1.14
*/
-EAPI Efl_VG* evas_vg_container_add(Efl_VG *parent);
+EAPI Evas_Vg_Container* evas_vg_container_add(Evas_Object *parent);
/**
*
@@ -3717,7 +3841,7 @@ EAPI Efl_VG* evas_vg_container_add(Efl_VG *parent);
*
*
*/
-EAPI Eina_Bool evas_vg_node_visible_get(Eo *obj);
+EAPI Eina_Bool evas_vg_node_visible_get(Evas_Vg_Node *obj);
/**
*
@@ -3726,7 +3850,7 @@ EAPI Eina_Bool evas_vg_node_visible_get(Eo *obj);
* @param[in] v @c EINA_TRUE if to make the object visible, @c EINA_FALSE
otherwise
*
*/
-EAPI void evas_vg_node_visible_set(Eo *obj, Eina_Bool v);
+EAPI void evas_vg_node_visible_set(Evas_Vg_Node *obj, Eina_Bool v);
/**
*
@@ -3748,7 +3872,7 @@ EAPI void evas_vg_node_visible_set(Eo *obj, Eina_Bool v);
* @param[out] a The alpha component of the given color.
*
*/
-EAPI void evas_vg_node_color_get(Eo *obj, int *r, int *g, int *b, int *a);
+EAPI void evas_vg_node_color_get(Evas_Vg_Node *obj, int *r, int *g, int *b,
int *a);
/**
*
@@ -3766,7 +3890,7 @@ EAPI void evas_vg_node_color_get(Eo *obj, int *r, int *g,
int *b, int *a);
* @param[in] a The alpha component of the given color.
*
*/
-EAPI void evas_vg_node_color_set(Eo *obj, int r, int g, int b, int a);
+EAPI void evas_vg_node_color_set(Evas_Vg_Node *obj, int r, int g, int b, int
a);
/**
*
@@ -3778,7 +3902,7 @@ EAPI void evas_vg_node_color_set(Eo *obj, int r, int g,
int b, int a);
* @param[out] h in
*
*/
-EAPI void evas_vg_node_geometry_get(Eo *obj, int *x, int *y, int *w, int *h);
+EAPI void evas_vg_node_geometry_get(Evas_Vg_Node *obj, int *x, int *y, int *w,
int *h);
/**
*
@@ -3790,7 +3914,7 @@ EAPI void evas_vg_node_geometry_get(Eo *obj, int *x, int
*y, int *w, int *h);
* @param[in] h in
*
*/
-EAPI void evas_vg_node_geometry_set(Eo *obj, int x, int y, int w, int h);
+EAPI void evas_vg_node_geometry_set(Evas_Vg_Node *obj, int x, int y, int w,
int h);
/**
*
@@ -3820,7 +3944,7 @@ EAPI void evas_vg_node_geometry_set(Eo *obj, int x, int
y, int w, int h);
* @param[in] below the object below which to stack
*
*/
-EAPI void evas_vg_node_stack_below(Eo *obj, Eo *below);
+EAPI void evas_vg_node_stack_below(Evas_Vg_Node *obj, Evas_Vg_Node *below);
/**
*
@@ -3850,7 +3974,7 @@ EAPI void evas_vg_node_stack_below(Eo *obj, Eo *below);
* @param[in] above the object above which to stack
*
*/
-EAPI void evas_vg_node_stack_above(Eo *obj, Eo *above);
+EAPI void evas_vg_node_stack_above(Evas_Vg_Node *obj, Evas_Vg_Node *above);
/**
*
@@ -3864,7 +3988,7 @@ EAPI void evas_vg_node_stack_above(Eo *obj, Eo *above);
* @see evas_object_lower()
*
*/
-EAPI void evas_vg_node_raise(Eo *obj);
+EAPI void evas_vg_node_raise(Evas_Vg_Node *obj);
/**
*
@@ -3880,7 +4004,7 @@ EAPI void evas_vg_node_raise(Eo *obj);
*
*
*/
-EAPI void evas_vg_node_lower(Eo *obj);
+EAPI void evas_vg_node_lower(Evas_Vg_Node *obj);
#include "canvas/efl_canvas_vg_node_eo.legacy.h"
@@ -3891,7 +4015,7 @@ EAPI void evas_vg_node_lower(Eo *obj);
*
*
*/
-EAPI double evas_vg_shape_stroke_scale_get(Eo *obj);
+EAPI double evas_vg_shape_stroke_scale_get(Evas_Vg_Shape *obj);
/**
*
@@ -3902,7 +4026,7 @@ EAPI double evas_vg_shape_stroke_scale_get(Eo *obj);
* @param[in] s stroke scale value
*
*/
-EAPI void evas_vg_shape_stroke_scale_set(Eo *obj, double s);
+EAPI void evas_vg_shape_stroke_scale_set(Evas_Vg_Shape *obj, double s);
/**
*
@@ -3915,7 +4039,7 @@ EAPI void evas_vg_shape_stroke_scale_set(Eo *obj, double
s);
* @param[out] a The alpha component of the given color.
*
*/
-EAPI void evas_vg_shape_stroke_color_get(Eo *obj, int *r, int *g, int *b, int
*a);
+EAPI void evas_vg_shape_stroke_color_get(Evas_Vg_Shape *obj, int *r, int *g,
int *b, int *a);
/**
*
@@ -3928,7 +4052,7 @@ EAPI void evas_vg_shape_stroke_color_get(Eo *obj, int *r,
int *g, int *b, int *a
* @param[in] a The alpha component of the given color.
*
*/
-EAPI void evas_vg_shape_stroke_color_set(Eo *obj, int r, int g, int b, int a);
+EAPI void evas_vg_shape_stroke_color_set(Evas_Vg_Shape *obj, int r, int g, int
b, int a);
/**
*
@@ -3937,7 +4061,7 @@ EAPI void evas_vg_shape_stroke_color_set(Eo *obj, int r,
int g, int b, int a);
*
*
*/
-EAPI double evas_vg_shape_stroke_width_get(Eo *obj);
+EAPI double evas_vg_shape_stroke_width_get(Evas_Vg_Shape *obj);
/**
*
@@ -3947,7 +4071,7 @@ EAPI double evas_vg_shape_stroke_width_get(Eo *obj);
* @param[in] w stroke width to be used
*
*/
-EAPI void evas_vg_shape_stroke_width_set(Eo *obj, double w);
+EAPI void evas_vg_shape_stroke_width_set(Evas_Vg_Shape *obj, double w);
/**
*
@@ -3955,7 +4079,7 @@ EAPI void evas_vg_shape_stroke_width_set(Eo *obj, double
w);
*
*
*/
-EAPI double evas_vg_shape_stroke_location_get(Eo *obj);
+EAPI double evas_vg_shape_stroke_location_get(Evas_Vg_Shape *obj);
/**
*
@@ -3964,7 +4088,7 @@ EAPI double evas_vg_shape_stroke_location_get(Eo *obj);
* @param[in] centered
*
*/
-EAPI void evas_vg_shape_stroke_location_set(Eo *obj, double centered);
+EAPI void evas_vg_shape_stroke_location_set(Evas_Vg_Shape *obj, double
centered);
/**
*
@@ -3974,7 +4098,7 @@ EAPI void evas_vg_shape_stroke_location_set(Eo *obj,
double centered);
* @param[out] length
*
*/
-EAPI void evas_vg_shape_stroke_dash_get(Eo *obj, const Efl_Gfx_Dash **dash,
unsigned int *length);
+EAPI void evas_vg_shape_stroke_dash_get(Evas_Vg_Shape *obj, const Evas_Vg_Dash
**dash, unsigned int *length);
/**
*
@@ -3984,7 +4108,7 @@ EAPI void evas_vg_shape_stroke_dash_get(Eo *obj, const
Efl_Gfx_Dash **dash, unsi
* @param[in] length
*
*/
-EAPI void evas_vg_shape_stroke_dash_set(Eo *obj, const Efl_Gfx_Dash *dash,
unsigned int length);
+EAPI void evas_vg_shape_stroke_dash_set(Evas_Vg_Shape *obj, const Evas_Vg_Dash
*dash, unsigned int length);
/**
*
@@ -3993,7 +4117,7 @@ EAPI void evas_vg_shape_stroke_dash_set(Eo *obj, const
Efl_Gfx_Dash *dash, unsig
*
*
*/
-EAPI Efl_Gfx_Cap evas_vg_shape_stroke_cap_get(Eo *obj);
+EAPI Evas_Vg_Cap evas_vg_shape_stroke_cap_get(Evas_Vg_Shape *obj);
/**
*
@@ -4007,7 +4131,7 @@ EAPI Efl_Gfx_Cap evas_vg_shape_stroke_cap_get(Eo *obj);
* @param[in] c cap style to use , default is EFL_GFX_CAP_BUTT
*
*/
-EAPI void evas_vg_shape_stroke_cap_set(Eo *obj, Efl_Gfx_Cap c);
+EAPI void evas_vg_shape_stroke_cap_set(Evas_Vg_Shape *obj, Evas_Vg_Cap c);
/**
*
@@ -4016,7 +4140,7 @@ EAPI void evas_vg_shape_stroke_cap_set(Eo *obj,
Efl_Gfx_Cap c);
*
*
*/
-EAPI Efl_Gfx_Join evas_vg_shape_stroke_join_get(Eo *obj);
+EAPI Evas_Vg_Join evas_vg_shape_stroke_join_get(Evas_Vg_Shape *obj);
/**
*
@@ -4031,7 +4155,7 @@ EAPI Efl_Gfx_Join evas_vg_shape_stroke_join_get(Eo *obj);
EFL_GFX_JOIN_MITER
*
*/
-EAPI void evas_vg_shape_stroke_join_set(Eo *obj, Efl_Gfx_Join j);
+EAPI void evas_vg_shape_stroke_join_set(Evas_Vg_Shape *obj, Evas_Vg_Join j);
/**
*
@@ -4046,7 +4170,7 @@ EAPI void evas_vg_shape_stroke_join_set(Eo *obj,
Efl_Gfx_Join j);
* @param[in] points point list
*
*/
-EAPI void evas_vg_shape_path_set(Eo *obj, const Efl_Gfx_Path_Command *op,
const double *points);
+EAPI void evas_vg_shape_path_set(Evas_Vg_Shape *obj, const
Evas_Vg_Path_Command *op, const double *points);
/**
*
@@ -4058,10 +4182,10 @@ EAPI void evas_vg_shape_path_set(Eo *obj, const
Efl_Gfx_Path_Command *op, const
*
*/
-EAPI void evas_vg_shape_path_get(Eo *obj, const Efl_Gfx_Path_Command **op,
const double **points);
-EAPI void evas_vg_shape_path_length_get(Eo *obj, unsigned int *commands,
unsigned int *points);
-EAPI void evas_vg_shape_current_get(Eo *obj, double *x, double *y);
-EAPI void evas_vg_shape_current_ctrl_get(Eo *obj, double *x, double *y);
+EAPI void evas_vg_shape_path_get(Evas_Vg_Shape *obj, const
Evas_Vg_Path_Command **op, const double **points);
+EAPI void evas_vg_shape_path_length_get(Evas_Vg_Shape *obj, unsigned int
*commands, unsigned int *points);
+EAPI void evas_vg_shape_current_get(Evas_Vg_Shape *obj, double *x, double *y);
+EAPI void evas_vg_shape_current_ctrl_get(Evas_Vg_Shape *obj, double *x, double
*y);
/**
*
@@ -4073,7 +4197,7 @@ EAPI void evas_vg_shape_current_ctrl_get(Eo *obj, double
*x, double *y);
* @param[in] dup_from Shape object from where data will be copied.
*
*/
-EAPI void evas_vg_shape_dup(Eo *obj, Eo *dup_from);
+EAPI void evas_vg_shape_dup(Evas_Vg_Shape *obj, Evas_Vg_Shape *dup_from);
/**
*
@@ -4084,7 +4208,7 @@ EAPI void evas_vg_shape_dup(Eo *obj, Eo *dup_from);
*
*
*/
-EAPI void evas_vg_shape_reset(Eo *obj);
+EAPI void evas_vg_shape_reset(Evas_Vg_Shape *obj);
/**
*
@@ -4099,7 +4223,7 @@ EAPI void evas_vg_shape_reset(Eo *obj);
* @param[in] y Y co-ordinate of the current point.
*
*/
-EAPI void evas_vg_shape_append_move_to(Eo *obj, double x, double y);
+EAPI void evas_vg_shape_append_move_to(Evas_Vg_Shape *obj, double x, double y);
/**
*
@@ -4118,7 +4242,7 @@ EAPI void evas_vg_shape_append_move_to(Eo *obj, double x,
double y);
* @param[in] y Y co-ordinate of end point of the line.
*
*/
-EAPI void evas_vg_shape_append_line_to(Eo *obj, double x, double y);
+EAPI void evas_vg_shape_append_line_to(Evas_Vg_Shape *obj, double x, double y);
/**
*
@@ -4136,7 +4260,7 @@ EAPI void evas_vg_shape_append_line_to(Eo *obj, double x,
double y);
* @param[in] ctrl_y Y co-ordinate of control point.
*
*/
-EAPI void evas_vg_shape_append_quadratic_to(Eo *obj, double x, double y,
double ctrl_x, double ctrl_y);
+EAPI void evas_vg_shape_append_quadratic_to(Evas_Vg_Shape *obj, double x,
double y, double ctrl_x, double ctrl_y);
/**
*
@@ -4151,7 +4275,7 @@ EAPI void evas_vg_shape_append_quadratic_to(Eo *obj,
double x, double y, double
* @param[in] y Y co-ordinate of end point of the line.
*
*/
-EAPI void evas_vg_shape_append_squadratic_to(Eo *obj, double x, double y);
+EAPI void evas_vg_shape_append_squadratic_to(Evas_Vg_Shape *obj, double x,
double y);
/**
*
@@ -4171,7 +4295,7 @@ EAPI void evas_vg_shape_append_squadratic_to(Eo *obj,
double x, double y);
* @param[in] ctrl_y1 Y co-ordinate of 2nd control point.
*
*/
-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);
+EAPI void evas_vg_shape_append_cubic_to(Evas_Vg_Shape *obj, double x, double
y, double ctrl_x0, double ctrl_y0, double ctrl_x1, double ctrl_y1);
/**
*
@@ -4189,7 +4313,7 @@ EAPI void evas_vg_shape_append_cubic_to(Eo *obj, double
x, double y, double ctrl
* @param[in] ctrl_y Y co-ordinate of 2nd control point.
*
*/
-EAPI void evas_vg_shape_append_scubic_to(Eo *obj, double x, double y, double
ctrl_x, double ctrl_y);
+EAPI void evas_vg_shape_append_scubic_to(Evas_Vg_Shape *obj, double x, double
y, double ctrl_x, double ctrl_y);
/**
*
@@ -4213,7 +4337,7 @@ EAPI void evas_vg_shape_append_scubic_to(Eo *obj, double
x, double y, double ctr
* @param[in] sweep Defines whether the arc will be drawn counter-clockwise or
clockwise from current point to the end point taking into account the large_arc
property.
*
*/
-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);
+EAPI void evas_vg_shape_append_arc_to(Evas_Vg_Shape *obj, double x, double y,
double rx, double ry, double angle, Eina_Bool large_arc, Eina_Bool sweep);
/**
* @brief Append an arc that enclosed in the given rectangle (x, y, w, h). The
@@ -4229,7 +4353,7 @@ EAPI void evas_vg_shape_append_arc_to(Eo *obj, double x,
double y, double rx, do
*
* @ingroup Efl_Gfx_Shape
*/
-EAPI void evas_vg_shape_append_arc(Eo *obj, double x, double y, double w,
double h, double start_angle, double sweep_length);
+EAPI void evas_vg_shape_append_arc(Evas_Vg_Shape *obj, double x, double y,
double w, double h, double start_angle, double sweep_length);
/**
*
@@ -4244,7 +4368,7 @@ EAPI void evas_vg_shape_append_arc(Eo *obj, double x,
double y, double w, double
*
*
*/
-EAPI void evas_vg_shape_append_close(Eo *obj);
+EAPI void evas_vg_shape_append_close(Evas_Vg_Shape *obj);
/**
*
@@ -4259,7 +4383,7 @@ EAPI void evas_vg_shape_append_close(Eo *obj);
* @param[in] radius radius of the circle.
*
*/
-EAPI void evas_vg_shape_append_circle(Eo *obj, double x, double y, double
radius);
+EAPI void evas_vg_shape_append_circle(Evas_Vg_Shape *obj, double x, double y,
double radius);
/**
*
@@ -4283,11 +4407,11 @@ EAPI void evas_vg_shape_append_circle(Eo *obj, double
x, double y, double radius
* @param[in] ry The y radius of the rounded corner and should be in range [ 0
to h/2 ]
*
*/
-EAPI void evas_vg_shape_append_rect(Eo *obj, double x, double y, double w,
double h, double rx, double ry);
+EAPI void evas_vg_shape_append_rect(Evas_Vg_Shape *obj, double x, double y,
double w, double h, double rx, double ry);
-EAPI void evas_vg_shape_append_svg_path(Eo *obj, const char *svg_path_data);
-EAPI Eina_Bool evas_vg_shape_interpolate(Eo *obj, const Eo *from, const Eo
*to, double pos_map);
-EAPI Eina_Bool evas_vg_shape_equal_commands(Eo *obj, const Eo *with);
+EAPI void evas_vg_shape_append_svg_path(Evas_Vg_Shape *obj, const char
*svg_path_data);
+EAPI Eina_Bool evas_vg_shape_interpolate(Evas_Vg_Shape *obj, const
Evas_Vg_Shape *from, const Evas_Vg_Shape *to, double pos_map);
+EAPI Eina_Bool evas_vg_shape_equal_commands(Evas_Vg_Shape *obj, const
Evas_Vg_Shape *with);
/**
* set a vg object as the fill property
@@ -4296,7 +4420,7 @@ EAPI Eina_Bool evas_vg_shape_equal_commands(Eo *obj,
const Eo *with);
* @param f The object content will be used for filling.
*
*/
-EAPI void evas_vg_shape_fill_set(Eo *obj, Efl_VG *f);
+EAPI void evas_vg_shape_fill_set(Evas_Vg_Shape *obj, Evas_Vg_Node *f);
/**
* returns the object that is set for the fill property
@@ -4305,7 +4429,7 @@ EAPI void evas_vg_shape_fill_set(Eo *obj, Efl_VG *f);
* @return The object that is set as fill property.
*
*/
-EAPI Efl_VG* evas_vg_shape_fill_get(const Eo *obj);
+EAPI Evas_Vg_Node* evas_vg_shape_fill_get(const Evas_Vg_Shape *obj);
/**
* set a vg object as the stroke fill property
@@ -4314,7 +4438,7 @@ EAPI Efl_VG* evas_vg_shape_fill_get(const Eo *obj);
* @param f The object content will be used for stroke filling.
*
*/
-EAPI void evas_vg_shape_stroke_fill_set(Eo *obj, Efl_VG *f);
+EAPI void evas_vg_shape_stroke_fill_set(Evas_Vg_Shape *obj, Evas_Vg_Node *f);
/**
* returns the object that is set for the stroke fill property
@@ -4323,7 +4447,7 @@ EAPI void evas_vg_shape_stroke_fill_set(Eo *obj, Efl_VG
*f);
* @return The object that is set as stroke fill property.
*
*/
-EAPI Efl_VG* evas_vg_shape_stroke_fill_get(const Eo *obj);
+EAPI Evas_Vg_Node* evas_vg_shape_stroke_fill_get(const Evas_Vg_Shape *obj);
#include "canvas/efl_canvas_vg_shape_eo.legacy.h"
@@ -4336,7 +4460,7 @@ EAPI Efl_VG* evas_vg_shape_stroke_fill_get(const Eo *obj);
* @param[in] length length of the list
*
*/
-EAPI void evas_vg_gradient_stop_set(Eo *obj, const Efl_Gfx_Gradient_Stop
*colors, unsigned int length);
+EAPI void evas_vg_gradient_stop_set(Evas_Vg_Gradient *obj, const
Evas_Vg_Gradient_Stop *colors, unsigned int length);
/**
*
@@ -4347,7 +4471,7 @@ EAPI void evas_vg_gradient_stop_set(Eo *obj, const
Efl_Gfx_Gradient_Stop *colors
* @param[out] length length of the list
*
*/
-EAPI void evas_vg_gradient_stop_get(Eo *obj, const Efl_Gfx_Gradient_Stop
**colors, unsigned int *length);
+EAPI void evas_vg_gradient_stop_get(Evas_Vg_Gradient *obj, const
Evas_Vg_Gradient_Stop **colors, unsigned int *length);
/**
*
@@ -4357,7 +4481,7 @@ EAPI void evas_vg_gradient_stop_get(Eo *obj, const
Efl_Gfx_Gradient_Stop **color
* @param[in] s spread type to be used
*
*/
-EAPI void evas_vg_gradient_spread_set(Eo *obj, Efl_Gfx_Gradient_Spread s);
+EAPI void evas_vg_gradient_spread_set(Evas_Vg_Gradient *obj,
Evas_Vg_Gradient_Spread s);
/**
*
@@ -4367,7 +4491,7 @@ EAPI void evas_vg_gradient_spread_set(Eo *obj,
Efl_Gfx_Gradient_Spread s);
*
*
*/
-EAPI Efl_Gfx_Gradient_Spread evas_vg_gradient_spread_get(Eo *obj);
+EAPI Evas_Vg_Gradient_Spread evas_vg_gradient_spread_get(Evas_Vg_Gradient
*obj);
/**
* Creates a new linear gradient object \.
@@ -4376,7 +4500,7 @@ EAPI Efl_Gfx_Gradient_Spread
evas_vg_gradient_spread_get(Eo *obj);
* @return The created linear gradient object handle.
*
*/
-EAPI Efl_VG* evas_vg_gradient_linear_add(Efl_VG *parent);
+EAPI Evas_Vg_Gradient_Linear* evas_vg_gradient_linear_add(Evas_Vg_Container
*parent);
/**
*
@@ -4386,7 +4510,7 @@ EAPI Efl_VG* evas_vg_gradient_linear_add(Efl_VG *parent);
* @param[in] y y co-ordinate of start point
*
*/
-EAPI void evas_vg_gradient_linear_start_set(Eo *obj, double x, double y);
+EAPI void evas_vg_gradient_linear_start_set(Evas_Vg_Gradient_Linear *obj,
double x, double y);
/**
*
@@ -4396,7 +4520,7 @@ EAPI void evas_vg_gradient_linear_start_set(Eo *obj,
double x, double y);
* @param[out] y y co-ordinate of start point
*
*/
-EAPI void evas_vg_gradient_linear_start_get(Eo *obj, double *x, double *y);
+EAPI void evas_vg_gradient_linear_start_get(Evas_Vg_Gradient_Linear *obj,
double *x, double *y);
/**
*
@@ -4406,7 +4530,7 @@ EAPI void evas_vg_gradient_linear_start_get(Eo *obj,
double *x, double *y);
* @param[in] y y co-ordinate of end point
*
*/
-EAPI void evas_vg_gradient_linear_end_set(Eo *obj, double x, double y);
+EAPI void evas_vg_gradient_linear_end_set(Evas_Vg_Gradient_Linear *obj, double
x, double y);
/**
*
@@ -4416,7 +4540,7 @@ EAPI void evas_vg_gradient_linear_end_set(Eo *obj, double
x, double y);
* @param[out] y y co-ordinate of end point
*
*/
-EAPI void evas_vg_gradient_linear_end_get(Eo *obj, double *x, double *y);
+EAPI void evas_vg_gradient_linear_end_get(Evas_Vg_Gradient_Linear *obj, double
*x, double *y);
/**
* Creates a new radial gradient object \.
@@ -4425,7 +4549,7 @@ EAPI void evas_vg_gradient_linear_end_get(Eo *obj, double
*x, double *y);
* @return The created radial gradient object handle.
*
*/
-EAPI Efl_VG* evas_vg_gradient_radial_add(Efl_VG *parent);
+EAPI Evas_Vg_Gradient_Radial* evas_vg_gradient_radial_add(Evas_Vg_Container
*parent);
/**
*
@@ -4435,7 +4559,7 @@ EAPI Efl_VG* evas_vg_gradient_radial_add(Efl_VG *parent);
* @param[in] y y co-ordinate of center point
*
*/
-EAPI void evas_vg_gradient_radial_center_set(Eo *obj, double x, double y);
+EAPI void evas_vg_gradient_radial_center_set(Evas_Vg_Gradient_Radial *obj,
double x, double y);
/**
*
@@ -4445,7 +4569,7 @@ EAPI void evas_vg_gradient_radial_center_set(Eo *obj,
double x, double y);
* @param[out] y y co-ordinate of center point
*
*/
-EAPI void evas_vg_gradient_radial_center_get(Eo *obj, double *x, double *y);
+EAPI void evas_vg_gradient_radial_center_get(Evas_Vg_Gradient_Radial *obj,
double *x, double *y);
/**
*
@@ -4454,7 +4578,7 @@ EAPI void evas_vg_gradient_radial_center_get(Eo *obj,
double *x, double *y);
* @param[in] r center radius
*
*/
-EAPI void evas_vg_gradient_radial_radius_set(Eo *obj, double r);
+EAPI void evas_vg_gradient_radial_radius_set(Evas_Vg_Gradient_Radial *obj,
double r);
/**
*
@@ -4462,7 +4586,7 @@ EAPI void evas_vg_gradient_radial_radius_set(Eo *obj,
double r);
*
*
*/
-EAPI double evas_vg_gradient_radial_radius_get(Eo *obj);
+EAPI double evas_vg_gradient_radial_radius_get(Evas_Vg_Gradient_Radial *obj);
/**
*
@@ -4472,7 +4596,7 @@ EAPI double evas_vg_gradient_radial_radius_get(Eo *obj);
* @param[in] y y co-ordinate of focal point
*
*/
-EAPI void evas_vg_gradient_radial_focal_set(Eo *obj, double x, double y);
+EAPI void evas_vg_gradient_radial_focal_set(Evas_Vg_Gradient_Radial *obj,
double x, double y);
/**
*
@@ -4482,7 +4606,7 @@ EAPI void evas_vg_gradient_radial_focal_set(Eo *obj,
double x, double y);
* @param[out] y y co-ordinate of focal point
*
*/
-EAPI void evas_vg_gradient_radial_focal_get(Eo *obj, double *x, double *y);
+EAPI void evas_vg_gradient_radial_focal_get(Evas_Vg_Gradient_Radial *obj,
double *x, double *y);
/**
* @}
diff --git a/src/lib/evas/canvas/efl_canvas_vg_container.c
b/src/lib/evas/canvas/efl_canvas_vg_container.c
index dfa5b1ec74..f791f8160a 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_container.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_container.c
@@ -481,8 +481,8 @@ efl_canvas_vg_container_blend_buffer_clear(Efl_VG *obj
EINA_UNUSED, Efl_Canvas_V
cd->blend.buffer = NULL;
}
-EAPI Efl_VG*
-evas_vg_container_add(Efl_VG *parent)
+EAPI Evas_Vg_Container *
+evas_vg_container_add(Evas_Object *parent)
{
/* Warn it because the usage has been changed.
We can remove this message after v1.21. */
diff --git a/src/lib/evas/canvas/efl_canvas_vg_container_eo.legacy.c
b/src/lib/evas/canvas/efl_canvas_vg_container_eo.legacy.c
index a31fc33d44..170a6668f0 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_container_eo.legacy.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_container_eo.legacy.c
@@ -1,12 +1,12 @@
-EAPI Efl_Canvas_Vg_Node *
-evas_vg_container_child_get(Efl_Canvas_Vg_Container *obj, const char *name)
+EAPI Evas_Vg_Node *
+evas_vg_container_child_get(Evas_Vg_Container *obj, const char *name)
{
return efl_canvas_vg_container_child_get(obj, name);
}
EAPI Eina_Iterator *
-evas_vg_container_children_get(Efl_Canvas_Vg_Container *obj)
+evas_vg_container_children_get(Evas_Vg_Container *obj)
{
return efl_canvas_vg_container_children_get(obj);
}
diff --git a/src/lib/evas/canvas/efl_canvas_vg_container_eo.legacy.h
b/src/lib/evas/canvas/efl_canvas_vg_container_eo.legacy.h
index 691a93b3c4..3ce85d03fc 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_container_eo.legacy.h
+++ b/src/lib/evas/canvas/efl_canvas_vg_container_eo.legacy.h
@@ -1,15 +1,15 @@
-#ifndef _EFL_CANVAS_VG_CONTAINER_EO_LEGACY_H_
-#define _EFL_CANVAS_VG_CONTAINER_EO_LEGACY_H_
+#ifndef _EVAS_VG_CONTAINER_EO_LEGACY_H_
+#define _EVAS_VG_CONTAINER_EO_LEGACY_H_
-#ifndef _EFL_CANVAS_VG_CONTAINER_EO_CLASS_TYPE
-#define _EFL_CANVAS_VG_CONTAINER_EO_CLASS_TYPE
+#ifndef _EVAS_VG_CONTAINER_EO_CLASS_TYPE
+#define _EVAS_VG_CONTAINER_EO_CLASS_TYPE
-typedef Eo Efl_Canvas_Vg_Container;
+typedef Eo Evas_Vg_Container;
#endif
-#ifndef _EFL_CANVAS_VG_CONTAINER_EO_TYPES
-#define _EFL_CANVAS_VG_CONTAINER_EO_TYPES
+#ifndef _EVAS_VG_CONTAINER_EO_TYPES
+#define _EVAS_VG_CONTAINER_EO_TYPES
#endif
@@ -24,7 +24,7 @@ typedef Eo Efl_Canvas_Vg_Container;
*
* @ingroup Evas_Vg_Container_Group
*/
-EAPI Efl_Canvas_Vg_Node *evas_vg_container_child_get(Efl_Canvas_Vg_Container
*obj, const char *name);
+EAPI Evas_Vg_Node *evas_vg_container_child_get(Evas_Vg_Container *obj, const
char *name);
/**
* @brief Get all children of container
@@ -35,6 +35,6 @@ EAPI Efl_Canvas_Vg_Node
*evas_vg_container_child_get(Efl_Canvas_Vg_Container *ob
*
* @ingroup Evas_Vg_Container_Group
*/
-EAPI Eina_Iterator *evas_vg_container_children_get(Efl_Canvas_Vg_Container
*obj) EINA_WARN_UNUSED_RESULT;
+EAPI Eina_Iterator *evas_vg_container_children_get(Evas_Vg_Container *obj)
EINA_WARN_UNUSED_RESULT;
#endif
diff --git a/src/lib/evas/canvas/efl_canvas_vg_gradient.c
b/src/lib/evas/canvas/efl_canvas_vg_gradient.c
index 3bc4ec80a8..2f6f2eb604 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_gradient.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_gradient.c
@@ -118,25 +118,25 @@ _efl_canvas_vg_gradient_efl_duplicate_duplicate(const Eo
*obj, Efl_Canvas_Vg_Gra
}
EAPI void
-evas_vg_gradient_stop_set(Eo *obj, const Efl_Gfx_Gradient_Stop *colors,
unsigned int length)
+evas_vg_gradient_stop_set(Evas_Vg_Gradient *obj, const Evas_Vg_Gradient_Stop
*colors, unsigned int length)
{
- efl_gfx_gradient_stop_set(obj, colors, length);
+ efl_gfx_gradient_stop_set(obj, (const Efl_Gfx_Gradient_Stop *)colors,
length);
}
EAPI void
-evas_vg_gradient_stop_get(Eo *obj, const Efl_Gfx_Gradient_Stop **colors,
unsigned int *length)
+evas_vg_gradient_stop_get(Evas_Vg_Gradient *obj, const Evas_Vg_Gradient_Stop
**colors, unsigned int *length)
{
- efl_gfx_gradient_stop_get(obj, colors, length);
+ efl_gfx_gradient_stop_get(obj, (const Efl_Gfx_Gradient_Stop **)colors,
length);
}
EAPI void
-evas_vg_gradient_spread_set(Eo *obj, Efl_Gfx_Gradient_Spread s)
+evas_vg_gradient_spread_set(Evas_Vg_Gradient *obj, Evas_Vg_Gradient_Spread s)
{
efl_gfx_gradient_spread_set(obj, s);
}
-EAPI Efl_Gfx_Gradient_Spread
-evas_vg_gradient_spread_get(Eo *obj)
+EAPI Evas_Vg_Gradient_Spread
+evas_vg_gradient_spread_get(Evas_Vg_Gradient *obj)
{
return efl_gfx_gradient_spread_get(obj);
}
diff --git a/src/lib/evas/canvas/efl_canvas_vg_gradient_eo.legacy.h
b/src/lib/evas/canvas/efl_canvas_vg_gradient_eo.legacy.h
new file mode 100644
index 0000000000..01ebdc32cb
--- /dev/null
+++ b/src/lib/evas/canvas/efl_canvas_vg_gradient_eo.legacy.h
@@ -0,0 +1,21 @@
+#ifndef _EVAS_VG_GRADIENT_EO_LEGACY_H_
+#define _EVAS_VG_GRADIENT_EO_LEGACY_H_
+
+typedef Eo Evas_Vg_Gradient;
+
+#endif
+
+#ifndef _EVAS_VG_GRADIENT_LINEAR_EO_LEGACY_H_
+#define _EVAS_VG_GRADIENT_LINEAR_EO_LEGACY_H_
+
+typedef Eo Evas_Vg_Gradient_Linear;
+
+#endif
+
+#ifndef _EVAS_VG_GRADIENT_RADIAL_EO_LEGACY_H_
+#define _EVAS_VG_GRADIENT_RADIAL_EO_LEGACY_H_
+
+typedef Eo Evas_Vg_Gradient_Radial;
+
+#endif
+
diff --git a/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.c
b/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.c
index fd681eda38..bd8ccebf36 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.c
@@ -172,31 +172,31 @@
_efl_canvas_vg_gradient_linear_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas
}
EAPI void
-evas_vg_gradient_linear_start_set(Eo *obj, double x, double y)
+evas_vg_gradient_linear_start_set(Evas_Vg_Gradient_Linear *obj, double x,
double y)
{
efl_gfx_gradient_linear_start_set(obj, x, y);
}
EAPI void
-evas_vg_gradient_linear_start_get(Eo *obj, double *x, double *y)
+evas_vg_gradient_linear_start_get(Evas_Vg_Gradient_Linear *obj, double *x,
double *y)
{
efl_gfx_gradient_linear_start_get(obj, x, y);
}
EAPI void
-evas_vg_gradient_linear_end_set(Eo *obj, double x, double y)
+evas_vg_gradient_linear_end_set(Evas_Vg_Gradient_Linear *obj, double x, double
y)
{
efl_gfx_gradient_linear_end_set(obj, x, y);
}
EAPI void
-evas_vg_gradient_linear_end_get(Eo *obj, double *x, double *y)
+evas_vg_gradient_linear_end_get(Evas_Vg_Gradient_Linear *obj, double *x,
double *y)
{
efl_gfx_gradient_linear_end_get(obj, x, y);
}
-EAPI Efl_VG*
-evas_vg_gradient_linear_add(Efl_VG *parent)
+EAPI Evas_Vg_Gradient_Linear *
+evas_vg_gradient_linear_add(Evas_Vg_Container *parent)
{
return efl_add(EFL_CANVAS_VG_GRADIENT_LINEAR_CLASS, parent);
}
diff --git a/src/lib/evas/canvas/efl_canvas_vg_gradient_radial.c
b/src/lib/evas/canvas/efl_canvas_vg_gradient_radial.c
index 8cbffa6e66..263428630b 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_gradient_radial.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_gradient_radial.c
@@ -194,43 +194,43 @@
_efl_canvas_vg_gradient_radial_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas
}
EAPI void
-evas_vg_gradient_radial_center_set(Eo *obj, double x, double y)
+evas_vg_gradient_radial_center_set(Evas_Vg_Gradient_Radial *obj, double x,
double y)
{
efl_gfx_gradient_radial_center_set(obj, x, y);
}
EAPI void
-evas_vg_gradient_radial_center_get(Eo *obj, double *x, double *y)
+evas_vg_gradient_radial_center_get(Evas_Vg_Gradient_Radial *obj, double *x,
double *y)
{
efl_gfx_gradient_radial_center_get(obj, x, y);
}
EAPI void
-evas_vg_gradient_radial_radius_set(Eo *obj, double r)
+evas_vg_gradient_radial_radius_set(Evas_Vg_Gradient_Radial *obj, double r)
{
efl_gfx_gradient_radial_radius_set(obj, r);
}
EAPI double
-evas_vg_gradient_radial_radius_get(Eo *obj)
+evas_vg_gradient_radial_radius_get(Evas_Vg_Gradient_Radial *obj)
{
return efl_gfx_gradient_radial_radius_get(obj);
}
EAPI void
-evas_vg_gradient_radial_focal_set(Eo *obj, double x, double y)
+evas_vg_gradient_radial_focal_set(Evas_Vg_Gradient_Radial *obj, double x,
double y)
{
efl_gfx_gradient_radial_focal_set(obj, x, y);
}
EAPI void
-evas_vg_gradient_radial_focal_get(Eo *obj, double *x, double *y)
+evas_vg_gradient_radial_focal_get(Evas_Vg_Gradient_Radial *obj, double *x,
double *y)
{
efl_gfx_gradient_radial_focal_get(obj, x, y);
}
-EAPI Efl_VG*
-evas_vg_gradient_radial_add(Efl_VG *parent)
+EAPI Evas_Vg_Gradient_Radial*
+evas_vg_gradient_radial_add(Evas_Vg_Container *parent)
{
return efl_add(EFL_CANVAS_VG_GRADIENT_RADIAL_CLASS, parent);
}
diff --git a/src/lib/evas/canvas/efl_canvas_vg_node.c
b/src/lib/evas/canvas/efl_canvas_vg_node.c
index 1f7975a937..865107639b 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_node.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_node.c
@@ -753,31 +753,31 @@ _efl_canvas_vg_node_efl_duplicate_duplicate(const Eo
*obj, Efl_Canvas_Vg_Node_Da
}
EAPI Eina_Bool
-evas_vg_node_visible_get(Eo *obj)
+evas_vg_node_visible_get(Evas_Vg_Node *obj)
{
return efl_gfx_entity_visible_get(obj);
}
EAPI void
-evas_vg_node_visible_set(Eo *obj, Eina_Bool v)
+evas_vg_node_visible_set(Evas_Vg_Node *obj, Eina_Bool v)
{
efl_gfx_entity_visible_set(obj, v);
}
EAPI void
-evas_vg_node_color_get(Eo *obj, int *r, int *g, int *b, int *a)
+evas_vg_node_color_get(Evas_Vg_Node *obj, int *r, int *g, int *b, int *a)
{
efl_gfx_color_get(obj, r, g, b, a);
}
EAPI void
-evas_vg_node_color_set(Eo *obj, int r, int g, int b, int a)
+evas_vg_node_color_set(Evas_Vg_Node *obj, int r, int g, int b, int a)
{
efl_gfx_color_set(obj, r, g, b, a);
}
EAPI void
-evas_vg_node_geometry_get(Eo *obj, int *x, int *y, int *w, int *h)
+evas_vg_node_geometry_get(Evas_Vg_Node *obj, int *x, int *y, int *w, int *h)
{
Eina_Rect r;
r.pos = efl_gfx_entity_position_get(obj);
@@ -789,32 +789,32 @@ evas_vg_node_geometry_get(Eo *obj, int *x, int *y, int
*w, int *h)
}
EAPI void
-evas_vg_node_geometry_set(Eo *obj, int x, int y, int w, int h)
+evas_vg_node_geometry_set(Evas_Vg_Node *obj, int x, int y, int w, int h)
{
efl_gfx_entity_position_set(obj, EINA_POSITION2D(x, y));
efl_gfx_entity_size_set(obj, EINA_SIZE2D(w, h));
}
EAPI void
-evas_vg_node_stack_below(Eo *obj, Eo *below)
+evas_vg_node_stack_below(Evas_Vg_Node *obj, Eo *below)
{
efl_gfx_stack_below(obj, below);
}
EAPI void
-evas_vg_node_stack_above(Eo *obj, Eo *above)
+evas_vg_node_stack_above(Evas_Vg_Node *obj, Eo *above)
{
efl_gfx_stack_above(obj, above);
}
EAPI void
-evas_vg_node_raise(Eo *obj)
+evas_vg_node_raise(Evas_Vg_Node *obj)
{
efl_gfx_stack_raise_to_top(obj);
}
EAPI void
-evas_vg_node_lower(Eo *obj)
+evas_vg_node_lower(Evas_Vg_Node *obj)
{
efl_gfx_stack_lower_to_bottom(obj);
}
diff --git a/src/lib/evas/canvas/efl_canvas_vg_node_eo.legacy.c
b/src/lib/evas/canvas/efl_canvas_vg_node_eo.legacy.c
index 559434b294..e6d520ca44 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_node_eo.legacy.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_node_eo.legacy.c
@@ -1,30 +1,30 @@
EAPI void
-evas_vg_node_transformation_set(Efl_Canvas_Vg_Node *obj, const Eina_Matrix3 *m)
+evas_vg_node_transformation_set(Evas_Vg_Node *obj, const Eina_Matrix3 *m)
{
efl_canvas_vg_node_transformation_set(obj, m);
}
EAPI const Eina_Matrix3 *
-evas_vg_node_transformation_get(const Efl_Canvas_Vg_Node *obj)
+evas_vg_node_transformation_get(const Evas_Vg_Node *obj)
{
return efl_canvas_vg_node_transformation_get(obj);
}
EAPI void
-evas_vg_node_origin_set(Efl_Canvas_Vg_Node *obj, double x, double y)
+evas_vg_node_origin_set(Evas_Vg_Node *obj, double x, double y)
{
efl_canvas_vg_node_origin_set(obj, x, y);
}
EAPI void
-evas_vg_node_origin_get(const Efl_Canvas_Vg_Node *obj, double *x, double *y)
+evas_vg_node_origin_get(const Evas_Vg_Node *obj, double *x, double *y)
{
efl_canvas_vg_node_origin_get(obj, x, y);
}
EAPI void
-evas_vg_node_mask_set(Efl_Canvas_Vg_Node *obj, Efl_Canvas_Vg_Node *mask, int
op EINA_UNUSED)
+evas_vg_node_mask_set(Evas_Vg_Node *obj, Evas_Vg_Node *mask, int op
EINA_UNUSED)
{
efl_canvas_vg_node_comp_method_set(obj, mask, 0);
}
diff --git a/src/lib/evas/canvas/efl_canvas_vg_node_eo.legacy.h
b/src/lib/evas/canvas/efl_canvas_vg_node_eo.legacy.h
index ee3b407331..ca85475ff5 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_node_eo.legacy.h
+++ b/src/lib/evas/canvas/efl_canvas_vg_node_eo.legacy.h
@@ -1,15 +1,15 @@
-#ifndef _EFL_CANVAS_VG_NODE_EO_LEGACY_H_
-#define _EFL_CANVAS_VG_NODE_EO_LEGACY_H_
+#ifndef _EVAS_VG_NODE_EO_LEGACY_H_
+#define _EVAS_VG_NODE_EO_LEGACY_H_
-#ifndef _EFL_CANVAS_VG_NODE_EO_CLASS_TYPE
-#define _EFL_CANVAS_VG_NODE_EO_CLASS_TYPE
+#ifndef _EVAS_VG_NODE_EO_CLASS_TYPE
+#define _EVAS_VG_NODE_EO_CLASS_TYPE
-typedef Eo Efl_Canvas_Vg_Node;
+typedef Eo Evas_Vg_Node;
#endif
-#ifndef _EFL_CANVAS_VG_NODE_EO_TYPES
-#define _EFL_CANVAS_VG_NODE_EO_TYPES
+#ifndef _EVAS_VG_NODE_EO_TYPES
+#define _EVAS_VG_NODE_EO_TYPES
#endif
@@ -26,7 +26,7 @@ typedef Eo Efl_Canvas_Vg_Node;
*
* @ingroup Evas_Vg_Node_Group
*/
-EAPI void evas_vg_node_transformation_set(Efl_Canvas_Vg_Node *obj, const
Eina_Matrix3 *m);
+EAPI void evas_vg_node_transformation_set(Evas_Vg_Node *obj, const
Eina_Matrix3 *m);
/**
* @brief Gets the transformation matrix used for this node object.
@@ -39,7 +39,7 @@ EAPI void evas_vg_node_transformation_set(Efl_Canvas_Vg_Node
*obj, const Eina_Ma
*
* @ingroup Evas_Vg_Node_Group
*/
-EAPI const Eina_Matrix3 *evas_vg_node_transformation_get(const
Efl_Canvas_Vg_Node *obj);
+EAPI const Eina_Matrix3 *evas_vg_node_transformation_get(const Evas_Vg_Node
*obj);
/**
* @brief Sets the origin position of the node object.
@@ -54,7 +54,7 @@ EAPI const Eina_Matrix3
*evas_vg_node_transformation_get(const Efl_Canvas_Vg_Nod
*
* @ingroup Evas_Vg_Node_Group
*/
-EAPI void evas_vg_node_origin_set(Efl_Canvas_Vg_Node *obj, double x, double y);
+EAPI void evas_vg_node_origin_set(Evas_Vg_Node *obj, double x, double y);
/**
* @brief Gets the origin position of the node object.
@@ -67,7 +67,7 @@ EAPI void evas_vg_node_origin_set(Efl_Canvas_Vg_Node *obj,
double x, double y);
*
* @ingroup Evas_Vg_Node_Group
*/
-EAPI void evas_vg_node_origin_get(const Efl_Canvas_Vg_Node *obj, double *x,
double *y);
+EAPI void evas_vg_node_origin_get(const Evas_Vg_Node *obj, double *x, double
*y);
/**
* @brief Set Mask Node to this renderer
@@ -78,6 +78,6 @@ EAPI void evas_vg_node_origin_get(const Efl_Canvas_Vg_Node
*obj, double *x, doub
*
* @ingroup Evas_Vg_Node_Group
*/
-EAPI void evas_vg_node_mask_set(Efl_Canvas_Vg_Node *obj, Efl_Canvas_Vg_Node
*mask, int op);
+EAPI void evas_vg_node_mask_set(Evas_Vg_Node *obj, Evas_Vg_Node *mask, int op);
#endif
diff --git a/src/lib/evas/canvas/efl_canvas_vg_object.c
b/src/lib/evas/canvas/efl_canvas_vg_object.c
index cccd9e2c6b..7963776889 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_object.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_object.c
@@ -1018,7 +1018,7 @@ _efl_canvas_vg_object_default_size_get(const Eo *eo_obj
EINA_UNUSED,
}
/* the actual api call to add a vector graphic object */
-EAPI Evas_Object *
+EAPI Eo *
evas_object_vg_add(Evas *e)
{
e = evas_find(e);
@@ -1090,13 +1090,13 @@
_efl_ui_canvas_object_vg_fill_mode_to_evas_object_vg_fill_mode(Efl_Canvas_Vg_Fil
}
EAPI void
-evas_object_vg_fill_mode_set(Efl_VG *obj, Evas_Object_Vg_Fill_Mode fill_mode)
+evas_object_vg_fill_mode_set(Evas_Object *obj, Evas_Object_Vg_Fill_Mode
fill_mode)
{
efl_canvas_vg_object_fill_mode_set(obj,
_evas_object_vg_fill_mode_to_efl_ui_canvas_object_vg_fill_mode(fill_mode));
}
EAPI Evas_Object_Vg_Fill_Mode
-evas_object_vg_fill_mode_get(const Efl_VG *obj)
+evas_object_vg_fill_mode_get(const Evas_Object *obj)
{
return
_efl_ui_canvas_object_vg_fill_mode_to_evas_object_vg_fill_mode(efl_canvas_vg_object_fill_mode_get(obj));
}
diff --git a/src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.c
b/src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.c
index 936ae0b512..14a9595c12 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.c
@@ -1,36 +1,36 @@
EAPI void
-evas_object_vg_viewbox_set(Efl_VG *obj, Eina_Rect viewbox)
+evas_object_vg_viewbox_set(Evas_Object *obj, Eina_Rect viewbox)
{
efl_canvas_vg_object_viewbox_set(obj, viewbox);
}
EAPI Eina_Rect
-evas_object_vg_viewbox_get(const Efl_VG *obj)
+evas_object_vg_viewbox_get(const Evas_Object *obj)
{
return efl_canvas_vg_object_viewbox_get(obj);
}
EAPI void
-evas_object_vg_viewbox_align_set(Efl_VG *obj, double align_x, double align_y)
+evas_object_vg_viewbox_align_set(Evas_Object *obj, double align_x, double
align_y)
{
efl_canvas_vg_object_viewbox_align_set(obj, align_x, align_y);
}
EAPI void
-evas_object_vg_viewbox_align_get(const Efl_VG *obj, double *align_x, double
*align_y)
+evas_object_vg_viewbox_align_get(const Evas_Object *obj, double *align_x,
double *align_y)
{
efl_canvas_vg_object_viewbox_align_get(obj, align_x, align_y);
}
EAPI void
-evas_object_vg_root_node_set(Efl_VG *obj, Efl_Canvas_Vg_Node *root)
+evas_object_vg_root_node_set(Evas_Object *obj, Efl_Canvas_Vg_Node *root)
{
efl_canvas_vg_object_root_node_set(obj, root);
}
EAPI Efl_Canvas_Vg_Node *
-evas_object_vg_root_node_get(const Efl_VG *obj)
+evas_object_vg_root_node_get(const Evas_Object *obj)
{
return efl_canvas_vg_object_root_node_get(obj);
}
diff --git a/src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.h
b/src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.h
index 319305f8c6..8877db086c 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.h
+++ b/src/lib/evas/canvas/efl_canvas_vg_object_eo.legacy.h
@@ -40,7 +40,7 @@ typedef enum
*
* @ingroup Evas_Object_Vg_Group
*/
-EAPI void evas_object_vg_fill_mode_set(Efl_VG *obj, Evas_Object_Vg_Fill_Mode
fill_mode);
+EAPI void evas_object_vg_fill_mode_set(Evas_Object *obj,
Evas_Object_Vg_Fill_Mode fill_mode);
/**
* @brief Control how the viewbox is mapped to the vg canvas's viewport.
@@ -51,7 +51,7 @@ EAPI void evas_object_vg_fill_mode_set(Efl_VG *obj,
Evas_Object_Vg_Fill_Mode fil
*
* @ingroup Evas_Object_Vg_Group
*/
-EAPI Evas_Object_Vg_Fill_Mode evas_object_vg_fill_mode_get(const Efl_VG *obj);
+EAPI Evas_Object_Vg_Fill_Mode evas_object_vg_fill_mode_get(const Evas_Object
*obj);
/**
* @brief Sets the viewbox for the evas vg canvas. viewbox if set should be
@@ -62,7 +62,7 @@ EAPI Evas_Object_Vg_Fill_Mode
evas_object_vg_fill_mode_get(const Efl_VG *obj);
*
* @ingroup Evas_Object_Vg_Group
*/
-EAPI void evas_object_vg_viewbox_set(Efl_VG *obj, Eina_Rect viewbox);
+EAPI void evas_object_vg_viewbox_set(Evas_Object *obj, Eina_Rect viewbox);
/**
* @brief Get the current viewbox from the evas_object_vg
@@ -73,7 +73,7 @@ EAPI void evas_object_vg_viewbox_set(Efl_VG *obj, Eina_Rect
viewbox);
*
* @ingroup Evas_Object_Vg_Group
*/
-EAPI Eina_Rect evas_object_vg_viewbox_get(const Efl_VG *obj);
+EAPI Eina_Rect evas_object_vg_viewbox_get(const Evas_Object *obj);
/**
* @brief Control how the viewbox is positioned inside the viewport.
@@ -84,7 +84,7 @@ EAPI Eina_Rect evas_object_vg_viewbox_get(const Efl_VG *obj);
*
* @ingroup Evas_Object_Vg_Group
*/
-EAPI void evas_object_vg_viewbox_align_set(Efl_VG *obj, double align_x, double
align_y);
+EAPI void evas_object_vg_viewbox_align_set(Evas_Object *obj, double align_x,
double align_y);
/**
* @brief Control how the viewbox is positioned inside the viewport.
@@ -95,7 +95,7 @@ EAPI void evas_object_vg_viewbox_align_set(Efl_VG *obj,
double align_x, double a
*
* @ingroup Evas_Object_Vg_Group
*/
-EAPI void evas_object_vg_viewbox_align_get(const Efl_VG *obj, double *align_x,
double *align_y);
+EAPI void evas_object_vg_viewbox_align_get(const Evas_Object *obj, double
*align_x, double *align_y);
/**
* @brief Set the root node of the evas_object_vg.
@@ -110,7 +110,7 @@ EAPI void evas_object_vg_viewbox_align_get(const Efl_VG
*obj, double *align_x, d
*
* @ingroup Evas_Object_Vg_Group
*/
-EAPI void evas_object_vg_root_node_set(Efl_VG *obj, Efl_Canvas_Vg_Node *root);
+EAPI void evas_object_vg_root_node_set(Evas_Object *obj, Evas_Vg_Node *root);
/**
* @brief Get the root node of the evas_object_vg.
@@ -123,6 +123,6 @@ EAPI void evas_object_vg_root_node_set(Efl_VG *obj,
Efl_Canvas_Vg_Node *root);
*
* @ingroup Evas_Object_Vg_Group
*/
-EAPI Efl_Canvas_Vg_Node *evas_object_vg_root_node_get(const Efl_VG *obj);
+EAPI Evas_Vg_Node *evas_object_vg_root_node_get(const Evas_Object *obj);
#endif
diff --git a/src/lib/evas/canvas/efl_canvas_vg_shape.c
b/src/lib/evas/canvas/efl_canvas_vg_shape.c
index cf220821d6..fb886d55df 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_shape.c
+++ b/src/lib/evas/canvas/efl_canvas_vg_shape.c
@@ -236,227 +236,227 @@ _efl_canvas_vg_shape_efl_duplicate_duplicate(const Eo
*obj, Efl_Canvas_Vg_Shape_
}
EAPI double
-evas_vg_shape_stroke_scale_get(Eo *obj)
+evas_vg_shape_stroke_scale_get(Evas_Vg_Shape *obj)
{
return efl_gfx_shape_stroke_scale_get(obj);
}
EAPI void
-evas_vg_shape_stroke_scale_set(Eo *obj, double s)
+evas_vg_shape_stroke_scale_set(Evas_Vg_Shape *obj, double s)
{
efl_gfx_shape_stroke_scale_set(obj, s);
efl_canvas_vg_node_change(obj);
}
EAPI void
-evas_vg_shape_stroke_color_get(Eo *obj, int *r, int *g, int *b, int *a)
+evas_vg_shape_stroke_color_get(Evas_Vg_Shape *obj, int *r, int *g, int *b, int
*a)
{
efl_gfx_shape_stroke_color_get(obj, r, g, b, a);
}
EAPI void
-evas_vg_shape_stroke_color_set(Eo *obj, int r, int g, int b, int a)
+evas_vg_shape_stroke_color_set(Evas_Vg_Shape *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
-evas_vg_shape_stroke_width_get(Eo *obj)
+evas_vg_shape_stroke_width_get(Evas_Vg_Shape *obj)
{
return efl_gfx_shape_stroke_width_get(obj);
}
EAPI void
-evas_vg_shape_stroke_width_set(Eo *obj, double w)
+evas_vg_shape_stroke_width_set(Evas_Vg_Shape *obj, double w)
{
efl_gfx_shape_stroke_width_set(obj, w);
efl_canvas_vg_node_change(obj);
}
EAPI double
-evas_vg_shape_stroke_location_get(Eo *obj)
+evas_vg_shape_stroke_location_get(Evas_Vg_Shape *obj)
{
return efl_gfx_shape_stroke_location_get(obj);
}
EAPI void
-evas_vg_shape_stroke_location_set(Eo *obj, double centered)
+evas_vg_shape_stroke_location_set(Evas_Vg_Shape *obj, double centered)
{
efl_gfx_shape_stroke_location_set(obj, centered);
efl_canvas_vg_node_change(obj);
}
EAPI void
-evas_vg_shape_stroke_dash_get(Eo *obj, const Efl_Gfx_Dash **dash, unsigned int
*length)
+evas_vg_shape_stroke_dash_get(Evas_Vg_Shape *obj, const Evas_Vg_Dash **dash,
unsigned int *length)
{
- efl_gfx_shape_stroke_dash_get(obj, dash, length);
+ efl_gfx_shape_stroke_dash_get(obj, (const Efl_Gfx_Dash **)dash, length);
}
EAPI void
-evas_vg_shape_stroke_dash_set(Eo *obj, const Efl_Gfx_Dash *dash, unsigned int
length)
+evas_vg_shape_stroke_dash_set(Evas_Vg_Shape *obj, const Evas_Vg_Dash *dash,
unsigned int length)
{
- efl_gfx_shape_stroke_dash_set(obj, dash, length);
+ efl_gfx_shape_stroke_dash_set(obj, (const Efl_Gfx_Dash *)dash, length);
efl_canvas_vg_node_change(obj);
}
-EAPI Efl_Gfx_Cap
-evas_vg_shape_stroke_cap_get(Eo *obj)
+EAPI Evas_Vg_Cap
+evas_vg_shape_stroke_cap_get(Evas_Vg_Shape *obj)
{
return efl_gfx_shape_stroke_cap_get(obj);
}
EAPI void
-evas_vg_shape_stroke_cap_set(Eo *obj, Efl_Gfx_Cap c)
+evas_vg_shape_stroke_cap_set(Evas_Vg_Shape *obj, Evas_Vg_Cap c)
{
efl_gfx_shape_stroke_cap_set(obj, c);
efl_canvas_vg_node_change(obj);
}
-EAPI Efl_Gfx_Join
-evas_vg_shape_stroke_join_get(Eo *obj)
+EAPI Evas_Vg_Join
+evas_vg_shape_stroke_join_get(Evas_Vg_Shape *obj)
{
return efl_gfx_shape_stroke_join_get(obj);
}
EAPI void
-evas_vg_shape_stroke_join_set(Eo *obj, Efl_Gfx_Join j)
+evas_vg_shape_stroke_join_set(Evas_Vg_Shape *obj, Evas_Vg_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)
+evas_vg_shape_path_set(Evas_Vg_Shape *obj, const Evas_Vg_Path_Command *op,
const double *points)
{
- efl_gfx_path_set(obj, op, points);
+ efl_gfx_path_set(obj, (const Efl_Gfx_Path_Command *)op, points);
efl_canvas_vg_node_change(obj);
}
EAPI void
-evas_vg_shape_path_get(Eo *obj, const Efl_Gfx_Path_Command **op, const double
**points)
+evas_vg_shape_path_get(Evas_Vg_Shape *obj, const Evas_Vg_Path_Command **op,
const double **points)
{
- efl_gfx_path_get(obj, op, points);
+ efl_gfx_path_get(obj, (const Efl_Gfx_Path_Command **)op, points);
}
EAPI void
-evas_vg_shape_path_length_get(Eo *obj, unsigned int *commands, unsigned int
*points)
+evas_vg_shape_path_length_get(Evas_Vg_Shape *obj, unsigned int *commands,
unsigned int *points)
{
efl_gfx_path_length_get(obj, commands, points);
}
EAPI void
-evas_vg_shape_current_get(Eo *obj, double *x, double *y)
+evas_vg_shape_current_get(Evas_Vg_Shape *obj, double *x, double *y)
{
efl_gfx_path_current_get(obj, x, y);
}
EAPI void
-evas_vg_shape_current_ctrl_get(Eo *obj, double *x, double *y)
+evas_vg_shape_current_ctrl_get(Evas_Vg_Shape *obj, double *x, double *y)
{
efl_gfx_path_current_ctrl_get(obj, x, y);
}
EAPI void
-evas_vg_shape_dup(Eo *obj, Eo *dup_from)
+evas_vg_shape_dup(Evas_Vg_Shape *obj, Evas_Vg_Shape *dup_from)
{
efl_gfx_path_copy_from(obj, dup_from);
efl_canvas_vg_node_change(obj);
}
EAPI void
-evas_vg_shape_reset(Eo *obj)
+evas_vg_shape_reset(Evas_Vg_Shape *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)
+evas_vg_shape_append_move_to(Evas_Vg_Shape *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)
+evas_vg_shape_append_line_to(Evas_Vg_Shape *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)
+evas_vg_shape_append_quadratic_to(Evas_Vg_Shape *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)
+evas_vg_shape_append_squadratic_to(Evas_Vg_Shape *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)
+evas_vg_shape_append_cubic_to(Evas_Vg_Shape *obj, double x, double y, double
ctrl_x0, double ctrl_y0, double ctrl_x1, double ctrl_y1)
{
efl_gfx_path_append_cubic_to(obj, ctrl_x0, ctrl_y0, ctrl_x1, ctrl_y1, x, y);
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)
+evas_vg_shape_append_scubic_to(Evas_Vg_Shape *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)
+evas_vg_shape_append_arc_to(Evas_Vg_Shape *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)
+evas_vg_shape_append_arc(Evas_Vg_Shape *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)
+evas_vg_shape_append_close(Evas_Vg_Shape *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)
+evas_vg_shape_append_circle(Evas_Vg_Shape *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)
+evas_vg_shape_append_rect(Evas_Vg_Shape *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)
+evas_vg_shape_append_svg_path(Evas_Vg_Shape *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)
+evas_vg_shape_interpolate(Evas_Vg_Shape *obj, const Evas_Vg_Shape *from, const
Evas_Vg_Shape *to, double pos_map)
{
Eina_Bool ret = efl_gfx_path_interpolate(obj, from, to, pos_map);
efl_canvas_vg_node_change(obj);
@@ -464,7 +464,7 @@ evas_vg_shape_interpolate(Eo *obj, const Eo *from, const Eo
*to, double pos_map)
}
EAPI Eina_Bool
-evas_vg_shape_equal_commands(Eo *obj, const Eo *with)
+evas_vg_shape_equal_commands(Evas_Vg_Shape *obj, const Evas_Vg_Shape *with)
{
return efl_gfx_path_equal_commands(obj, with);
}
diff --git a/src/lib/evas/canvas/efl_canvas_vg_shape_eo.legacy.h
b/src/lib/evas/canvas/efl_canvas_vg_shape_eo.legacy.h
index 444acd2334..a721c95928 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_shape_eo.legacy.h
+++ b/src/lib/evas/canvas/efl_canvas_vg_shape_eo.legacy.h
@@ -1,16 +1,15 @@
-#ifndef _EFL_CANVAS_VG_SHAPE_EO_LEGACY_H_
-#define _EFL_CANVAS_VG_SHAPE_EO_LEGACY_H_
+#ifndef _EVAS_VG_SHAPE_EO_LEGACY_H_
+#define _EVAS_VG_SHAPE_EO_LEGACY_H_
-#ifndef _EFL_CANVAS_VG_SHAPE_EO_CLASS_TYPE
-#define _EFL_CANVAS_VG_SHAPE_EO_CLASS_TYPE
+#ifndef _EVAS_VG_SHAPE_EO_CLASS_TYPE
+#define _EVAS_VG_SHAPE_EO_CLASS_TYPE
-typedef Eo Efl_Canvas_Vg_Shape;
+typedef Eo Evas_Vg_Shape;
#endif
-#ifndef _EFL_CANVAS_VG_SHAPE_EO_TYPES
-#define _EFL_CANVAS_VG_SHAPE_EO_TYPES
-
+#ifndef _EVAS_VG_SHAPE_EO_TYPES
+#define _EVAS_VG_SHAPE_EO_TYPES
#endif
@@ -22,7 +21,7 @@ typedef Eo Efl_Canvas_Vg_Shape;
*
* @ingroup Evas_Vg_Shape_Group
*/
-EAPI void evas_vg_shape_fill_set(Efl_Canvas_Vg_Shape *obj, Efl_Canvas_Vg_Node
*f);
+EAPI void evas_vg_shape_fill_set(Evas_Vg_Shape *obj, Evas_Vg_Node *f);
/**
* @brief Fill of the shape object
@@ -33,7 +32,7 @@ EAPI void evas_vg_shape_fill_set(Efl_Canvas_Vg_Shape *obj,
Efl_Canvas_Vg_Node *f
*
* @ingroup Evas_Vg_Shape_Group
*/
-EAPI Efl_Canvas_Vg_Node *evas_vg_shape_fill_get(const Efl_Canvas_Vg_Shape
*obj);
+EAPI Evas_Vg_Node *evas_vg_shape_fill_get(const Evas_Vg_Shape *obj);
/**
* @brief Stroke fill of the shape object
@@ -43,7 +42,7 @@ EAPI Efl_Canvas_Vg_Node *evas_vg_shape_fill_get(const
Efl_Canvas_Vg_Shape *obj);
*
* @ingroup Evas_Vg_Shape_Group
*/
-EAPI void evas_vg_shape_stroke_fill_set(Efl_Canvas_Vg_Shape *obj,
Efl_Canvas_Vg_Node *f);
+EAPI void evas_vg_shape_stroke_fill_set(Evas_Vg_Shape *obj, Evas_Vg_Node *f);
/**
* @brief Stroke fill of the shape object
@@ -54,7 +53,7 @@ EAPI void evas_vg_shape_stroke_fill_set(Efl_Canvas_Vg_Shape
*obj, Efl_Canvas_Vg_
*
* @ingroup Evas_Vg_Shape_Group
*/
-EAPI Efl_Canvas_Vg_Node *evas_vg_shape_stroke_fill_get(const
Efl_Canvas_Vg_Shape *obj);
+EAPI Evas_Vg_Node *evas_vg_shape_stroke_fill_get(const Evas_Vg_Shape *obj);
/**
* @brief Stroke marker of the shape object
@@ -64,7 +63,7 @@ EAPI Efl_Canvas_Vg_Node *evas_vg_shape_stroke_fill_get(const
Efl_Canvas_Vg_Shape
*
* @ingroup Evas_Vg_Shape_Group
*/
-EAPI void evas_vg_shape_stroke_marker_set(Efl_Canvas_Vg_Shape *obj,
Efl_Canvas_Vg_Node *m);
+EAPI void evas_vg_shape_stroke_marker_set(Evas_Vg_Shape *obj, Evas_Vg_Node *m);
/**
* @brief Stroke marker of the shape object
@@ -75,6 +74,6 @@ EAPI void evas_vg_shape_stroke_marker_set(Efl_Canvas_Vg_Shape
*obj, Efl_Canvas_V
*
* @ingroup Evas_Vg_Shape_Group
*/
-EAPI Efl_Canvas_Vg_Node *evas_vg_shape_stroke_marker_get(const
Efl_Canvas_Vg_Shape *obj);
+EAPI Evas_Vg_Node *evas_vg_shape_stroke_marker_get(const Evas_Vg_Shape *obj);
#endif
diff --git a/src/lib/evas/canvas/meson.build b/src/lib/evas/canvas/meson.build
index 35bdb46841..a7a6d06385 100644
--- a/src/lib/evas/canvas/meson.build
+++ b/src/lib/evas/canvas/meson.build
@@ -111,6 +111,7 @@ evas_legacy_h = files([
'efl_canvas_vg_node_eo.legacy.h',
'efl_canvas_vg_object_eo.legacy.h',
'efl_canvas_vg_shape_eo.legacy.h',
+ 'efl_canvas_vg_gradient_eo.legacy.h',
'evas_box_eo.legacy.h',
'evas_canvas_eo.legacy.h',
'evas_grid_eo.legacy.h',
--
