Pencil: Edit selected paths within 0 turns editing off

docs/control-protocol.md and the tool.options params text say that 0 turns the Pencil and Paintbrush options Edit selected paths within and Close paths when ends are within off. A stroke that started exactly on an end of a selected open path still continued that path at 0, and a stroke that ended exactly where it started was still closed at 0, because both checks compared the distance with <= 0. At 0, a stroke that starts on an end of a selected open path now draws a new path, as one that starts on the path away from its ends already did, and a stroke that ends where it started stays open. Docs: docs/target-app-parity.md.
2026-10-24 09:46:59 -06:00 · 2026-10-21 15:42:37 +07:00
parent 53569a883a
commit ba8c1e042c
2 changed files with 60 additions and 2 deletions
@@ -135,8 +135,11 @@ impl GestureTool {
        }
    }

-    /// The selected open path whose end is near `p`.
+    /// The selected open path whose end is near `p` (Edit Selected Paths, off at 0 pixels).
    fn find_extend(&self, cx: &ToolContext, p: Point) -> Option<(NodeId, bool)> {
+        if self.edit_within <= 0.0 {
+            return None;
+        }
        let tol = cx.tol(self.edit_within);
        for id in &cx.selection.objects {
            let Some(pd) = cx.doc.node(*id).and_then(|n| n.path_data()) else { continue };
@@ -200,7 +203,8 @@ impl GestureTool {
                if !self.began {
                    return vec![];
                }
-                let near = pts.len() > 2 && pts[0].distance(pts[pts.len() - 1]) <= cx.tol(self.close_within);
+                // Close Paths When Ends Are Within is off at 0 pixels.
+                let near = self.close_within > 0.0 && pts.len() > 2 && pts[0].distance(pts[pts.len() - 1]) <= cx.tol(self.close_within);
                let closed = (m.alt && !self.alt_smooth) || (self.extend.is_none() && near);
                vec![Action::Preview("path.freehand".into(), self.freehand_params(closed)), Action::Commit]
            }
@@ -558,6 +562,59 @@ mod tests {
        assert!(matches!(&acts[1][1], Action::Preview(_, v) if v.get("extend").is_none()));
    }

+    /// Edit selected paths within 0 turns editing off: a stroke that starts exactly on an end of a
+    /// selected open path draws a new path; at 12 px it continues the path from that end.
+    #[test]
+    fn edit_selected_paths_within_0_draws_a_new_path_from_an_end() {
+        let (mut d, _) = doc_with_rect();
+        let l = d.layers[0].id;
+        let id = d.alloc_id();
+        let line = vectorcraft_geom::PathData::from_bezpath(&vectorcraft_geom::BezPath::from_vec(vec![
+            vectorcraft_geom::PathEl::MoveTo(Point::new(300.0, 300.0)),
+            vectorcraft_geom::PathEl::LineTo(Point::new(400.0, 300.0)),
+        ]));
+        d.insert(Some(l), 1, vectorcraft_doc::Node::path(id, line, vectorcraft_doc::Appearance::default_art())).unwrap();
+        let mut s = Selection::default();
+        s.set([id]);
+        let p = paint();
+        let cx = cx(&d, &s, &p);
+        for tool in ["pencil", "paintbrush"] {
+            let mut t = GestureTool::new(tool);
+            for (within, extends) in [(12.0, true), (0.0, false)] {
+                t.set_option("editWithin", &json!(within));
+                for (x, end) in [(400.0, "end"), (300.0, "start")] {
+                    let acts = drag(&mut t, &cx, &[(x, 300.0), (x + 20.0, 350.0), (x, 380.0)], Mods::default());
+                    let Some(Action::Preview(_, v)) = acts.last().and_then(|a| a.first()) else { panic!("{tool}: {acts:?}") };
+                    if extends {
+                        assert_eq!(v["extend"], json!({"id": id.0, "end": end}), "{tool} from the {end}");
+                    } else {
+                        assert!(v.get("extend").is_none() && v.get("redraw").is_none(), "{tool} from the {end}: {v}");
+                    }
+                }
+            }
+        }
+    }
+
+    /// Close paths when ends are within 0 turns closing off: a stroke that ends exactly where it
+    /// started stays open; at 15 px it is closed.
+    #[test]
+    fn close_paths_within_0_leaves_a_stroke_that_ends_at_its_start_open() {
+        let (d, _) = doc_with_rect();
+        let s = Selection::default();
+        let p = paint();
+        let cx = cx(&d, &s, &p);
+        for tool in ["pencil", "paintbrush"] {
+            let mut t = GestureTool::new(tool);
+            for (within, closes) in [(15.0, true), (0.0, false)] {
+                t.set_option("closeWithin", &json!(within));
+                let acts = drag(&mut t, &cx, &[(310.0, 330.0), (360.0, 350.0), (330.0, 390.0), (310.0, 330.0)], Mods::default());
+                let Some(Action::Preview(_, v)) = acts.last().and_then(|a| a.first()) else { panic!("{tool}: {acts:?}") };
+                assert_eq!(v["points"][0], v["points"][3], "{tool}");
+                assert_eq!(v["closed"], json!(closes), "{tool} at {within} px");
+            }
+        }
+    }
+
    #[test]
    fn eraser_and_knife_exec_on_release() {
        let (d, _) = doc_with_rect();
@@ -581,6 +581,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
  - **Panel drag and drop:** art dragged off the canvas onto the Symbols panel becomes a symbol, onto the Swatches panel a pattern swatch and onto the Brushes panel an Art brush; a symbol dragged onto the canvas places an instance where it is dropped, and a brush dragged onto a path is applied to it.
    In the Swatches panel, Alt-dragging a swatch onto another swatch of its kind (not a tint swatch) replaces that swatch's color, gradient or pattern, and the swatch keeps its name and place.
  - **Tool double-clicks:** double-clicking a tool's button opens its options: Hand fits the artboard in the window, Zoom shows 100 %, Rotate, Scale, Reflect and Shear open their Object › Transform dialogs, the Selection, Direct Selection and Group Selection tools the Move dialog (Enter opens these seven tools' dialogs too; Move opens on the offset of the last drag or Move and with the checkboxes it was last confirmed with, so Enter, Enter repeats a move or a copy at the same spacing, as [an Adobe Community thread](https://community.adobe.com/questions-652/move-tool-771221) describes), Gradient, Eyedropper, Blend and the Liquify tools their panels or options, the Pencil, Paintbrush, Smooth, Blob Brush and Eraser tools their Tool Options (Fidelity, fill, Keep selected, the tolerances, the brush size), and (#812) the Flare tool its Flare Tool Options, the Artboard tool the active artboard's Artboard Options, the graph tools Graph Type for the selected graph, the Symbolism tools the Symbolism Tools Options (Diameter, Intensity, Symbol Set Density) and the Magic Wand tool its panel.
+    In the Pencil and Paintbrush Tool Options, Edit selected paths within 0 px turns editing off, so a stroke that starts exactly on an end of a selected open path draws a new path; Close paths when ends are within 0 px turns closing off, so a stroke that ends exactly where it started stays open.
    Keep selected in the Pencil and Paintbrush Tool Options is on by default; while it is off, the path a stroke draws or continues is not selected afterwards and the rest of the selection stays as it was (`path.freehand` `keepSelected`).
    The Blob Brush Tool Options have Keep selected and Merge only with selection, both off by default: while Keep selected is off, the blob a stroke draws or merges into is not selected afterwards, and while Merge only with selection is on, a stroke merges only with selected blobs of its color that it touches (`path.blob` `keepSelected` and `mergeOnlySelection`).
 - **Ruler guides as layer objects:** a guide goes on the current layer, shows, hides, locks and is deleted with it, is listed in the Layers panel (its row selects it) and moves to another layer (`guide.setLayer`, or its row dragged onto that layer's rows); guides on a hidden or locked layer can't be selected, moved or deleted, Duplicate copies a layer's guides and Merge Selected and Flatten Artwork keep them on the merged layer; guides from files saved before guides had layers go on the top visible, unlocked layer when the document opens. Not done: guides stacked among the art of their layer (they are listed above it), a guide row's own eye and lock. Lock Guides also locks the objects made into guides: they can't be selected, moved or deleted (#1543); they are drawn in the guide colour and style of Preferences, and a dragged selection snaps to ruler guides with Smart Guides on (#1583, fixes #1534). The Transform panel shows a selected ruler guide's X or Y, and typing a value moves it (#1659, part of #1597). This is not established by the documentation we could find: the public help pages on guides, rulers and the Transform, Control and Properties panels (read again on 2026-10-14) describe selecting and dragging unlocked guides and the panels' X and Y for a selection, not a guide's position in a panel, and the one public statement of it is a user's [community answer](https://community.adobe.com/questions-652/adding-a-new-custom-guide-785586), which is not documentation. It is kept as a convenience pending the owner's decision, with no parity claim and nothing counted towards a score.