Merge branch 'red/t23e' into fw/mac1

One shift-lock opt-in: OutlineDraft::locking_shift_drags (t7d) carries t23e's rule that a Mixed draft which doesn't lock keeps the pointer's path under shift.
This commit is contained in:
aiongg
2026-11-17 01:05:14 +00:00
4 changed files with 28 additions and 7 deletions
+7 -2
View File
@@ -288,12 +288,17 @@ impl OutlineDraft {
/// Where a freehand point of `at` goes. With ⇧ held a [`locking_shift_drags`](Self::locking_shift_drags) Mixed draft's drag follows one line: once the pointer has
/// travelled [`LOCK_DISTANCE`] screen points from the last vertex, the nearest of eight directions from there
/// is locked and every later point is the pointer's projection onto it, however the pointer wanders, until ⇧ is
/// released. Before the lock the point stays at the vertex. Otherwise [`shift_step`](Self::shift_step).
/// released. Before the lock the point stays at the vertex. A Mixed draft that doesn't lock keeps the pointer's path
/// under ⇧. Otherwise [`shift_step`](Self::shift_step).
fn drag_step(&mut self, at: DraftPoint) -> Point {
if !self.locks_shift_drag || self.kind != DraftKind::Mixed || !at.mods.shift || self.polygonal {
if self.kind != DraftKind::Mixed || !at.mods.shift || self.polygonal {
self.lock = None;
return self.shift_step(at);
}
if !self.locks_shift_drag {
self.lock = None;
return at.at;
}
let Some(&last) = self.points.last() else { return at.at };
let (origin, direction) = match self.lock {
Some(lock) => lock,
+8
View File
@@ -82,6 +82,14 @@ fn shift_holds_a_freehand_drag_to_one_line() {
assert!(points.len() >= 3, "{points:?}");
assert!(points.iter().all(|p| p.y == 60.0), "the drag stays on the horizontal line through its start: {points:?}");
assert_eq!(points.last().map(|p| p.x), Some(100.0), "and follows the pointer along it");
// A selection Lasso's ⇧ at the press adds to the selection: its drag keeps the pointer's path.
let mut lasso = OutlineDraft::new(DraftKind::Mixed, REACH);
lasso.press(at(10.0, 60.0, 1.0), true);
for (x, y) in [(30.0, 63.0), (50.0, 55.0)] {
lasso.drag(shift(x, y));
}
assert_eq!(lasso.points().last(), Some(&Point::new(50.0, 55.0)));
}
#[test]
+1 -1
View File
@@ -47,7 +47,7 @@ impl<'a> AnchorTool<'a> {
}
/// The cursor of `tool` off the overlay's parts with `mods` held; `precise` is the canvas's precise cursor.
fn cursor_of(tool: PathTool, mods: Mods, precise: bool) -> PaintedCursor {
pub(super) fn cursor_of(tool: PathTool, mods: Mods, precise: bool) -> PaintedCursor {
// The pen's tip is the bottom left corner of the icon's box.
let pen = |badge| PaintedCursor::tool(ToolIcon::Pen.icon(), Vec2::Y * ICON_BOX, Some(badge));
match tool {
+12 -4
View File
@@ -14,7 +14,7 @@ mod words;
use craft_behavior::geometry::{SelectionOperation, axis_or_diagonal};
use craft_behavior::kurbo::{Point, Rect as DocRect, Vec2};
use craft_behavior::{
Axis, CanvasView, CursorPriority, EditCommand, GesturePhase, Granularity, HitLevel, HitPriority, HitShape, Intent, MoveMods, NavMove, NavShape,
Axis, CanvasView, Cursor, CursorPriority, EditCommand, GesturePhase, Granularity, HitLevel, HitPriority, HitShape, Intent, MoveMods, NavMove, NavShape,
PartKey, PartRef, PointerButton, PressPhase, PressStart, Roving, Sense,
};
use craft_keymap::{Chord, Key, Mods};
@@ -41,7 +41,8 @@ pub use model::{AnchorDelete, EditPath, EditSubpath, HandleSide, Knot, KnotRef,
pub use style::BezierStyle;
pub use words::BezierWords;
use super::PathOptionsSettings;
use super::anchor_tool::cursor_of;
use super::{PathOptionsSettings, PathTool};
/// Insert on a picked anchor adds one halfway along the segment leaving it.
const INSERT: Chord = Chord::plain(Key::Insert);
@@ -831,9 +832,16 @@ impl<'a> BezierOverlay<'a> {
}
if matches!(self.tool, BezierTool::AddAnchor | BezierTool::DeleteAnchor)
&& let Some(result) = cx.part_if_declared(EMPTY)
&& matches!(result.press.phase, PressPhase::Down { start, .. } if start.button == PointerButton::Primary)
{
self.report.pressed_empty = true;
let (press, hover) = (result.press, result.hover_pos);
// The part covers the canvas background, so it owns the cursor the host tool shows off the paths too.
if hover.is_some() {
let tool = if self.tool == BezierTool::AddAnchor { PathTool::AddAnchor } else { PathTool::DeleteAnchor };
cx.cursor(Cursor::Painted(cursor_of(tool, press.mods, space.precise())), CursorPriority::Part);
}
if matches!(press.phase, PressPhase::Down { start, .. } if start.button == PointerButton::Primary) {
self.report.pressed_empty = true;
}
}
// A press none of the parts carries any more (its part went with the paths) is over for the overlay.
if !pressed && cx.press_slot::<Held>().is_some() {