summaryrefslogtreecommitdiff
path: root/src/lib/ector
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2018-02-12 16:58:57 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2018-02-12 16:59:48 -0500
commit09f2fab14440ceb6e71b7af681edc44fffc82733 (patch)
tree52c719b4fd709af3a9af73aa945db6f3763238d2 /src/lib/ector
parent27ae060633fdc5d950410492fec14806e2d4b9f3 (diff)
interfaces: merge all bounds_get methods into efl.gfx.path
ref 884fc35160152712decdf7fd43082ef3912c0856
Diffstat (limited to 'src/lib/ector')
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c2
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo4
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c2
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo4
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_shape.c2
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_shape.eo4
-rw-r--r--src/lib/ector/ector_renderer.eo6
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_linear.c2
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo4
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_radial.c2
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo4
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_shape.c4
-rw-r--r--src/lib/ector/gl/ector_renderer_gl_shape.eo4
13 files changed, 19 insertions, 25 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
115static void 115static 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 @@
1class Ector.Renderer.Cairo.Gradient.Linear (Ector.Renderer.Cairo, Ector.Renderer.Gradient, Ector.Renderer.Gradient.Linear) 1class 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
138static void 138static 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 @@
1class Ector.Renderer.Cairo.Gradient.Radial (Ector.Renderer.Cairo, Ector.Renderer.Gradient, Ector.Renderer.Gradient.Radial) 1class 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
239static void 239static 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 @@
1class Ector.Renderer.Cairo.Shape (Ector.Renderer.Cairo, Ector.Renderer.Shape) 1class 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
42static void 42static 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 @@
1class Ector.Renderer.GL.Gradient.Linear (Ector.Renderer.GL, Ector.Renderer.Gradient, Ector.Renderer.Gradient.Linear) 1class 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
56static void 56static 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 @@
1class Ector.Renderer.GL.Gradient.Radial (Ector.Renderer.GL, Ector.Renderer.Gradient, Ector.Renderer.Gradient.Radial) 1class 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
112static void 112static 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 @@
1class Ector.Renderer.GL.Shape (Ector.Renderer.GL, Ector.Renderer.Shape) 1class 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 }