github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-08-01 10:56:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

⚡ hoist grid frame-axis projections out of cell loop

Browse Source
This commit is contained in:
Elena Torro 2026-06-10 13:21:53 +02:00
parent 15f469becb
commit cf934fcc4b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
render-wasm/src/shapes/modifiers/grid_layout.rs
View File

@ -684,15 +684,13 @@ fn child_frame_aabb(child_bounds: &Bounds, hv: Vector, vv: Vector) -> (f32, f32,
fn child_position( fn child_position(
child: &Shape, child: &Shape,
layout_bounds: &Bounds, hv: Vector,
vv: Vector,
layout_data: &LayoutData, layout_data: &LayoutData,
child_bounds: &Bounds, child_bounds: &Bounds,
layout_item: Option<LayoutItem>, layout_item: Option<LayoutItem>,
cell: &CellData, cell: &CellData,
) -> Point { ) -> Point {
let hv = layout_bounds.hv(1.0);
let vv = layout_bounds.vv(1.0);
let margin_left = layout_item.map(|i| i.margin_left).unwrap_or(0.0); let margin_left = layout_item.map(|i| i.margin_left).unwrap_or(0.0);
let margin_top = layout_item.map(|i| i.margin_top).unwrap_or(0.0); let margin_top = layout_item.map(|i| i.margin_top).unwrap_or(0.0);
let margin_right = layout_item.map(|i| i.margin_right).unwrap_or(0.0); let margin_right = layout_item.map(|i| i.margin_right).unwrap_or(0.0);
@ -779,13 +777,14 @@ pub fn reflow_grid_layout(
false, false,
); );
// hv/vv are loop-invariant; compute once instead of per cell and per child.
let hv = layout_bounds.hv(1.0);
let vv = layout_bounds.vv(1.0);
for cell in cells.iter() { for cell in cells.iter() {
let Some(child) = cell.shape else { continue }; let Some(child) = cell.shape else { continue };
let child_bounds = bounds.find(child); let child_bounds = bounds.find(child);
// Compute frame-axis projections once; used for both sizing and positioning.
let hv = layout_bounds.hv(1.0);
let vv = layout_bounds.vv(1.0);
let (h_min, v_min, child_frame_w, child_frame_h) = child_frame_aabb(&child_bounds, hv, vv); let (h_min, v_min, child_frame_w, child_frame_h) = child_frame_aabb(&child_bounds, hv, vv);
// resize_matrix scales the child in the parent's local frame coordinate system // resize_matrix scales the child in the parent's local frame coordinate system
@ -842,7 +841,8 @@ pub fn reflow_grid_layout(
let position = child_position( let position = child_position(
child, child,
&layout_bounds, hv,
vv,
layout_data, layout_data,
&child_bounds, &child_bounds,
child.layout_item, child.layout_item,