diff --git a/crates/draw/src/ui/pen/curvature_mode.rs b/crates/draw/src/ui/pen/curvature_mode.rs index 496e389ad..3a453d009 100644 --- a/crates/draw/src/ui/pen/curvature_mode.rs +++ b/crates/draw/src/ui/pen/curvature_mode.rs @@ -5,7 +5,7 @@ use super::PenTool; use super::bezier::{EditSubpath, Knot}; use super::tool::{Drag, Kind, PenEnd, PenEvent, PenStyle, paint_anchors, paint_close_cue, paint_path}; use craft_behavior::CanvasView; -use craft_behavior::kurbo::BezPath; +use craft_behavior::kurbo::{BezPath, Point}; use craft_ui::canvas::{ToolAction, ToolContext, ToolPointer}; use craft_ui::primitives::{Dashes, Draw, StrokeWidth}; use egui::Pos2; @@ -24,7 +24,7 @@ impl PenTool { /// [`kept`](PenTool::kept) knots' handles; /// - the second click of a double click on an anchor toggles it between smooth and corner and reflows; on empty /// canvas the first click's anchor is under it, so a double click places a corner point. - pub(super) fn press_curve(&mut self, pointer: &ToolPointer, view: &CanvasView, reach: f32) -> ToolAction { + pub(super) fn press_curve(&mut self, pointer: &ToolPointer, at: Point, view: &CanvasView, reach: f32) -> ToolAction { let mut draft = self.shown.clone(); let n = draft.knots.len(); let under = draft @@ -62,7 +62,7 @@ impl PenTool { i } None => { - draft.knots.push(Knot { smooth: true, ..Knot::corner(view.to_doc(pointer.pos)) }); + draft.knots.push(Knot { smooth: true, ..Knot::corner(at) }); n } }; diff --git a/crates/draw/src/ui/pen/tool.rs b/crates/draw/src/ui/pen/tool.rs index ebef82088..b3cf7daf0 100644 --- a/crates/draw/src/ui/pen/tool.rs +++ b/crates/draw/src/ui/pen/tool.rs @@ -448,7 +448,8 @@ impl PenTool { // ---- presses ---- /// The press at `pos` with the Pen: Auto Add/Delete, the draft's own parts, a resumed path or a new anchor. - fn press_pen(&mut self, pos: Pos2, mods: Mods, view: &CanvasView, reach: f32) -> ToolAction { + /// A press at screen point `pos`; `at` is its document point as the canvas snaps it, where a new anchor goes. + fn press_pen(&mut self, pos: Pos2, at: Point, mods: Mods, view: &CanvasView, reach: f32) -> ToolAction { let mut draft = self.shown.clone(); // Auto Add/Delete takes the press whole: one Update, no drag, nothing added. if let Some(edit) = self.auto_edit(&draft, pos, mods, view, reach) { @@ -486,7 +487,7 @@ impl PenTool { let at = if kind == Kind::Close { 0 } else { n.saturating_sub(1) }; let in_ctrl = match kind { Kind::Pull => { - let mut p = view.to_doc(pos); + let mut p = at; if mods.shift && n > 0 { p = turn_to_45(draft.knots[n - 1].anchor, p); } @@ -506,16 +507,16 @@ impl PenTool { ToolAction::Claimed } - /// One sample of a press the tool owns: past the click slop the held part follows the pointer. With `space` + /// One sample of a press the tool owns at screen point `pos`, `to` its document point as the canvas snaps it: past + /// the click slop the held part follows `to`. With `space` /// held past the slop the pulled anchor and its handles move by the pointer's travel since the last sample /// instead, so a sample that repeats a position (a second pass of a frame) moves nothing. - fn track(&mut self, pos: Pos2, mods: Mods, view: &CanvasView, slop: f32, space: bool) { + fn track(&mut self, pos: Pos2, to: Point, mods: Mods, view: &CanvasView, slop: f32, space: bool) { let Some(mut drag) = self.drag.take() else { return }; let was_moved = drag.moved; drag.moved |= pos.distance(drag.origin) > slop; if drag.moved { let mut draft = self.shown.clone(); - let to = view.to_doc(pos); match drag.kind { Kind::Move(index) => { if let Some(k) = draft.knots.get_mut(index) { @@ -531,7 +532,7 @@ impl PenTool { let at = if kind == Kind::Close { 0 } else { draft.knots.len().saturating_sub(1) }; if let Some(k) = draft.knots.get_mut(at) { if space && was_moved { - let by = to - view.to_doc(drag.last); + let by = view.to_doc(pos) - view.to_doc(drag.last); k.anchor += by; k.in_ctrl += by; k.out_ctrl += by; @@ -603,21 +604,25 @@ impl CanvasTool for PenTool { return ToolAction::Ignored; } let reach = reach(cx); + // A new anchor goes where the canvas snaps the pointer (View > Snap To and the pixel grid). + let at = cx.snap(space.view.to_doc(pointer.pos)); match self.mode { - PenMode::Pen => self.press_pen(pointer.pos, pointer.mods, &space.view, reach), - PenMode::Curvature => self.press_curve(pointer, &space.view, reach), + PenMode::Pen => self.press_pen(pointer.pos, at, pointer.mods, &space.view, reach), + PenMode::Curvature => self.press_curve(pointer, at, &space.view, reach), } } fn drag(&mut self, pointer: &ToolPointer, cx: &mut ToolContext<'_>) { if let Some(space) = cx.space() { - self.track(pointer.pos, pointer.mods, &space.view, cx.slop, cx.held(Key::Space)); + let to = cx.snap(space.view.to_doc(pointer.pos)); + self.track(pointer.pos, to, pointer.mods, &space.view, cx.slop, cx.held(Key::Space)); } } fn release(&mut self, pointer: &ToolPointer, cx: &mut ToolContext<'_>) { if let Some(space) = cx.space() { - self.track(pointer.pos, pointer.mods, &space.view, cx.slop, cx.held(Key::Space)); + let to = cx.snap(space.view.to_doc(pointer.pos)); + self.track(pointer.pos, to, pointer.mods, &space.view, cx.slop, cx.held(Key::Space)); } let Some(drag) = self.drag.take() else { return }; if drag.kind == Kind::Close {