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

Merge remote-tracking branch 'origin/main' into staging

Browse Source
This commit is contained in:
Andrey Antukh 2026-07-22 16:23:48 +02:00
commit e076443eca
4 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -705,16 +705,21 @@ impl Shape {
} }
pub fn set_path_segments(&mut self, segments: Vec<Segment>) { pub fn set_path_segments(&mut self, segments: Vec<Segment>) {
let path = Path::new(segments);
match &mut self.shape_type { match &mut self.shape_type {
Type::Bool(Bool { bool_type, .. }) => { Type::Bool(Bool { bool_type, .. }) => {
let path = match bool_type {
// Exclusion booleans are computed with even-odd semantics but
// PathData uploads do not carry the fill rule.
BoolType::Exclusion => Path::new(segments).with_even_odd(true),
_ => Path::new(segments),
};
self.shape_type = Type::Bool(Bool { self.shape_type = Type::Bool(Bool {
bool_type: *bool_type, bool_type: *bool_type,
path, path,
}); });
} }
Type::Path(_) => { Type::Path(_) => {
self.shape_type = Type::Path(path); self.shape_type = Type::Path(Path::new(segments));
} }
_ => {} _ => {}
}; };

9
render-wasm/src/shapes/modifiers/flex_layout.rs
View File

@ -667,9 +667,12 @@ pub fn reflow_flex_layout(
transform.post_concat(&Matrix::translate(delta_v)); transform.post_concat(&Matrix::translate(delta_v));
} }
result.push_back(Modifier::transform_propagate(child.id, transform)); // Skip identity: propagating it fans out through the whole subtree.
if child.has_layout() { if !math::identitish(&transform) {
result.push_back(Modifier::reflow(child.id, force_reflow)); result.push_back(Modifier::transform_propagate(child.id, transform));
if child.has_layout() {
result.push_back(Modifier::reflow(child.id, force_reflow));
}
} }
shape_anchor = next_anchor( shape_anchor = next_anchor(

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

@ -884,9 +884,12 @@ pub fn reflow_grid_layout(
transform.post_concat(&Matrix::translate(delta_v)); transform.post_concat(&Matrix::translate(delta_v));
} }
result.push_back(Modifier::transform_propagate(child.id, transform)); // Skip identity: propagating it fans out through the whole subtree.
if child.has_layout() { if !math::identitish(&transform) {
result.push_back(Modifier::reflow(child.id, force_reflow)); result.push_back(Modifier::transform_propagate(child.id, transform));
if child.has_layout() {
result.push_back(Modifier::reflow(child.id, force_reflow));
}
} }
} }

3
render-wasm/src/shapes/paths.rs
View File

@ -251,6 +251,9 @@ impl Path {
pub fn to_skia_path(&self, svg_attrs: Option<&SvgAttrs>) -> skia::Path { pub fn to_skia_path(&self, svg_attrs: Option<&SvgAttrs>) -> skia::Path {
let mut path = self.skia_path.snapshot(); let mut path = self.skia_path.snapshot();
if self.is_even_odd() {
path.set_fill_type(skia::PathFillType::EvenOdd);
}
if let Some(attrs) = svg_attrs { if let Some(attrs) = svg_attrs {
if attrs.fill_rule == FillRule::Evenodd { if attrs.fill_rule == FillRule::Evenodd {
path.set_fill_type(skia::PathFillType::EvenOdd); path.set_fill_type(skia::PathFillType::EvenOdd);