summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/ector/Makefile.am4
-rw-r--r--src/lib/ector/cairo/Ector_Cairo.h2
-rw-r--r--src/lib/ector/cairo/ector_cairo_private.h4
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo.c (renamed from src/lib/ector/cairo/ector_renderer_cairo_base.c)28
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo.eo (renamed from src/lib/ector/cairo/ector_renderer_cairo_base.eo)2
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c6
-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.c6
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo4
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_shape.c10
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_shape.eo4
11 files changed, 37 insertions, 37 deletions
diff --git a/src/lib/ector/Makefile.am b/src/lib/ector/Makefile.am
index 0aec2f9e6c..2456f0dc2c 100644
--- a/src/lib/ector/Makefile.am
+++ b/src/lib/ector/Makefile.am
@@ -18,7 +18,7 @@ ector_eolian_generic_h = $(ector_eolian_files_generic:%.eo=%.eo.h)
18ector_eolian_files_cairo = \ 18ector_eolian_files_cairo = \
19 cairo/ector_cairo_surface.eo \ 19 cairo/ector_cairo_surface.eo \
20 cairo/ector_cairo_software_surface.eo \ 20 cairo/ector_cairo_software_surface.eo \
21 cairo/ector_renderer_cairo_base.eo \ 21 cairo/ector_renderer_cairo.eo \
22 cairo/ector_renderer_cairo_shape.eo \ 22 cairo/ector_renderer_cairo_shape.eo \
23 cairo/ector_renderer_cairo_gradient_linear.eo \ 23 cairo/ector_renderer_cairo_gradient_linear.eo \
24 cairo/ector_renderer_cairo_gradient_radial.eo 24 cairo/ector_renderer_cairo_gradient_radial.eo
@@ -89,7 +89,7 @@ libector_la_SOURCES += \
89cairo/ector_renderer_cairo_gradient_linear.c \ 89cairo/ector_renderer_cairo_gradient_linear.c \
90cairo/ector_renderer_cairo_gradient_radial.c \ 90cairo/ector_renderer_cairo_gradient_radial.c \
91cairo/ector_renderer_cairo_shape.c \ 91cairo/ector_renderer_cairo_shape.c \
92cairo/ector_renderer_cairo_base.c \ 92cairo/ector_renderer_cairo.c \
93cairo/ector_cairo_software_surface.c \ 93cairo/ector_cairo_software_surface.c \
94cairo/ector_cairo_surface.c 94cairo/ector_cairo_surface.c
95 95
diff --git a/src/lib/ector/cairo/Ector_Cairo.h b/src/lib/ector/cairo/Ector_Cairo.h
index 1a99181409..b0c605855d 100644
--- a/src/lib/ector/cairo/Ector_Cairo.h
+++ b/src/lib/ector/cairo/Ector_Cairo.h
@@ -16,7 +16,7 @@ typedef struct _cairo_t cairo_t;
16 16
17#include "cairo/ector_cairo_surface.eo.h" 17#include "cairo/ector_cairo_surface.eo.h"
18#include "cairo/ector_cairo_software_surface.eo.h" 18#include "cairo/ector_cairo_software_surface.eo.h"
19#include "cairo/ector_renderer_cairo_base.eo.h" 19#include "cairo/ector_renderer_cairo.eo.h"
20#include "cairo/ector_renderer_cairo_shape.eo.h" 20#include "cairo/ector_renderer_cairo_shape.eo.h"
21#include "cairo/ector_renderer_cairo_gradient_linear.eo.h" 21#include "cairo/ector_renderer_cairo_gradient_linear.eo.h"
22#include "cairo/ector_renderer_cairo_gradient_radial.eo.h" 22#include "cairo/ector_renderer_cairo_gradient_radial.eo.h"
diff --git a/src/lib/ector/cairo/ector_cairo_private.h b/src/lib/ector/cairo/ector_cairo_private.h
index 1b38e34cff..d8754351fd 100644
--- a/src/lib/ector/cairo/ector_cairo_private.h
+++ b/src/lib/ector/cairo/ector_cairo_private.h
@@ -12,7 +12,7 @@ typedef struct {
12} cairo_matrix_t; 12} cairo_matrix_t;
13 13
14typedef struct _Ector_Cairo_Surface_Data Ector_Cairo_Surface_Data; 14typedef struct _Ector_Cairo_Surface_Data Ector_Cairo_Surface_Data;
15typedef struct _Ector_Renderer_Cairo_Base_Data Ector_Renderer_Cairo_Base_Data; 15typedef struct _Ector_Renderer_Cairo_Data Ector_Renderer_Cairo_Data;
16 16
17struct _Ector_Cairo_Surface_Data 17struct _Ector_Cairo_Surface_Data
18{ 18{
@@ -22,7 +22,7 @@ struct _Ector_Cairo_Surface_Data
22 } current; 22 } current;
23}; 23};
24 24
25struct _Ector_Renderer_Cairo_Base_Data 25struct _Ector_Renderer_Cairo_Data
26{ 26{
27 Ector_Cairo_Surface_Data *parent; 27 Ector_Cairo_Surface_Data *parent;
28 Ector_Renderer_Generic_Base_Data *generic; 28 Ector_Renderer_Generic_Base_Data *generic;
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_base.c b/src/lib/ector/cairo/ector_renderer_cairo.c
index 1afc3d587f..ee6e64b5a6 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_base.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo.c
@@ -73,8 +73,8 @@ static cairo_matrix_t identity;
73 73
74// Cairo need unpremul color, so force unpremul here 74// Cairo need unpremul color, so force unpremul here
75void 75void
76_ector_renderer_cairo_base_ector_renderer_generic_base_color_set(Eo *obj EINA_UNUSED, 76_ector_renderer_cairo_ector_renderer_generic_base_color_set(Eo *obj EINA_UNUSED,
77 Ector_Renderer_Cairo_Base_Data *pd, 77 Ector_Renderer_Cairo_Data *pd,
78 int r, int g, int b, int a) 78 int r, int g, int b, int a)
79{ 79{
80 pd->generic->color.r = r; 80 pd->generic->color.r = r;
@@ -84,8 +84,8 @@ _ector_renderer_cairo_base_ector_renderer_generic_base_color_set(Eo *obj EINA_UN
84} 84}
85 85
86void 86void
87_ector_renderer_cairo_base_ector_renderer_generic_base_color_get(Eo *obj EINA_UNUSED, 87_ector_renderer_cairo_ector_renderer_generic_base_color_get(Eo *obj EINA_UNUSED,
88 Ector_Renderer_Cairo_Base_Data *pd, 88 Ector_Renderer_Cairo_Data *pd,
89 int *r, int *g, int *b, int *a) 89 int *r, int *g, int *b, int *a)
90{ 90{
91 if (r) *r = pd->generic->color.r; 91 if (r) *r = pd->generic->color.r;
@@ -95,7 +95,7 @@ _ector_renderer_cairo_base_ector_renderer_generic_base_color_get(Eo *obj EINA_UN
95} 95}
96 96
97static Eina_Bool 97static Eina_Bool
98_ector_renderer_cairo_base_ector_renderer_generic_base_prepare(Eo *obj, Ector_Renderer_Cairo_Base_Data *pd) 98_ector_renderer_cairo_ector_renderer_generic_base_prepare(Eo *obj, Ector_Renderer_Cairo_Data *pd)
99{ 99{
100 if (!pd->parent) 100 if (!pd->parent)
101 { 101 {
@@ -119,8 +119,8 @@ _ector_renderer_cairo_base_ector_renderer_generic_base_prepare(Eo *obj, Ector_Re
119} 119}
120 120
121static Eina_Bool 121static Eina_Bool
122_ector_renderer_cairo_base_ector_renderer_generic_base_draw(Eo *obj EINA_UNUSED, 122_ector_renderer_cairo_ector_renderer_generic_base_draw(Eo *obj EINA_UNUSED,
123 Ector_Renderer_Cairo_Base_Data *pd, 123 Ector_Renderer_Cairo_Data *pd,
124 Efl_Gfx_Render_Op op, 124 Efl_Gfx_Render_Op op,
125 Eina_Array *clips EINA_UNUSED, 125 Eina_Array *clips EINA_UNUSED,
126 unsigned int mul_col) 126 unsigned int mul_col)
@@ -180,9 +180,9 @@ _ector_renderer_cairo_base_ector_renderer_generic_base_draw(Eo *obj EINA_UNUSED,
180} 180}
181 181
182static Eo * 182static Eo *
183_ector_renderer_cairo_base_eo_base_constructor(Eo *obj, Ector_Renderer_Cairo_Base_Data *pd EINA_UNUSED) 183_ector_renderer_cairo_eo_base_constructor(Eo *obj, Ector_Renderer_Cairo_Data *pd EINA_UNUSED)
184{ 184{
185 obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_CAIRO_BASE_CLASS)); 185 obj = eo_constructor(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS));
186 if (!obj) return NULL; 186 if (!obj) return NULL;
187 187
188 pd->generic = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS, obj); 188 pd->generic = eo_data_xref(obj, ECTOR_RENDERER_GENERIC_BASE_CLASS, obj);
@@ -191,9 +191,9 @@ _ector_renderer_cairo_base_eo_base_constructor(Eo *obj, Ector_Renderer_Cairo_Bas
191} 191}
192 192
193static Eo_Base * 193static Eo_Base *
194_ector_renderer_cairo_base_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Base_Data *pd) 194_ector_renderer_cairo_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Data *pd)
195{ 195{
196 obj = eo_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_BASE_CLASS)); 196 obj = eo_finalize(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS));
197 if (!obj) return NULL; 197 if (!obj) return NULL;
198 198
199 USE(pd->generic, cairo_matrix_init, NULL); 199 USE(pd->generic, cairo_matrix_init, NULL);
@@ -213,7 +213,7 @@ _ector_renderer_cairo_base_eo_base_finalize(Eo *obj, Ector_Renderer_Cairo_Base_D
213} 213}
214 214
215static void 215static void
216_ector_renderer_cairo_base_eo_base_destructor(Eo *obj, Ector_Renderer_Cairo_Base_Data *pd) 216_ector_renderer_cairo_eo_base_destructor(Eo *obj, Ector_Renderer_Cairo_Data *pd)
217{ 217{
218 Ector_Renderer_Generic_Base_Data *base; 218 Ector_Renderer_Generic_Base_Data *base;
219 219
@@ -223,7 +223,7 @@ _ector_renderer_cairo_base_eo_base_destructor(Eo *obj, Ector_Renderer_Cairo_Base
223 223
224 free(pd->m); 224 free(pd->m);
225 225
226 eo_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_BASE_CLASS)); 226 eo_destructor(eo_super(obj, ECTOR_RENDERER_CAIRO_CLASS));
227} 227}
228 228
229#include "ector_renderer_cairo_base.eo.c" 229#include "ector_renderer_cairo.eo.c"
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_base.eo b/src/lib/ector/cairo/ector_renderer_cairo.eo
index 374594c177..9da20ecbe3 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_base.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo.eo
@@ -1,4 +1,4 @@
1abstract Ector.Renderer.Cairo.Base (Ector.Renderer.Generic.Base) 1abstract Ector.Renderer.Cairo (Ector.Renderer.Generic.Base)
2{ 2{
3 legacy_prefix: null; 3 legacy_prefix: null;
4 methods { 4 methods {
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 3d5b508c06..130c4b76bf 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.c
@@ -91,7 +91,7 @@ _ector_renderer_cairo_gradient_linear_ector_renderer_generic_base_draw(Eo *obj,
91} 91}
92 92
93static Eina_Bool 93static Eina_Bool
94_ector_renderer_cairo_gradient_linear_ector_renderer_cairo_base_fill(Eo *obj, 94_ector_renderer_cairo_gradient_linear_ector_renderer_cairo_fill(Eo *obj,
95 Ector_Renderer_Cairo_Gradient_Linear_Data *pd, 95 Ector_Renderer_Cairo_Gradient_Linear_Data *pd,
96 unsigned int mul_col) 96 unsigned int mul_col)
97{ 97{
@@ -118,10 +118,10 @@ _ector_renderer_cairo_gradient_linear_ector_renderer_generic_base_bounds_get(Eo
118 Eina_Rectangle *r) 118 Eina_Rectangle *r)
119{ 119{
120 Ector_Renderer_Generic_Gradient_Linear_Data *gld; 120 Ector_Renderer_Generic_Gradient_Linear_Data *gld;
121 Ector_Renderer_Cairo_Base_Data *bd; 121 Ector_Renderer_Cairo_Data *bd;
122 122
123 gld = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN); 123 gld = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN);
124 bd = eo_data_scope_get(obj, ECTOR_RENDERER_CAIRO_BASE_CLASS); 124 bd = eo_data_scope_get(obj, ECTOR_RENDERER_CAIRO_CLASS);
125 EINA_RECTANGLE_SET(r, 125 EINA_RECTANGLE_SET(r,
126 bd->generic->origin.x + gld->start.x, 126 bd->generic->origin.x + gld->start.x,
127 bd->generic->origin.y + gld->start.y, 127 bd->generic->origin.y + gld->start.y,
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 31c968ef13..8111ebed1c 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo
@@ -1,4 +1,4 @@
1class Ector.Renderer.Cairo.Gradient_Linear (Ector.Renderer.Cairo.Base, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Linear) 1class Ector.Renderer.Cairo.Gradient_Linear (Ector.Renderer.Cairo, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Linear)
2{ 2{
3 eo_prefix: ector_renderer_cairo_gradient_linear; 3 eo_prefix: ector_renderer_cairo_gradient_linear;
4 legacy_prefix: null; 4 legacy_prefix: null;
@@ -7,7 +7,7 @@ class Ector.Renderer.Cairo.Gradient_Linear (Ector.Renderer.Cairo.Base, Ector.Ren
7 Ector.Renderer.Generic.Base.draw; 7 Ector.Renderer.Generic.Base.draw;
8 Ector.Renderer.Generic.Base.bounds_get; 8 Ector.Renderer.Generic.Base.bounds_get;
9 Ector.Renderer.Generic.Base.crc.get; 9 Ector.Renderer.Generic.Base.crc.get;
10 Ector.Renderer.Cairo.Base.fill; 10 Ector.Renderer.Cairo.fill;
11 Eo.Base.finalize; 11 Eo.Base.finalize;
12 Eo.Base.destructor; 12 Eo.Base.destructor;
13 Efl.Gfx.Gradient.stop.set; 13 Efl.Gfx.Gradient.stop.set;
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 30cad94627..209630cd4e 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.c
@@ -97,7 +97,7 @@ _ector_renderer_cairo_gradient_radial_ector_renderer_generic_base_draw(Eo *obj,
97 97
98// Clearly duplicated and should be in a common place... 98// Clearly duplicated and should be in a common place...
99static Eina_Bool 99static Eina_Bool
100_ector_renderer_cairo_gradient_radial_ector_renderer_cairo_base_fill(Eo *obj, 100_ector_renderer_cairo_gradient_radial_ector_renderer_cairo_fill(Eo *obj,
101 Ector_Renderer_Cairo_Gradient_Radial_Data *pd, 101 Ector_Renderer_Cairo_Gradient_Radial_Data *pd,
102 unsigned int mul_col) 102 unsigned int mul_col)
103{ 103{
@@ -124,10 +124,10 @@ _ector_renderer_cairo_gradient_radial_ector_renderer_generic_base_bounds_get(Eo
124 Eina_Rectangle *r) 124 Eina_Rectangle *r)
125{ 125{
126 Ector_Renderer_Generic_Gradient_Radial_Data *gld; 126 Ector_Renderer_Generic_Gradient_Radial_Data *gld;
127 Ector_Renderer_Cairo_Base_Data *bd; 127 Ector_Renderer_Cairo_Data *bd;
128 128
129 gld = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN); 129 gld = eo_data_scope_get(obj, ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN);
130 bd = eo_data_scope_get(obj, ECTOR_RENDERER_CAIRO_BASE_CLASS); 130 bd = eo_data_scope_get(obj, ECTOR_RENDERER_CAIRO_CLASS);
131 EINA_RECTANGLE_SET(r, 131 EINA_RECTANGLE_SET(r,
132 bd->generic->origin.x + gld->radial.x - gld->radius, 132 bd->generic->origin.x + gld->radial.x - gld->radius,
133 bd->generic->origin.y + gld->radial.y - gld->radius, 133 bd->generic->origin.y + gld->radial.y - gld->radius,
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 caa47c7907..a4f2de3acb 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo
@@ -1,4 +1,4 @@
1class Ector.Renderer.Cairo.Gradient_Radial (Ector.Renderer.Cairo.Base, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Radial) 1class Ector.Renderer.Cairo.Gradient_Radial (Ector.Renderer.Cairo, Ector.Renderer.Generic.Gradient, Ector.Renderer.Generic.Gradient_Radial)
2{ 2{
3 eo_prefix: ector_renderer_cairo_gradient_radial; 3 eo_prefix: ector_renderer_cairo_gradient_radial;
4 legacy_prefix: null; 4 legacy_prefix: null;
@@ -7,7 +7,7 @@ class Ector.Renderer.Cairo.Gradient_Radial (Ector.Renderer.Cairo.Base, Ector.Ren
7 Ector.Renderer.Generic.Base.draw; 7 Ector.Renderer.Generic.Base.draw;
8 Ector.Renderer.Generic.Base.bounds_get; 8 Ector.Renderer.Generic.Base.bounds_get;
9 Ector.Renderer.Generic.Base.crc.get; 9 Ector.Renderer.Generic.Base.crc.get;
10 Ector.Renderer.Cairo.Base.fill; 10 Ector.Renderer.Cairo.fill;
11 Eo.Base.destructor; 11 Eo.Base.destructor;
12 Eo.Base.finalize; 12 Eo.Base.finalize;
13 Efl.Gfx.Gradient.stop.set; 13 Efl.Gfx.Gradient.stop.set;
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.c b/src/lib/ector/cairo/ector_renderer_cairo_shape.c
index 99e3016b87..66d2cca9f6 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_shape.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.c
@@ -175,14 +175,14 @@ _ector_renderer_cairo_shape_ector_renderer_generic_base_draw(Eo *obj, Ector_Rend
175 cairo_set_fill_rule(pd->parent->cairo, CAIRO_FILL_RULE_WINDING); 175 cairo_set_fill_rule(pd->parent->cairo, CAIRO_FILL_RULE_WINDING);
176 176
177 if (pd->shape->fill) 177 if (pd->shape->fill)
178 ector_renderer_cairo_base_fill(pd->shape->fill, mul_col); 178 ector_renderer_cairo_fill(pd->shape->fill, mul_col);
179 179
180 if (pd->shape->stroke.fill || pd->public_shape->stroke.color.a > 0) 180 if (pd->shape->stroke.fill || pd->public_shape->stroke.color.a > 0)
181 { 181 {
182 cairo_fill_preserve(pd->parent->cairo); 182 cairo_fill_preserve(pd->parent->cairo);
183 183
184 if (pd->shape->stroke.fill) 184 if (pd->shape->stroke.fill)
185 ector_renderer_cairo_base_fill(pd->shape->stroke.fill, mul_col); 185 ector_renderer_cairo_fill(pd->shape->stroke.fill, mul_col);
186 else 186 else
187 { 187 {
188 r = (((pd->public_shape->stroke.color.r * R_VAL(&mul_col)) + 0xff) >> 8); 188 r = (((pd->public_shape->stroke.color.r * R_VAL(&mul_col)) + 0xff) >> 8);
@@ -222,7 +222,7 @@ _ector_renderer_cairo_shape_ector_renderer_generic_base_draw(Eo *obj, Ector_Rend
222} 222}
223 223
224static Eina_Bool 224static Eina_Bool
225_ector_renderer_cairo_shape_ector_renderer_cairo_base_fill(Eo *obj EINA_UNUSED, 225_ector_renderer_cairo_shape_ector_renderer_cairo_fill(Eo *obj EINA_UNUSED,
226 Ector_Renderer_Cairo_Shape_Data *pd EINA_UNUSED, 226 Ector_Renderer_Cairo_Shape_Data *pd EINA_UNUSED,
227 unsigned int mul_col EINA_UNUSED) 227 unsigned int mul_col EINA_UNUSED)
228{ 228{
@@ -237,12 +237,12 @@ _ector_renderer_cairo_shape_ector_renderer_generic_base_bounds_get(Eo *obj,
237 Ector_Renderer_Cairo_Shape_Data *pd EINA_UNUSED, 237 Ector_Renderer_Cairo_Shape_Data *pd EINA_UNUSED,
238 Eina_Rectangle *r) 238 Eina_Rectangle *r)
239{ 239{
240 Ector_Renderer_Cairo_Base_Data *bd; 240 Ector_Renderer_Cairo_Data *bd;
241 241
242 // FIXME: It should be possible to actually ask cairo about that 242 // FIXME: It should be possible to actually ask cairo about that
243 efl_gfx_shape_bounds_get(obj, r); 243 efl_gfx_shape_bounds_get(obj, r);
244 244
245 bd = eo_data_scope_get(obj, ECTOR_RENDERER_CAIRO_BASE_CLASS); 245 bd = eo_data_scope_get(obj, ECTOR_RENDERER_CAIRO_CLASS);
246 r->x += bd->generic->origin.x; 246 r->x += bd->generic->origin.x;
247 r->y += bd->generic->origin.y; 247 r->y += bd->generic->origin.y;
248} 248}
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.eo b/src/lib/ector/cairo/ector_renderer_cairo_shape.eo
index 8b1626086f..aeeb03007d 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_shape.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.eo
@@ -1,4 +1,4 @@
1class Ector.Renderer.Cairo.Shape (Ector.Renderer.Cairo.Base, Ector.Renderer.Generic.Shape) 1class Ector.Renderer.Cairo.Shape (Ector.Renderer.Cairo, Ector.Renderer.Generic.Shape)
2{ 2{
3 eo_prefix: ector_renderer_cairo_shape; 3 eo_prefix: ector_renderer_cairo_shape;
4 legacy_prefix: null; 4 legacy_prefix: null;
@@ -7,7 +7,7 @@ class Ector.Renderer.Cairo.Shape (Ector.Renderer.Cairo.Base, Ector.Renderer.Gene
7 Ector.Renderer.Generic.Base.draw; 7 Ector.Renderer.Generic.Base.draw;
8 Ector.Renderer.Generic.Base.bounds_get; 8 Ector.Renderer.Generic.Base.bounds_get;
9 Ector.Renderer.Generic.Base.crc.get; 9 Ector.Renderer.Generic.Base.crc.get;
10 Ector.Renderer.Cairo.Base.fill; 10 Ector.Renderer.Cairo.fill;
11 Eo.Base.constructor; 11 Eo.Base.constructor;
12 Eo.Base.finalize; 12 Eo.Base.finalize;
13 Eo.Base.destructor; 13 Eo.Base.destructor;