diff --git a/render-wasm/src/render.rs b/render-wasm/src/render.rs index 5d9709e9d..f681d29fb 100644 --- a/render-wasm/src/render.rs +++ b/render-wasm/src/render.rs @@ -416,9 +416,17 @@ impl RenderState { } Type::Text(text_content) => { - self.surfaces.apply_mut(&[SurfaceId::Fills], |s| { - s.canvas().concat(&matrix); - }); + self.surfaces.apply_mut( + &[ + SurfaceId::Fills, + SurfaceId::Strokes, + SurfaceId::DropShadows, + SurfaceId::InnerShadows, + ], + |s| { + s.canvas().concat(&matrix); + }, + ); let text_content = text_content.new_bounds(shape.selrect()); let paragraphs = text_content.get_skia_paragraphs(self.fonts.font_collection()); diff --git a/render-wasm/src/shapes/text.rs b/render-wasm/src/shapes/text.rs index e63b1df29..fe4ea7849 100644 --- a/render-wasm/src/shapes/text.rs +++ b/render-wasm/src/shapes/text.rs @@ -197,8 +197,8 @@ impl Default for TextContent { pub struct Paragraph { num_leaves: u32, text_align: u8, - text_decoration: u8, text_direction: u8, + text_decoration: u8, text_transform: u8, line_height: f32, letter_spacing: f32, @@ -212,8 +212,8 @@ impl Default for Paragraph { Self { num_leaves: 0, text_align: 0, - text_decoration: 0, text_direction: 0, + text_decoration: 0, text_transform: 0, line_height: 1.0, letter_spacing: 0.0, @@ -229,8 +229,8 @@ impl Paragraph { pub fn new( num_leaves: u32, text_align: u8, - text_decoration: u8, text_direction: u8, + text_decoration: u8, text_transform: u8, line_height: f32, letter_spacing: f32, @@ -241,8 +241,8 @@ impl Paragraph { Self { num_leaves, text_align, - text_decoration, text_direction, + text_decoration, text_transform, line_height, letter_spacing, @@ -345,6 +345,8 @@ impl TextLeaf { 3 => skia::textlayout::TextDecoration::OVERLINE, _ => skia::textlayout::TextDecoration::NO_DECORATION, }); + // FIXME + style.set_decoration_color(paint.color()); style.set_font_families(&[ self.serialized_font_family(), @@ -362,6 +364,15 @@ impl TextLeaf { ) -> skia::textlayout::TextStyle { let mut style = self.to_style(paragraph, &Rect::default()); style.set_foreground_paint(stroke_paint); + style.set_font_size(self.font_size); + style.set_letter_spacing(paragraph.letter_spacing); + style.set_decoration_type(match paragraph.text_decoration { + 0 => skia::textlayout::TextDecoration::NO_DECORATION, + 1 => skia::textlayout::TextDecoration::UNDERLINE, + 2 => skia::textlayout::TextDecoration::LINE_THROUGH, + 3 => skia::textlayout::TextDecoration::OVERLINE, + _ => skia::textlayout::TextDecoration::NO_DECORATION, + }); style }