mirror of
https://github.com/penpot/penpot.git
synced 2025-06-27 21:57:00 +02:00
🐛 Fix inner strokes black background effect
This commit is contained in:
parent
88e77e3218
commit
5c58a04fc2
2 changed files with 26 additions and 10 deletions
|
@ -19,7 +19,7 @@ use options::RenderOptions;
|
||||||
use surfaces::{SurfaceId, Surfaces};
|
use surfaces::{SurfaceId, Surfaces};
|
||||||
|
|
||||||
use crate::performance;
|
use crate::performance;
|
||||||
use crate::shapes::{modified_children_ids, Corners, Shape, StructureEntry, Type};
|
use crate::shapes::{modified_children_ids, Corners, Shape, StrokeKind, StructureEntry, Type};
|
||||||
use crate::tiles::{self, TileRect, TileViewbox, TileWithDistance};
|
use crate::tiles::{self, TileRect, TileViewbox, TileWithDistance};
|
||||||
use crate::uuid::Uuid;
|
use crate::uuid::Uuid;
|
||||||
use crate::view::Viewbox;
|
use crate::view::Viewbox;
|
||||||
|
@ -441,6 +441,13 @@ impl RenderState {
|
||||||
self.fonts.font_collection(),
|
self.fonts.font_collection(),
|
||||||
);
|
);
|
||||||
shadows::render_text_drop_shadows(self, &shape, &stroke_paragraphs, antialias);
|
shadows::render_text_drop_shadows(self, &shape, &stroke_paragraphs, antialias);
|
||||||
|
if stroke.kind == StrokeKind::Inner {
|
||||||
|
// Inner strokes must be rendered on the Fills surface because their blend modes
|
||||||
|
// (e.g., SrcATop, DstOver) rely on the text fill already being present underneath.
|
||||||
|
// Rendering them on a separate surface would break this blending and result in incorrect visuals as
|
||||||
|
// black color background.
|
||||||
|
text::render(self, &shape, &stroke_paragraphs, None, None);
|
||||||
|
} else {
|
||||||
text::render(
|
text::render(
|
||||||
self,
|
self,
|
||||||
&shape,
|
&shape,
|
||||||
|
@ -448,6 +455,7 @@ impl RenderState {
|
||||||
Some(SurfaceId::Strokes),
|
Some(SurfaceId::Strokes),
|
||||||
None,
|
None,
|
||||||
);
|
);
|
||||||
|
}
|
||||||
shadows::render_text_inner_shadows(self, &shape, &stroke_paragraphs, antialias);
|
shadows::render_text_inner_shadows(self, &shape, &stroke_paragraphs, antialias);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -8,13 +8,19 @@ pub fn render(
|
||||||
surface_id: Option<SurfaceId>,
|
surface_id: Option<SurfaceId>,
|
||||||
paint: Option<skia::Paint>,
|
paint: Option<skia::Paint>,
|
||||||
) {
|
) {
|
||||||
|
let use_save_layer = paint.is_some();
|
||||||
let mask_paint = paint.unwrap_or_default();
|
let mask_paint = paint.unwrap_or_default();
|
||||||
let mask = SaveLayerRec::default().paint(&mask_paint);
|
let mask = SaveLayerRec::default().paint(&mask_paint);
|
||||||
let canvas = render_state
|
let canvas = render_state
|
||||||
.surfaces
|
.surfaces
|
||||||
.canvas(surface_id.unwrap_or(SurfaceId::Fills));
|
.canvas(surface_id.unwrap_or(SurfaceId::Fills));
|
||||||
|
|
||||||
|
// Skip save_layer when no custom paint is provided to avoid isolating content unnecessarily.
|
||||||
|
// This ensures inner strokes and fills can blend correctly on the same surface.
|
||||||
|
if use_save_layer {
|
||||||
canvas.save_layer(&mask);
|
canvas.save_layer(&mask);
|
||||||
|
}
|
||||||
|
|
||||||
for group in paragraphs {
|
for group in paragraphs {
|
||||||
let mut offset_y = 0.0;
|
let mut offset_y = 0.0;
|
||||||
for skia_paragraph in group {
|
for skia_paragraph in group {
|
||||||
|
@ -23,5 +29,7 @@ pub fn render(
|
||||||
offset_y += skia_paragraph.height();
|
offset_y += skia_paragraph.height();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if use_save_layer {
|
||||||
canvas.restore();
|
canvas.restore();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue