diff options
24 files changed, 35 insertions, 60 deletions
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c index 40783d1bfc..d6ed647ed7 100644 --- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c +++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c | |||
@@ -113,7 +113,7 @@ _ector_renderer_cairo_gradient_linear_ector_renderer_cairo_op_fill(Eo *obj, | |||
113 | } | 113 | } |
114 | 114 | ||
115 | static void | 115 | static void |
116 | _ector_renderer_cairo_gradient_linear_ector_renderer_boundary_get(Eo *obj, | 116 | _ector_renderer_cairo_gradient_linear_efl_gfx_path_bounds_get(Eo *obj, |
117 | Ector_Renderer_Cairo_Gradient_Linear_Data *pd EINA_UNUSED, | 117 | Ector_Renderer_Cairo_Gradient_Linear_Data *pd EINA_UNUSED, |
118 | Eina_Rect *r) | 118 | Eina_Rect *r) |
119 | { | 119 | { |
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo index 1d8d4d1d15..948792a9c0 100644 --- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo +++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo | |||
@@ -1,11 +1,11 @@ | |||
1 | class Ector.Renderer.Cairo.Gradient.Linear (Ector.Renderer.Cairo, Ector.Renderer.Gradient, Ector.Renderer.Gradient.Linear) | 1 | class Ector.Renderer.Cairo.Gradient.Linear (Ector.Renderer.Cairo, Ector.Renderer.Gradient, Ector.Renderer.Gradient.Linear, Efl.Gfx.Path) |
2 | { | 2 | { |
3 | [[Ector cairo renderer gradient linear]] | 3 | [[Ector cairo renderer gradient linear]] |
4 | eo_prefix: ector_renderer_cairo_gradient_linear; | 4 | eo_prefix: ector_renderer_cairo_gradient_linear; |
5 | implements { | 5 | implements { |
6 | Ector.Renderer.prepare; | 6 | Ector.Renderer.prepare; |
7 | Ector.Renderer.draw; | 7 | Ector.Renderer.draw; |
8 | Ector.Renderer.boundary_get; | 8 | Efl.Gfx.Path.bounds_get; |
9 | Ector.Renderer.crc { get; } | 9 | Ector.Renderer.crc { get; } |
10 | Ector.Renderer.Cairo.op_fill; | 10 | Ector.Renderer.Cairo.op_fill; |
11 | Efl.Object.finalize; | 11 | Efl.Object.finalize; |
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c index 555c553dc0..85764bcdcd 100644 --- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c +++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c | |||
@@ -136,7 +136,7 @@ _ector_renderer_cairo_gradient_radial_ector_renderer_cairo_op_fill(Eo *obj, | |||
136 | } | 136 | } |
137 | 137 | ||
138 | static void | 138 | static void |
139 | _ector_renderer_cairo_gradient_radial_ector_renderer_boundary_get(Eo *obj EINA_UNUSED, | 139 | _ector_renderer_cairo_gradient_radial_efl_gfx_path_bounds_get(Eo *obj EINA_UNUSED, |
140 | Ector_Renderer_Cairo_Gradient_Radial_Data *pd EINA_UNUSED, | 140 | Ector_Renderer_Cairo_Gradient_Radial_Data *pd EINA_UNUSED, |
141 | Eina_Rect *r) | 141 | Eina_Rect *r) |
142 | { | 142 | { |
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo index e95a14fdd4..afcd44182c 100644 --- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo +++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo | |||
@@ -1,11 +1,11 @@ | |||
1 | class Ector.Renderer.Cairo.Gradient.Radial (Ector.Renderer.Cairo, Ector.Renderer.Gradient, Ector.Renderer.Gradient.Radial) | 1 | class Ector.Renderer.Cairo.Gradient.Radial (Ector.Renderer.Cairo, Ector.Renderer.Gradient, Ector.Renderer.Gradient.Radial, Efl.Gfx.Path) |
2 | { | 2 | { |
3 | [[Ector cairo renderer gradient radial]] | 3 | [[Ector cairo renderer gradient radial]] |
4 | eo_prefix: ector_renderer_cairo_gradient_radial; | 4 | eo_prefix: ector_renderer_cairo_gradient_radial; |
5 | implements { | 5 | implements { |
6 | Ector.Renderer.prepare; | 6 | Ector.Renderer.prepare; |
7 | Ector.Renderer.draw; | 7 | Ector.Renderer.draw; |
8 | Ector.Renderer.boundary_get; | 8 | Efl.Gfx.Path.bounds_get; |
9 | Ector.Renderer.crc { get; } | 9 | Ector.Renderer.crc { get; } |
10 | Ector.Renderer.Cairo.op_fill; | 10 | Ector.Renderer.Cairo.op_fill; |
11 | Efl.Object.destructor; | 11 | Efl.Object.destructor; |
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.c b/src/lib/ector/cairo/ector_renderer_cairo_shape.c index dcd954d62f..3f147fc81d 100644 --- a/src/lib/ector/cairo/ector_renderer_cairo_shape.c +++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.c | |||
@@ -237,7 +237,7 @@ _ector_renderer_cairo_shape_ector_renderer_cairo_op_fill(Eo *obj EINA_UNUSED, | |||
237 | } | 237 | } |
238 | 238 | ||
239 | static void | 239 | static void |
240 | _ector_renderer_cairo_shape_ector_renderer_boundary_get(Eo *obj, | 240 | _ector_renderer_cairo_shape_efl_gfx_path_bounds_get(Eo *obj, |
241 | Ector_Renderer_Cairo_Shape_Data *pd EINA_UNUSED, | 241 | Ector_Renderer_Cairo_Shape_Data *pd EINA_UNUSED, |
242 | Eina_Rect *r) | 242 | Eina_Rect *r) |
243 | { | 243 | { |
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.eo b/src/lib/ector/cairo/ector_renderer_cairo_shape.eo index cbc980f430..b76dd29879 100644 --- a/src/lib/ector/cairo/ector_renderer_cairo_shape.eo +++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.eo | |||
@@ -1,11 +1,11 @@ | |||
1 | class Ector.Renderer.Cairo.Shape (Ector.Renderer.Cairo, Ector.Renderer.Shape) | 1 | class Ector.Renderer.Cairo.Shape (Ector.Renderer.Cairo, Ector.Renderer.Shape, Efl.Gfx.Path) |
2 | { | 2 | { |
3 | [[Ector cairo renderer shape class]] | 3 | [[Ector cairo renderer shape class]] |
4 | eo_prefix: ector_renderer_cairo_shape; | 4 | eo_prefix: ector_renderer_cairo_shape; |
5 | implements { | 5 | implements { |
6 | Ector.Renderer.prepare; | 6 | Ector.Renderer.prepare; |
7 | Ector.Renderer.draw; | 7 | Ector.Renderer.draw; |
8 | Ector.Renderer.boundary_get; | 8 | Efl.Gfx.Path.bounds_get; |
9 | Ector.Renderer.crc { get; } | 9 | Ector.Renderer.crc { get; } |
10 | Ector.Renderer.Cairo.op_fill; | 10 | Ector.Renderer.Cairo.op_fill; |
11 | Efl.Object.constructor; | 11 | Efl.Object.constructor; |
diff --git a/src/lib/ector/ector_renderer.eo b/src/lib/ector/ector_renderer.eo index 3ac2347888..eaddc64fb0 100644 --- a/src/lib/ector/ector_renderer.eo +++ b/src/lib/ector/ector_renderer.eo | |||
@@ -107,12 +107,6 @@ abstract Ector.Renderer (Efl.Object) | |||
107 | return: uint; [[CRC value]] | 107 | return: uint; [[CRC value]] |
108 | } | 108 | } |
109 | } | 109 | } |
110 | boundary_get @pure_virtual { | ||
111 | [[Retrieves the bounds of the renderer]] | ||
112 | params { | ||
113 | @out r: Eina.Rect; [[Bounds as @Eina.Rect]] | ||
114 | } | ||
115 | } | ||
116 | draw @pure_virtual { | 110 | draw @pure_virtual { |
117 | [[Actual draw operation]] | 111 | [[Actual draw operation]] |
118 | return: bool; [[$true on success, $false otherwise]] | 112 | return: bool; [[$true on success, $false otherwise]] |
diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c index a84a341780..4aed54484d 100644 --- a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c +++ b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.c | |||
@@ -40,7 +40,7 @@ _ector_renderer_gl_gradient_linear_ector_renderer_draw(Eo *obj, Ector_Renderer_G | |||
40 | } | 40 | } |
41 | 41 | ||
42 | static void | 42 | static void |
43 | _ector_renderer_gl_gradient_linear_ector_renderer_boundary_get(Eo *obj EINA_UNUSED, | 43 | _ector_renderer_gl_gradient_linear_efl_gfx_path_bounds_get(Eo *obj EINA_UNUSED, |
44 | Ector_Renderer_GL_Gradient_Linear_Data *pd, | 44 | Ector_Renderer_GL_Gradient_Linear_Data *pd, |
45 | Eina_Rect *r) | 45 | Eina_Rect *r) |
46 | { | 46 | { |
diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo index 0626ec5618..0623a8ebb9 100644 --- a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo +++ b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo | |||
@@ -1,11 +1,11 @@ | |||
1 | class Ector.Renderer.GL.Gradient.Linear (Ector.Renderer.GL, Ector.Renderer.Gradient, Ector.Renderer.Gradient.Linear) | 1 | class Ector.Renderer.GL.Gradient.Linear (Ector.Renderer.GL, Ector.Renderer.Gradient, Ector.Renderer.Gradient.Linear, Efl.Gfx.Path) |
2 | { | 2 | { |
3 | [[Ector GL renderer gradient linear]] | 3 | [[Ector GL renderer gradient linear]] |
4 | eo_prefix: ector_renderer_gl_gradient_linear; | 4 | eo_prefix: ector_renderer_gl_gradient_linear; |
5 | implements { | 5 | implements { |
6 | Ector.Renderer.prepare; | 6 | Ector.Renderer.prepare; |
7 | Ector.Renderer.draw; | 7 | Ector.Renderer.draw; |
8 | Ector.Renderer.boundary_get; | 8 | Efl.Gfx.Path.bounds_get; |
9 | Ector.Renderer.crc { get; } | 9 | Ector.Renderer.crc { get; } |
10 | Ector.Renderer.GL.op_fill; | 10 | Ector.Renderer.GL.op_fill; |
11 | Efl.Object.constructor; | 11 | Efl.Object.constructor; |
diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c index 5b9339b27d..083aeb43c3 100644 --- a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c +++ b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.c | |||
@@ -54,7 +54,7 @@ _ector_renderer_gl_gradient_radial_ector_renderer_gl_op_fill(Eo *obj, Ector_Rend | |||
54 | } | 54 | } |
55 | 55 | ||
56 | static void | 56 | static void |
57 | _ector_renderer_gl_gradient_radial_ector_renderer_boundary_get(Eo *obj EINA_UNUSED, | 57 | _ector_renderer_gl_gradient_radial_efl_gfx_path_bounds_get(Eo *obj EINA_UNUSED, |
58 | Ector_Renderer_GL_Gradient_Radial_Data *pd, | 58 | Ector_Renderer_GL_Gradient_Radial_Data *pd, |
59 | Eina_Rect *r) | 59 | Eina_Rect *r) |
60 | { | 60 | { |
diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo index 2c1445081b..954ecbc079 100644 --- a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo +++ b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo | |||
@@ -1,11 +1,11 @@ | |||
1 | class Ector.Renderer.GL.Gradient.Radial (Ector.Renderer.GL, Ector.Renderer.Gradient, Ector.Renderer.Gradient.Radial) | 1 | class Ector.Renderer.GL.Gradient.Radial (Ector.Renderer.GL, Ector.Renderer.Gradient, Ector.Renderer.Gradient.Radial, Efl.Gfx.Path) |
2 | { | 2 | { |
3 | [[Ector GL renderer gradient radial]] | 3 | [[Ector GL renderer gradient radial]] |
4 | eo_prefix: ector_renderer_gl_gradient_radial; | 4 | eo_prefix: ector_renderer_gl_gradient_radial; |
5 | implements { | 5 | implements { |
6 | Ector.Renderer.prepare; | 6 | Ector.Renderer.prepare; |
7 | Ector.Renderer.draw; | 7 | Ector.Renderer.draw; |
8 | Ector.Renderer.boundary_get; | 8 | Efl.Gfx.Path.bounds_get; |
9 | Ector.Renderer.crc { get; } | 9 | Ector.Renderer.crc { get; } |
10 | Ector.Renderer.GL.op_fill; | 10 | Ector.Renderer.GL.op_fill; |
11 | Efl.Object.constructor; | 11 | 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 f472d9c28c..d89b15a97b 100644 --- a/src/lib/ector/gl/ector_renderer_gl_shape.c +++ b/src/lib/ector/gl/ector_renderer_gl_shape.c | |||
@@ -44,7 +44,7 @@ _ector_renderer_gl_shape_ector_renderer_prepare(Eo *obj, Ector_Renderer_GL_Shape | |||
44 | 44 | ||
45 | r = ector_renderer_prepare(efl_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS)); | 45 | r = ector_renderer_prepare(efl_super(obj, ECTOR_RENDERER_GL_SHAPE_CLASS)); |
46 | 46 | ||
47 | ector_renderer_boundary_get(obj, &bounding_box); | 47 | efl_gfx_path_bounds_get(obj, &bounding_box); |
48 | 48 | ||
49 | pd->vertex = malloc(sizeof (GLshort) * 6 * 3); | 49 | pd->vertex = malloc(sizeof (GLshort) * 6 * 3); |
50 | 50 | ||
@@ -110,7 +110,7 @@ _ector_renderer_gl_shape_ector_renderer_gl_op_fill(Eo *obj EINA_UNUSED, | |||
110 | } | 110 | } |
111 | 111 | ||
112 | static void | 112 | static void |
113 | _ector_renderer_gl_shape_ector_renderer_boundary_get(Eo *obj, Ector_Renderer_GL_Shape_Data *pd, Eina_Rect *r) | 113 | _ector_renderer_gl_shape_efl_gfx_path_bounds_get(Eo *obj, Ector_Renderer_GL_Shape_Data *pd, Eina_Rect *r) |
114 | { | 114 | { |
115 | efl_gfx_path_bounds_get(obj, r); | 115 | efl_gfx_path_bounds_get(obj, r); |
116 | 116 | ||
diff --git a/src/lib/ector/gl/ector_renderer_gl_shape.eo b/src/lib/ector/gl/ector_renderer_gl_shape.eo index 83e2801806..21ef655d7c 100644 --- a/src/lib/ector/gl/ector_renderer_gl_shape.eo +++ b/src/lib/ector/gl/ector_renderer_gl_shape.eo | |||
@@ -1,13 +1,13 @@ | |||
1 | class Ector.Renderer.GL.Shape (Ector.Renderer.GL, Ector.Renderer.Shape) | 1 | class Ector.Renderer.GL.Shape (Ector.Renderer.GL, Ector.Renderer.Shape, Efl.Gfx.Path) |
2 | { | 2 | { |
3 | [[Ector GL renderer shape class]] | 3 | [[Ector GL renderer shape class]] |
4 | eo_prefix: ector_renderer_gl_shape; | 4 | eo_prefix: ector_renderer_gl_shape; |
5 | implements { | 5 | implements { |
6 | Ector.Renderer.prepare; | 6 | Ector.Renderer.prepare; |
7 | Ector.Renderer.draw; | 7 | Ector.Renderer.draw; |
8 | Ector.Renderer.boundary_get; | ||
9 | Ector.Renderer.crc { get; } | 8 | Ector.Renderer.crc { get; } |
10 | Ector.Renderer.GL.op_fill; | 9 | Ector.Renderer.GL.op_fill; |
10 | Efl.Gfx.Path.bounds_get; | ||
11 | Efl.Object.constructor; | 11 | Efl.Object.constructor; |
12 | Efl.Object.destructor; | 12 | Efl.Object.destructor; |
13 | } | 13 | } |
diff --git a/src/lib/evas/canvas/efl_vg.eo b/src/lib/evas/canvas/efl_vg.eo index 030cdac48a..651e83ef36 100644 --- a/src/lib/evas/canvas/efl_vg.eo +++ b/src/lib/evas/canvas/efl_vg.eo | |||
@@ -1,6 +1,6 @@ | |||
1 | import eina_types; | 1 | import eina_types; |
2 | 2 | ||
3 | abstract Efl.VG (Efl.Object, Efl.Gfx, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Duplicate) | 3 | abstract Efl.VG (Efl.Object, Efl.Gfx, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Duplicate, Efl.Gfx.Path) |
4 | { | 4 | { |
5 | [[Efl vector graphics abstract class]] | 5 | [[Efl vector graphics abstract class]] |
6 | eo_prefix: efl_vg; | 6 | eo_prefix: efl_vg; |
@@ -60,17 +60,6 @@ abstract Efl.VG (Efl.Object, Efl.Gfx, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Duplicat | |||
60 | Evas_VG_Quality q; | 60 | Evas_VG_Quality q; |
61 | } | 61 | } |
62 | } */ | 62 | } */ |
63 | bounds_get @pure_virtual { | ||
64 | [[Give the bounding box in screen coordinates as being drawn. | ||
65 | |||
66 | It will start as the control box until it is refined, once the shape | ||
67 | is computed. | ||
68 | |||
69 | @since 1.14]] | ||
70 | params { | ||
71 | @out r: Eina.Rect; [[Bounding box to be returned.]] | ||
72 | } | ||
73 | } | ||
74 | interpolate { | 63 | interpolate { |
75 | [[Interpolate a given vector graphics object]] | 64 | [[Interpolate a given vector graphics object]] |
76 | 65 | ||
diff --git a/src/lib/evas/canvas/efl_vg_container.eo b/src/lib/evas/canvas/efl_vg_container.eo index 264d94e9ef..59347c00bf 100644 --- a/src/lib/evas/canvas/efl_vg_container.eo +++ b/src/lib/evas/canvas/efl_vg_container.eo | |||
@@ -18,7 +18,7 @@ class Efl.VG.Container (Efl.VG) | |||
18 | implements { | 18 | implements { |
19 | Efl.Object.constructor; | 19 | Efl.Object.constructor; |
20 | Efl.Object.destructor; | 20 | Efl.Object.destructor; |
21 | Efl.VG.bounds_get; | 21 | Efl.Gfx.Path.bounds_get; |
22 | Efl.VG.interpolate; | 22 | Efl.VG.interpolate; |
23 | Efl.Duplicate.duplicate; | 23 | Efl.Duplicate.duplicate; |
24 | } | 24 | } |
diff --git a/src/lib/evas/canvas/efl_vg_gradient_linear.eo b/src/lib/evas/canvas/efl_vg_gradient_linear.eo index 3048e17970..938e9286f7 100644 --- a/src/lib/evas/canvas/efl_vg_gradient_linear.eo +++ b/src/lib/evas/canvas/efl_vg_gradient_linear.eo | |||
@@ -5,9 +5,9 @@ class Efl.VG.Gradient.Linear (Efl.VG.Gradient, Efl.Gfx.Gradient.Linear) | |||
5 | implements { | 5 | implements { |
6 | Efl.Gfx.Gradient.Linear.start { get; set; } | 6 | Efl.Gfx.Gradient.Linear.start { get; set; } |
7 | Efl.Gfx.Gradient.Linear.end { get; set; } | 7 | Efl.Gfx.Gradient.Linear.end { get; set; } |
8 | Efl.VG.bounds_get; | ||
9 | Efl.VG.interpolate; | 8 | Efl.VG.interpolate; |
10 | Efl.Duplicate.duplicate; | 9 | Efl.Duplicate.duplicate; |
10 | Efl.Gfx.Path.bounds_get; | ||
11 | Efl.Object.constructor; | 11 | Efl.Object.constructor; |
12 | Efl.Object.destructor; | 12 | Efl.Object.destructor; |
13 | } | 13 | } |
diff --git a/src/lib/evas/canvas/efl_vg_gradient_radial.eo b/src/lib/evas/canvas/efl_vg_gradient_radial.eo index efc75bebe4..cf35a6ace6 100644 --- a/src/lib/evas/canvas/efl_vg_gradient_radial.eo +++ b/src/lib/evas/canvas/efl_vg_gradient_radial.eo | |||
@@ -6,7 +6,7 @@ class Efl.VG.Gradient.Radial (Efl.VG.Gradient, Efl.Gfx.Gradient.Radial) | |||
6 | Efl.Gfx.Gradient.Radial.center { get; set; } | 6 | Efl.Gfx.Gradient.Radial.center { get; set; } |
7 | Efl.Gfx.Gradient.Radial.radius { get; set; } | 7 | Efl.Gfx.Gradient.Radial.radius { get; set; } |
8 | Efl.Gfx.Gradient.Radial.focal { get; set; } | 8 | Efl.Gfx.Gradient.Radial.focal { get; set; } |
9 | Efl.VG.bounds_get; | 9 | Efl.Gfx.Path.bounds_get; |
10 | Efl.VG.interpolate; | 10 | Efl.VG.interpolate; |
11 | Efl.Duplicate.duplicate; | 11 | Efl.Duplicate.duplicate; |
12 | Efl.Object.constructor; | 12 | Efl.Object.constructor; |
diff --git a/src/lib/evas/canvas/efl_vg_shape.eo b/src/lib/evas/canvas/efl_vg_shape.eo index 716d1877d5..be68f0fd89 100644 --- a/src/lib/evas/canvas/efl_vg_shape.eo +++ b/src/lib/evas/canvas/efl_vg_shape.eo | |||
@@ -35,7 +35,6 @@ class Efl.VG.Shape (Efl.VG, Efl.Gfx.Shape) | |||
35 | } | 35 | } |
36 | } | 36 | } |
37 | implements { | 37 | implements { |
38 | Efl.VG.bounds_get; | ||
39 | Efl.VG.interpolate; | 38 | Efl.VG.interpolate; |
40 | Efl.Duplicate.duplicate; | 39 | Efl.Duplicate.duplicate; |
41 | Efl.Object.constructor; | 40 | Efl.Object.constructor; |
diff --git a/src/lib/evas/canvas/evas_vg_container.c b/src/lib/evas/canvas/evas_vg_container.c index 5ddad99390..05e67e369c 100644 --- a/src/lib/evas/canvas/evas_vg_container.c +++ b/src/lib/evas/canvas/evas_vg_container.c | |||
@@ -65,7 +65,7 @@ _efl_vg_container_efl_object_destructor(Eo *obj, | |||
65 | } | 65 | } |
66 | 66 | ||
67 | static void | 67 | static void |
68 | _efl_vg_container_efl_vg_bounds_get(Eo *obj EINA_UNUSED, | 68 | _efl_vg_container_efl_gfx_path_bounds_get(Eo *obj EINA_UNUSED, |
69 | Efl_VG_Container_Data *pd, | 69 | Efl_VG_Container_Data *pd, |
70 | Eina_Rect *r) | 70 | Eina_Rect *r) |
71 | { | 71 | { |
@@ -80,12 +80,12 @@ _efl_vg_container_efl_vg_bounds_get(Eo *obj EINA_UNUSED, | |||
80 | { | 80 | { |
81 | if (first) | 81 | if (first) |
82 | { | 82 | { |
83 | efl_vg_bounds_get(child, r); | 83 | efl_gfx_path_bounds_get(child, r); |
84 | first = EINA_FALSE; | 84 | first = EINA_FALSE; |
85 | } | 85 | } |
86 | else | 86 | else |
87 | { | 87 | { |
88 | efl_vg_bounds_get(child, &s); | 88 | efl_gfx_path_bounds_get(child, &s); |
89 | eina_rectangle_union(&r->rect, &s.rect); | 89 | eina_rectangle_union(&r->rect, &s.rect); |
90 | } | 90 | } |
91 | } | 91 | } |
diff --git a/src/lib/evas/canvas/evas_vg_gradient_linear.c b/src/lib/evas/canvas/evas_vg_gradient_linear.c index 8747950b5f..e0cac2203d 100644 --- a/src/lib/evas/canvas/evas_vg_gradient_linear.c +++ b/src/lib/evas/canvas/evas_vg_gradient_linear.c | |||
@@ -112,7 +112,7 @@ _efl_vg_gradient_linear_efl_object_destructor(Eo *obj, Efl_VG_Gradient_Linear_Da | |||
112 | } | 112 | } |
113 | 113 | ||
114 | static void | 114 | static void |
115 | _efl_vg_gradient_linear_efl_vg_bounds_get(Eo *obj, Efl_VG_Gradient_Linear_Data *pd, Eina_Rect *r) | 115 | _efl_vg_gradient_linear_efl_gfx_path_bounds_get(Eo *obj, Efl_VG_Gradient_Linear_Data *pd, Eina_Rect *r) |
116 | { | 116 | { |
117 | Efl_VG_Data *nd; | 117 | Efl_VG_Data *nd; |
118 | 118 | ||
diff --git a/src/lib/evas/canvas/evas_vg_gradient_radial.c b/src/lib/evas/canvas/evas_vg_gradient_radial.c index 1489e8100c..dac3c8b266 100644 --- a/src/lib/evas/canvas/evas_vg_gradient_radial.c +++ b/src/lib/evas/canvas/evas_vg_gradient_radial.c | |||
@@ -129,7 +129,7 @@ _efl_vg_gradient_radial_efl_object_destructor(Eo *obj, | |||
129 | } | 129 | } |
130 | 130 | ||
131 | static void | 131 | static void |
132 | _efl_vg_gradient_radial_efl_vg_bounds_get(Eo *obj, Efl_VG_Gradient_Radial_Data *pd, Eina_Rect *r) | 132 | _efl_vg_gradient_radial_efl_gfx_path_bounds_get(Eo *obj, Efl_VG_Gradient_Radial_Data *pd, Eina_Rect *r) |
133 | { | 133 | { |
134 | Efl_VG_Data *nd; | 134 | Efl_VG_Data *nd; |
135 | 135 | ||
diff --git a/src/lib/evas/canvas/evas_vg_node.c b/src/lib/evas/canvas/evas_vg_node.c index 8cd5add2b3..c343b3e122 100644 --- a/src/lib/evas/canvas/evas_vg_node.c +++ b/src/lib/evas/canvas/evas_vg_node.c | |||
@@ -189,7 +189,7 @@ _efl_vg_efl_gfx_size_get(Eo *obj, Efl_VG_Data *pd EINA_UNUSED) | |||
189 | { | 189 | { |
190 | Eina_Rect r; | 190 | Eina_Rect r; |
191 | 191 | ||
192 | efl_vg_bounds_get(obj, &r); | 192 | efl_gfx_path_bounds_get(obj, &r); |
193 | return r.size; | 193 | return r.size; |
194 | } | 194 | } |
195 | 195 | ||
@@ -508,7 +508,7 @@ _efl_vg_walk_down_at(Eo *root, Eina_Array *a, Eina_Rectangle *r) | |||
508 | { | 508 | { |
509 | Eina_Rect bounds; | 509 | Eina_Rect bounds; |
510 | 510 | ||
511 | efl_vg_bounds_get(root, &bounds); | 511 | efl_gfx_path_bounds_get(root, &bounds); |
512 | if (!eina_rectangles_intersect(&bounds.rect, r)) return ; | 512 | if (!eina_rectangles_intersect(&bounds.rect, r)) return ; |
513 | 513 | ||
514 | eina_array_push(a, root); | 514 | eina_array_push(a, root); |
@@ -546,7 +546,7 @@ _efl_vg_efl_gfx_stack_below_get(Eo *obj, Efl_VG_Data *pd EINA_UNUSED) | |||
546 | Eina_Array_Iterator iterator; | 546 | Eina_Array_Iterator iterator; |
547 | unsigned int i; | 547 | unsigned int i; |
548 | 548 | ||
549 | efl_vg_bounds_get(obj, &r); | 549 | efl_gfx_path_bounds_get(obj, &r); |
550 | 550 | ||
551 | eina_array_step_set(&a, sizeof (Eina_Array), 8); | 551 | eina_array_step_set(&a, sizeof (Eina_Array), 8); |
552 | 552 | ||
@@ -576,7 +576,7 @@ _efl_vg_efl_gfx_stack_above_get(Eo *obj, Efl_VG_Data *pd EINA_UNUSED) | |||
576 | Eina_Array_Iterator iterator; | 576 | Eina_Array_Iterator iterator; |
577 | unsigned int i; | 577 | unsigned int i; |
578 | 578 | ||
579 | efl_vg_bounds_get(obj, &r); | 579 | efl_gfx_path_bounds_get(obj, &r); |
580 | 580 | ||
581 | eina_array_step_set(&a, sizeof (Eina_Array), 8); | 581 | eina_array_step_set(&a, sizeof (Eina_Array), 8); |
582 | 582 | ||
diff --git a/src/lib/evas/canvas/evas_vg_shape.c b/src/lib/evas/canvas/evas_vg_shape.c index 4d603235a5..840a7017fb 100644 --- a/src/lib/evas/canvas/evas_vg_shape.c +++ b/src/lib/evas/canvas/evas_vg_shape.c | |||
@@ -16,14 +16,7 @@ struct _Efl_VG_Shape_Data | |||
16 | } stroke; | 16 | } stroke; |
17 | }; | 17 | }; |
18 | 18 | ||
19 | static void | 19 | // FIXME: Use the renderer bounding box when it has been created instead of an estimation |
20 | _efl_vg_shape_efl_vg_bounds_get(Eo *obj, | ||
21 | Efl_VG_Shape_Data *pd EINA_UNUSED, | ||
22 | Eina_Rect *r) | ||
23 | { | ||
24 | // FIXME: Use the renderer bounding box when it has been created instead of an estimation | ||
25 | efl_gfx_path_bounds_get(obj, r); | ||
26 | } | ||
27 | 20 | ||
28 | static void | 21 | static void |
29 | _efl_vg_shape_fill_set(Eo *obj EINA_UNUSED, | 22 | _efl_vg_shape_fill_set(Eo *obj EINA_UNUSED, |
diff --git a/src/static_libs/vg_common/vg_common.c b/src/static_libs/vg_common/vg_common.c index fbc4c45095..e1601ec633 100644 --- a/src/static_libs/vg_common/vg_common.c +++ b/src/static_libs/vg_common/vg_common.c | |||
@@ -561,7 +561,7 @@ _apply_gradient_property(Svg_Style_Gradient *g, Efl_VG *vg, Vg_File_Data *vg_dat | |||
561 | //TODO: apply actual sizes (imporve bounds_get function?)... | 561 | //TODO: apply actual sizes (imporve bounds_get function?)... |
562 | //for example with figures and paths | 562 | //for example with figures and paths |
563 | if (!g->user_space) | 563 | if (!g->user_space) |
564 | evas_vg_node_bounds_get(vg, &r); | 564 | efl_gfx_path_bounds_get(vg, &r); |
565 | else | 565 | else |
566 | { | 566 | { |
567 | r.w = vg_data->view_box.w; | 567 | r.w = vg_data->view_box.w; |
@@ -610,7 +610,7 @@ _apply_gradient_property(Svg_Style_Gradient *g, Efl_VG *vg, Vg_File_Data *vg_dat | |||
610 | scale_reversed_X = ((double) r.w) / r.h; | 610 | scale_reversed_X = ((double) r.w) / r.h; |
611 | } | 611 | } |
612 | 612 | ||
613 | evas_vg_node_bounds_get(grad_obj, &grad_geom); | 613 | efl_gfx_path_bounds_get(grad_obj, &grad_geom); |
614 | 614 | ||
615 | double cy = grad_geom.h / 2 + grad_geom.y; | 615 | double cy = grad_geom.h / 2 + grad_geom.y; |
616 | double cy_scaled = (grad_geom.h / 2) * scale_reversed_Y; | 616 | double cy_scaled = (grad_geom.h / 2) * scale_reversed_Y; |