VectorCraft: An open-source, vector art tool written by scratch in pure Rust
G4: Touch Type arrow keys nudge the selected character
nrq6993-a11y222ec72e28b0
diff --git a/crates/engine/src/tests_textedit.rs b/crates/engine/src/tests_textedit.rsindex 917a01156..4a761ec0c 100644--- a/crates/engine/src/tests_textedit.rs+++ b/crates/engine/src/tests_textedit.rs@@ -361,6 +361,26 @@ fn the_touch_type_tool_drags_a_character() {assert!(near(moved_by(&before, &after, 2), (0.0, 0.0)), "{:?}", moved_by(&before, &after, 2));}+/// Arrow keys with the Touch Type tool nudge the selected character by the keyboard increment.+#[test]+fn touch_type_arrow_keys_nudge_the_selected_character() {+ let mut s = session();+ let id = NodeId(s.execute("text.create", &json!({"x": 100, "y": 100, "text": "Type", "size": 40})).unwrap()["id"].as_u64().unwrap());+ s.execute("select.set", &json!({"ids": []})).unwrap();+ let v = ViewInfo::default();+ s.select_tool("touchType", v).unwrap();+ let t = obj(&s, id);+ let lay = vectorcraft_text::layout(vectorcraft_text::FontDb::global(), &t);+ let y = lay.glyphs.iter().find(|g| g.byte == 1).unwrap();+ let at = t.xf * (y.origin + vectorcraft_geom::Vec2::new(y.advance / 2.0, -10.0));+ click(&mut s, at.x, at.y);+ let before = glyph_pens(&s, id);+ s.tool_key(vectorcraft_tools::ToolKey::Right, Mods::default(), v).unwrap();+ let after = glyph_pens(&s, id);+ assert!(near(moved_by(&before, &after, 1), (1.0, 0.0)), "{:?}", moved_by(&before, &after, 1));+ assert_eq!(undo_labels(&s).iter().filter(|l| *l == "Touch Type").count(), 1);+}+#[test]fn type_tool_typing_is_one_undo_step() {let mut s = session();diff --git a/crates/engine/src/tooling.rs b/crates/engine/src/tooling.rsindex 1d371d00c..9975707d2 100644--- a/crates/engine/src/tooling.rs+++ b/crates/engine/src/tooling.rs@@ -207,6 +207,7 @@ impl Session {gradient_stop: self.selected_stop(),appearance_item: self.appearance_item(),constrain_angle: self.prefs.constrain_angle,+ keyboard_increment: self.prefs.keyboard_increment,freeform_point: self.selected_freeform_point(),raster_sample: self.prefs.eyedropper.sample_size,preview_bounds: self.prefs.use_preview_bounds,diff --git a/crates/tools/src/lib.rs b/crates/tools/src/lib.rsindex 85858cb9d..2eaceb1ba 100644--- a/crates/tools/src/lib.rs+++ b/crates/tools/src/lib.rs@@ -263,6 +263,8 @@ pub struct ToolContext<'a> {pub appearance_item: Option<usize>,/// General → Constrain Angle (degrees): Shift constrains drags to 45° steps from it.pub constrain_angle: f64,+ /// General → Keyboard Increment: arrow-key nudges in document units (Shift multiplies by 10).+ pub keyboard_increment: f64,/// The selected freeform gradient point (`paint.freeform.selectPoint`), marked on the/// freeform annotator.pub freeform_point: Option<usize>,@@ -937,6 +939,7 @@ pub(crate) mod testutil {gradient_stop: None,appearance_item: None,constrain_angle: 0.0,+ keyboard_increment: 1.0,freeform_point: None,raster_sample: 1,preview_bounds: false,diff --git a/crates/tools/src/touchtype.rs b/crates/tools/src/touchtype.rsindex 2cf8c96e1..bcc973109 100644--- a/crates/tools/src/touchtype.rs+++ b/crates/tools/src/touchtype.rs@@ -231,30 +231,65 @@ impl TouchTypeTool {in_quad(&b.quad, xf.inverse() * p).then_some(Part::Move)}+ /// Document-space move for a character box (`b` of `t`): kerning along the line and baseline+ /// shift along the character's up axis.+ fn move_params(id: NodeId, t: &TextObject, b: &CharBox, moved: Vec2) -> Value {+ let doc_len = |v: Vec2| linear(t.xf, v).hypot();+ let det = b.along.cross(b.ey);+ let (along, rise) = if !b.kerned {+ (0.0, moved.dot(b.ey))+ } else if det.abs() > 0.1 {+ (moved.cross(b.ey) / det, b.along.cross(moved) / det)+ } else {+ (moved.dot(b.along), 0.0)+ };+ let mut out = json!({"id": id.0, "start": b.start});+ let dx = along * doc_len(b.along);+ let dy = rise * doc_len(b.ey);+ if dx != 0.0 {+ out["dx"] = json!(dx);+ }+ if dy != 0.0 {+ out["dy"] = json!(dy);+ }+ out+ }++ /// Arrow-key nudge in document space.+ fn nudge_params(id: NodeId, t: &TextObject, b: &CharBox, doc_dx: f64, doc_dy: f64) -> Value {+ Self::move_params(id, t, b, linear(t.xf.inverse(), Vec2::new(doc_dx, doc_dy)))+ }++ fn arrow_nudge(key: ToolKey, vertical: bool, step: f64) -> Option<Vec2> {+ let key = if vertical {+ match key {+ ToolKey::Up => ToolKey::Left,+ ToolKey::Down => ToolKey::Right,+ ToolKey::Right => ToolKey::Up,+ ToolKey::Left => ToolKey::Down,+ other => other,+ }+ } else {+ key+ };+ match key {+ ToolKey::Left => Some(Vec2::new(-step, 0.0)),+ ToolKey::Right => Some(Vec2::new(step, 0.0)),+ ToolKey::Up => Some(Vec2::new(0.0, -step)),+ ToolKey::Down => Some(Vec2::new(0.0, step)),+ _ => None,+ }+ }+/// The `text.touchType` params for the drag `d` with the pointer at `p` (document space).fn params(id: NodeId, t: &TextObject, d: &Drag, p: Point) -> Value {let b = &d.from;let inv = t.xf.inverse();let moved = linear(inv, p - d.press);- let doc_len = |v: Vec2| linear(t.xf, v).hypot();let st = &b.style;let mut out = json!({"id": id.0, "start": b.start});match d.part {- Part::Move => {- // Kerning moves the character along its line, and baseline shift moves it along its- // own up axis, which turns with its rotation. The drag is split between the two.- // Turned nearly onto the line, the character moves only along the line.- let det = b.along.cross(b.ey);- let (along, rise) = if !b.kerned {- (0.0, moved.dot(b.ey))- } else if det.abs() > 0.1 {- (moved.cross(b.ey) / det, b.along.cross(moved) / det)- } else {- (moved.dot(b.along), 0.0)- };- out["dx"] = json!(along * doc_len(b.along));- out["dy"] = json!(rise * doc_len(b.ey));- }+ Part::Move => out = Self::move_params(id, t, b, moved),Part::HScale => {let w = (b.quad[1] - b.quad[0]).hypot();out["hScale"] = json!(st.h_scale * factor(w + moved.dot(b.ex), w));@@ -336,23 +371,40 @@ impl Tool for TouchTypeTool {}}- /// Escape cancels a drag, and otherwise lets go of the selected character.- fn key(&mut self, _cx: &ToolContext, key: ToolKey, _mods: Mods) -> Vec<Action> {- if key != ToolKey::Escape {+ /// Escape cancels a drag or clears the selection; arrow keys nudge the selected character.+ fn key(&mut self, cx: &ToolContext, key: ToolKey, mods: Mods) -> Vec<Action> {+ if key == ToolKey::Escape {+ return match self.drag.take() {+ Some(d) if d.began => vec![Action::Cancel],+ Some(_) => vec![],+ None => {+ self.target = None;+ vec![]+ }+ };+ }+ if self.drag.is_some() {return vec![];}- match self.drag.take() {- Some(d) if d.began => vec![Action::Cancel],- Some(_) => vec![],- None => {- self.target = None;- vec![]- }+ let Some((id, t, b)) = self.current(cx) else { return vec![] };+ let lay = self.layout(t);+ let step = cx.keyboard_increment * if mods.shift { 10.0 } else { 1.0 };+ let Some(d) = Self::arrow_nudge(key, lay.vertical, step) else { return vec![] };+ let params = Self::nudge_params(id, t, &b, d.x, d.y);+ if params.get("dx").is_none() && params.get("dy").is_none() {+ return vec![];}+ vec![Action::Exec("text.touchType".into(), params)]}fn claims_key(&self, cx: &ToolContext, key: ToolKey) -> bool {- key == ToolKey::Escape && (self.drag.is_some() || self.current(cx).is_some())+ if key == ToolKey::Escape {+ return self.drag.is_some() || self.current(cx).is_some();+ }+ if self.drag.is_some() {+ return false;+ }+ self.current(cx).is_some() && matches!(key, ToolKey::Left | ToolKey::Right | ToolKey::Up | ToolKey::Down)}fn overlays(&self, cx: &ToolContext) -> Vec<Overlay> {@@ -512,6 +564,43 @@ mod tests {assert!(close(p3["dx"].as_f64().unwrap(), 0.0) && close(p3["dy"].as_f64().unwrap(), 4.0), "{p3}");}+ #[test]+ fn arrow_keys_nudge_the_selected_character() {+ let (d, id, s) = doc_with_type();+ let p = paint();+ let cx = cx(&d, &s, &p);+ let mut t = TouchTypeTool::default();+ let lay = vectorcraft_text::layout(FontDb::global(), text_of(&cx, id).unwrap());+ let y = lay.glyphs.iter().find(|g| g.byte == 1).unwrap();+ let at = Point::new(100.0, 200.0) + (y.origin.to_vec2() + Vec2::new(y.advance / 2.0, -10.0));+ drag(&mut t, &cx, at, at);+ assert!(t.claims_key(&cx, ToolKey::Right));+ let acts = t.key(&cx, ToolKey::Right, Mods::default());+ let p1 = match &acts[0] {+ Action::Exec(c, v) if c == "text.touchType" => v,+ other => panic!("{other:?}"),+ };+ assert!(close(p1["dx"].as_f64().unwrap(), 1.0) && p1.get("dy").is_none(), "{p1}");+ // The first character can't kern: a horizontal nudge does nothing.+ let first = Point::new(100.0, 200.0) + Vec2::new(lay.glyphs[0].advance / 2.0, -10.0);+ drag(&mut t, &cx, first, first);+ assert!(t.key(&cx, ToolKey::Left, Mods::default()).is_empty());+ let acts = t.key(&cx, ToolKey::Up, Mods::default());+ let p2 = match &acts[0] {+ Action::Exec(_, v) => v,+ other => panic!("{other:?}"),+ };+ assert!(close(p2["dy"].as_f64().unwrap(), 1.0), "{p2}");+ // Shift multiplies the increment (on a character that can kern).+ drag(&mut t, &cx, at, at);+ let acts = t.key(&cx, ToolKey::Right, Mods { shift: true, ..Mods::default() });+ let p3 = match &acts[0] {+ Action::Exec(_, v) => v,+ other => panic!("{other:?}"),+ };+ assert!(close(p3["dx"].as_f64().unwrap(), 10.0), "{p3}");+ }+#[test]fn the_handles_scale_and_rotate_the_character() {let (d, id, s) = doc_with_type();