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

✨ Reparent modifiers

Browse source
This commit is contained in:
alonso.torres 2025-04-16 11:00:33 +02:00
parent f3d13005b2
commit daf048e258
10 changed files with 283 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

37
render-wasm/src/shapes/modifiers.rs
View file

@ -8,7 +8,8 @@ use common::GetBounds;
use crate::math::{identitish, Bounds, Matrix, Point};
use crate::shapes::{
ConstraintH, ConstraintV, Frame, Group, Layout, Modifier, Shape, TransformEntry, Type,
modified_children_ids, ConstraintH, ConstraintV, Frame, Group, Layout, Modifier, Shape,
StructureEntry, TransformEntry, Type,
};
use crate::state::State;
use crate::uuid::Uuid;
@ -20,14 +21,17 @@ fn propagate_children(
parent_bounds_after: &Bounds,
transform: Matrix,
bounds: &HashMap<Uuid, Bounds>,
structure: &HashMap<Uuid, Vec<StructureEntry>>,
) -> VecDeque<Modifier> {
if shape.children.len() == 0 || identitish(transform) {
let children_ids = modified_children_ids(shape, structure.get(&shape.id));
if children_ids.len() == 0 || identitish(transform) {
return VecDeque::new();
}
let mut result = VecDeque::new();
for child_id in shape.children.iter() {
for child_id in children_ids.iter() {
let Some(child) = shapes.get(child_id) else {
continue;
};
@ -81,10 +85,13 @@ fn calculate_group_bounds(
shape: &Shape,
shapes: &HashMap<Uuid, Shape>,
bounds: &HashMap<Uuid, Bounds>,
structure: &HashMap<Uuid, Vec<StructureEntry>>,
) -> Option<Bounds> {
let shape_bounds = bounds.find(&shape);
let mut result = Vec::<Point>::new();
for child_id in shape.children.iter() {
let children_ids = modified_children_ids(shape, structure.get(&shape.id));
for child_id in children_ids.iter() {
let Some(child) = shapes.get(child_id) else {
continue;
};
@ -103,6 +110,13 @@ pub fn propagate_modifiers(state: &State, modifiers: Vec<TransformEntry>) -> Vec
.iter()
.map(|entry| Modifier::Transform(entry.clone()))
.collect();
for (id, _) in &state.structure {
if id != &Uuid::nil() {
entries.push_back(Modifier::Reflow(*id));
}
}
let mut modifiers = HashMap::<Uuid, Matrix>::new();
let mut bounds = HashMap::<Uuid, Bounds>::new();
@ -133,6 +147,7 @@ pub fn propagate_modifiers(state: &State, modifiers: Vec<TransformEntry>) -> Vec
&shape_bounds_after,
entry.transform,
&bounds,
&state.structure,
);
entries.append(&mut children);
@ -191,7 +206,9 @@ pub fn propagate_modifiers(state: &State, modifiers: Vec<TransformEntry>) -> Vec
}
}
Type::Group(Group { masked: true }) => {
if let Some(child) = shapes.get(&shape.children[0]) {
let children_ids =
modified_children_ids(shape, state.structure.get(&shape.id));
if let Some(child) = shapes.get(&children_ids[0]) {
let child_bounds = bounds.find(&child);
bounds.insert(shape.id, child_bounds);
reflow_parent = true;
@ -199,7 +216,7 @@ pub fn propagate_modifiers(state: &State, modifiers: Vec<TransformEntry>) -> Vec
}
Type::Group(_) => {
if let Some(shape_bounds) =
calculate_group_bounds(shape, shapes, &bounds)
calculate_group_bounds(shape, shapes, &bounds, &state.structure)
{
bounds.insert(shape.id, shape_bounds);
reflow_parent = true;
@ -210,7 +227,7 @@ pub fn propagate_modifiers(state: &State, modifiers: Vec<TransformEntry>) -> Vec
// new path... impossible right now. I'm going to use for the moment the group
// calculation
if let Some(shape_bounds) =
calculate_group_bounds(shape, shapes, &bounds)
calculate_group_bounds(shape, shapes, &bounds, &state.structure)
{
bounds.insert(shape.id, shape_bounds);
reflow_parent = true;
@ -250,6 +267,7 @@ pub fn propagate_modifiers(state: &State, modifiers: Vec<TransformEntry>) -> Vec
flex_data,
shapes,
&mut bounds,
&state.structure,
);
entries.append(&mut children);
}
@ -313,7 +331,8 @@ mod tests {
&bounds_before,
&bounds_after,
transform,
&HashMap::<Uuid, Bounds>::new(),
&HashMap::new(),
&HashMap::new(),
);
assert_eq!(result.len(), 1);
@ -342,7 +361,7 @@ mod tests {
shapes.insert(parent_id, parent.clone());
let bounds =
calculate_group_bounds(&parent, &shapes, &HashMap::<Uuid, Bounds>::new()).unwrap();
calculate_group_bounds(&parent, &shapes, &HashMap::new(), &HashMap::new()).unwrap();
assert_eq!(bounds.width(), 3.0);
assert_eq!(bounds.height(), 3.0);