summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-09-14 11:59:44 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-09-18 13:22:52 +0900
commitf3eff6eb3ee6e9b56c0be5cd7f8905f14b388e4f (patch)
tree473b3d1b3e56cc5875d4496bf40fe8279165e132 /src/lib/evas/canvas
parentcb3b4cc8d7794bea575a85325c8a58f25f0507b2 (diff)
efl: Introduce Eina.Rect and switch EO APIs to it
It's a complex struct but defined in EO as a simple struct. ABI-wise it's equivalent to Eina_Rectangle. Some macros that use Eina_Rectangle also work on Eina_Rect out of the box, most of the code dealing with x,y,w,h will require no modifications either. But Eina_Rect provides direct access to a size or position 2d component, as well as the usual x,y,w,h. The field "rect" is provided as a convenience for code dealing with both Eina_Rectangle and Eina_Rect. We may or may not require it. Note: Size2D could use unsigned values but I have spotted a few places in the code that actually use -1 to indicate invalid size (as opposed to 0x0). @feature
Diffstat (limited to 'src/lib/evas/canvas')
-rw-r--r--src/lib/evas/canvas/efl_canvas_text.eo4
-rw-r--r--src/lib/evas/canvas/efl_gfx_map.c2
-rw-r--r--src/lib/evas/canvas/efl_vg.eo2
-rw-r--r--src/lib/evas/canvas/evas_canvas.eo8
-rw-r--r--src/lib/evas/canvas/evas_image_legacy.c2
-rw-r--r--src/lib/evas/canvas/evas_object_image.c6
-rw-r--r--src/lib/evas/canvas/evas_object_main.c10
-rw-r--r--src/lib/evas/canvas/evas_object_vg.c4
-rw-r--r--src/lib/evas/canvas/evas_vg_container.c10
-rw-r--r--src/lib/evas/canvas/evas_vg_gradient_linear.c2
-rw-r--r--src/lib/evas/canvas/evas_vg_gradient_radial.c2
-rw-r--r--src/lib/evas/canvas/evas_vg_node.c18
-rw-r--r--src/lib/evas/canvas/evas_vg_private.h2
-rw-r--r--src/lib/evas/canvas/evas_vg_shape.c4
14 files changed, 38 insertions, 38 deletions
diff --git a/src/lib/evas/canvas/efl_canvas_text.eo b/src/lib/evas/canvas/efl_canvas_text.eo
index 6600e7a..0cbe8e1 100644
--- a/src/lib/evas/canvas/efl_canvas_text.eo
+++ b/src/lib/evas/canvas/efl_canvas_text.eo
@@ -178,7 +178,7 @@ Efl.Text.Font, Efl.Text.Style, Efl.Text.Format, Efl.Text.Cursor, Efl.Text.Annota
178 @in cur1: const(ptr(Efl.Text.Cursor.Cursor)); [[Start of range]] 178 @in cur1: const(ptr(Efl.Text.Cursor.Cursor)); [[Start of range]]
179 @in cur2: const(ptr(Efl.Text.Cursor.Cursor)); [[End of range]] 179 @in cur2: const(ptr(Efl.Text.Cursor.Cursor)); [[End of range]]
180 } 180 }
181 return: iterator<Eina.Rectangle> @owned; [[ 181 return: iterator<Eina.Rect> @owned; [[
182 Iterator on all geoemtries of the given range 182 Iterator on all geoemtries of the given range
183 ]] 183 ]]
184 } 184 }
@@ -196,7 +196,7 @@ Efl.Text.Font, Efl.Text.Style, Efl.Text.Format, Efl.Text.Cursor, Efl.Text.Annota
196 @in cur1: ptr(const(Efl.Text.Cursor.Cursor)); [[Start of range]] 196 @in cur1: ptr(const(Efl.Text.Cursor.Cursor)); [[Start of range]]
197 @in cur2: ptr(const(Efl.Text.Cursor.Cursor)); [[End of range]] 197 @in cur2: ptr(const(Efl.Text.Cursor.Cursor)); [[End of range]]
198 } 198 }
199 return: iterator<Eina.Rectangle> @owned; [[ 199 return: iterator<Eina.Rect> @owned; [[
200 Iterator on all simple geometries of the given range 200 Iterator on all simple geometries of the given range
201 ]] 201 ]]
202 } 202 }
diff --git a/src/lib/evas/canvas/efl_gfx_map.c b/src/lib/evas/canvas/efl_gfx_map.c
index 5f434b7..f44d1b4 100644
--- a/src/lib/evas/canvas/efl_gfx_map.c
+++ b/src/lib/evas/canvas/efl_gfx_map.c
@@ -78,7 +78,7 @@ struct _Gfx_Map_Pivot
78 78
79 Evas_Object_Protected_Data *map_obj; 79 Evas_Object_Protected_Data *map_obj;
80 Eo *eo_obj; // strong or weak ref? 80 Eo *eo_obj; // strong or weak ref?
81 Eina_Rectangle geometry; 81 Eina_Rect geometry;
82 Eina_Bool event_cbs; 82 Eina_Bool event_cbs;
83 Eina_Bool is_evas; 83 Eina_Bool is_evas;
84 Eina_Bool is_canvas; 84 Eina_Bool is_canvas;
diff --git a/src/lib/evas/canvas/efl_vg.eo b/src/lib/evas/canvas/efl_vg.eo
index beb1328..e44a852 100644
--- a/src/lib/evas/canvas/efl_vg.eo
+++ b/src/lib/evas/canvas/efl_vg.eo
@@ -90,7 +90,7 @@ abstract Efl.VG (Efl.Object, Efl.Gfx, Efl.Gfx.Stack)
90 90
91 @since 1.14]] 91 @since 1.14]]
92 params { 92 params {
93 @out r: Eina.Rectangle; [[Bounding box to be returned.]] 93 @out r: Eina.Rect; [[Bounding box to be returned.]]
94 } 94 }
95 } 95 }
96 interpolate { 96 interpolate {
diff --git a/src/lib/evas/canvas/evas_canvas.eo b/src/lib/evas/canvas/evas_canvas.eo
index a00e5f2..65a5a22 100644
--- a/src/lib/evas/canvas/evas_canvas.eo
+++ b/src/lib/evas/canvas/evas_canvas.eo
@@ -571,10 +571,10 @@ class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface,
571 571
572 @since 1.15 572 @since 1.15
573 ]] 573 ]]
574 return: free(list<ptr(Eina.Rectangle)>, evas_render_updates_free) 574 return: free(list<ptr(Eina.Rect)>, evas_render_updates_free)
575 @owned @warn_unused; [[ 575 @owned @warn_unused; [[
576 A newly allocated list of updated rectangles of the canvas 576 A newly allocated list of updated rectangles of the canvas
577 ($Eina.Rectangle structs). Free this list with 577 ($Eina.Rect structs). Free this list with
578 \@ref evas_render_updates_free. 578 \@ref evas_render_updates_free.
579 ]] 579 ]]
580 } 580 }
@@ -866,10 +866,10 @@ class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface,
866 866
867 See the full @ref Example_Evas_Events "example". 867 See the full @ref Example_Evas_Events "example".
868 */ 868 */
869 return: free(list<ptr(Eina.Rectangle)>, evas_render_updates_free) 869 return: free(list<ptr(Eina.Rect)>, evas_render_updates_free)
870 @owned @warn_unused; [[ 870 @owned @warn_unused; [[
871 A newly allocated list of updated rectangles of the canvas 871 A newly allocated list of updated rectangles of the canvas
872 ($Eina.Rectangle structs). Free this list with 872 ($Eina.Rect structs). Free this list with
873 \@ref evas_render_updates_free. 873 \@ref evas_render_updates_free.
874 ]] 874 ]]
875 } 875 }
diff --git a/src/lib/evas/canvas/evas_image_legacy.c b/src/lib/evas/canvas/evas_image_legacy.c
index 9b75571..c78c97d 100644
--- a/src/lib/evas/canvas/evas_image_legacy.c
+++ b/src/lib/evas/canvas/evas_image_legacy.c
@@ -90,7 +90,7 @@ evas_object_image_fill_get(const Evas_Object *obj,
90 Evas_Coord *x, Evas_Coord *y, 90 Evas_Coord *x, Evas_Coord *y,
91 Evas_Coord *w, Evas_Coord *h) 91 Evas_Coord *w, Evas_Coord *h)
92{ 92{
93 Eina_Rectangle r; 93 Eina_Rect r;
94 94
95 EVAS_IMAGE_API(obj); 95 EVAS_IMAGE_API(obj);
96 r = efl_gfx_fill_get(obj); 96 r = efl_gfx_fill_get(obj);
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index 452311e..05b7ca0 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -668,7 +668,7 @@ _evas_image_fill_set(Eo *eo_obj, Evas_Image_Data *o, int x, int y, int w, int h)
668} 668}
669 669
670EOLIAN static void 670EOLIAN static void
671_efl_canvas_image_internal_efl_gfx_fill_fill_set(Eo *eo_obj, Evas_Image_Data *o, Eina_Rectangle fill) 671_efl_canvas_image_internal_efl_gfx_fill_fill_set(Eo *eo_obj, Evas_Image_Data *o, Eina_Rect fill)
672{ 672{
673 // Should (0,0,0,0) reset the filled flag to true? 673 // Should (0,0,0,0) reset the filled flag to true?
674 o->filled = EINA_FALSE; 674 o->filled = EINA_FALSE;
@@ -676,10 +676,10 @@ _efl_canvas_image_internal_efl_gfx_fill_fill_set(Eo *eo_obj, Evas_Image_Data *o,
676 _evas_image_fill_set(eo_obj, o, fill.x, fill.y, fill.w, fill.h); 676 _evas_image_fill_set(eo_obj, o, fill.x, fill.y, fill.w, fill.h);
677} 677}
678 678
679EOLIAN static Eina_Rectangle 679EOLIAN static Eina_Rect
680_efl_canvas_image_internal_efl_gfx_fill_fill_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o) 680_efl_canvas_image_internal_efl_gfx_fill_fill_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o)
681{ 681{
682 return o->cur->fill; 682 return (Eina_Rect) o->cur->fill;
683} 683}
684 684
685EOLIAN static void 685EOLIAN static void
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index 8ad0e78..4fc7a13 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -1156,7 +1156,7 @@ end:
1156} 1156}
1157 1157
1158EOLIAN static void 1158EOLIAN static void
1159_efl_canvas_object_efl_gfx_geometry_set(Eo *obj, Evas_Object_Protected_Data *pd EINA_UNUSED, Eina_Rectangle r) 1159_efl_canvas_object_efl_gfx_geometry_set(Eo *obj, Evas_Object_Protected_Data *pd EINA_UNUSED, Eina_Rect r)
1160{ 1160{
1161 efl_gfx_position_set(obj, r.x, r.y); 1161 efl_gfx_position_set(obj, r.x, r.y);
1162 efl_gfx_size_set(obj, r.w, r.h); 1162 efl_gfx_size_set(obj, r.w, r.h);
@@ -1168,7 +1168,7 @@ evas_object_geometry_set(Evas_Object *eo_obj, Evas_Coord x, Evas_Coord y, Evas_C
1168 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); 1168 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ);
1169 return; 1169 return;
1170 MAGIC_CHECK_END(); 1170 MAGIC_CHECK_END();
1171 efl_gfx_geometry_set(eo_obj, (Eina_Rectangle) { x, y, w, h }); 1171 efl_gfx_geometry_set(eo_obj, EINA_RECT(x, y, w, h));
1172} 1172}
1173 1173
1174EAPI void 1174EAPI void
@@ -1316,16 +1316,16 @@ _efl_canvas_object_efl_gfx_size_set(Eo *eo_obj, Evas_Object_Protected_Data *obj,
1316 evas_object_inform_call_resize(eo_obj); 1316 evas_object_inform_call_resize(eo_obj);
1317} 1317}
1318 1318
1319EOLIAN Eina_Rectangle 1319EOLIAN Eina_Rect
1320_efl_canvas_object_efl_gfx_geometry_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj) 1320_efl_canvas_object_efl_gfx_geometry_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj)
1321{ 1321{
1322 return obj->cur->geometry; 1322 return (Eina_Rect) obj->cur->geometry;
1323} 1323}
1324 1324
1325EAPI void 1325EAPI void
1326evas_object_geometry_get(const Evas_Object *eo_obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) 1326evas_object_geometry_get(const Evas_Object *eo_obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
1327{ 1327{
1328 Eina_Rectangle r = efl_gfx_geometry_get(eo_obj); 1328 Eina_Rect r = efl_gfx_geometry_get(eo_obj);
1329 if (x) *x = r.x; 1329 if (x) *x = r.x;
1330 if (y) *y = r.y; 1330 if (y) *y = r.y;
1331 if (w) *w = r.w; 1331 if (w) *w = r.w;
diff --git a/src/lib/evas/canvas/evas_object_vg.c b/src/lib/evas/canvas/evas_object_vg.c
index 19a4b45..006f070 100644
--- a/src/lib/evas/canvas/evas_object_vg.c
+++ b/src/lib/evas/canvas/evas_object_vg.c
@@ -418,12 +418,12 @@ _evas_vg_efl_gfx_view_view_size_set(Eo *obj EINA_UNUSED, Evas_VG_Data *pd,
418} 418}
419 419
420void 420void
421_evas_vg_efl_gfx_fill_fill_set(Eo *obj EINA_UNUSED, Evas_VG_Data *pd, Eina_Rectangle fill) 421_evas_vg_efl_gfx_fill_fill_set(Eo *obj EINA_UNUSED, Evas_VG_Data *pd, Eina_Rect fill)
422{ 422{
423 pd->fill = fill; 423 pd->fill = fill;
424} 424}
425 425
426Eina_Rectangle 426Eina_Rect
427_evas_vg_efl_gfx_fill_fill_get(Eo *obj EINA_UNUSED, Evas_VG_Data *pd) 427_evas_vg_efl_gfx_fill_fill_get(Eo *obj EINA_UNUSED, Evas_VG_Data *pd)
428{ 428{
429 return pd->fill; 429 return pd->fill;
diff --git a/src/lib/evas/canvas/evas_vg_container.c b/src/lib/evas/canvas/evas_vg_container.c
index 7534150..704d6c1 100644
--- a/src/lib/evas/canvas/evas_vg_container.c
+++ b/src/lib/evas/canvas/evas_vg_container.c
@@ -66,15 +66,15 @@ _efl_vg_container_efl_object_destructor(Eo *obj,
66 66
67static void 67static void
68_efl_vg_container_efl_vg_bounds_get(Eo *obj EINA_UNUSED, 68_efl_vg_container_efl_vg_bounds_get(Eo *obj EINA_UNUSED,
69 Efl_VG_Container_Data *pd, 69 Efl_VG_Container_Data *pd,
70 Eina_Rectangle *r) 70 Eina_Rect *r)
71{ 71{
72 Eina_Rectangle s; 72 Eina_Rect s;
73 Eina_Bool first = EINA_TRUE; 73 Eina_Bool first = EINA_TRUE;
74 Eina_List *l; 74 Eina_List *l;
75 Eo *child; 75 Eo *child;
76 76
77 EINA_RECTANGLE_SET(&s, -1, -1, 0, 0); 77 EINA_RECT_SET(s, -1, -1, 0, 0);
78 78
79 EINA_LIST_FOREACH(pd->children, l, child) 79 EINA_LIST_FOREACH(pd->children, l, child)
80 { 80 {
@@ -86,7 +86,7 @@ _efl_vg_container_efl_vg_bounds_get(Eo *obj EINA_UNUSED,
86 else 86 else
87 { 87 {
88 efl_vg_bounds_get(child, &s); 88 efl_vg_bounds_get(child, &s);
89 eina_rectangle_union(r, &s); 89 eina_rectangle_union(&r->rect, &s.rect);
90 } 90 }
91 } 91 }
92} 92}
diff --git a/src/lib/evas/canvas/evas_vg_gradient_linear.c b/src/lib/evas/canvas/evas_vg_gradient_linear.c
index a1e9046..fcefa55 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
114static void 114static void
115_efl_vg_gradient_linear_efl_vg_bounds_get(Eo *obj, Efl_VG_Gradient_Linear_Data *pd, Eina_Rectangle *r) 115_efl_vg_gradient_linear_efl_vg_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 a464e2a..3436df2 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
131static void 131static void
132_efl_vg_gradient_radial_efl_vg_bounds_get(Eo *obj, Efl_VG_Gradient_Radial_Data *pd, Eina_Rectangle *r) 132_efl_vg_gradient_radial_efl_vg_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 3267f76..dd32a50 100644
--- a/src/lib/evas/canvas/evas_vg_node.c
+++ b/src/lib/evas/canvas/evas_vg_node.c
@@ -194,17 +194,17 @@ _efl_vg_efl_gfx_size_get(Eo *obj,
194 Efl_VG_Data *pd EINA_UNUSED, 194 Efl_VG_Data *pd EINA_UNUSED,
195 int *w, int *h) 195 int *w, int *h)
196{ 196{
197 Eina_Rectangle r = { 0, 0, 0, 0 }; 197 Eina_Rect r;
198 198
199 efl_vg_bounds_get(obj, &r); 199 efl_vg_bounds_get(obj, &r);
200 if (w) *w = r.w; 200 if (w) *w = r.w;
201 if (h) *h = r.h; 201 if (h) *h = r.h;
202} 202}
203 203
204EOLIAN static Eina_Rectangle 204EOLIAN static Eina_Rect
205_efl_vg_efl_gfx_geometry_get(Eo *obj, Efl_VG_Data *pd EINA_UNUSED) 205_efl_vg_efl_gfx_geometry_get(Eo *obj, Efl_VG_Data *pd EINA_UNUSED)
206{ 206{
207 Eina_Rectangle r = { 0, }; 207 Eina_Rect r = EINA_RECT_ZERO();
208 efl_gfx_position_get(obj, &r.x, &r.y); 208 efl_gfx_position_get(obj, &r.x, &r.y);
209 efl_gfx_size_get(obj, &r.w, &r.h); 209 efl_gfx_size_get(obj, &r.w, &r.h);
210 return r; 210 return r;
@@ -522,10 +522,10 @@ _efl_vg_root_parent_get(Eo *obj)
522static void 522static void
523_efl_vg_walk_down_at(Eo *root, Eina_Array *a, Eina_Rectangle *r) 523_efl_vg_walk_down_at(Eo *root, Eina_Array *a, Eina_Rectangle *r)
524{ 524{
525 Eina_Rectangle bounds; 525 Eina_Rect bounds;
526 526
527 efl_vg_bounds_get(root, &bounds); 527 efl_vg_bounds_get(root, &bounds);
528 if (!eina_rectangles_intersect(&bounds, r)) return ; 528 if (!eina_rectangles_intersect(&bounds.rect, r)) return ;
529 529
530 eina_array_push(a, root); 530 eina_array_push(a, root);
531 531
@@ -555,7 +555,7 @@ _efl_vg_object_at(Eo *obj, Eina_Array *a, Eina_Rectangle *r)
555static Efl_Gfx_Stack * 555static Efl_Gfx_Stack *
556_efl_vg_efl_gfx_stack_below_get(Eo *obj, Efl_VG_Data *pd EINA_UNUSED) 556_efl_vg_efl_gfx_stack_below_get(Eo *obj, Efl_VG_Data *pd EINA_UNUSED)
557{ 557{
558 Eina_Rectangle r; 558 Eina_Rect r;
559 Eina_Array a; 559 Eina_Array a;
560 Eo *current; 560 Eo *current;
561 Eo *below = NULL; 561 Eo *below = NULL;
@@ -566,7 +566,7 @@ _efl_vg_efl_gfx_stack_below_get(Eo *obj, Efl_VG_Data *pd EINA_UNUSED)
566 566
567 eina_array_step_set(&a, sizeof (Eina_Array), 8); 567 eina_array_step_set(&a, sizeof (Eina_Array), 8);
568 568
569 _efl_vg_object_at(obj, &a, &r); 569 _efl_vg_object_at(obj, &a, &r.rect);
570 570
571 EINA_ARRAY_ITER_NEXT(&a, i, current, iterator) 571 EINA_ARRAY_ITER_NEXT(&a, i, current, iterator)
572 if (current == obj) 572 if (current == obj)
@@ -585,7 +585,7 @@ _efl_vg_efl_gfx_stack_below_get(Eo *obj, Efl_VG_Data *pd EINA_UNUSED)
585static Efl_Gfx_Stack * 585static Efl_Gfx_Stack *
586_efl_vg_efl_gfx_stack_above_get(Eo *obj, Efl_VG_Data *pd EINA_UNUSED) 586_efl_vg_efl_gfx_stack_above_get(Eo *obj, Efl_VG_Data *pd EINA_UNUSED)
587{ 587{
588 Eina_Rectangle r; 588 Eina_Rect r;
589 Eina_Array a; 589 Eina_Array a;
590 Eo *current; 590 Eo *current;
591 Eo *above = NULL; 591 Eo *above = NULL;
@@ -596,7 +596,7 @@ _efl_vg_efl_gfx_stack_above_get(Eo *obj, Efl_VG_Data *pd EINA_UNUSED)
596 596
597 eina_array_step_set(&a, sizeof (Eina_Array), 8); 597 eina_array_step_set(&a, sizeof (Eina_Array), 8);
598 598
599 _efl_vg_object_at(obj, &a, &r); 599 _efl_vg_object_at(obj, &a, &r.rect);
600 600
601 EINA_ARRAY_ITER_NEXT(&a, i, current, iterator) 601 EINA_ARRAY_ITER_NEXT(&a, i, current, iterator)
602 if (current == obj) 602 if (current == obj)
diff --git a/src/lib/evas/canvas/evas_vg_private.h b/src/lib/evas/canvas/evas_vg_private.h
index 4598e4f..ac945bc 100644
--- a/src/lib/evas/canvas/evas_vg_private.h
+++ b/src/lib/evas/canvas/evas_vg_private.h
@@ -15,7 +15,7 @@ struct _Evas_VG_Data
15 void *engine_data; 15 void *engine_data;
16 Efl_VG *root; 16 Efl_VG *root;
17 17
18 Eina_Rectangle fill; 18 Eina_Rect fill;
19 19
20 unsigned int width, height; 20 unsigned int width, height;
21 21
diff --git a/src/lib/evas/canvas/evas_vg_shape.c b/src/lib/evas/canvas/evas_vg_shape.c
index a53eb98..a5f0d29 100644
--- a/src/lib/evas/canvas/evas_vg_shape.c
+++ b/src/lib/evas/canvas/evas_vg_shape.c
@@ -18,8 +18,8 @@ struct _Efl_VG_Shape_Data
18 18
19static void 19static void
20_efl_vg_shape_efl_vg_bounds_get(Eo *obj, 20_efl_vg_shape_efl_vg_bounds_get(Eo *obj,
21 Efl_VG_Shape_Data *pd EINA_UNUSED, 21 Efl_VG_Shape_Data *pd EINA_UNUSED,
22 Eina_Rectangle *r) 22 Eina_Rect *r)
23{ 23{
24 // FIXME: Use the renderer bounding box when it has been created instead of an estimation 24 // FIXME: Use the renderer bounding box when it has been created instead of an estimation
25 efl_gfx_path_bounds_get(obj, r); 25 efl_gfx_path_bounds_get(obj, r);