Fix path color bugs

nicklockwood · Apr 28, 2022 · 9a3dced · 9a3dced
1 parent 2554814
commit 9a3dced
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ShapeScript/Euclid+Extensions.swift b/ShapeScript/Euclid+Extensions.swift
@@ -136,7 +136,10 @@ extension Path {
 
     /// Remove point colors
     func removingColors() -> Path {
-        Path(points.map { $0.with(color: nil) })
+        if subpaths.count > 1 {
+            return Path(subpaths: subpaths.map { $0.removingColors() })
+        }
+        return Path(points.map { $0.with(color: nil) })
     }
 
     /// Create an array of text paths

diff --git a/ShapeScript/SVGPath+Path.swift b/ShapeScript/SVGPath+Path.swift
@@ -142,7 +142,8 @@ extension SVGPath {
                     t += step
                     points.append(.curve(
                         cubicBezier(p0.x, p1.x, p2.x, p3.x, t),
-                        cubicBezier(p0.y, p1.y, p2.y, p3.y, t)
+                        cubicBezier(p0.y, p1.y, p2.y, p3.y, t),
+                        color: color
                     ))
                 }
                 points.append(.point(Vector(p3), color: color))