summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2015-02-07 23:32:47 +0100
committerChunEon Park <chuneon.park@samsung.com>2015-02-11 15:34:23 +0900
commite53901886c2af3b3938c92591a7dd5865bf03c68 (patch)
treecb19a08b3bd9edd9df8996cd36a48d60e320365f
parent9502d7c293549a5eb5771a5346b55ce70b2f7fc6 (diff)
downloadefl-e53901886c2af3b3938c92591a7dd5865bf03c68.tar.gz
ector: fix inheritance in cairo backend.
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo2
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo2
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_shape.c9
-rw-r--r--src/lib/ector/cairo/ector_renderer_cairo_shape.eo2
4 files changed, 5 insertions, 10 deletions
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 11914ab720..c7a6a5842d 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 @@
-class Ector.Renderer.Cairo.Gradient_Linear (Ector.Renderer.Cairo.Base, Ector.Renderer.Generic.Gradient_Linear)
+class Ector.Renderer.Cairo.Gradient_Linear (Ector.Renderer.Generic.Gradient_Linear, Ector.Renderer.Cairo.Base)
{
eo_prefix: ector_renderer_cairo_gradient_linear;
legacy_prefix: null;
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 c3322f851b..91a2f42c6a 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 @@
-class Ector.Renderer.Cairo.Gradient_Radial (Ector.Renderer.Cairo.Base, Ector.Renderer.Generic.Gradient_Radial)
+class Ector.Renderer.Cairo.Gradient_Radial (Ector.Renderer.Generic.Gradient_Radial, Ector.Renderer.Cairo.Base)
{
eo_prefix: ector_renderer_cairo_gradient_radial;
legacy_prefix: null;
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.c b/src/lib/ector/cairo/ector_renderer_cairo_shape.c
index eeb366b0c0..efbb4ca76a 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_shape.c
+++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.c
@@ -51,13 +51,6 @@ _ector_renderer_cairo_shape_ector_renderer_generic_base_prepare(Eo *obj, Ector_R
const Efl_Gfx_Path_Command *cmds = NULL;
const double *pts = NULL;
- // FIXME: shouldn't that be part of the shape generic implementation ?
- if (pd->shape->fill)
- eo_do(pd->shape->fill, ector_renderer_prepare());
- if (pd->shape->stroke.fill)
- eo_do(pd->shape->stroke.fill, ector_renderer_prepare());
- if (pd->shape->stroke.marker)
- eo_do(pd->shape->stroke.marker, ector_renderer_prepare());
eo_do_super(obj, ECTOR_RENDERER_CAIRO_SHAPE_CLASS, ector_renderer_prepare());
// shouldn't that be moved to the cairo base object
@@ -178,6 +171,8 @@ _ector_renderer_cairo_shape_ector_renderer_cairo_base_fill(Eo *obj, Ector_Render
{
// FIXME: let's find out how to fill a shape with a shape later.
// I need to read SVG specification and see how to map that with cairo.
+ ERR("fill with shape not implemented\n");
+ return EINA_FALSE;
}
static void
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.eo b/src/lib/ector/cairo/ector_renderer_cairo_shape.eo
index 55bd0495d1..ed16848e5f 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 @@
-class Ector.Renderer.Cairo.Shape (Ector.Renderer.Cairo.Base, Ector.Renderer.Generic.Shape)
+class Ector.Renderer.Cairo.Shape (Ector.Renderer.Generic.Shape, Ector.Renderer.Cairo.Base)
{
eo_prefix: ector_renderer_cairo_shape;
legacy_prefix: null;