diff options
Diffstat (limited to 'src/shapes.rs')
| -rw-r--r-- | src/shapes.rs | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/shapes.rs b/src/shapes.rs index e92d1e85..81571f39 100644 --- a/src/shapes.rs +++ b/src/shapes.rs @@ -12,7 +12,7 @@ use crate::drawing_ctx::DrawingCtx; use crate::element::{set_attribute, ElementTrait}; use crate::error::*; use crate::iri::Iri; -use crate::layout::{Marker, Shape, StackingContext, Stroke}; +use crate::layout::{Layer, LayerKind, Marker, Shape, StackingContext, Stroke}; use crate::length::*; use crate::node::{CascadedValues, Node, NodeBorrow}; use crate::parsers::{optional_comma, Parse, ParseValue}; @@ -121,7 +121,7 @@ fn draw_basic_shape( let stroke_paint = stroke_paint.to_user_space(&extents, &view_params, values); let fill_paint = fill_paint.to_user_space(&extents, &view_params, values); - let shape = Shape { + let shape = Box::new(Shape { path: shape_def.path, extents, is_visible, @@ -135,7 +135,7 @@ fn draw_basic_shape( marker_start, marker_mid, marker_end, - }; + }); let elt = node.borrow_element(); let stacking_ctx = StackingContext::new( @@ -146,7 +146,12 @@ fn draw_basic_shape( values, ); - draw_ctx.draw_shape(&shape, &stacking_ctx, acquired_nodes, values, clipping) + let layer = Layer { + kind: LayerKind::Shape(shape), + stacking_ctx, + }; + + draw_ctx.draw_layer(&layer, acquired_nodes, values, clipping) } macro_rules! impl_draw { |