From 4f98cab04dc653904235eb2637d1bed9e14a23f3 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Fri, 3 Apr 2015 16:31:18 +0200 Subject: [PATCH] ector: fix inheritance in cairo backend. --- src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo | 2 +- src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo | 2 +- src/lib/ector/cairo/ector_renderer_cairo_shape.c | 9 ++------- src/lib/ector/cairo/ector_renderer_cairo_shape.eo | 2 +- 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 11914ab..c7a6a58 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 c3322f8..91a2f42 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 eeb366b..efbb4ca 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 55bd049..ed16848 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; -- 2.7.4