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

🐛 Fix children blur rendering

Browse Source
This commit is contained in:
Elena Torro
2025-11-04 12:20:47 +01:00
parent 69bbdad570
commit 564ad8adba
5 changed files with 242 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
render-wasm/src/render.rs
View File

@@ -1182,10 +1182,11 @@ impl RenderState {
if !node_render_state.is_root() {
let transformed_element: Cow<Shape> = Cow::Borrowed(element);
let extrect = element.extrect(tree);
// FIXME: we need to find a way to update the extrect properly instead
let bounds = transformed_element.apply_children_blur(extrect, tree);
let is_visible = transformed_element
.extrect(tree)
.intersects(self.render_area)
let is_visible = bounds.intersects(self.render_area)
&& !transformed_element.hidden
&& !transformed_element.visually_insignificant(self.get_scale(), tree);
@@ -1346,9 +1347,7 @@ impl RenderState {
match element.shape_type {
Type::Frame(_) | Type::Group(_) => {
if let Some(blur) = element.blur {
self.nested_blurs.push(Some(blur));
}
self.nested_blurs.push(element.blur);
}
_ => {}
}

40
render-wasm/src/shapes.rs
View File

@@ -861,6 +861,45 @@ impl Shape {
rect
}
pub fn apply_children_blur(&self, mut rect: math::Rect, tree: ShapesPoolRef) -> math::Rect {
let mut children_blur = 0.0;
let mut current_parent_id = self.parent_id;
while let Some(parent_id) = current_parent_id {
if parent_id.is_nil() {
break;
}
if let Some(parent) = tree.get(&parent_id) {
match parent.shape_type {
Type::Frame(_) | Type::Group(_) => {
if let Some(blur) = parent.blur {
if !blur.hidden && blur.blur_type == BlurType::LayerBlur {
children_blur += blur.value;
}
}
}
_ => {}
}
current_parent_id = parent.parent_id;
} else {
break;
}
}
let blur = children_blur;
if blur > 0.0 {
rect.left -= blur;
rect.top -= blur;
rect.right += blur;
rect.bottom += blur;
}
rect
}
pub fn calculate_extrect(&self, shapes_pool: ShapesPoolRef) -> math::Rect {
let shape = self;
let max_stroke = Stroke::max_bounds_width(shape.strokes.iter(), shape.is_open());
@@ -886,6 +925,7 @@ impl Shape {
rect = self.apply_shadow_bounds(rect);
rect = self.apply_blur_bounds(rect);
rect = self.apply_children_bounds(rect, shapes_pool);
rect = self.apply_children_blur(rect, shapes_pool);
rect
}