3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-07-14 05:57:19 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix shapes without fills contained in a group with fills

Browse source
This commit is contained in:
Alejandro Alonso 2025-06-06 08:22:25 +02:00
parent fec7d5cff2
commit a9702f104d
3 changed files with 32 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

28
render-wasm/src/render.rs
View file

@ -19,7 +19,9 @@ use options::RenderOptions;
use surfaces::{SurfaceId, Surfaces};
use crate::performance;
use crate::shapes::{modified_children_ids, Corners, Shape, StrokeKind, StructureEntry, Type};
use crate::shapes::{
modified_children_ids, Corners, Fill, Shape, StrokeKind, StructureEntry, Type,
};
use crate::tiles::{self, PendingTiles, TileRect};
use crate::uuid::Uuid;
use crate::view::Viewbox;
@ -97,6 +99,11 @@ pub(crate) struct RenderState {
pub tile_viewbox: tiles::TileViewbox,
pub tiles: tiles::TileHashMap,
pub pending_tiles: PendingTiles,
// nested_fills maintains a stack of group fills that apply to nested shapes
// without their own fill definitions. This is necessary because in SVG, a group's `fill`
// can affect its child elements if they don't specify one themselves. If the planned
// migration to remove group-level fills is completed, this code should be removed.
pub nested_fills: Vec<Vec<Fill>>,
}
pub fn get_cache_size(viewbox: Viewbox, scale: f32) -> skia::ISize {
@ -162,6 +169,7 @@ impl RenderState {
1.0,
),
pending_tiles: PendingTiles::new_empty(),
nested_fills: vec![],
}
}
@ -435,8 +443,17 @@ impl RenderState {
s.canvas().concat(&matrix);
});
for fill in shape.fills().rev() {
fills::render(self, &shape, fill, antialias);
if shape.fills.is_empty() && matches!(shape.shape_type, Type::Group(_)) {
if let Some(fills_to_render) = self.nested_fills.last() {
let fills_to_render = fills_to_render.clone();
for fill in fills_to_render.iter() {
fills::render(self, &shape, fill, antialias);
}
}
} else {
for fill in shape.fills().rev() {
fills::render(self, &shape, fill, antialias);
}
}
for stroke in shape.strokes().rev() {
@ -599,6 +616,8 @@ impl RenderState {
// an extra save_layer to keep all the masked group separate from
// other already drawn elements.
if let Type::Group(group) = element.shape_type {
let fills = &element.fills;
self.nested_fills.push(fills.to_vec());
if group.masked {
let paint = skia::Paint::default();
let layer_rec = skia::canvas::SaveLayerRec::default().paint(&paint);
@ -645,6 +664,9 @@ impl RenderState {
}
}
}
if let Type::Group(group) = element.shape_type {
self.nested_fills.pop();
}
self.surfaces.canvas(SurfaceId::Current).restore();
}