github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-04-25 11:18:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

🔧 Prevent duplicate layout calculations

Browse Source 
Use HashSet for layout_reflows to avoid processing the same
layout multiple times. Also use std::mem::take instead of
creating a new Vec on each iteration.
This commit is contained in:
Elena Torro 2026-02-04 11:03:26 +01:00
parent c87ffdcd30
commit 216d400262
1 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
render-wasm/src/shapes/modifiers.rs
View File

@ -300,7 +300,20 @@ fn propagate_reflow(
Type::Frame(Frame {
layout: Some(_), ..
}) => {
layout_reflows.insert(*id);
let mut skip_reflow = false;
if shape.is_layout_horizontal_fill() || shape.is_layout_vertical_fill() {
if let Some(parent_id) = shape.parent_id {
if parent_id != Uuid::nil() && !reflown.contains(&parent_id) {
// If this is a fill layout but the parent has not been reflown yet
// we wait for the next iteration for reflow
skip_reflow = true;
}
}
}
if !skip_reflow {
layout_reflows.insert(*id);
}
}
Type::Group(Group { masked: true }) => {
let children_ids = shape.children_ids(true);
@ -417,26 +430,32 @@ pub fn propagate_modifiers(
}
}
}
// let mut layout_reflows_vec: Vec<Uuid> = layout_reflows.into_iter().collect();
let mut layout_reflows_vec: Vec<Uuid> = layout_reflows.into_iter().collect();
// // We sort the reflows so they are process first the ones that are more
// // deep in the tree structure. This way we can be sure that the children layouts
// // are already reflowed.
// layout_reflows_vec.sort_unstable_by(|id_a, id_b| {
// let da = shapes.get_depth(id_a);
// let db = shapes.get_depth(id_b);
// db.cmp(&da)
// });
// We sort the reflows so they are process first the ones that are more
// deep in the tree structure. This way we can be sure that the children layouts
// are already reflowed.
layout_reflows_vec.sort_unstable_by(|id_a, id_b| {
let da = shapes.get_depth(id_a);
let db = shapes.get_depth(id_b);
db.cmp(&da)
});
// let mut bounds_temp = bounds.clone();
// for id in layout_reflows_vec.iter() {
// if reflown.contains(id) {
// continue;
// }
// reflow_shape(id, state, &mut reflown, &mut entries, &mut bounds_temp);
// }
// layout_reflows = HashSet::new();
let mut bounds_temp = bounds.clone();
for id in layout_reflows_vec.iter() {
if reflown.contains(id) {
for id in std::mem::take(&mut layout_reflows) {
if reflown.contains(&id) {
continue;
}
reflow_shape(id, state, &mut reflown, &mut entries, &mut bounds_temp);
reflow_shape(&id, state, &mut reflown, &mut entries, &mut bounds);
}
layout_reflows = HashSet::new();
}
modifiers