johanels/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-12-12 06:24:17 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge pull request #7170 from penpot/elenatorro-fix-text-tests

Browse Source 
🔧 Update and fix text tests
This commit is contained in:
Alejandro Alonso
2025-08-22 13:34:00 +02:00
committed by GitHub
parent c05c179d67 0b7444e8ff
commit c0c2c9489c
13 changed files with 2357 additions and 1067 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
render-wasm/src/shapes/text.rs
View File

@@ -124,6 +124,7 @@ impl TextContent {
bounds: &Rect,
blur: Option<&ImageFilter>,
blur_mask: Option<&MaskFilter>,
count_inner_strokes: usize,
) -> Vec<Vec<ParagraphBuilder>> {
let fallback_fonts = get_fallback_fonts();
let fonts = get_font_collection();
@@ -138,8 +139,14 @@ impl TextContent {
if let Some(blur_mask) = blur_mask {
text_paint.set_mask_filter(blur_mask.clone());
}
let stroke_paints =
get_text_stroke_paints(stroke, bounds, &text_paint, blur, blur_mask);
let stroke_paints = get_text_stroke_paints(
stroke,
bounds,
&text_paint,
blur,
blur_mask,
count_inner_strokes,
);
let text: String = leaf.apply_text_transform();
for (paint_idx, stroke_paint) in stroke_paints.iter().enumerate() {
@@ -198,8 +205,15 @@ impl TextContent {
bounds: &Rect,
blur: Option<&ImageFilter>,
blur_mask: Option<&MaskFilter>,
count_inner_strokes: usize,
) -> Vec<Vec<ParagraphBuilder>> {
self.collect_paragraphs(self.to_stroke_paragraphs(stroke, bounds, blur, blur_mask))
self.collect_paragraphs(self.to_stroke_paragraphs(
stroke,
bounds,
blur,
blur_mask,
count_inner_strokes,
))
}
pub fn grow_type(&self) -> GrowType {
@@ -765,6 +779,7 @@ fn get_text_stroke_paints(
text_paint: &Paint,
blur: Option<&ImageFilter>,
blur_mask: Option<&MaskFilter>,
count_inner_strokes: usize,
) -> Vec<Paint> {
let mut paints = Vec::new();
@@ -777,7 +792,7 @@ fn get_text_stroke_paints(
is_opaque = shader.unwrap().is_opaque();
}
if is_opaque {
if is_opaque && count_inner_strokes == 1 {
let mut paint = text_paint.clone();
paint.set_style(skia::PaintStyle::Fill);
paint.set_anti_alias(true);
@@ -785,7 +800,6 @@ fn get_text_stroke_paints(
paint.set_image_filter(blur.clone());
}
paints.push(paint);
let mut paint = skia::Paint::default();
paint.set_style(skia::PaintStyle::Stroke);
paint.set_blend_mode(skia::BlendMode::SrcIn);