Skip to content

DesignCraft: An open-source page and layout design editor written by scratch in pure Rust

Detect smooth anchors on all open subpaths in from_bezpath

NetterSilver7c3e8a9dc7ef
diff --git a/crates/geom/src/path.rs b/crates/geom/src/path.rs
index b50234a8f..adfc4a2e4 100644
--- a/crates/geom/src/path.rs
+++ b/crates/geom/src/path.rs
@@ -281,9 +281,12 @@ impl PathData {
for el in bp.elements() {
match *el {
PathEl::MoveTo(p) => {
- if let Some(sp) = cur.take()
+ if let Some(mut sp) = cur.take()
&& !sp.anchors.is_empty()
{
+ for a in &mut sp.anchors {
+ *a = Anchor::with_handles(a.p, a.h_in, a.h_out);
+ }
subpaths.push(sp);
}
cur = Some(SubPath { anchors: vec![Anchor::corner(p)], closed: false });
@@ -418,6 +421,20 @@ mod tests {
PathData::single(SubPath::polyline(&[Point::new(0.0, 0.0), Point::new(10.0, 0.0), Point::new(10.0, 10.0), Point::new(0.0, 10.0)], true))
}
+ #[test]
+ fn from_bezpath_detects_smooth_on_every_open_subpath() {
+ let mut bp = BezPath::new();
+ for _ in 0..2 {
+ bp.move_to((0.0, 0.0));
+ bp.curve_to((0.0, 10.0), (10.0, 10.0), (10.0, 0.0));
+ bp.curve_to((10.0, -10.0), (20.0, -10.0), (20.0, 0.0));
+ }
+ let pd = PathData::from_bezpath(&bp);
+ assert_eq!(pd.subpaths.len(), 2);
+ assert_eq!(pd.subpaths[1].anchors[1].kind, AnchorKind::Smooth);
+ assert_eq!(pd.subpaths[0].anchors[1].kind, pd.subpaths[1].anchors[1].kind);
+ }
+
#[test]
fn anchors_serialize_compactly_and_read_v1_maps() {
let corner = Anchor::corner(Point::new(1.0, 2.0));