From c0550a00a7e55bf9c6cef36c6c28655e56a2db76 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sun, 15 Nov 2026 09:07:57 -0800 Subject: [PATCH 01/78] Recolor Artwork: Edit tab right-click menus set the base color, pick a shade and add colors A right-click on a wheel marker or a color bar offers Set As Base Color, Select Shade (a 7 by 7 grid of the color's hue), Color Picker and Remove Color. A right-click elsewhere on the wheel offers Add New Color, and a color added on a marker's line moves with that marker while the colors are unlinked. Set Current Color As Base Color makes the selected color the base. The base color is stored on its row (`base: true`) instead of being the first selected row, so the harmony rules build from it whichever color is selected for the sliders. Merge, Separate, Randomize and Prominent Colors keep the marks, and the rows sent to `recolor.apply` leave them out. --- crates/ui-egui/src/dialogs/recolor.rs | 503 ++++++++++++++++++++++++-- crates/ui-egui/src/i18n/bg.tsv | 4 + crates/ui-egui/src/i18n/bs.tsv | 4 + crates/ui-egui/src/i18n/ca.tsv | 4 + crates/ui-egui/src/i18n/cs.tsv | 4 + crates/ui-egui/src/i18n/da.tsv | 4 + crates/ui-egui/src/i18n/de.tsv | 4 + crates/ui-egui/src/i18n/el.tsv | 4 + crates/ui-egui/src/i18n/es.tsv | 4 + crates/ui-egui/src/i18n/fi.tsv | 4 + crates/ui-egui/src/i18n/fr.tsv | 4 + crates/ui-egui/src/i18n/gu.tsv | 4 + crates/ui-egui/src/i18n/hi.tsv | 4 + crates/ui-egui/src/i18n/hu.tsv | 4 + crates/ui-egui/src/i18n/id.tsv | 4 + crates/ui-egui/src/i18n/it.tsv | 4 + crates/ui-egui/src/i18n/ja.tsv | 4 + crates/ui-egui/src/i18n/ka.tsv | 4 + crates/ui-egui/src/i18n/ko.tsv | 4 + crates/ui-egui/src/i18n/nl.tsv | 4 + crates/ui-egui/src/i18n/pl.tsv | 4 + crates/ui-egui/src/i18n/pt-br.tsv | 4 + crates/ui-egui/src/i18n/ru.tsv | 4 + crates/ui-egui/src/i18n/sv.tsv | 4 + crates/ui-egui/src/i18n/tr.tsv | 4 + crates/ui-egui/src/i18n/uk.tsv | 4 + crates/ui-egui/src/i18n/vi.tsv | 4 + crates/ui-egui/src/i18n/zh-hans.tsv | 4 + crates/ui-egui/src/i18n/zh-hant.tsv | 4 + crates/ui-egui/src/tests/recolor.rs | 163 +++++++++ crates/ui-egui/src/widgets.rs | 2 +- crates/ui-egui/src/widgets/color.rs | 62 +++- docs/control-protocol.md | 18 +- docs/target-app-parity.md | 3 +- 34 files changed, 812 insertions(+), 51 deletions(-) diff --git a/crates/ui-egui/src/dialogs/recolor.rs b/crates/ui-egui/src/dialogs/recolor.rs index 01142eb6f8..199b828edc 100644 --- a/crates/ui-egui/src/dialogs/recolor.rs +++ b/crates/ui-egui/src/dialogs/recolor.rs @@ -27,7 +27,14 @@ //! Remove Color tool removes the color whose marker is clicked; a bar's right-click menu has Remove //! Color too. The base color can't be removed. A removed color's row goes, unless it has current //! colors and art or a group is open: it then keeps them, with no new color, so that art keeps its -//! colors and the group's swatch at that place goes. With art, the Prominent Colors bar under the wheel shows the new +//! colors and the group's swatch at that place goes. The base color is the one the harmony rules +//! build from, drawn with the larger marker; it stays the base when another color is selected for +//! the sliders. A right-click on a marker or a color bar offers Set As Base Color, Select Shade (a +//! grid of the color's hue at 7 saturations by 7 brightnesses; a click moves the marker there as a +//! drag would), Color Picker and Remove Color; a right-click elsewhere on the wheel offers Add New +//! Color, which adds the hue and saturation there as the Add Color tool does, and a color added on +//! the line from the centre to a marker moves with that marker when the colors are unlinked. Set +//! Current Color As Base Color, before the color chips, makes the selected color the base. With art, the Prominent Colors bar under the wheel shows the new //! colors, each part as wide as its row's share of the art's uses, the largest first; dragging the //! edge between two parts moves width between them, and when the drag ends the rows' current //! colors move toward those widths (`recolor.weigh`), and the art previews them. The New Color @@ -48,7 +55,10 @@ //! //! Fields (`ui.dialog.set`): `rows` ([{from: [keys], to: key, exclude?, tint?: percent of a spot //! color, added?}]; a row with no current colors, `from: []`, recolors no art, and with `added: true` -//! (a color the Add Color tool added) adds its new color to the color group; `to: null`, no new color), `colors` (null: Auto, or a count), `method`, `preserveWhite`, `preserveBlack`, +//! (a color the Add Color tool added) adds its new color to the color group; `to: null`, no new color; +//! `base: true`, the base color, else the first color the Edit tab shows; `tie: n` on a marker and +//! `follows: n` on a color added on its line, which moves with it; the dialog sends `recolor.apply` +//! the rows without these three), `colors` (null: Auto, or a count), `method`, `preserveWhite`, `preserveBlack`, //! `preserveGrays`, `limitTo` (library id, "document" for the document's swatches, "" for none), //! `group`, `groupName`, `tab` (`assign` or `edit`), `rule` (harmony id), `linked`, `preview`, //! `sliderMode` (`hsb`, `rgb`, `cmyk`, `lab` or `tint`; unset: the row color's own model, HSB for @@ -280,7 +290,9 @@ fn sync_weights(app: &mut VectorcraftApp, d: &mut Dialog) { match app.session.execute("recolor.weigh", &json!({"map": rows(d), "weights": w})) { Ok(r) => { if let Some(m) = r["map"].as_array() { - d.fields.insert("rows".into(), Value::Array(m.clone())); + let mut m = m.clone(); + keep_marks(&rows(d), &mut m); + d.fields.insert("rows".into(), Value::Array(m)); } } Err(e) => app.status(e.to_string()), @@ -599,8 +611,10 @@ fn apply_params(d: &Dialog) -> Value { let rename = (!name.trim().is_empty() && name != g).then_some(name); json!({"group": g, "groupColors": colors, "rename": rename}) }); - // A row edited with the sliders carries `model: "new"`: its art takes the mode they showed. - let mut p = json!({"map": rs, "method": d.str("method"), "limitTo": d.str("limitTo")}); + // A row edited with the sliders carries `model: "new"`: its art takes the mode they showed. The + // Edit tab's own marks (the base color, colors tied to a marker) stay in the dialog. + let map: Vec = rs.iter().map(without_marks).collect(); + let mut p = json!({"map": map, "method": d.str("method"), "limitTo": d.str("limitTo")}); // The Global Adjust amounts, kept while the sliders show another mode; at 0% they are left out. let values = adjust_values(d); if values.iter().any(|v| *v != 0.0) { @@ -647,7 +661,7 @@ fn body(app: &mut VectorcraftApp, ui: &mut Ui, d: &mut Dialog) -> bool { } let mut rs = rows(d); let top = ui.cursor().top(); - let (changed, pick) = if d.str("tab") == "edit" { (edit_tab(app, ui, d, &mut rs), None) } else { assign_tab(app, ui, d, &mut rs) }; + let (changed, pick) = if d.str("tab") == "edit" { edit_tab(app, ui, d, &mut rs) } else { assign_tab(app, ui, d, &mut rs) }; if d.str("tab") != "edit" { ui.add_space((TAB_H - (ui.cursor().top() - top)).max(0.0)); } @@ -892,7 +906,9 @@ fn assign_tab(app: &mut VectorcraftApp, ui: &mut Ui, d: &mut Dialog, rows: &mut let p = json!({"map": rows, "order": !sb, "saturationBrightness": sb, "seed": seed}); match app.session.execute("recolor.randomize", &p) { Ok(r) => { - *rows = r["map"].as_array().cloned().unwrap_or_default(); + let mut shuffled = r["map"].as_array().cloned().unwrap_or_default(); + keep_marks(rows, &mut shuffled); + *rows = shuffled; if !sb { d.fields.insert(SHUFFLED.into(), json!(true)); } @@ -1244,6 +1260,21 @@ fn merge(rows: &mut Vec, sel: &[usize]) { for &i in rest.iter().rev() { let row = rows.remove(i); moved.splice(0..0, row["from"].as_array().cloned().unwrap_or_default()); + // The base color merged into another row makes that row the base, and the colors that + // followed the merged row's marker follow that row's. + if row[BASE] == json!(true) { + rows[first][BASE] = json!(true); + } + if let Some(t) = row[TIE].as_u64() { + match rows[first][TIE].as_u64() { + Some(to) => { + for r in rows.iter_mut().filter(|r| r[FOLLOWS].as_u64() == Some(t)) { + r[FOLLOWS] = json!(to); + } + } + None => rows[first][TIE] = json!(t), + } + } } if let Some(dst) = rows[first]["from"].as_array_mut() { dst.extend(moved); @@ -1255,7 +1286,17 @@ fn separate(rows: &mut Vec, sel: &[usize]) { let mut out = vec![]; for (i, row) in rows.drain(..).enumerate() { match row["from"].as_array() { - Some(a) if sel.contains(&i) && a.len() > 1 => out.extend(a.iter().map(|k| json!({"from": [k], "to": k}))), + Some(a) if sel.contains(&i) && a.len() > 1 => { + let at = out.len(); + out.extend(a.iter().map(|k| json!({"from": [k], "to": k}))); + // A separated row's marks (the base color, a marker's tie, a color it follows) go + // to the row of its first color. + for k in [BASE, TIE, FOLLOWS] { + if let Some(v) = row.get(k) { + out[at][k] = v.clone(); + } + } + } _ => out.push(row), } } @@ -1278,13 +1319,29 @@ fn active_rows(rows: &[Value]) -> Vec { } /// Set row `i`'s new colour to hue/saturation/brightness `hsb` ([`move_on_wheel`]: with `linked` -/// the other rows keep their relation to it). Excluded rows stay. +/// the other rows keep their relation to it; unlinked, the colors added on its marker's line, which +/// follow its `tie`, and those that follow theirs, keep theirs). Excluded rows stay. fn move_color(rows: &mut [Value], i: usize, hsb: [f32; 3], linked: bool) { - let active = active_rows(rows); + let all = active_rows(rows); + let active: Vec = if linked { + all + } else { + // Row `i` and the rows that follow it, directly or through another follower. + let mut moving = vec![i]; + let mut n = 0; + while let Some(&j) = moving.get(n) { + if let Some(t) = rows.get(j).and_then(|r| r[TIE].as_u64()) { + let next: Vec = all.iter().copied().filter(|&k| rows[k][FOLLOWS].as_u64() == Some(t) && !moving.contains(&k)).collect(); + moving.extend(next); + } + n += 1; + } + all.into_iter().filter(|j| moving.contains(j)).collect() + }; let Some(k) = active.iter().position(|&j| j == i) else { return }; let before: Vec = active.iter().filter_map(|&j| to_color(&rows[j])).collect(); let mut colors = before.clone(); - move_on_wheel(&mut colors, k, hsb, linked); + move_on_wheel(&mut colors, k, hsb, true); for ((&j, c), old) in active.iter().zip(&colors).zip(&before) { if key(c) != key(old) { set_to(&mut rows[j], c); @@ -1299,8 +1356,8 @@ const DRAG: &str = "__drag"; const WHEEL_TOOL: &str = "wheelTool"; /// The new color the Add Color tool gives a click at hue `h` (degrees) and saturation `s`: at the -/// brightness of `base` (the base color, whose brightness the wheel shows; full without one), the -/// segmented wheel's patch color with `segmented`, in `base`'s model. +/// brightness of `base` (the selected color, whose brightness the wheel shows; full without one), +/// the segmented wheel's patch color with `segmented`, in `base`'s model. fn added_color(base: Option, h: f32, s: f32, segmented: bool) -> Color { let v = base.map_or(1.0, |b| b.to_hsb()[2]); let c = if segmented { widgets::segment_color(h, s, v) } else { Color::from_hsb(h, s, v) }; @@ -1348,14 +1405,221 @@ fn removed(d: &mut Dialog, base: usize) { d.fields.remove(COMPS); } -/// The Edit tab. Returns true when the rows changed. -fn edit_tab(app: &VectorcraftApp, ui: &mut Ui, d: &mut Dialog, rows: &mut Vec) -> bool { +/// A row's mark as the base color, the color the harmony rules build from (`true`). +const BASE: &str = "base"; +/// A row's number on a marker that the colors added on its line follow. +const TIE: &str = "tie"; +/// A row's mark as a color added on a marker's line: the marker's `tie`, which it moves with. +const FOLLOWS: &str = "follows"; +/// The target of the wheel's right-click menu: `{marker, line, hs}` (row indexes and the hue and +/// saturation clicked). +const MENU_AT: &str = "__wheelMenu"; +/// Select Shade's grid: saturations across, from 0% to 100%, and brightnesses down, from 100%. +const SHADE_COLS: usize = 7; +const SHADE_ROWS: usize = 7; +const SHADE_CELL: f32 = 16.0; + +/// The base color's row: the row of `active` (the rows the Edit tab shows) marked `base`, else +/// the first of them. +fn base_row(rows: &[Value], active: &[usize]) -> Option { + active.iter().copied().find(|&i| rows[i][BASE] == json!(true)).or(active.first().copied()) +} + +/// Whether Set As Base Color would change anything for row `i`: it is shown on the Edit tab, and it +/// isn't the base already, or it is the base only because the marked row is hidden (excluded, or +/// with no new color), whose mark would make it the base again once shown. +fn can_set_base(rows: &[Value], i: usize) -> bool { + let active = active_rows(rows); + active.contains(&i) && (base_row(rows, &active) != Some(i) || rows.iter().enumerate().any(|(k, r)| k != i && r[BASE] == json!(true))) +} + +/// Make row `i` the base color (Set As Base Color). Returns false when that changes nothing +/// ([`can_set_base`]). +fn set_base(rows: &mut [Value], i: usize) -> bool { + if !can_set_base(rows, i) { + return false; + } + for r in rows.iter_mut() { + if let Some(o) = r.as_object_mut() { + o.remove(BASE); + } + } + rows[i][BASE] = json!(true); + true +} + +/// Make row `follower` move with the marker of row `leader`: the leader keeps its `tie` (a new +/// number, past every `tie` and `follows`, when it has none, so that colors left from a removed +/// marker follow no other) and the follower takes it as `follows`. +fn tie_to(rows: &mut [Value], leader: usize, follower: usize) { + if leader == follower || leader >= rows.len() || follower >= rows.len() { + return; + } + let used = rows.iter().flat_map(|r| [r[TIE].as_u64(), r[FOLLOWS].as_u64()]).flatten().max(); + let t = rows[leader][TIE].as_u64().unwrap_or_else(|| used.map_or(1, |m| m.saturating_add(1))); + rows[leader][TIE] = json!(t); + rows[follower][FOLLOWS] = json!(t); +} + +/// Give each row of `after` the base, tie and follows marks of the row at its place in `before`, +/// when the two have as many rows (the engine's `recolor.randomize` and `recolor.weigh` keep the +/// rows in order and return them without the dialog's own marks). +fn keep_marks(before: &[Value], after: &mut [Value]) { + if before.len() != after.len() { + return; + } + for (a, b) in after.iter_mut().zip(before) { + for k in [BASE, TIE, FOLLOWS] { + if a.get(k).is_none() + && let Some(v) = b.get(k) + { + a[k] = v.clone(); + } + } + } +} + +/// `row` without the dialog's base, tie and follows marks. +fn without_marks(row: &Value) -> Value { + let mut r = row.clone(); + if let Some(o) = r.as_object_mut() { + for k in [BASE, TIE, FOLLOWS] { + o.remove(k); + } + } + r +} + +/// The saturation and brightness of Select Shade's cell in column `col` and row `row`. +fn shade_at(col: usize, row: usize) -> [f32; 2] { + [col as f32 / (SHADE_COLS - 1) as f32, 1.0 - row as f32 / SHADE_ROWS as f32] +} + +/// Select Shade's grid of `c`'s hue, the cell nearest `c` framed. Returns the saturation and +/// brightness of the cell clicked. +fn shade_grid(ui: &mut Ui, c: &Color) -> Option<[f32; 2]> { + let t = Tokens::get(ui.ctx()); + let [h, s0, v0] = c.to_hsb(); + let near = ((s0 * (SHADE_COLS - 1) as f32).round() as usize, (((1.0 - v0) * SHADE_ROWS as f32).round() as usize).min(SHADE_ROWS - 1)); + let mut out = None; + egui::Grid::new("recolor-shades").spacing([2.0, 2.0]).show(ui, |ui| { + for row in 0..SHADE_ROWS { + for col in 0..SHADE_COLS { + let [s, v] = shade_at(col, row); + let (r, resp) = ui.allocate_exact_size(vec2(SHADE_CELL, SHADE_CELL), Sense::click()); + ui.painter().rect_filled(r, 1.0, c32(&Color::from_hsb(h, s, v))); + if (col, row) == near { + ui.painter().rect_stroke(r, 1.0, egui::Stroke::new(1.5, t.accent), egui::StrokeKind::Outside); + } + let name = format!("{} {}%, {} {}%", tl!("Saturation"), (s * 100.0).round(), tl!("Brightness"), (v * 100.0).round()); + resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, &name)); + if resp.clicked() { + out = Some([s, v]); + ui.close(); + } + } + ui.end_row(); + } + }); + out +} + +/// What a marker's or a color bar's right-click menu, or the wheel's, chose. +enum MenuChoice { + /// Set As Base Color for the row. + Base(usize), + /// Select Shade: the row's color at this saturation and brightness. + Shade(usize, [f32; 2]), + /// Color Picker for the row. + Picker(usize), + /// Remove Color for the row. + Remove(usize), + /// Add New Color at this hue and saturation, moving with the marker of the row on whose line + /// it is. + Add([f32; 2], Option), +} + +/// A marker's or a color bar's right-click menu for row `i`: Set As Base Color and Remove Color +/// (neither for the base color `base`), Select Shade and Color Picker. +fn color_menu(ui: &mut Ui, rows: &[Value], i: usize, base: Option) -> Option { + let mut choice = None; + if widgets::menu_item_name(ui, tl!("Set As Base Color"), can_set_base(rows, i), false) { + choice = Some(MenuChoice::Base(i)); + } + if let Some(c) = rows.get(i).and_then(to_color) { + // Indented like the items beside it (their check column). + ui.menu_button(format!(" {}", tl!("Select Shade")), |ui| { + if let Some(sv) = shade_grid(ui, &c) { + choice = Some(MenuChoice::Shade(i, sv)); + } + }); + } + if widgets::menu_item_name(ui, tl!("Color Picker"), true, false) { + choice = Some(MenuChoice::Picker(i)); + } + if widgets::menu_item_name(ui, tl!("Remove Color"), Some(i) != base, false) { + choice = Some(MenuChoice::Remove(i)); + } + choice +} + +/// Carry out a right-click menu's `choice` on the rows (`base`: the base color's row; `shown`: the +/// color whose brightness the wheel shows; `segmented`: the menu was on the segmented wheel). +/// Returns whether the rows changed and the row whose new color the Color Picker is to edit. +fn choose( + d: &mut Dialog, + rows: &mut Vec, + choice: MenuChoice, + base: Option, + shown: Option, + segmented: bool, +) -> (bool, Option) { + match choice { + MenuChoice::Base(i) => (set_base(rows, i), None), + MenuChoice::Shade(i, [s, v]) => { + let Some(h) = rows.get(i).and_then(to_color).map(|c| c.to_hsb()[0]) else { return (false, None) }; + let before = rows.clone(); + move_color(rows, i, [h, s, v], d.bool("linked")); + d.fields.insert("__sel".into(), json!([i])); + d.fields.remove(COMPS); + (*rows != before, None) + } + MenuChoice::Picker(i) => { + d.fields.insert("__sel".into(), json!([i])); + (false, Some(i)) + } + MenuChoice::Remove(i) => match remove_color(rows, i, base, keeps_rows(d)) { + Some(b) => { + removed(d, b); + (true, None) + } + None => (false, None), + }, + MenuChoice::Add([h, s], line) => { + let i = add_color(rows, &added_color(shown, h, s, segmented)); + if let Some(l) = line { + tie_to(rows, l, i); + } + d.fields.insert("__sel".into(), json!([i])); + d.fields.remove(COMPS); + (true, None) + } + } +} + +/// The Edit tab. Returns whether the rows changed and the row whose new color a right-click menu's +/// Color Picker is to edit. +fn edit_tab(app: &VectorcraftApp, ui: &mut Ui, d: &mut Dialog, rows: &mut Vec) -> (bool, Option) { let top = ui.cursor().top(); let t = Tokens::get(ui.ctx()); let mut changed = false; + let mut pick = None; let linked = d.bool("linked"); let active = active_rows(rows); - let base = selection(d).into_iter().find(|i| active.contains(i)).or(active.first().copied()); + // The harmony rules build from the base color; the sliders and the Brightness slider edit the + // selected color (the base color when none is selected). + let base = base_row(rows, &active); + let sel = selection(d).into_iter().find(|i| active.contains(i)).or(base); let target = SliderTarget::of(app, d, rows); ui.horizontal(|ui| { ui.label(egui::RichText::new(tl!("Harmony Rules:")).color(t.text_dim)); @@ -1401,6 +1665,9 @@ fn edit_tab(app: &VectorcraftApp, ui: &mut Ui, d: &mut Dialog, rows: &mut Vec = active.iter().filter_map(|&i| to_color(&rows[i])).collect(); let marked = base.and_then(|b| active.iter().position(|&i| i == b)); + let selected = sel.and_then(|s| active.iter().position(|&i| i == s)); + let shown = sel.and_then(|s| to_color(&rows[s])); + let mut choice = None; let display = d.str("display"); let tool = d.str(WHEEL_TOOL); // The tools act on either wheel, not on the color bars. @@ -1429,16 +1696,56 @@ fn edit_tab(app: &VectorcraftApp, ui: &mut Ui, d: &mut Dialog, rows: &mut Vec w = widgets::segmented_wheel(ui, "recolor-wheel", WHEEL, &colors, marked), - "bars" => changed |= color_bars(ui, d, rows, &active, base), - _ => w = widgets::harmony_wheel(ui, "recolor-wheel", WHEEL, &colors, marked), + "bars" => { + let (moved, chosen) = color_bars(ui, d, rows, &active, base); + changed |= moved; + choice = chosen; + } + _ => w = widgets::recolor_wheel(ui, "recolor-wheel", WHEEL, &colors, marked, selected, display == "segmented"), }); }); + // A right-click on the wheel: a marker's menu, or Add New Color elsewhere. Its target is kept + // while the menu stays open. + if let Some((hit, line, hs)) = w.secondary { + d.fields.insert(MENU_AT.into(), json!({"marker": hit.map(|k| active[k]), "line": line.map(|k| active[k]), "hs": hs})); + } else if w.response.as_ref().is_some_and(egui::Response::secondary_clicked) { + // A right-click off the wheel (in a corner of its square) targets nothing: its menu's Add + // New Color is off, and no earlier marker is changed. + d.fields.remove(MENU_AT); + } + if let Some(resp) = &w.response { + let at = d.fields.get(MENU_AT).cloned().unwrap_or_default(); + let row = |k: &str| at[k].as_u64().map(|i| i as usize).filter(|i| active.contains(i)); + let hs = at["hs"].as_array().and_then(|a| Some([a.first()?.as_f64()? as f32, a.get(1)?.as_f64()? as f32])); + resp.context_menu(|ui| match row("marker") { + Some(i) => choice = color_menu(ui, rows, i, base), + None => { + if widgets::menu_item_name(ui, tl!("Add New Color"), hs.is_some(), false) + && let Some(hs) = hs + { + choice = Some(MenuChoice::Add(hs, row("line"))); + } + } + }); + } + // A menu's choice changes the rows the wheel's indexes were for, so the wheel's own clicks and + // drags of this frame are left alone. + let chosen = choice.is_some(); + if let Some(c) = choice { + let (did, picked) = choose(d, rows, c, base, shown, display == "segmented"); + changed |= did; + pick = picked; + } + if chosen { + w.pressed = None; + w.moved = None; + w.clicked = None; + } // A click with a wheel tool adds a color there, or removes the color of the marker clicked. let clicked = w.clicked.filter(|_| on_wheel && matches!(tool.as_str(), "add" | "remove")); if let Some((hit, [h, s])) = clicked { if tool == "add" { - let c = added_color(base.and_then(|b| to_color(&rows[b])), h, s, display == "segmented"); + let c = added_color(shown, h, s, display == "segmented"); let i = add_color(rows, &c); d.fields.insert("__sel".into(), json!([i])); d.fields.remove(COMPS); @@ -1482,43 +1789,57 @@ fn edit_tab(app: &VectorcraftApp, ui: &mut Ui, d: &mut Dialog, rows: &mut Vec, active: &[usize], base: Option) -> bool { +/// the pointer shows, keeping every new color. A bar's right-click menu is a marker's +/// ([`color_menu`]). Returns true when the rows moved, and the menu's choice. +fn color_bars(ui: &mut Ui, d: &mut Dialog, rows: &mut [Value], active: &[usize], base: Option) -> (bool, Option) { let t = Tokens::get(ui.ctx()); let mut rects: Vec = Vec::with_capacity(active.len()); - let (mut dragging, mut released, mut dropped, mut remove) = (None, None, None, None); + let (mut dragging, mut released, mut dropped, mut choice) = (None, None, None, None); // The area is given its full height first: in the row beside the display buttons a scroll area // alone is only as tall as the room the row has. let area = vec2(ui.available_width(), BARS_H); @@ -1551,8 +1872,8 @@ fn color_bars(ui: &mut Ui, d: &mut Dialog, rows: &mut Vec, active: &[usiz rects.push(r); let resp = resp.on_hover_text(rows[i]["to"].as_str().unwrap_or_default()); resp.context_menu(|ui| { - if widgets::menu_item_name(ui, tl!("Remove Color"), Some(i) != base, false) { - remove = Some(i); + if let Some(c) = color_menu(ui, rows, i, base) { + choice = Some(c); } }); } @@ -1569,15 +1890,14 @@ fn color_bars(ui: &mut Ui, d: &mut Dialog, rows: &mut Vec, active: &[usiz dropped = released.zip(at); }); }); - if let Some(b) = remove.and_then(|i| remove_color(rows, i, base, keeps_rows(d))) { - removed(d, b); - return true; + if choice.is_some() { + return (false, choice); } - let Some(moved) = dropped.and_then(|(n, to)| move_bar(rows, active, n, to)) else { return false }; + let Some(moved) = dropped.and_then(|(n, to)| move_bar(rows, active, n, to)) else { return (false, None) }; d.fields.insert("__sel".into(), json!([moved])); // The slider values held are those of a row index that may now hold another row. d.fields.remove(COMPS); - true + (true, None) } /// Move the row of the `from`th active row (of `active`, ascending row indexes) to before the @@ -1796,6 +2116,117 @@ mod tests { assert_eq!([&r[0]["to"], &r[1]["to"], &r[2]["to"]], ["rgb 255 0 0", "rgb 0 255 0", "rgb 0 0 255"]); } + /// The base color is the row marked `base`, else the first row shown; Set As Base Color moves the + /// mark, and does nothing for the base row already or a row the Edit tab doesn't show. + #[test] + fn set_base_moves_the_base_mark() { + let mut r = rows(); + assert_eq!(base_row(&r, &active_rows(&r)), Some(0)); + assert!(!set_base(&mut r, 0), "the first row is the base already"); + assert!(set_base(&mut r, 2)); + assert_eq!(base_row(&r, &active_rows(&r)), Some(2)); + assert!(set_base(&mut r, 1)); + assert_eq!(r.iter().filter(|x| x[BASE] == json!(true)).count(), 1, "one base mark: {r:?}"); + assert!(!set_base(&mut r, 1)); + r[2]["exclude"] = json!(true); + assert!(!set_base(&mut r, 2), "an excluded row isn't shown"); + assert!(!set_base(&mut r, 9)); + // An excluded base row leaves the first row shown as the base. + r[1]["exclude"] = json!(true); + assert_eq!(base_row(&r, &active_rows(&r)), Some(0)); + // Setting that row as the base keeps it the base once the marked row is shown again. + assert!(set_base(&mut r, 0), "the hidden row's mark moves to it"); + r[1]["exclude"] = json!(false); + assert_eq!(base_row(&r, &active_rows(&r)), Some(0), "{r:?}"); + } + + /// Merge and Separate keep the base mark on a row of the base color's colors; Randomize's rows + /// (as the engine returns them) take the marks at their places again; `recolor.apply` gets no marks. + #[test] + fn the_base_mark_follows_merge_separate_and_randomize() { + let mut r = rows(); + set_base(&mut r, 2); + merge(&mut r, &[0, 2]); + assert_eq!(r[0][BASE], json!(true), "merged into the first row: {r:?}"); + let mut r = rows(); + set_base(&mut r, 1); + separate(&mut r, &[1]); + assert_eq!(r.len(), 4); + assert_eq!((r[1][BASE].clone(), r[2].get(BASE)), (json!(true), None), "{r:?}"); + // A marker's tie goes with it too. + let mut t = rows(); + t[1][TIE] = json!(1); + separate(&mut t, &[1]); + assert_eq!((t[1][TIE].clone(), t[2].get(TIE)), (json!(1), None)); + let mut t = rows(); + t[0][TIE] = json!(1); + t[2][TIE] = json!(3); + t.push(json!({"from": [], "to": "rgb 1 2 3", "follows": 3})); + merge(&mut t, &[0, 2]); + assert_eq!((t[0][TIE].clone(), t[2][FOLLOWS].clone()), (json!(1), json!(1)), "its follower follows the row merged into: {t:?}"); + let before = r.clone(); + let mut shuffled: Vec = r.iter().map(without_marks).collect(); + assert!(shuffled.iter().all(|x| x.get(BASE).is_none())); + keep_marks(&before, &mut shuffled); + assert_eq!(shuffled, before); + let mut fewer = vec![json!({"from": [], "to": "rgb 1 1 1"})]; + keep_marks(&before, &mut fewer); + assert!(fewer[0].get(BASE).is_none(), "rows of another count take no marks"); + let mut d = Dialog::new(KIND, json!({})); + d.fields.insert("rows".into(), json!(before)); + assert!(apply_params(&d)["map"].as_array().unwrap().iter().all(|x| x.get(BASE).is_none())); + } + + /// A color added on a marker's line moves with that marker when the colors are unlinked; it + /// moves alone itself, and linked colors all move together as before. + #[test] + fn a_color_added_on_a_markers_line_moves_with_it() { + let hue = |r: &[Value], i: usize| to_color(&r[i]).unwrap().to_hsb()[0]; + let mut r = rows(); + let added = add_color(&mut r, &Color::from_hsb(240.0, 0.5, 1.0)); + tie_to(&mut r, 1, added); + assert_eq!((r[1][TIE].clone(), r[added][FOLLOWS].clone()), (json!(1), json!(1))); + move_color(&mut r, 1, [270.0, 1.0, 1.0], false); + assert!((hue(&r, added) - 270.0).abs() < 0.5, "the added color turns with its marker: {}", hue(&r, added)); + assert!((hue(&r, 0) - 0.0).abs() < 0.5 && (hue(&r, 2) - 120.0).abs() < 0.5, "the others stay"); + move_color(&mut r, added, [300.0, 0.5, 1.0], false); + assert!((hue(&r, 1) - 270.0).abs() < 0.5, "its marker stays"); + // A second color tied to the same marker shares its number. + let next = add_color(&mut r, &Color::from_hsb(270.0, 0.2, 1.0)); + tie_to(&mut r, 1, next); + assert_eq!(r[next][FOLLOWS], json!(1)); + let other = add_color(&mut r, &Color::from_hsb(0.0, 0.2, 1.0)); + tie_to(&mut r, 0, other); + assert_eq!(r[0][TIE], json!(2), "another marker takes a new number"); + tie_to(&mut r, 0, 0); + assert!(r[0].get(FOLLOWS).is_none(), "a row isn't tied to itself"); + // Colors left from a removed marker follow no marker tied later. + let mut r = rows(); + let added = add_color(&mut r, &Color::from_hsb(240.0, 0.5, 1.0)); + tie_to(&mut r, 1, added); + r.remove(1); + let next = add_color(&mut r, &Color::from_hsb(0.0, 0.5, 1.0)); + tie_to(&mut r, 0, next); + assert_eq!(r[0][TIE], json!(2), "{r:?}"); + // A color added on an added color's line moves with the first marker too. + let mut r = rows(); + let added = add_color(&mut r, &Color::from_hsb(240.0, 0.5, 1.0)); + tie_to(&mut r, 1, added); + let chained = add_color(&mut r, &Color::from_hsb(240.0, 0.25, 1.0)); + tie_to(&mut r, added, chained); + move_color(&mut r, 1, [250.0, 1.0, 1.0], false); + assert!((hue(&r, chained) - 250.0).abs() < 0.5, "{r:?}"); + } + + /// Select Shade's grid runs from 0% to 100% saturation across and from 100% brightness down. + #[test] + fn the_shade_grid_spans_saturation_and_brightness() { + assert_eq!(shade_at(0, 0), [0.0, 1.0]); + assert_eq!(shade_at(SHADE_COLS - 1, 0)[0], 1.0); + let last = shade_at(0, SHADE_ROWS - 1)[1]; + assert!(last > 0.0 && last < 0.2, "{last}"); + } + /// A rule or a wheel move that gives a row a new color drops the row's tint; a row whose /// color stays keeps it. #[test] diff --git a/crates/ui-egui/src/i18n/bg.tsv b/crates/ui-egui/src/i18n/bg.tsv index 45d7d6a60b..7bd64afbf8 100644 --- a/crates/ui-egui/src/i18n/bg.tsv +++ b/crates/ui-egui/src/i18n/bg.tsv @@ -1496,6 +1496,10 @@ font-technology Variable Променливи Add Color Tool Инструмент „Добавяне на цвят“ Remove Color Tool Инструмент „Премахване на цвят“ Remove Color Премахване на цвят + Set As Base Color Задаване като основен цвят + Select Shade Избор на нюанс + Add New Color Добавяне на нов цвят + Set Current Color As Base Color Задаване на текущия цвят като основен Harmony Sets Набори от хармонии Height Височина Height: Височина: diff --git a/crates/ui-egui/src/i18n/bs.tsv b/crates/ui-egui/src/i18n/bs.tsv index dac3186436..a246020ea2 100644 --- a/crates/ui-egui/src/i18n/bs.tsv +++ b/crates/ui-egui/src/i18n/bs.tsv @@ -2909,6 +2909,10 @@ digits Malayalam Malajalam Add Color Tool Alat za dodavanje boje Remove Color Tool Alat za uklanjanje boje Remove Color Ukloni boju + Set As Base Color Postavi kao osnovnu boju + Select Shade Odaberi nijansu + Add New Color Dodaj novu boju + Set Current Color As Base Color Postavi trenutnu boju kao osnovnu Harmony Rules Pravila harmonije Keep this row's colors (exclude) Zadrži boje ovog reda (isključi) Limit to Library: Ograniči na biblioteku: diff --git a/crates/ui-egui/src/i18n/ca.tsv b/crates/ui-egui/src/i18n/ca.tsv index 59fed8d0da..ff6ad4a111 100644 --- a/crates/ui-egui/src/i18n/ca.tsv +++ b/crates/ui-egui/src/i18n/ca.tsv @@ -2026,6 +2026,10 @@ digits Malayalam Malaiàlam Add Color Tool Eina Afegeix color Remove Color Tool Eina Elimina color Remove Color Elimina el color + Set As Base Color Defineix com a color base + Select Shade Selecciona el to + Add New Color Afegeix un color nou + Set Current Color As Base Color Defineix el color actual com a color base Harmony Sets Conjunts d’harmonia HDTV 1080p HDTV 1080p HDTV 720p HDTV 720p diff --git a/crates/ui-egui/src/i18n/cs.tsv b/crates/ui-egui/src/i18n/cs.tsv index a5a78f94e6..970cd6a715 100644 --- a/crates/ui-egui/src/i18n/cs.tsv +++ b/crates/ui-egui/src/i18n/cs.tsv @@ -2987,6 +2987,10 @@ digits Malayalam Malajálamské Add Color Tool Nástroj Přidat barvu Remove Color Tool Nástroj Odstranit barvu Remove Color Odstranit barvu + Set As Base Color Nastavit jako základní barvu + Select Shade Vybrat odstín + Add New Color Přidat novou barvu + Set Current Color As Base Color Nastavit aktuální barvu jako základní Harmony Rules Pravidla harmonie Keep this row's colors (exclude) Ponechat barvy tohoto řádku (vyloučit) Limit to Library: Omezit na knihovnu: diff --git a/crates/ui-egui/src/i18n/da.tsv b/crates/ui-egui/src/i18n/da.tsv index 44845efda4..96be705fc5 100644 --- a/crates/ui-egui/src/i18n/da.tsv +++ b/crates/ui-egui/src/i18n/da.tsv @@ -3385,6 +3385,10 @@ digits Malayalam Malayalam Add Color Tool Værktøjet Tilføj farve Remove Color Tool Værktøjet Fjern farve Remove Color Fjern farve + Set As Base Color Angiv som grundfarve + Select Shade Vælg nuance + Add New Color Tilføj ny farve + Set Current Color As Base Color Angiv aktuel farve som grundfarve Harmony Rules Harmoniregler Keep this row's colors (exclude) Behold farverne i denne række (ekskludér) Limit to Library: Begræns til bibliotek: diff --git a/crates/ui-egui/src/i18n/de.tsv b/crates/ui-egui/src/i18n/de.tsv index 45d4f15868..77fee8d62a 100644 --- a/crates/ui-egui/src/i18n/de.tsv +++ b/crates/ui-egui/src/i18n/de.tsv @@ -1539,6 +1539,10 @@ file-filter Templates Vorlagen Add Color Tool Farbe-hinzufügen-Werkzeug Remove Color Tool Farbe-entfernen-Werkzeug Remove Color Farbe entfernen + Set As Base Color Als Grundfarbe festlegen + Select Shade Schattierung auswählen + Add New Color Neue Farbe hinzufügen + Set Current Color As Base Color Aktuelle Farbe als Grundfarbe festlegen Harmony Sets Harmoniesätze Height Höhe Height: Höhe: diff --git a/crates/ui-egui/src/i18n/el.tsv b/crates/ui-egui/src/i18n/el.tsv index ec116764f2..79cc962095 100644 --- a/crates/ui-egui/src/i18n/el.tsv +++ b/crates/ui-egui/src/i18n/el.tsv @@ -1471,6 +1471,10 @@ font-technology Variable Μεταβλητές Add Color Tool Εργαλείο προσθήκης χρώματος Remove Color Tool Εργαλείο αφαίρεσης χρώματος Remove Color Αφαίρεση χρώματος + Set As Base Color Ορισμός ως βασικό χρώμα + Select Shade Επιλογή απόχρωσης + Add New Color Προσθήκη νέου χρώματος + Set Current Color As Base Color Ορισμός τρέχοντος χρώματος ως βασικού Harmony Sets Σύνολα χρωματικής αρμονίας Height Ύψος Height: Ύψος: diff --git a/crates/ui-egui/src/i18n/es.tsv b/crates/ui-egui/src/i18n/es.tsv index 5824894cec..0f8adfd195 100644 --- a/crates/ui-egui/src/i18n/es.tsv +++ b/crates/ui-egui/src/i18n/es.tsv @@ -1550,6 +1550,10 @@ font-technology Variable Variables Add Color Tool Herramienta Añadir color Remove Color Tool Herramienta Eliminar color Remove Color Eliminar color + Set As Base Color Establecer como color base + Select Shade Seleccionar matiz + Add New Color Añadir nuevo color + Set Current Color As Base Color Establecer el color actual como color base Harmony Sets Conjuntos de armonía Height Altura Height: Altura: diff --git a/crates/ui-egui/src/i18n/fi.tsv b/crates/ui-egui/src/i18n/fi.tsv index 018335f0ed..e80e1837d6 100644 --- a/crates/ui-egui/src/i18n/fi.tsv +++ b/crates/ui-egui/src/i18n/fi.tsv @@ -2931,6 +2931,10 @@ digits Malayalam Malajalam Add Color Tool Lisää väri -työkalu Remove Color Tool Poista väri -työkalu Remove Color Poista väri + Set As Base Color Aseta perusväriksi + Select Shade Valitse sävy + Add New Color Lisää uusi väri + Set Current Color As Base Color Aseta nykyinen väri perusväriksi Harmony Rules Harmoniasäännöt Keep this row's colors (exclude) Säilytä tämän rivin värit (jätä pois) Limit to Library: Rajoita kirjastoon: diff --git a/crates/ui-egui/src/i18n/fr.tsv b/crates/ui-egui/src/i18n/fr.tsv index c58d836b7f..636b03bdab 100644 --- a/crates/ui-egui/src/i18n/fr.tsv +++ b/crates/ui-egui/src/i18n/fr.tsv @@ -1543,6 +1543,10 @@ font-technology Variable Variables Add Color Tool Outil Ajouter une couleur Remove Color Tool Outil Supprimer une couleur Remove Color Supprimer la couleur + Set As Base Color Définir comme couleur de base + Select Shade Sélectionner une nuance + Add New Color Ajouter une nouvelle couleur + Set Current Color As Base Color Définir la couleur actuelle comme couleur de base Harmony Rules: Règles d’harmonie : Harmony Sets Ensembles d’harmonies Height Hauteur diff --git a/crates/ui-egui/src/i18n/gu.tsv b/crates/ui-egui/src/i18n/gu.tsv index 95f9f4dd66..4ebc35caa5 100644 --- a/crates/ui-egui/src/i18n/gu.tsv +++ b/crates/ui-egui/src/i18n/gu.tsv @@ -3564,6 +3564,10 @@ Add Color Tool રંગ ઉમેરો સાધન Remove Color Tool રંગ દૂર કરો સાધન Remove Color રંગ દૂર કરો + Set As Base Color આધાર રંગ તરીકે સેટ કરો + Select Shade છાયા પસંદ કરો + Add New Color નવો રંગ ઉમેરો + Set Current Color As Base Color વર્તમાન રંગને આધાર રંગ તરીકે સેટ કરો Show handles when multiple anchors are selected બહુવિધ એન્કર પસંદ હોય ત્યારે હૅન્ડલ બતાવો Show in Folder ફોલ્ડરમાં બતાવો Show its progress, see Cancel and write log lines તેની પ્રગતિ બતાવવી, રદ કરવાની વિનંતી જોવી અને લૉગ લાઇનો લખવી diff --git a/crates/ui-egui/src/i18n/hi.tsv b/crates/ui-egui/src/i18n/hi.tsv index 829996278d..21560a13b7 100644 --- a/crates/ui-egui/src/i18n/hi.tsv +++ b/crates/ui-egui/src/i18n/hi.tsv @@ -4650,6 +4650,10 @@ antiAlias Sharp शार्प Add Color Tool रंग जोड़ें टूल Remove Color Tool रंग हटाएँ टूल Remove Color रंग हटाएँ + Set As Base Color आधार रंग के रूप में सेट करें + Select Shade शेड चुनें + Add New Color नया रंग जोड़ें + Set Current Color As Base Color वर्तमान रंग को आधार रंग के रूप में सेट करें Show Color Groups रंग समूह दिखाएँ Show Color Swatches रंग स्वॉचेस दिखाएँ Show Corner Widget शो कॉर्नर विजेट diff --git a/crates/ui-egui/src/i18n/hu.tsv b/crates/ui-egui/src/i18n/hu.tsv index 7602d4b503..969f2964c1 100644 --- a/crates/ui-egui/src/i18n/hu.tsv +++ b/crates/ui-egui/src/i18n/hu.tsv @@ -1954,6 +1954,10 @@ file-filter Templates Sablonok Add Color Tool Szín hozzáadása eszköz Remove Color Tool Szín eltávolítása eszköz Remove Color Szín eltávolítása + Set As Base Color Beállítás alapszínként + Select Shade Árnyalat kiválasztása + Add New Color Új szín hozzáadása + Set Current Color As Base Color Aktuális szín beállítása alapszínként Harmony Sets Harmóniakészletek HDTV 1080p HDTV 1080p HDTV 720p HDTV 720p diff --git a/crates/ui-egui/src/i18n/id.tsv b/crates/ui-egui/src/i18n/id.tsv index 76310f9e21..5a7340cd16 100644 --- a/crates/ui-egui/src/i18n/id.tsv +++ b/crates/ui-egui/src/i18n/id.tsv @@ -2719,6 +2719,10 @@ digits Malayalam Malayalam Add Color Tool Alat Tambah Warna Remove Color Tool Alat Hapus Warna Remove Color Hapus Warna + Set As Base Color Atur sebagai Warna Dasar + Select Shade Pilih Corak + Add New Color Tambah Warna Baru + Set Current Color As Base Color Atur Warna Saat Ini sebagai Warna Dasar Harmony Rules Aturan harmoni Keep this row's colors (exclude) Pertahankan warna baris ini (kecualikan) Limit to Library: Batasi ke pustaka: diff --git a/crates/ui-egui/src/i18n/it.tsv b/crates/ui-egui/src/i18n/it.tsv index 977a592bff..2888f7399f 100644 --- a/crates/ui-egui/src/i18n/it.tsv +++ b/crates/ui-egui/src/i18n/it.tsv @@ -1569,6 +1569,10 @@ file-filter Templates Modelli Add Color Tool Strumento Aggiungi colore Remove Color Tool Strumento Rimuovi colore Remove Color Rimuovi colore + Set As Base Color Imposta come colore base + Select Shade Seleziona sfumatura + Add New Color Aggiungi nuovo colore + Set Current Color As Base Color Imposta il colore corrente come colore base Harmony Sets Gruppi di armonia Height Altezza Height: Altezza: diff --git a/crates/ui-egui/src/i18n/ja.tsv b/crates/ui-egui/src/i18n/ja.tsv index 484f3c3f82..2b0d539b42 100644 --- a/crates/ui-egui/src/i18n/ja.tsv +++ b/crates/ui-egui/src/i18n/ja.tsv @@ -1941,6 +1941,10 @@ antiAlias Sharp シャープ Add Color Tool カラー追加ツール Remove Color Tool カラー削除ツール Remove Color カラーを削除 + Set As Base Color ベースカラーに設定 + Select Shade シェードを選択 + Add New Color 新規カラーを追加 + Set Current Color As Base Color 現在のカラーをベースカラーに設定 Height 高さ Height: 高さ: Help › Search Commands… ヘルプ › コマンドを検索… diff --git a/crates/ui-egui/src/i18n/ka.tsv b/crates/ui-egui/src/i18n/ka.tsv index 1b845d619f..06af2a08c3 100644 --- a/crates/ui-egui/src/i18n/ka.tsv +++ b/crates/ui-egui/src/i18n/ka.tsv @@ -4763,6 +4763,10 @@ digits Malayalam მალაიალამური Add Color Tool ფერის დამატების ხელსაწყო Remove Color Tool ფერის წაშლის ხელსაწყო Remove Color ფერის წაშლა + Set As Base Color საბაზო ფერად დაყენება + Select Shade ელფერის არჩევა + Add New Color ახალი ფერის დამატება + Set Current Color As Base Color მიმდინარე ფერის საბაზო ფერად დაყენება Keep this row's colors (exclude) ამ სტრიქონის ფერების შენარჩუნება (გამორიცხვა) Limit to Library: ბიბლიოთეკით შეზღუდვა: Link harmony colors ჰარმონიის ფერების დაკავშირება diff --git a/crates/ui-egui/src/i18n/ko.tsv b/crates/ui-egui/src/i18n/ko.tsv index 5e5e14c0bf..f2194f1629 100644 --- a/crates/ui-egui/src/i18n/ko.tsv +++ b/crates/ui-egui/src/i18n/ko.tsv @@ -1931,6 +1931,10 @@ antiAlias Sharp 날카롭게 Add Color Tool 색상 추가 도구 Remove Color Tool 색상 제거 도구 Remove Color 색상 제거 + Set As Base Color 기본 색상으로 설정 + Select Shade 음영 선택 + Add New Color 새 색상 추가 + Set Current Color As Base Color 현재 색상을 기본 색상으로 설정 Height 높이 Height: 높이: Help › Search Commands… 도움말 › 명령 검색… diff --git a/crates/ui-egui/src/i18n/nl.tsv b/crates/ui-egui/src/i18n/nl.tsv index 231684a775..358ccbe10e 100644 --- a/crates/ui-egui/src/i18n/nl.tsv +++ b/crates/ui-egui/src/i18n/nl.tsv @@ -3281,6 +3281,10 @@ digits Malayalam Malayalam Add Color Tool Gereedschap Kleur toevoegen Remove Color Tool Gereedschap Kleur verwijderen Remove Color Kleur verwijderen + Set As Base Color Instellen als basiskleur + Select Shade Schakering selecteren + Add New Color Nieuwe kleur toevoegen + Set Current Color As Base Color Huidige kleur instellen als basiskleur Harmony Rules Harmonieregels Keep this row's colors (exclude) De kleuren van deze rij behouden (uitsluiten) Limit to Library: Beperken tot bibliotheek: diff --git a/crates/ui-egui/src/i18n/pl.tsv b/crates/ui-egui/src/i18n/pl.tsv index 21cdc04a15..3faefd0740 100644 --- a/crates/ui-egui/src/i18n/pl.tsv +++ b/crates/ui-egui/src/i18n/pl.tsv @@ -2897,6 +2897,10 @@ digits Malayalam Malajalam Add Color Tool Narzędzie Dodaj kolor Remove Color Tool Narzędzie Usuń kolor Remove Color Usuń kolor + Set As Base Color Ustaw jako kolor bazowy + Select Shade Wybierz odcień + Add New Color Dodaj nowy kolor + Set Current Color As Base Color Ustaw bieżący kolor jako bazowy Keep this row's colors (exclude) Zachowaj kolory tego wiersza (wyklucz) Limit to Library: Ogranicz do biblioteki: Link harmony colors Połącz kolory harmonii diff --git a/crates/ui-egui/src/i18n/pt-br.tsv b/crates/ui-egui/src/i18n/pt-br.tsv index 07fdfec0a1..23a3e0be20 100644 --- a/crates/ui-egui/src/i18n/pt-br.tsv +++ b/crates/ui-egui/src/i18n/pt-br.tsv @@ -1337,6 +1337,10 @@ antiAlias Sharp Nítido Add Color Tool Ferramenta Adicionar cor Remove Color Tool Ferramenta Remover cor Remove Color Remover cor + Set As Base Color Definir como cor base + Select Shade Selecionar tonalidade + Add New Color Adicionar nova cor + Set Current Color As Base Color Definir cor atual como cor base Harmony Sets Conjuntos de Harmonia Height Altura Height: Altura: diff --git a/crates/ui-egui/src/i18n/ru.tsv b/crates/ui-egui/src/i18n/ru.tsv index 674b65d2de..a84eac454c 100644 --- a/crates/ui-egui/src/i18n/ru.tsv +++ b/crates/ui-egui/src/i18n/ru.tsv @@ -1560,6 +1560,10 @@ file-filter Templates Шаблоны Add Color Tool Инструмент «Добавить цвет» Remove Color Tool Инструмент «Удалить цвет» Remove Color Удалить цвет + Set As Base Color Сделать базовым цветом + Select Shade Выбрать оттенок + Add New Color Добавить новый цвет + Set Current Color As Base Color Сделать текущий цвет базовым Harmony Sets Наборы гармонии Height Высота Height: Высота: diff --git a/crates/ui-egui/src/i18n/sv.tsv b/crates/ui-egui/src/i18n/sv.tsv index 2a82868e09..83ac0f4c58 100644 --- a/crates/ui-egui/src/i18n/sv.tsv +++ b/crates/ui-egui/src/i18n/sv.tsv @@ -1507,6 +1507,10 @@ font-technology Variable Variabla Add Color Tool Verktyget Lägg till färg Remove Color Tool Verktyget Ta bort färg Remove Color Ta bort färg + Set As Base Color Ange som grundfärg + Select Shade Välj nyans + Add New Color Lägg till ny färg + Set Current Color As Base Color Ange aktuell färg som grundfärg Harmony Sets Harmoniuppsättningar Height Höjd Height: Höjd: diff --git a/crates/ui-egui/src/i18n/tr.tsv b/crates/ui-egui/src/i18n/tr.tsv index 826beda686..f56b6ba94a 100644 --- a/crates/ui-egui/src/i18n/tr.tsv +++ b/crates/ui-egui/src/i18n/tr.tsv @@ -1464,6 +1464,10 @@ font-technology Variable Değişken Add Color Tool Renk Ekle aracı Remove Color Tool Renk Kaldır aracı Remove Color Rengi kaldır + Set As Base Color Temel renk olarak ayarla + Select Shade Ton seç + Add New Color Yeni renk ekle + Set Current Color As Base Color Geçerli rengi temel renk olarak ayarla Harmony Sets Armoni Setleri Height Yükseklik Height: Yükseklik: diff --git a/crates/ui-egui/src/i18n/uk.tsv b/crates/ui-egui/src/i18n/uk.tsv index 03ea0f9cf0..5af0736fa7 100644 --- a/crates/ui-egui/src/i18n/uk.tsv +++ b/crates/ui-egui/src/i18n/uk.tsv @@ -1563,6 +1563,10 @@ file-filter Templates Шаблони Add Color Tool Інструмент «Додати колір» Remove Color Tool Інструмент «Вилучити колір» Remove Color Вилучити колір + Set As Base Color Зробити базовим кольором + Select Shade Вибрати відтінок + Add New Color Додати новий колір + Set Current Color As Base Color Зробити поточний колір базовим Harmony Sets Набори гармонії Height Висота Height: Висота: diff --git a/crates/ui-egui/src/i18n/vi.tsv b/crates/ui-egui/src/i18n/vi.tsv index 58aa63fdf9..56681a83ad 100644 --- a/crates/ui-egui/src/i18n/vi.tsv +++ b/crates/ui-egui/src/i18n/vi.tsv @@ -1801,6 +1801,10 @@ file-filter Templates Mẫu Add Color Tool Công cụ Thêm màu Remove Color Tool Công cụ Xóa màu Remove Color Xóa màu + Set As Base Color Đặt làm màu cơ sở + Select Shade Chọn sắc độ + Add New Color Thêm màu mới + Set Current Color As Base Color Đặt màu hiện tại làm màu cơ sở Harmony Sets Bộ hài hòa màu Height Chiều cao Height: Chiều cao: diff --git a/crates/ui-egui/src/i18n/zh-hans.tsv b/crates/ui-egui/src/i18n/zh-hans.tsv index 6f41e03ad6..c87d323004 100644 --- a/crates/ui-egui/src/i18n/zh-hans.tsv +++ b/crates/ui-egui/src/i18n/zh-hans.tsv @@ -1497,6 +1497,10 @@ file-filter Templates 模板 Add Color Tool 添加颜色工具 Remove Color Tool 删除颜色工具 Remove Color 删除颜色 + Set As Base Color 设为基色 + Select Shade 选择色调 + Add New Color 添加新颜色 + Set Current Color As Base Color 将当前颜色设为基色 Harmony Sets 色彩调和组 Height 高度 Height: 高度: diff --git a/crates/ui-egui/src/i18n/zh-hant.tsv b/crates/ui-egui/src/i18n/zh-hant.tsv index cd3df5d104..693276fca6 100644 --- a/crates/ui-egui/src/i18n/zh-hant.tsv +++ b/crates/ui-egui/src/i18n/zh-hant.tsv @@ -1534,6 +1534,10 @@ file-filter Templates 範本 Add Color Tool 新增顏色工具 Remove Color Tool 移除顏色工具 Remove Color 移除顏色 + Set As Base Color 設為基色 + Select Shade 選取色調 + Add New Color 新增顏色 + Set Current Color As Base Color 將目前顏色設為基色 Harmony Sets 色彩調和組 Height 高度 Height: 高度: diff --git a/crates/ui-egui/src/tests/recolor.rs b/crates/ui-egui/src/tests/recolor.rs index ec6921500b..161a72ffd2 100644 --- a/crates/ui-egui/src/tests/recolor.rs +++ b/crates/ui-egui/src/tests/recolor.rs @@ -1339,3 +1339,166 @@ fn a_color_bars_menu_removes_its_color() { assert!(h.query_by_role_and_label(egui::accesskit::Role::Button, "Color 2").is_none(), "its bar goes"); assert_eq!(field(h.state(), "__sel"), json!([0])); } + +/// Right-clicks the point `at`. +fn right_click_at(h: &mut egui_kittest::Harness<'_, VectorcraftApp>, at: Pos2) { + h.event(Event::PointerMoved(at)); + h.event(Event::PointerButton { pos: at, button: PointerButton::Secondary, pressed: true, modifiers: Modifiers::NONE }); + h.event(Event::PointerButton { pos: at, button: PointerButton::Secondary, pressed: false, modifiers: Modifiers::NONE }); + h.run_steps(2); +} + +/// The smaller angle between hues `a` and `b`, in degrees. +fn hue_gap(a: f32, b: f32) -> f32 { + (a - b).rem_euclid(360.0).min((b - a).rem_euclid(360.0)) +} + +/// A marker's right-click menu has Set As Base Color, Select Shade, Color Picker and Remove Color. +/// Set As Base Color marks the row as the base, whose menu then has neither Set As Base Color nor +/// Remove Color; with another color selected, a harmony rule builds from the base color, and OK +/// recolors the art. +#[test] +fn a_markers_menu_sets_the_base_color_that_the_rules_build_from() { + let mut h = edit_harness(&["#ff0000", "#0000ff", "#00ff00"]); + let hsb = new_hsb(h.state()); + let at = wheel_at(&h, hsb[1][0], hsb[1][1]); + right_click_at(&mut h, at); + for item in [" Set As Base Color", " Select Shade", " Color Picker", " Remove Color"] { + assert!(h.query_by_label(item).is_some(), "{item}"); + } + h.get_by_label(" Set As Base Color").click(); + h.run_steps(3); + let rows = field(h.state(), "rows"); + assert_eq!(rows[1]["base"], json!(true), "{rows}"); + assert!(rows[0].get("base").is_none() && rows[2].get("base").is_none()); + right_click_at(&mut h, at); + assert!(h.get_by_label(" Set As Base Color").accesskit_node().is_disabled(), "it is the base already"); + assert!(h.get_by_label(" Remove Color").accesskit_node().is_disabled(), "the base color can't be removed"); + h.key_press(egui::Key::Escape); + h.run_steps(2); + // The selected color is another one; the rule still builds from the base. + set(h.state_mut(), "__sel", json!([0])); + h.run_steps(3); + h.get_by_role_and_label(egui::accesskit::Role::ComboBox, "Harmony Rules:").click(); + h.run_steps(2); + h.get_by_label("Triad").click(); + h.run_steps(3); + let now = new_hsb(h.state()); + assert!(hue_gap(now[1][0], hsb[1][0]) < 1.0, "the base color keeps its hue: {hsb:?} -> {now:?}"); + assert!(hue_gap(now[0][0], now[1][0]) > 110.0 && hue_gap(now[2][0], now[1][0]) > 110.0, "the others are a triad from it: {now:?}"); + assert_eq!(field(h.state(), "rows")[1]["base"], json!(true), "the rule keeps the base mark"); + let before = fills(h.state()); + let app = h.state_mut(); + dialogs::confirm(app).unwrap(); + assert_eq!(fills(app), before, "OK keeps the previewed colors"); +} + +/// Select Shade on a marker's menu shows a grid of the color's hue; a click on a cell gives the color +/// that saturation and brightness, keeping its hue, and closes the menu. Unlinked, the other colors +/// stay; linked, they move as a drag would move them. +#[test] +fn select_shade_gives_a_marker_the_shade_clicked() { + for linked in [false, true] { + let mut h = edit_harness(&["rgb 200 100 100", "rgb 100 200 200"]); + set(h.state_mut(), "linked", json!(linked)); + h.run_steps(3); + let hsb = new_hsb(h.state()); + let at = wheel_at(&h, hsb[0][0], hsb[0][1]); + right_click_at(&mut h, at); + h.get_by_label(" Select Shade").click(); + h.run_steps(2); + let cell = "Saturation 50%, Brightness 57%"; + h.get_by_label(cell).click(); + h.run_steps(3); + let now = new_hsb(h.state()); + assert!(hue_gap(now[0][0], hsb[0][0]) < 1.0 && (now[0][1] - 0.5).abs() < 0.01 && (now[0][2] - 4.0 / 7.0).abs() < 0.01, "{now:?}"); + let other_moved = (now[1][2] - hsb[1][2]).abs() > 0.01; + assert_eq!(other_moved, linked, "linked {linked}: {hsb:?} -> {now:?}"); + assert!(h.query_by_label(cell).is_none(), "the menu closes"); + assert_eq!(field(h.state(), "__sel"), json!([0])); + } +} + +/// Color Picker on a marker's menu opens the Color Picker for that color. +#[test] +fn a_markers_menu_opens_the_color_picker() { + let mut h = edit_harness(&["rgb 200 100 100", "rgb 100 200 200"]); + let hsb = new_hsb(h.state()); + let at = wheel_at(&h, hsb[1][0], hsb[1][1]); + right_click_at(&mut h, at); + h.get_by_label(" Color Picker").click(); + h.run_steps(3); + assert_eq!(h.state().ui.dialog.as_ref().map(|d| d.kind.as_str()), Some("colorPicker")); +} + +/// A right-click on the wheel away from the markers offers Add New Color, which adds the hue and +/// saturation there as a new color. A color added on the line from the centre to a marker moves +/// with that marker when the colors are unlinked, and the others stay. +#[test] +fn add_new_color_on_a_markers_line_moves_with_that_marker() { + let mut h = edit_harness(&["rgb 200 100 100", "rgb 100 200 200"]); + set(h.state_mut(), "linked", json!(false)); + set(h.state_mut(), "__sel", json!([0])); + h.run_steps(4); + let hsb = new_hsb(h.state()); + let at = wheel_at(&h, 90.0, 0.6); + right_click_at(&mut h, at); + assert!(h.query_by_label(" Set As Base Color").is_none(), "no marker there"); + h.get_by_label(" Add New Color").click(); + h.run_steps(3); + let rows = field(h.state(), "rows"); + assert_eq!(rows.as_array().unwrap().len(), 3, "{rows}"); + assert_eq!((&rows[2]["from"], &rows[2]["added"]), (&json!([]), &json!(true))); + assert!(rows[2].get("follows").is_none(), "off every marker's line"); + let [hue, s, v] = new_hsb(h.state())[2]; + assert!((hue - 90.0).abs() < 1.0 && (s - 0.6).abs() < 0.01 && (v - hsb[0][2]).abs() < 0.01, "{:?}", [hue, s, v]); + assert_eq!(field(h.state(), "__sel"), json!([2])); + // Halfway along the second color's line. + let on_line = wheel_at(&h, hsb[1][0], hsb[1][1] / 2.0); + right_click_at(&mut h, on_line); + h.get_by_label(" Add New Color").click(); + h.run_steps(3); + let rows = field(h.state(), "rows"); + assert_eq!(rows.as_array().unwrap().len(), 4); + assert!(rows[1]["tie"].is_u64() && rows[3]["follows"] == rows[1]["tie"], "{rows}"); + // Drag the second color's marker a little way round: the color on its line turns with it. + let before = new_hsb(h.state()); + let start = wheel_at(&h, before[1][0], before[1][1]); + h.hover_at(start); + h.run_steps(1); + h.drag_at(start); + h.run_steps(1); + let mut p = start; + for k in 1..=6 { + p = wheel_at(&h, before[1][0] + 5.0 * k as f32, before[1][1]); + h.hover_at(p); + h.run_steps(1); + } + h.drop_at(p); + h.run_steps(2); + let after = new_hsb(h.state()); + let turned = hue_gap(after[1][0], before[1][0]); + assert!(turned > 20.0, "the marker turned: {before:?} -> {after:?}"); + assert!((hue_gap(after[3][0], before[3][0]) - turned).abs() < 1.0, "the color on its line turned as far: {before:?} -> {after:?}"); + assert!(hue_gap(after[0][0], before[0][0]) < 0.5 && hue_gap(after[2][0], before[2][0]) < 0.5, "the others stay: {before:?} -> {after:?}"); +} + +/// Set Current Color As Base Color makes the selected color the base; it is off while the selected +/// color is the base. A color bar's menu has Set As Base Color too. +#[test] +fn set_current_color_as_base_color_marks_the_selected_color() { + let mut h = edit_harness(&["#ff0000", "#0000ff", "#00ff00"]); + let name = "Set Current Color As Base Color"; + assert!(h.get_by_role_and_label(egui::accesskit::Role::Button, name).accesskit_node().is_disabled(), "the base color is the selected one"); + set(h.state_mut(), "__sel", json!([2])); + h.run_steps(3); + click_button(&mut h, name); + assert_eq!(field(h.state(), "rows")[2]["base"], json!(true)); + assert!(h.get_by_role_and_label(egui::accesskit::Role::Button, name).accesskit_node().is_disabled()); + show_display(&mut h, "Show color bars"); + right_click_bar(&mut h, "Color 1"); + h.get_by_label(" Set As Base Color").click(); + h.run_steps(3); + let rows = field(h.state(), "rows"); + assert_eq!((&rows[0]["base"], rows[2].get("base")), (&json!(true), None), "{rows}"); +} diff --git a/crates/ui-egui/src/widgets.rs b/crates/ui-egui/src/widgets.rs index d4d677a0a6..5319574db1 100644 --- a/crates/ui-egui/src/widgets.rs +++ b/crates/ui-egui/src/widgets.rs @@ -37,7 +37,7 @@ pub use chips::{ProxyClicks, chip_button, chip_button_named, fill_stroke_proxy, pub use color::{ FieldAxis, Live, RingResponse, SliderValue, WheelResponse, channel_slider, channel_slider_named, channel_slider_valued, color_field, color_mesh, color_slider, color_slider_named, color_slider_stepped, color_slider_valued, harmony_wheel, hex_field, hex_field_named, hsb32, hue_ring, - region_texture, ring_square, segment_color, segmented_wheel, stepped_area, + recolor_wheel, region_texture, ring_square, segment_color, stepped_area, }; pub(crate) use color::{HEX_FIELD_CHARS, hex_text, pointer_phase}; pub use drag::{ diff --git a/crates/ui-egui/src/widgets/color.rs b/crates/ui-egui/src/widgets/color.rs index 04aae5be55..e3f378c9cf 100644 --- a/crates/ui-egui/src/widgets/color.rs +++ b/crates/ui-egui/src/widgets/color.rs @@ -926,6 +926,12 @@ pub struct WheelResponse { /// A click on the wheel: the color whose marker is within reach of it (if any), and the hue /// (degrees) and saturation under the pointer (1 for a marker past the wheel's edge). pub clicked: Option<(Option, [f32; 2])>, + /// A right-click on the wheel, or on a marker past its edge: the color whose marker is within + /// reach of it (if any), the color on whose line from the centre it is (when it is on no + /// marker), and the hue (degrees) and saturation under the pointer. + pub secondary: Option<(Option, Option, [f32; 2])>, + /// The wheel's own response, for a right-click menu. + pub response: Option, } /// The harmony wheel of Recolor Artwork's Edit tab and the Color Themes panel: a hue and saturation @@ -933,21 +939,40 @@ pub struct WheelResponse { /// marker per colour joined to the centre (the selected colour, `base`, larger) and a Brightness /// slider for the selected colour below it. pub fn harmony_wheel(ui: &mut Ui, id: &str, size: f32, colors: &[Color], base: Option) -> WheelResponse { - wheel(ui, id, size, colors, base, false) + wheel(ui, id, size, colors, base, base, false) } -/// [`harmony_wheel`] drawn as solid patches (24 hues by 5 saturations, each in its -/// [`segment_color`]). The markers sit at their colors' own hue and +/// Recolor Artwork's wheel: [`harmony_wheel`] with the base color's marker (`base`) larger and the +/// selected color's (`selected`, when another) ringed, at the selected color's brightness, with the +/// Brightness slider for it. With `segmented` it is drawn as solid patches (24 hues by 5 +/// saturations, each in its [`segment_color`]); the markers sit at their colors' own hue and /// saturation, and a drag moves them as freely as on the smooth wheel. -pub fn segmented_wheel(ui: &mut Ui, id: &str, size: f32, colors: &[Color], base: Option) -> WheelResponse { - wheel(ui, id, size, colors, base, true) +pub fn recolor_wheel( + ui: &mut Ui, + id: &str, + size: f32, + colors: &[Color], + base: Option, + selected: Option, + segmented: bool, +) -> WheelResponse { + wheel(ui, id, size, colors, base, selected.or(base), segmented) } -/// [`harmony_wheel`], or with `segmented` [`segmented_wheel`]. -fn wheel(ui: &mut Ui, id: &str, size: f32, colors: &[Color], base: Option, segmented: bool) -> WheelResponse { +/// The distance from `p` to the segment from `a` to `b`. +fn segment_distance(p: egui::Pos2, a: egui::Pos2, b: egui::Pos2) -> f32 { + let ab = b - a; + let len2 = ab.length_sq(); + let t = if len2 > 0.0 { ((p - a).dot(ab) / len2).clamp(0.0, 1.0) } else { 0.0 }; + p.distance(a + ab * t) +} + +/// [`harmony_wheel`] or [`recolor_wheel`]: the big marker is `base`'s, and the wheel's brightness +/// and the Brightness slider are `selected`'s. +fn wheel(ui: &mut Ui, id: &str, size: f32, colors: &[Color], base: Option, selected: Option, segmented: bool) -> WheelResponse { let t = Tokens::get(ui.ctx()); let mut out = WheelResponse::default(); - let base_hsb = base.and_then(|b| colors.get(b)).map(Color::to_hsb); + let base_hsb = selected.and_then(|b| colors.get(b)).map(Color::to_hsb); let v = base_hsb.map_or(1.0, |c| c[2]); ui.horizontal(|ui| { ui.add_space(((ui.available_width() - size) / 2.0).max(0.0)); @@ -965,6 +990,24 @@ fn wheel(ui: &mut Ui, id: &str, size: f32, colors: &[Color], base: Option painter.line_segment([c, p], Stroke::new(1.0, Color32::from_white_alpha(160))); painter.circle(p, if big { 8.0 } else { 5.5 }, crate::panels::c32(col), Stroke::new(1.5, Color32::WHITE)); painter.circle_stroke(p, if big { 9.0 } else { 6.5 }, Stroke::new(1.0, Color32::BLACK)); + if Some(i) == selected && selected != base { + painter.circle_stroke(p, 8.5, Stroke::new(1.5, t.accent)); + } + } + // A right-click: the marker under it, or else the line from the centre to a marker. + if resp.secondary_clicked() + && let Some(p) = resp.interact_pointer_pos() + { + let near = colors.iter().map(at).enumerate().map(|(i, m)| (i, m.distance(p))).filter(|x| x.1 <= 14.0).min_by(|a, b| a.1.total_cmp(&b.1)); + let dv = p - c; + if dv.length() <= r || near.is_some() { + let line = near.is_none().then(|| { + let on = colors.iter().map(at).enumerate().map(|(i, m)| (i, segment_distance(p, c, m))).filter(|x| x.1 <= 4.0); + on.min_by(|a, b| a.1.total_cmp(&b.1)).map(|x| x.0) + }); + let h = (-dv.y).atan2(dv.x).to_degrees().rem_euclid(360.0); + out.secondary = Some((near.map(|x| x.0), line.flatten(), [h, (dv.length() / r).clamp(0.0, 1.0)])); + } } // Drag a marker: the nearest one within reach of the press. let drag = ui.scope_id().with((id, "drag")); @@ -991,6 +1034,7 @@ fn wheel(ui: &mut Ui, id: &str, size: f32, colors: &[Color], base: Option } let name = if segmented { tl!("Segmented color wheel") } else { tl!("Color wheel") }; resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Slider, ui.is_enabled(), name)); + out.response = Some(resp); }); ui.add_space(6.0); ui.horizontal(|ui| { @@ -998,7 +1042,7 @@ fn wheel(ui: &mut Ui, id: &str, size: f32, colors: &[Color], base: Option ui.add_sized([70.0, 22.0], egui::Label::new(egui::RichText::new(tl!("Brightness")).color(t.text_dim))); // Screen readers get the brightness in percent, as the Color panel's HSB B field shows it. let shown = SliderValue::field((f64::from(v) * 100.0).round(), 0.0..=100.0, "%", 0); - if let (Some(b), Some([h, s, _])) = (base, base_hsb) + if let (Some(b), Some([h, s, _])) = (selected, base_hsb) && let (Some(nv), _) = color_slider_valued(ui, (id, "brightness"), tl!("Brightness"), Some(shown), v, size, &|x| { crate::panels::c32(&Color::from_hsb(h, s, x)) }) diff --git a/docs/control-protocol.md b/docs/control-protocol.md index 618b6a126b..915c634134 100644 --- a/docs/control-protocol.md +++ b/docs/control-protocol.md @@ -291,13 +291,23 @@ colors; colors opened alone are saved as a group with the change. `display` sets colors: `smooth` (the smooth wheel, also when unset; each opening starts there), `segmented` (a wheel of solid patches, 24 hues by 5 saturations, whose markers move as freely) or `bars` (a solid bar per recolored color in row order; a click selects its row for the sliders and a drag moves the row without changing a color). `wheelTool` turns on a wheel tool -on either wheel: `add` (the Add Color tool) adds a click as a new color, the hue and saturation clicked at the base -color's brightness (the patch's color on the segmented wheel), in a new row with no current colors (`from: []`) and -`added: true` that becomes the selected row; `remove` (the Remove Color tool) removes the color of the marker clicked. A color bar's -right-click menu has Remove Color too. The base color can't be removed. A removed color's row is dropped, unless it +on either wheel: `add` (the Add Color tool) adds a click as a new color, the hue and saturation clicked at the selected +color's brightness (the base color's when none is selected; the patch's color on the segmented wheel), in a new row with no current colors (`from: []`) and +`added: true` that becomes the selected row; `remove` (the Remove Color tool) removes the color of the marker clicked. The base color can't be removed. A removed color's row is dropped, unless it has current colors and art or a group is open: it then keeps them with `to: null`, that art keeps its colors, and the group's swatch at that place is removed. A row with no current colors recolors no art; with a group, the new color of one with `added: true` is added to the group after the group's other colors, and a row made with New Row adds none. +The base color is the row with `base: true`, or the first color the Edit tab shows when no row has it; the harmony rules +build from it, and selecting another color for the sliders leaves it the base. A right-click on a wheel marker or a +color bar opens a menu with Set As Base Color (moves `base: true` to that row), Select Shade (a grid of the color's hue +at 7 saturations, 0% to 100%, by 7 brightnesses, 100% down to 14%; a click moves the color there as a drag of its +marker would, so linked colors follow), Color Picker and Remove Color; the base color's menu has neither Set As Base +Color nor Remove Color. A right-click elsewhere on either wheel offers Add New Color, which adds a color as the Add +Color tool does. A color added on the line from the centre to a marker moves with that marker while the colors are +unlinked: the marker's row gets `tie: n` and the added row `follows: n`, and dragging the marker, or Select Shade on +it, moves every row that follows its `tie` by the same change. Set Current Color As Base Color, before the color chips, +makes the selected color the base. The rows keep these marks when Randomize (`recolor.randomize`) or Prominent Colors +(`recolor.weigh`) changes them, and the rows the dialog sends `recolor.apply` leave `base`, `tie` and `follows` out. Setting `colors`, a preserve flag or `limitTo` reduces the rows again (also on `ui.dialog.confirm`). The dialog previews `recolor.apply` on the canvas; confirm keeps it as one undo step (with a group, the group is rewritten in the same step; with no art selected only the group changes). In the Swatches panel, double-clicking a colour group's folder, diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index dd13141816..de53f44b1b 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -1628,7 +1628,8 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - **Document Color Mode for effects and graphs:** File › Document Color Mode and `document.open {colorMode}` convert the colors of effects (Drop Shadow, Inner Glow, Outer Glow and the other effects with a color, on objects, their fills and strokes and in graphic styles) and the series paints and label styles that a graph keeps, so a graph drawn again from new data keeps the converted colors; File › Document Color Mode also converts the fill and stroke that new art takes. Undo restores the original new-art fill and stroke and Redo applies the conversion again. - **Recolor Artwork layout (#3416):** the Edit chip list uses the modal scroll helper and its actual remaining height; the tab's minimum-height space scrolls with the chips. `tests_recolor` covers 5/20/200/400 colors, window resizing, 100/125/150/200% UI scaling, scrolling to and editing the final chip, Preview, Cancel, Confirm and Undo, alongside the existing #1733 drag regressions. Scores and estimates unchanged. - **Recolor Artwork Edit displays:** buttons beside the Edit tab's wheel show the colors on a smooth color wheel, a segmented color wheel or as color bars ([Edit colors using Recolor Artwork](https://helpx.adobe.com/illustrator/desktop/manage-colors/modify-colors/edit-colors-using-edit-colors-dialog.html)). The segmented wheel draws 24 hues by 5 saturations as solid patches, and its markers move freely as on the smooth wheel. The bars show one solid bar per recolored color in row order: a click selects a bar for the color sliders, and a drag moves its row without changing a color ([Advanced recolor options overview](https://helpx.adobe.com/illustrator/desktop/manage-colors/learn-color-basics/edit-colors-dialog-overview.html)). The dialog opens on the smooth wheel; `display` (`smooth`, `segmented`, `bars`) is the dialog field. `tests_recolor` covers switching, the dialog height, segmented dragging and Brightness, and bar selection, editing, reordering, scrolling, Preview, Cancel and OK. Scores and estimates unchanged. - - **Recolor Artwork Add Color and Remove Color tools:** under the display buttons beside the Edit tab's wheel, the Add Color tool adds the color clicked on either wheel to the color group, and the Remove Color tool removes the color whose marker is clicked; a color bar's right-click menu has Remove Color, and the base color can't be removed ([Advanced recolor options overview](https://helpx.adobe.com/illustrator/desktop/manage-colors/learn-color-basics/edit-colors-dialog-overview.html), [Edit swatch groups using the color wheel](https://helpx.adobe.com/illustrator/desktop/manage-colors/modify-colors/edit-color-groups-using-the-color-wheel.html)). An added color is a new row with no current colors and `added: true`; unlike a row made with New Row, it adds its new color to a rewritten color group, after the group's other colors. VectorCraft's own rules: an added color takes the base color's brightness, and with art or a group a removed color's row stays with its current colors and no new color, so that art keeps its colors and the group's swatch at that place is removed. `wheelTool` (`add`, `remove`) is the dialog field. Tests: `the_add_color_tool_adds_a_row_with_no_current_colors`, `an_added_color_joins_the_color_group`, `the_remove_color_tool_removes_a_marker_but_not_the_base_colors` and `a_color_bars_menu_removes_its_color` in `crates/ui-egui/src/tests/recolor.rs`, `apply_params_give_the_group_added_colors_and_keep_its_other_colors` in `crates/ui-egui/src/dialogs/recolor.rs`, and `an_added_empty_row_gives_the_group_its_color_after_the_others` in `crates/engine/src/tests/recolor.rs`. Scores and estimates unchanged. + - **Recolor Artwork Add Color and Remove Color tools:** under the display buttons beside the Edit tab's wheel, the Add Color tool adds the color clicked on either wheel to the color group, and the Remove Color tool removes the color whose marker is clicked; a color bar's right-click menu has Remove Color, and the base color can't be removed ([Advanced recolor options overview](https://helpx.adobe.com/illustrator/desktop/manage-colors/learn-color-basics/edit-colors-dialog-overview.html), [Edit swatch groups using the color wheel](https://helpx.adobe.com/illustrator/desktop/manage-colors/modify-colors/edit-color-groups-using-the-color-wheel.html)). An added color is a new row with no current colors and `added: true`; unlike a row made with New Row, it adds its new color to a rewritten color group, after the group's other colors. VectorCraft's own rules: an added color takes the selected color's brightness (the base color's when none is selected), and with art or a group a removed color's row stays with its current colors and no new color, so that art keeps its colors and the group's swatch at that place is removed. `wheelTool` (`add`, `remove`) is the dialog field. Tests: `the_add_color_tool_adds_a_row_with_no_current_colors`, `an_added_color_joins_the_color_group`, `the_remove_color_tool_removes_a_marker_but_not_the_base_colors` and `a_color_bars_menu_removes_its_color` in `crates/ui-egui/src/tests/recolor.rs`, `apply_params_give_the_group_added_colors_and_keep_its_other_colors` in `crates/ui-egui/src/dialogs/recolor.rs`, and `an_added_empty_row_gives_the_group_its_color_after_the_others` in `crates/engine/src/tests/recolor.rs`. Scores and estimates unchanged. + - **Recolor Artwork base color and right-click menus:** a right-click on an Edit tab wheel marker or a color bar offers Set As Base Color, Select Shade, Color Picker and Remove Color, and a right-click elsewhere on the wheel offers Add New Color; a color added on a marker's line moves with that marker; Set Current Color As Base Color makes the selected color the base, and the harmony rules build from the base color whichever color is selected ([Edit swatch groups using the color wheel](https://helpx.adobe.com/illustrator/desktop/manage-colors/modify-colors/edit-color-groups-using-the-color-wheel.html), [Advanced recolor options overview](https://helpx.adobe.com/illustrator/desktop/manage-colors/learn-color-basics/edit-colors-dialog-overview.html), [Using Illustrator CS5, pages 137 to 140](https://help.adobe.com/archive/en_US/illustrator/cs5/illustrator_cs5_help.pdf)). The base color is the row with `base: true`, or the first color shown; a color added on a marker's line follows the marker's `tie` with `follows`. VectorCraft's own rules: Select Shade's grid is 7 saturations by 7 brightnesses of the color's hue and moves the color as a drag of its marker would, and a tied color follows its marker only while the colors are unlinked (linked, every color moves). Tests: `a_markers_menu_sets_the_base_color_that_the_rules_build_from`, `select_shade_gives_a_marker_the_shade_clicked`, `a_markers_menu_opens_the_color_picker`, `add_new_color_on_a_markers_line_moves_with_that_marker` and `set_current_color_as_base_color_marks_the_selected_color` in `crates/ui-egui/src/tests/recolor.rs`, and `set_base_moves_the_base_mark`, `the_base_mark_follows_merge_separate_and_randomize`, `a_color_added_on_a_markers_line_moves_with_it` and `the_shade_grid_spans_saturation_and_brightness` in `crates/ui-egui/src/dialogs/recolor.rs`. Scores and estimates unchanged. - **Recolor Artwork New Row:** the Assign tab's New Row button adds a row with no current colors, so current colors can be moved into it and take its new color ([Advanced recolor options overview](https://helpx.adobe.com/illustrator/desktop/manage-colors/learn-color-basics/edit-colors-dialog-overview.html), [Assign new colors to selected artworks](https://helpx.adobe.com/illustrator/desktop/manage-colors/modify-colors/assign-new-colors-to-selected-artwork.html)). VectorCraft's own rules: the row goes above the first selected row (at the top when none is selected) with that row's new color and becomes the selection, and Merge with it as the first selected row moves the other rows' colors into it. The button needs selected art. An empty row recolors nothing, does not count toward Colors, adds no library swatch and gives a rewritten color group no color. Tests: `a_new_row_goes_above_the_selection_and_takes_merged_colors`, `an_empty_row_gives_the_group_no_color` and `colors_merged_into_a_new_row_take_its_new_color` in `crates/ui-egui/src/dialogs/recolor.rs`, `an_empty_row_recolors_nothing` and `an_empty_row_adds_no_swatch_and_no_group_color` in `crates/engine/src/tests/recolor.rs`. - **Edit Colors parameters:** `edit.colors.saturate` needs a number `intensity`, the value from -100% to 100% that Saturate takes ([Adjusting colors](https://web.archive.org/web/20230128232631/https://helpx.adobe.com/illustrator/using/adjusting-colors.html)), and answers "missing number `intensity`" without one; a number outside the range counts as its nearest end. A value that is not a number, such as `"40"`, is refused with `` `intensity` must be a number, not "40" ``, as in every command that needs a number (`tests::params::a_malformed_required_number_is_not_reported_as_missing`). `edit.colors.adjustBalance` refuses a channel and `color.harmony` refuses `steps` or `amount` that is not a number; both read `null` as a value left out. `tests::editcolors` and `tests::colorguide` cover them. - **Convert to Indexed Color:** Edit › Edit Colors › Convert to Indexed Color… (`edit.colors.toIndexed`) stores the embedded images in the selection as indexed-color PNGs of at most 256 colors. The palette is chosen as for a PNG-8 export, as evenly spaced levels of red, green and blue, or from the document's swatches, with diffusion, pattern or noise dithering; pixels under half opacity become transparent. The dialog previews live, and OK is one undo step. This is VectorCraft's own command and counts toward no score. `tests::editcolors` and `encode::tests_palette` cover it. Scores and estimates unchanged. From 78e56b6d7a2f44fe7861484a1788312f7deaf6b0 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sun, 15 Nov 2026 09:16:17 -0800 Subject: [PATCH 02/78] Recolor Artwork: an added color whose row is excluded joins no color group --- crates/ui-egui/src/dialogs/recolor.rs | 6 +++++- docs/control-protocol.md | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/crates/ui-egui/src/dialogs/recolor.rs b/crates/ui-egui/src/dialogs/recolor.rs index 199b828edc..eaab85179c 100644 --- a/crates/ui-egui/src/dialogs/recolor.rs +++ b/crates/ui-egui/src/dialogs/recolor.rs @@ -605,7 +605,7 @@ fn apply_params(d: &Dialog) -> Value { let took: Vec<&Value> = rs.iter().filter(|r| !no_current(r)).map(|r| &r["to"]).collect(); let assign = d.fields.get("__assign").and_then(Value::as_array).filter(|_| d.bool("__art")); let rest = assign.map_or(&[][..], |a| a.get(took.len()..).unwrap_or_default()); - let added = rs.iter().filter(|r| no_current(r) && is_added(r)).map(|r| &r["to"]).filter(|c| !c.is_null()); + let added = rs.iter().filter(|r| no_current(r) && is_added(r) && !excluded(r)).map(|r| &r["to"]).filter(|c| !c.is_null()); let colors: Vec<&Value> = took.into_iter().chain(rest).chain(added).collect(); let name = d.str("groupName"); let rename = (!name.trim().is_empty() && name != g).then_some(name); @@ -2029,6 +2029,10 @@ mod tests { add_color(&mut rs, &Color::rgb(9.0 / 255.0, 9.0 / 255.0, 9.0 / 255.0)); d.fields.insert("rows".into(), json!(rs)); assert_eq!(apply_params(&d)["groupColors"], json!(["rgb 1 1 1", null, "rgb 3 3 3", "rgb 9 9 9"])); + // An added color whose row is excluded joins no group. + rs[3]["exclude"] = json!(true); + d.fields.insert("rows".into(), json!(rs)); + assert_eq!(apply_params(&d)["groupColors"], json!(["rgb 1 1 1", null, "rgb 3 3 3"])); } #[test] diff --git a/docs/control-protocol.md b/docs/control-protocol.md index 915c634134..7f67758c9f 100644 --- a/docs/control-protocol.md +++ b/docs/control-protocol.md @@ -296,7 +296,7 @@ color's brightness (the base color's when none is selected; the patch's color on `added: true` that becomes the selected row; `remove` (the Remove Color tool) removes the color of the marker clicked. The base color can't be removed. A removed color's row is dropped, unless it has current colors and art or a group is open: it then keeps them with `to: null`, that art keeps its colors, and the group's swatch at that place is removed. A row with no current colors recolors no art; with a group, the new color of -one with `added: true` is added to the group after the group's other colors, and a row made with New Row adds none. +one with `added: true` that is not excluded is added to the group after the group's other colors, and a row made with New Row adds none. The base color is the row with `base: true`, or the first color the Edit tab shows when no row has it; the harmony rules build from it, and selecting another color for the sliders leaves it the base. A right-click on a wheel marker or a color bar opens a menu with Set As Base Color (moves `base: true` to that row), Select Shade (a grid of the color's hue From 20413c6c3dd376a6568c411066fdfbc28afb323c Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sun, 15 Nov 2026 11:32:12 -0800 Subject: [PATCH 03/78] Recolor Artwork: new text uses American spelling and a neutral link label --- crates/ui-egui/src/dialogs/recolor.rs | 2 +- crates/ui-egui/src/tests/recolor.rs | 2 +- crates/ui-egui/src/widgets/color.rs | 4 ++-- docs/control-protocol.md | 2 +- docs/target-app-parity.md | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/crates/ui-egui/src/dialogs/recolor.rs b/crates/ui-egui/src/dialogs/recolor.rs index 49f44cf26c..ffb251c3e9 100644 --- a/crates/ui-egui/src/dialogs/recolor.rs +++ b/crates/ui-egui/src/dialogs/recolor.rs @@ -35,7 +35,7 @@ //! grid of the color's hue at 7 saturations by 7 brightnesses; a click moves the marker there as a //! drag would), Color Picker and Remove Color; a right-click elsewhere on the wheel offers Add New //! Color, which adds the hue and saturation there as the Add Color tool does, and a color added on -//! the line from the centre to a marker moves with that marker when the colors are unlinked. Set +//! the line from the center to a marker moves with that marker when the colors are unlinked. Set //! Current Color As Base Color, before the color chips, makes the selected color the base. With art, the Prominent Colors bar under the wheel shows the new //! colors, each part as wide as its row's share of the art's uses, the largest first; dragging the //! edge between two parts moves width between them, and when the drag ends the rows' current diff --git a/crates/ui-egui/src/tests/recolor.rs b/crates/ui-egui/src/tests/recolor.rs index 161a72ffd2..5944cb8b18 100644 --- a/crates/ui-egui/src/tests/recolor.rs +++ b/crates/ui-egui/src/tests/recolor.rs @@ -1432,7 +1432,7 @@ fn a_markers_menu_opens_the_color_picker() { } /// A right-click on the wheel away from the markers offers Add New Color, which adds the hue and -/// saturation there as a new color. A color added on the line from the centre to a marker moves +/// saturation there as a new color. A color added on the line from the center to a marker moves /// with that marker when the colors are unlinked, and the others stay. #[test] fn add_new_color_on_a_markers_line_moves_with_that_marker() { diff --git a/crates/ui-egui/src/widgets/color.rs b/crates/ui-egui/src/widgets/color.rs index e3f378c9cf..634a52de21 100644 --- a/crates/ui-egui/src/widgets/color.rs +++ b/crates/ui-egui/src/widgets/color.rs @@ -927,7 +927,7 @@ pub struct WheelResponse { /// (degrees) and saturation under the pointer (1 for a marker past the wheel's edge). pub clicked: Option<(Option, [f32; 2])>, /// A right-click on the wheel, or on a marker past its edge: the color whose marker is within - /// reach of it (if any), the color on whose line from the centre it is (when it is on no + /// reach of it (if any), the color on whose line from the center it is (when it is on no /// marker), and the hue (degrees) and saturation under the pointer. pub secondary: Option<(Option, Option, [f32; 2])>, /// The wheel's own response, for a right-click menu. @@ -994,7 +994,7 @@ fn wheel(ui: &mut Ui, id: &str, size: f32, colors: &[Color], base: Option painter.circle_stroke(p, 8.5, Stroke::new(1.5, t.accent)); } } - // A right-click: the marker under it, or else the line from the centre to a marker. + // A right-click: the marker under it, or else the line from the center to a marker. if resp.secondary_clicked() && let Some(p) = resp.interact_pointer_pos() { diff --git a/docs/control-protocol.md b/docs/control-protocol.md index a66c5347b0..51045638b2 100644 --- a/docs/control-protocol.md +++ b/docs/control-protocol.md @@ -303,7 +303,7 @@ color bar opens a menu with Set As Base Color (moves `base: true` to that row), at 7 saturations, 0% to 100%, by 7 brightnesses, 100% down to 14%; a click moves the color there as a drag of its marker would, so linked colors follow), Color Picker and Remove Color; the base color's menu has neither Set As Base Color nor Remove Color. A right-click elsewhere on either wheel offers Add New Color, which adds a color as the Add -Color tool does. A color added on the line from the centre to a marker moves with that marker while the colors are +Color tool does. A color added on the line from the center to a marker moves with that marker while the colors are unlinked: the marker's row gets `tie: n` and the added row `follows: n`, and dragging the marker, or Select Shade on it, moves every row that follows its `tie` by the same change. Set Current Color As Base Color, before the color chips, makes the selected color the base. The rows keep these marks when Randomize (`recolor.randomize`) or Prominent Colors diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index 6b837ab516..ca121ddcfb 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -1635,7 +1635,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - **Recolor Artwork layout (#3416):** the Edit chip list uses the modal scroll helper and its actual remaining height; the tab's minimum-height space scrolls with the chips. `tests_recolor` covers 5/20/200/400 colors, window resizing, 100/125/150/200% UI scaling, scrolling to and editing the final chip, Preview, Cancel, Confirm and Undo, alongside the existing #1733 drag regressions. Scores and estimates unchanged. - **Recolor Artwork Edit displays:** buttons beside the Edit tab's wheel show the colors on a smooth color wheel, a segmented color wheel or as color bars ([Edit colors using Recolor Artwork](https://helpx.adobe.com/illustrator/desktop/manage-colors/modify-colors/edit-colors-using-edit-colors-dialog.html)). The segmented wheel draws 24 hues by 5 saturations as solid patches, and its markers move freely as on the smooth wheel. The bars show one solid bar per recolored color in row order: a click selects a bar for the color sliders, and a drag moves its row without changing a color ([Advanced recolor options overview](https://helpx.adobe.com/illustrator/desktop/manage-colors/learn-color-basics/edit-colors-dialog-overview.html)). The dialog opens on the smooth wheel; `display` (`smooth`, `segmented`, `bars`) is the dialog field. `tests_recolor` covers switching, the dialog height, segmented dragging and Brightness, and bar selection, editing, reordering, scrolling, Preview, Cancel and OK. Scores and estimates unchanged. - **Recolor Artwork Add Color and Remove Color tools:** under the display buttons beside the Edit tab's wheel, the Add Color tool adds the color clicked on either wheel to the color group, and the Remove Color tool removes the color whose marker is clicked; a color bar's right-click menu has Remove Color, and the base color can't be removed ([Advanced recolor options overview](https://helpx.adobe.com/illustrator/desktop/manage-colors/learn-color-basics/edit-colors-dialog-overview.html), [Edit swatch groups using the color wheel](https://helpx.adobe.com/illustrator/desktop/manage-colors/modify-colors/edit-color-groups-using-the-color-wheel.html)). An added color is a new row with no current colors and `added: true`; unlike a row made with New Row, it adds its new color to a rewritten color group, after the group's other colors. VectorCraft's own rules: an added color takes the selected color's brightness (the base color's when none is selected), and with art or a group a removed color's row stays with its current colors and no new color, so that art keeps its colors and the group's swatch at that place is removed. `wheelTool` (`add`, `remove`) is the dialog field. Tests: `the_add_color_tool_adds_a_row_with_no_current_colors`, `an_added_color_joins_the_color_group`, `the_remove_color_tool_removes_a_marker_but_not_the_base_colors` and `a_color_bars_menu_removes_its_color` in `crates/ui-egui/src/tests/recolor.rs`, `apply_params_give_the_group_added_colors_and_keep_its_other_colors` in `crates/ui-egui/src/dialogs/recolor.rs`, and `an_added_empty_row_gives_the_group_its_color_after_the_others` in `crates/engine/src/tests/recolor.rs`. Scores and estimates unchanged. - - **Recolor Artwork base color and right-click menus:** a right-click on an Edit tab wheel marker or a color bar offers Set As Base Color, Select Shade, Color Picker and Remove Color, and a right-click elsewhere on the wheel offers Add New Color; a color added on a marker's line moves with that marker; Set Current Color As Base Color makes the selected color the base, and the harmony rules build from the base color whichever color is selected ([Edit swatch groups using the color wheel](https://helpx.adobe.com/illustrator/desktop/manage-colors/modify-colors/edit-color-groups-using-the-color-wheel.html), [Advanced recolor options overview](https://helpx.adobe.com/illustrator/desktop/manage-colors/learn-color-basics/edit-colors-dialog-overview.html), [Using Illustrator CS5, pages 137 to 140](https://help.adobe.com/archive/en_US/illustrator/cs5/illustrator_cs5_help.pdf)). The base color is the row with `base: true`, or the first color shown; a color added on a marker's line follows the marker's `tie` with `follows`. VectorCraft's own rules: Select Shade's grid is 7 saturations by 7 brightnesses of the color's hue and moves the color as a drag of its marker would, and a tied color follows its marker only while the colors are unlinked (linked, every color moves). Tests: `a_markers_menu_sets_the_base_color_that_the_rules_build_from`, `select_shade_gives_a_marker_the_shade_clicked`, `a_markers_menu_opens_the_color_picker`, `add_new_color_on_a_markers_line_moves_with_that_marker` and `set_current_color_as_base_color_marks_the_selected_color` in `crates/ui-egui/src/tests/recolor.rs`, and `set_base_moves_the_base_mark`, `the_base_mark_follows_merge_separate_and_randomize`, `a_color_added_on_a_markers_line_moves_with_it` and `the_shade_grid_spans_saturation_and_brightness` in `crates/ui-egui/src/dialogs/recolor.rs`. Scores and estimates unchanged. + - **Recolor Artwork base color and right-click menus:** a right-click on an Edit tab wheel marker or a color bar offers Set As Base Color, Select Shade, Color Picker and Remove Color, and a right-click elsewhere on the wheel offers Add New Color; a color added on a marker's line moves with that marker; Set Current Color As Base Color makes the selected color the base, and the harmony rules build from the base color whichever color is selected ([Edit swatch groups using the color wheel](https://helpx.adobe.com/illustrator/desktop/manage-colors/modify-colors/edit-color-groups-using-the-color-wheel.html), [Advanced recolor options overview](https://helpx.adobe.com/illustrator/desktop/manage-colors/learn-color-basics/edit-colors-dialog-overview.html), [archived user guide, pages 137 to 140](https://help.adobe.com/archive/en_US/illustrator/cs5/illustrator_cs5_help.pdf)). The base color is the row with `base: true`, or the first color shown; a color added on a marker's line follows the marker's `tie` with `follows`. VectorCraft's own rules: Select Shade's grid is 7 saturations by 7 brightnesses of the color's hue and moves the color as a drag of its marker would, and a tied color follows its marker only while the colors are unlinked (linked, every color moves). Tests: `a_markers_menu_sets_the_base_color_that_the_rules_build_from`, `select_shade_gives_a_marker_the_shade_clicked`, `a_markers_menu_opens_the_color_picker`, `add_new_color_on_a_markers_line_moves_with_that_marker` and `set_current_color_as_base_color_marks_the_selected_color` in `crates/ui-egui/src/tests/recolor.rs`, and `set_base_moves_the_base_mark`, `the_base_mark_follows_merge_separate_and_randomize`, `a_color_added_on_a_markers_line_moves_with_it` and `the_shade_grid_spans_saturation_and_brightness` in `crates/ui-egui/src/dialogs/recolor.rs`. Scores and estimates unchanged. - **Recolor Artwork Find:** the Assign tab's Find button finds the colors of the selected rows in the art ([Advanced recolor options overview](https://helpx.adobe.com/illustrator/desktop/manage-colors/learn-color-basics/edit-colors-dialog-overview.html)): while it is on, their art shows as the preview shows it and the rest of the selected art shows dimmed, until a second click ([archived help, Recolor Artwork](https://help.adobe.com/archive/en_US/illustrator/cs5/illustrator_cs5_help.pdf#page=149)). VectorCraft's own rules: a dimmed color is a 25% tint of its current color (or the nearest lighter tint when that one is a color a selected row lists), a color a selected row also lists is not dimmed, and Find records no undo step. `findColors` is the dialog field. Tests: `find_dims_the_colors_of_the_rows_not_selected` and `find_shows_the_selected_rows_art_and_dims_the_rest` in `crates/ui-egui/src/dialogs/recolor.rs`. Scores and estimates unchanged. - **Recolor Artwork New Row:** the Assign tab's New Row button adds a row with no current colors, so current colors can be moved into it and take its new color ([Advanced recolor options overview](https://helpx.adobe.com/illustrator/desktop/manage-colors/learn-color-basics/edit-colors-dialog-overview.html), [Assign new colors to selected artworks](https://helpx.adobe.com/illustrator/desktop/manage-colors/modify-colors/assign-new-colors-to-selected-artwork.html)). VectorCraft's own rules: the row goes above the first selected row (at the top when none is selected) with that row's new color and becomes the selection, and Merge with it as the first selected row moves the other rows' colors into it. The button needs selected art. An empty row recolors nothing, does not count toward Colors, adds no library swatch and gives a rewritten color group no color. Tests: `a_new_row_goes_above_the_selection_and_takes_merged_colors`, `an_empty_row_gives_the_group_no_color` and `colors_merged_into_a_new_row_take_its_new_color` in `crates/ui-egui/src/dialogs/recolor.rs`, `an_empty_row_recolors_nothing` and `an_empty_row_adds_no_swatch_and_no_group_color` in `crates/engine/src/tests/recolor.rs`. - **Edit Colors parameters:** `edit.colors.saturate` needs a number `intensity`, the value from -100% to 100% that Saturate takes ([Adjusting colors](https://web.archive.org/web/20230128232631/https://helpx.adobe.com/illustrator/using/adjusting-colors.html)), and answers "missing number `intensity`" without one; a number outside the range counts as its nearest end. A value that is not a number, such as `"40"`, is refused with `` `intensity` must be a number, not "40" ``, as in every command that needs a number (`tests::params::a_malformed_required_number_is_not_reported_as_missing`). `edit.colors.adjustBalance` refuses a channel and `color.harmony` refuses `steps` or `amount` that is not a number; both read `null` as a value left out. `tests::editcolors` and `tests::colorguide` cover them. From 0fb2c95c5168826e93f16898150bf2bca1402db9 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sun, 15 Nov 2026 12:29:23 -0800 Subject: [PATCH 04/78] Recolor Artwork: a removed color joins no saved color group Save All Colors and OK on colors opened alone skipped only excluded rows, so a row whose new color was removed on the Edit tab gave the new group its first current color. Both now also skip rows with no new color, as the wheel does, and Save All Colors is turned off when no such row is left. --- crates/ui-egui/src/dialogs/recolor.rs | 36 ++++++++++++++++++++++++--- docs/mcp.md | 2 +- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/crates/ui-egui/src/dialogs/recolor.rs b/crates/ui-egui/src/dialogs/recolor.rs index ffb251c3e9..08656f9913 100644 --- a/crates/ui-egui/src/dialogs/recolor.rs +++ b/crates/ui-egui/src/dialogs/recolor.rs @@ -412,13 +412,13 @@ fn group_colors<'a>(app: &VectorcraftApp, d: &Dialog, rs: impl Iterator = match which { "prominent" => prominent_parts(d, &rs).into_iter().map(|p| p.0).collect(), - _ => (0..rs.len()).filter(|&i| !excluded(&rs[i])).collect(), + _ => (0..rs.len()).filter(|&i| !excluded(&rs[i]) && to_color(&rs[i]).is_some()).collect(), }; let colors = group_colors(app, d, order.iter().filter_map(|&i| rs.get(i))); if colors.is_empty() { @@ -823,7 +823,7 @@ fn confirm(app: &mut VectorcraftApp, d: &Dialog) -> Result { sync_theme(app, &mut d); sync_weights(app, &mut d); if d.bool("__newGroup") { - let colors = group_colors(app, &d, rows(&d).iter().filter(|r| !excluded(r))); + let colors = group_colors(app, &d, rows(&d).iter().filter(|r| !excluded(r) && to_color(r).is_some())); return form::commit_preview(app, "swatch.newGroup", json!({"name": d.str("groupName"), "colors": colors, "keepModel": true})); } let r = form::commit_preview(app, CMD, apply_params(&d))?; @@ -1756,7 +1756,7 @@ fn edit_tab(app: &VectorcraftApp, ui: &mut Ui, d: &mut Dialog, rows: &mut Vec Vec { + let doc = &app.session.doc().unwrap().doc; + doc.swatch_groups.last().unwrap().swatches.iter().map(|w| w.paint.color().unwrap().to_hex()).collect() + }; + let d = app.ui.dialog.as_mut().unwrap(); + d.fields.insert("rows".into(), json!([{"from": [BLUE], "to": null}, {"from": [RED, PURPLE], "to": "rgb 0 255 0"}])); + d.fields.insert(SAVE_GROUP.into(), json!("all")); + frame(&mut app, &ctx, 0.1, vec![], 0); + frame(&mut app, &ctx, 0.11, vec![], 0); + assert_eq!(last(&app), ["#00ff00"], "Save All Colors"); + + let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), Default::default()); + app.run("file.new", json!({"width": 100, "height": 100})).unwrap(); + app.run("ui.recolorDialog", json!({"colors": ["#ff0000", "#0000ff"]})).unwrap(); + let d = app.ui.dialog.as_mut().unwrap(); + d.fields.insert("rows".into(), json!([{"from": ["rgb 255 0 0"], "to": "rgb 255 0 0"}, {"from": ["rgb 0 0 255"], "to": null}])); + let d = d.clone(); + confirm(&mut app, &d).unwrap(); + assert_eq!(last(&app), ["#ff0000"], "OK on colors opened alone"); + } + /// One frame with `modifiers` held. fn frame_with(app: &mut VectorcraftApp, ctx: &egui::Context, time: f64, events: Vec, modifiers: egui::Modifiers) { let events = std::iter::once(egui::Event::ModifiersChanged(modifiers)).chain(events).collect(); diff --git a/docs/mcp.md b/docs/mcp.md index 2098f154e5..aae49de740 100644 --- a/docs/mcp.md +++ b/docs/mcp.md @@ -4582,7 +4582,7 @@ bar sits under the Edit tab's wheel: each row with a share is a part as wide as the largest first. Dragging the edge between two parts moves width between them, and when the drag ends the widths become the `weights` field, which moves the rows' current colors and previews the result. The New Color Group menu beside the link button runs `swatch.newGroup` right away, as its own undo step: Save All Colors saves the new colors -of the rows that are not excluded, in row order, and Save Prominent Colors saves the bar's colors in the bar's order. +of the rows that are not excluded and still have one, in row order, and Save Prominent Colors saves the bar's colors in the bar's order. ```json {"name":"run_command","arguments":{"command":"recolor.weigh","params":{"map":[{"from":["rgb 255 0 0","rgb 128 0 204"],"to":"#00ff00"},{"from":["rgb 0 0 255"],"to":"#ffff00"}],"weights":[1,1]}}} From a075bfbffd1f8841669ff0882991eb6c6ed14b77 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sun, 15 Nov 2026 13:58:25 -0800 Subject: [PATCH 05/78] Recolor Artwork: an excluded row keeps its color group swatch OK on a color group sent an excluded row's new color in groupColors, so the group's swatch at that place changed (or was removed after Remove Color) while the row's art kept its colors. The dialog now sends "keep" for an excluded row with current colors. recolor.apply takes "keep" in groupColors: the swatch at that place stays as it is, without Global Adjust, Limit to Library or the document's model, and past the group's last swatch it adds none. --- crates/engine/src/cmd/recolor.rs | 20 +++++++++++--- crates/engine/src/tests/recolor.rs | 15 +++++++++++ crates/ui-egui/src/dialogs/recolor.rs | 39 ++++++++++++++++++++++++--- docs/control-protocol.md | 2 +- docs/mcp.md | 5 +++- 5 files changed, 73 insertions(+), 8 deletions(-) diff --git a/crates/engine/src/cmd/recolor.rs b/crates/engine/src/cmd/recolor.rs index b1291125c8..e4ae2bf5e8 100644 --- a/crates/engine/src/cmd/recolor.rs +++ b/crates/engine/src/cmd/recolor.rs @@ -34,7 +34,7 @@ pub fn specs() -> Vec { "Recolor Artwork", ["Edit", "Edit Colors"], None, - "{map: rows [{from: [colour keys (recolor.colors) or \"#rrggbb\" (every colour shown as that hex); may be empty: an empty row recolours nothing, adds no library swatch and gives `group` no colour unless `added`], to: colour (hex, key, {c,m,y,k} or {l,a,b}) | null (in from, to and groupColors, #rrggbbaa and #rgba are refused), exclude?: false (the row's colours are kept), tint?: 100 (percent; with limitTo, art linked to the global or spot swatch the new color is takes this share of its tint), added?: false (an empty row's new color is a color added to `group`)}] | {\"key or #rrggbb\": colour, …} (one row per colour), method?: \"exact\" (default)|\"preserveTints\"|\"scaleTints\"|\"tintsShades\"|\"hueShift\" (how a row's colours take its new colour, relative to the row's darkest, average or most saturated colour), limitTo?: swatch library id or name; or \"document\" (the document's swatches): new colours snap to its nearest colour, group?: colour group to rewrite, groupColors?: [colour | null] (what `group` is rewritten with, a null removing the group's swatch at its place; default: the new colors of the rows with current colors, in order, then those of the empty rows with `added`, excluded rows left out), rename?: the group's new name, includeImages?: true, includePatterns?: true, globalAdjust?: {saturation?: 0, brightness?: 0, temperature?: 0, luminosity?: 0} (Global Adjust: percent from -100 to 100, 0 changes nothing; every colour a row that isn't excluded recolours, and the group's new colours, take the same change after the row's new colour: saturation scales HSB saturation by 1 + saturation/100, brightness moves HSB brightness that share of the way to full or to black, temperature adds 0.2 × temperature/100 to red and takes it from blue, luminosity moves Lab lightness that share of the way to 100 or 0 keeping a and b; with limitTo each row's new colour takes the change before it snaps to the library)} recolour the selection (gradients, text, meshes, image pixels and pattern tiles included; each new colour keeps the model of the one it replaces (model?: \"keep\" default | \"new\" (the new colour's own model, so a CMYK colour replacing RGB art gives CMYK art) | \"document\" (the document's colour mode)), except a library swatch's with limitTo: art takes the swatch itself, linked to a global or spot colour at its tints, and the swatch joins the document's swatches; art linked to a global swatch of `group` that is rewritten with its row's new color stays linked to it, at its tint, unless the row converts the color into the art's model; other recolored art, and art in a row linked to a global swatch of `group` that is rewritten with another color, keeps its row's new color and loses its swatch link) and the group, as one undo step (none when nothing changes). On a path directly in a graph series, the graph also stores the new paint of the topmost visible fill and stroke, and on a graph label the new paint of its characters and rows for every label of its kind (docs/mcp.md) → {changed, swatches: [names added to the document's swatches], relinked?: with group, the other paints linked to its global swatches that took their new colors, note?: set when a colour kept a model other than its new colour's (see model), notChanged: {locked, hidden} (as edit.colors.invert), warning?: set when notChanged counts any object}", + "{map: rows [{from: [colour keys (recolor.colors) or \"#rrggbb\" (every colour shown as that hex); may be empty: an empty row recolours nothing, adds no library swatch and gives `group` no colour unless `added`], to: colour (hex, key, {c,m,y,k} or {l,a,b}) | null (in from, to and groupColors, #rrggbbaa and #rgba are refused), exclude?: false (the row's colours are kept), tint?: 100 (percent; with limitTo, art linked to the global or spot swatch the new color is takes this share of its tint), added?: false (an empty row's new color is a color added to `group`)}] | {\"key or #rrggbb\": colour, …} (one row per colour), method?: \"exact\" (default)|\"preserveTints\"|\"scaleTints\"|\"tintsShades\"|\"hueShift\" (how a row's colours take its new colour, relative to the row's darkest, average or most saturated colour), limitTo?: swatch library id or name; or \"document\" (the document's swatches): new colours snap to its nearest colour, group?: colour group to rewrite, groupColors?: [colour | null | \"keep\"] (what `group` is rewritten with, a null removing the group's swatch at its place and \"keep\" leaving it as it is, without globalAdjust, limitTo or model, and adding none past the group's swatches; default: the new colors of the rows with current colors, in order, then those of the empty rows with `added`, excluded rows left out), rename?: the group's new name, includeImages?: true, includePatterns?: true, globalAdjust?: {saturation?: 0, brightness?: 0, temperature?: 0, luminosity?: 0} (Global Adjust: percent from -100 to 100, 0 changes nothing; every colour a row that isn't excluded recolours, and the group's new colours, take the same change after the row's new colour: saturation scales HSB saturation by 1 + saturation/100, brightness moves HSB brightness that share of the way to full or to black, temperature adds 0.2 × temperature/100 to red and takes it from blue, luminosity moves Lab lightness that share of the way to 100 or 0 keeping a and b; with limitTo each row's new colour takes the change before it snaps to the library)} recolour the selection (gradients, text, meshes, image pixels and pattern tiles included; each new colour keeps the model of the one it replaces (model?: \"keep\" default | \"new\" (the new colour's own model, so a CMYK colour replacing RGB art gives CMYK art) | \"document\" (the document's colour mode)), except a library swatch's with limitTo: art takes the swatch itself, linked to a global or spot colour at its tints, and the swatch joins the document's swatches; art linked to a global swatch of `group` that is rewritten with its row's new color stays linked to it, at its tint, unless the row converts the color into the art's model; other recolored art, and art in a row linked to a global swatch of `group` that is rewritten with another color, keeps its row's new color and loses its swatch link) and the group, as one undo step (none when nothing changes). On a path directly in a graph series, the graph also stores the new paint of the topmost visible fill and stroke, and on a graph label the new paint of its characters and rows for every label of its kind (docs/mcp.md) → {changed, swatches: [names added to the document's swatches], relinked?: with group, the other paints linked to its global swatches that took their new colors, note?: set when a colour kept a model other than its new colour's (see model), notChanged: {locked, hidden} (as edit.colors.invert), warning?: set when notChanged counts any object}", has_doc, apply ), @@ -1655,12 +1655,26 @@ fn apply(s: &mut Session, p: &Value) -> Result { Some(Value::Array(cs)) => Some(cs), Some(_) => return Err(bad(C, "`groupColors` must be an array")), }; - // A null in groupColors removes the group's swatch at its place. + // The colors of the group's swatches, which "keep" leaves as they are. + let swatches: Vec> = match group { + Some(g) => { + s.doc()?.doc.swatch_groups.iter().find(|x| x.name == g).map(|x| x.swatches.iter().map(|w| w.paint.color()).collect()).unwrap_or_default() + } + None => vec![], + }; + // A null in groupColors removes the group's swatch at its place; "keep" leaves it as it is, + // without Global Adjust, Limit to Library or the document's model, and past the swatches adds none. let new: Vec> = match group_colors { Some(cs) => cs .iter() - .map(|v| match v { + .enumerate() + .map(|(i, v)| match v { Value::Null => Ok(None), + Value::String(k) if k == "keep" => match swatches.get(i) { + Some(Some(c)) => Ok(Some(*c)), + Some(None) => Err(bad(C, format!("the swatch at place {} of `group` has no colour to keep", i + 1))), + None => Ok(None), + }, v => color_value(v) .map(|c| adjust.apply(c)) .map(|c| Some(in_doc_model(palette.as_ref().map_or(c, |pl| pl.nearest(c))))) diff --git a/crates/engine/src/tests/recolor.rs b/crates/engine/src/tests/recolor.rs index a85bd921b5..6fe3b99b43 100644 --- a/crates/engine/src/tests/recolor.rs +++ b/crates/engine/src/tests/recolor.rs @@ -804,6 +804,21 @@ fn a_null_in_group_colors_removes_that_swatch_and_the_ones_after_it_keep_their_p assert_eq!(link(&s, green), ("#00ff00".into(), Some(names[2].clone())), "art linked to a swatch that stays keeps its link"); } +/// "keep" in `groupColors` leaves the group's swatch at its place as it is, without Global Adjust, +/// and past the group's swatches it adds none. +#[test] +fn keep_in_group_colors_leaves_that_swatch_as_it_is() { + let mut s = session(); + run(&mut s, "swatch.newGroup", json!({"name": "Brand", "colors": ["#2878f0", "#ff0000"]})); + let p = json!({"map": [], "group": "Brand", "groupColors": ["keep", "#00ff00", "keep"], "globalAdjust": {"brightness": -50}}); + run(&mut s, "recolor.apply", p); + let g = &s.doc().unwrap().doc.swatch_groups.iter().find(|g| g.name == "Brand").unwrap().swatches; + let g: Vec = g.iter().map(|w| w.paint.color().unwrap().to_hex()).collect(); + assert_eq!(g.len(), 2, "{g:?}"); + assert_eq!(g[0], "#2878f0", "the kept swatch takes no Global Adjust"); + assert_ne!(g[1], "#00ff00", "the other new color takes it"); +} + #[test] fn recolor_of_everything_does_not_count_locked_art_whose_pattern_the_group_rewrite_recolors() { let mut s = session(); diff --git a/crates/ui-egui/src/dialogs/recolor.rs b/crates/ui-egui/src/dialogs/recolor.rs index 08656f9913..05dfb6f3b2 100644 --- a/crates/ui-egui/src/dialogs/recolor.rs +++ b/crates/ui-egui/src/dialogs/recolor.rs @@ -600,14 +600,16 @@ fn selection(d: &Dialog) -> Vec { /// `recolor.apply` parameters: the rows, method, library and the group with its new name and /// colors: the new colors of the rows with current colors, each in its swatch's place (`null` -/// for a row whose new color was removed, which removes its swatch), then (with art) the group's -/// colors no row took, then the colors added on the Edit tab. +/// for a row whose new color was removed, which removes its swatch; `"keep"` for an excluded row, +/// which leaves its swatch as it is), then (with art) the group's colors no row took, then the +/// colors added on the Edit tab. fn apply_params(d: &Dialog) -> Value { let rs = rows(d); + let keep = json!("keep"); let group = d.fields.get("group").and_then(Value::as_str).map(|g| { // A row made with New Row that holds no current colors gives the group no color; a color // added on the Edit tab (`added`) joins it after the others. - let took: Vec<&Value> = rs.iter().filter(|r| !no_current(r)).map(|r| &r["to"]).collect(); + let took: Vec<&Value> = rs.iter().filter(|r| !no_current(r)).map(|r| if excluded(r) { &keep } else { &r["to"] }).collect(); let assign = d.fields.get("__assign").and_then(Value::as_array).filter(|_| d.bool("__art")); let rest = assign.map_or(&[][..], |a| a.get(took.len()..).unwrap_or_default()); let added = rs.iter().filter(|r| no_current(r) && is_added(r) && !excluded(r)).map(|r| &r["to"]).filter(|c| !c.is_null()); @@ -2148,6 +2150,37 @@ mod tests { assert_eq!(apply_params(&d)["groupColors"], json!(["rgb 1 1 1", null, "rgb 3 3 3"])); } + /// An excluded row with current colors keeps the group's swatch at its place as it is, even + /// after its new color was edited or removed, and with Global Adjust on. + #[test] + fn an_excluded_row_keeps_its_group_swatch() { + let mut d = Dialog::new(KIND, json!({"group": "G", "groupName": "G", "__art": true, "__assign": ["rgb 1 1 1", "rgb 2 2 2", "rgb 3 3 3"]})); + let rs = json!([ + {"from": ["rgb 255 0 0"], "to": "rgb 7 7 7", "exclude": true}, + {"from": ["rgb 0 0 255"], "to": null, "exclude": true}, + {"from": ["rgb 0 255 0"], "to": "rgb 8 8 8"}, + ]); + d.fields.insert("rows".into(), rs); + assert_eq!(apply_params(&d)["groupColors"], json!(["keep", "keep", "rgb 8 8 8"])); + // Without art the rows are the group's colors. + let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), Default::default()); + app.run("file.new", json!({"width": 100, "height": 100})).unwrap(); + app.run("swatch.newGroup", json!({"name": "G", "colors": ["#2878f0", "#ff0000"]})).unwrap(); + app.run("ui.recolorDialog", json!({"group": "G"})).unwrap(); + let mut d = app.ui.dialog.clone().unwrap(); + let mut rs = super::rows(&d); + rs[0]["to"] = json!("#00ff00"); + rs[0]["exclude"] = json!(true); + rs[1]["to"] = json!("#0000ff"); + d.fields.insert("rows".into(), json!(rs)); + d.fields.insert("globalAdjust".into(), json!({"brightness": -50})); + confirm(&mut app, &d).unwrap(); + let g = app.session.doc().unwrap().doc.swatch_groups.iter().find(|g| g.name == "G").unwrap(); + let hex: Vec = g.swatches.iter().map(|w| w.paint.color().unwrap().to_hex()).collect(); + assert_eq!(hex[0], "#2878f0", "{hex:?}"); + assert_ne!(hex[1], "#ff0000", "{hex:?}"); + } + #[test] fn merge_and_separate_rows() { let mut r = rows(); diff --git a/docs/control-protocol.md b/docs/control-protocol.md index 51045638b2..2ed7ee5cc4 100644 --- a/docs/control-protocol.md +++ b/docs/control-protocol.md @@ -295,7 +295,7 @@ on either wheel: `add` (the Add Color tool) adds a click as a new color, the hue color's brightness (the base color's when none is selected; the patch's color on the segmented wheel), in a new row with no current colors (`from: []`) and `added: true` that becomes the selected row; `remove` (the Remove Color tool) removes the color of the marker clicked. The base color can't be removed. A removed color's row is dropped, unless it has current colors and art or a group is open: it then keeps them with `to: null`, that art keeps its colors, and the -group's swatch at that place is removed. A row with no current colors recolors no art; with a group, the new color of +group's swatch at that place is removed, unless the row is excluded: an excluded row with current colors leaves the group's swatch at its place as it is. A row with no current colors recolors no art; with a group, the new color of one with `added: true` that is not excluded is added to the group after the group's other colors, and a row made with New Row adds none. The base color is the row with `base: true`, or the first color the Edit tab shows when no row has it; the harmony rules build from it, and selecting another color for the sliders leaves it the base. A right-click on a wheel marker or a diff --git a/docs/mcp.md b/docs/mcp.md index aae49de740..9d59215a0d 100644 --- a/docs/mcp.md +++ b/docs/mcp.md @@ -4518,7 +4518,10 @@ linked to the global or spot swatch its new color is that share of its tint; `ti moves a row's `tint` with its new color and removes it from a color it changes, and moves a row's `model` with its new color. `swatch.editGroup {group, colors, rename?}` rewrites a colour group in one undo step (art linked to its global swatches follows), and `recolor.apply` with `group` recolours the art and rewrites the group together. A `null` in `groupColors` removes the group's swatch at that place, and the swatches after it keep -their colors and names; art linked to a removed global swatch keeps its color and is no longer linked to it. Art linked to one of the group's global swatches stays linked when the swatch is rewritten with its +their colors and names; art linked to a removed global swatch keeps its color and is no longer linked to it. A `"keep"` +in `groupColors` leaves the group's swatch at that place as it is (`globalAdjust`, `limitTo` and `model` do not change +it) and adds no swatch past the group's last one; the Recolor Artwork dialog sends it for an excluded row with current +colors. A swatch at that place that is not a color is refused. Art linked to one of the group's global swatches stays linked when the swatch is rewritten with its row's new color (the default without `groupColors` when the rows follow the group's order), so a later `swatch.edit` still reaches it; the reply's `relinked` counts the other linked paints that took the group's new colors. Art in a row that is linked to a swatch rewritten with another color keeps its row's new color, even an unchanged one, and is no longer From 005cde50f49d1500a0c6c489e790fc74a4f57e70 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sun, 15 Nov 2026 17:06:48 -0800 Subject: [PATCH 06/78] Swatches: Add to Swatches refuses a gradient or pattern in a library color group Color groups hold solid colors only, as swatch.new, swatch.newGroup and swatch.move already require. swatch.library.add now refuses a library color group that holds a gradient or pattern swatch, with the error swatch.move gives, and leaves the document unchanged. Recolor Artwork rewrites a group by position, so a non-solid member would shift the colors that follow it. --- crates/engine/src/cmd/swatchlib.rs | 6 +++++- crates/engine/src/tests/swatchlib.rs | 32 ++++++++++++++++++++++++++++ docs/mcp.md | 3 ++- 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/crates/engine/src/cmd/swatchlib.rs b/crates/engine/src/cmd/swatchlib.rs index ed712d8509..d6eed98378 100644 --- a/crates/engine/src/cmd/swatchlib.rs +++ b/crates/engine/src/cmd/swatchlib.rs @@ -49,7 +49,7 @@ pub fn specs() -> Vec { "Add to Swatches", ["Window", "Swatch Libraries"], None, - "{library: id or name, names?: [swatch or colour group names in the library] (default: all of it; a group comes as a colour group, a single swatch ungrouped), apply?: \"fill\"|\"stroke\" (also apply the first one to the selection and the defaults, as paint.setFill / paint.setStroke), focus?: true (with apply: false keeps the active proxy)} copy library swatches into the document as one undo step. A swatch the document already has (same name and paint) isn't added again; a name taken by another swatch gets a number (\"Clay 1 2\"). A pattern swatch brings its pattern, as pasting art painted with it does: the same pattern the document has is used, and a name another pattern or swatch has gets a number → {library, added: [names in the document], existing: [names already there], applied?: name}", + "{library: id or name, names?: [swatch or colour group names in the library] (default: all of it; a group comes as a colour group, a single swatch ungrouped), apply?: \"fill\"|\"stroke\" (also apply the first one to the selection and the defaults, as paint.setFill / paint.setStroke), focus?: true (with apply: false keeps the active proxy)} copy library swatches into the document as one undo step. A gradient or pattern swatch in a library color group is refused (color groups hold solid colors only), and the document is left unchanged. A swatch the document already has (same name and paint) isn't added again; a name taken by another swatch gets a number (\"Clay 1 2\"). A pattern swatch brings its pattern, as pasting art painted with it does: the same pattern the document has is used, and a name another pattern or swatch has gets a number → {library, added: [names in the document], existing: [names already there], applied?: name}", has_doc, add ), @@ -839,6 +839,10 @@ fn add(s: &mut Session, p: &Value) -> Result { }; let focus = switch_or(p, "focus", true, C)?; let picked = picked(&lib, &names_param(p, C)?, C)?; + // Color groups hold solid colors only, as swatch.new, swatch.newGroup and swatch.move keep them. + if let Some((_, w)) = picked.iter().find(|(g, w)| g.is_some() && w.paint.color().is_none()) { + return Err(bad(C, format!("`{}`: colour groups hold solid colours only", w.name))); + } // Swatches the document already has (same name and paint; for a pattern swatch, a swatch of the // same pattern) are reused, not added again. let patterns = patternlib::library_doc(&info.id); diff --git a/crates/engine/src/tests/swatchlib.rs b/crates/engine/src/tests/swatchlib.rs index dbf32eba7c..fb088508c4 100644 --- a/crates/engine/src/tests/swatchlib.rs +++ b/crates/engine/src/tests/swatchlib.rs @@ -160,6 +160,38 @@ fn save_and_load_round_trip_keeps_cmyk_spot_and_groups() { assert!(s.execute("swatch.library.save", &json!({"user": true})).is_err(), "no user folder in a headless session"); } +/// A library color group that holds a gradient is not copied into the document: color groups +/// hold solid colors only. The document keeps its swatches and no undo step is recorded. +#[test] +fn add_refuses_a_library_color_group_holding_a_gradient() { + let mut s = session(); + run(&mut s, "swatch.newGroup", json!({"name": "Brand", "colors": ["#123456", "#abcdef"]})); + let r = run(&mut s, "swatch.library.save", json!({"names": ["Brand", "Sunset"], "name": "Mixed"})); + // Move the Sunset gradient into the library's Brand group, as a hand-edited file can. + let mut lib: Value = serde_json::from_str(r["data"].as_str().unwrap()).unwrap(); + let swatches = lib["swatches"].as_array_mut().unwrap(); + let at = swatches.iter().position(|w| w["name"] == "Sunset").unwrap(); + let sunset = swatches.remove(at); + lib["groups"][0]["swatches"].as_array_mut().unwrap().insert(1, sunset); + let r = run(&mut s, "swatch.library.load", json!({"data": lib.to_string(), "name": "mixed.vcswatches"})); + let id = r["library"].as_str().unwrap().to_string(); + let (_, loaded) = cmd::swatchlib::library(&s, &id).unwrap(); + assert!(matches!(loaded.groups[0].swatches[1].paint, Paint::Gradient(_)), "the reader keeps the gradient in the group"); + run(&mut s, "swatch.delete", json!({"names": ["Brand", "Sunset"]})); + let (before, undo) = (doc(&s).swatch_groups.clone(), undo_len(&s)); + for p in [json!({"library": id}), json!({"library": id, "names": ["Brand"]})] { + let e = s.execute("swatch.library.add", &p).unwrap_err().to_string(); + assert!(e.contains("`Sunset`: colour groups hold solid colours only"), "{p}: {e}"); + assert_eq!(doc(&s).swatch_groups, before, "{p}"); + assert_eq!(undo_len(&s), undo, "{p}"); + } + // The gradient on its own comes in ungrouped. + let r = run(&mut s, "swatch.library.add", json!({"library": id, "names": ["Sunset"]})); + assert_eq!(r["added"], json!(["Sunset"]), "{r}"); + assert!(doc(&s).swatches.iter().any(|w| w.name == "Sunset" && matches!(w.paint, Paint::Gradient(_)))); + assert_eq!(doc(&s).swatch_groups, before); +} + /// The swatch library commands, and the graphic style library save and load that share their file /// handling, refuse a parameter of the wrong form, such as `user: "true"` or `names: "Grays"`, with /// an error that names it; the document keeps its swatches and no undo step is recorded. A null diff --git a/docs/mcp.md b/docs/mcp.md index d0df04dbf5..2c374000c3 100644 --- a/docs/mcp.md +++ b/docs/mcp.md @@ -4739,7 +4739,8 @@ them (`id`, `name`, `category`, `count`) and `swatch.library.get {library}` retu in the `swatch.list` shape (`library` is an id or a name). `swatch.library.add {library, names?}` copies swatches into the document as one undo step: a colour group's name brings the whole group, a swatch's name the swatch alone, no names the whole library; swatches the document already has (same name and paint) are reported under `existing` -and not added again. `apply: "fill"|"stroke"` also applies the first one, in the same undo step (what clicking a +and not added again. Color groups hold solid colors only: an add that would bring a gradient or pattern swatch +into a color group is refused, and the document is left unchanged. `apply: "fill"|"stroke"` also applies the first one, in the same undo step (what clicking a swatch in the library panel does). The pattern libraries Geometric Patterns (`geometric-patterns`), Grit Textures (`grit-textures`: seamless black grain, grit, sand, speckle, stipple, scratch and fleck tiles) and Optical Effects (`optical-effects`: VectorCraft's own black wave, ring, warped-check, pinched-stripe, chevron and lens tiles), From e9a6864c968673e2354bd997138225db11465fb3 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sun, 15 Nov 2026 17:19:49 -0800 Subject: [PATCH 07/78] Recolor Artwork: Save Prominent Colors leaves out removed colors A color removed on the Edit tab no longer joins the group that Save Prominent Colors makes, as Save All Colors already does. The menu item is turned off when every prominent color was removed. --- crates/ui-egui/src/dialogs/recolor.rs | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/crates/ui-egui/src/dialogs/recolor.rs b/crates/ui-egui/src/dialogs/recolor.rs index 05dfb6f3b2..24eb035e81 100644 --- a/crates/ui-egui/src/dialogs/recolor.rs +++ b/crates/ui-egui/src/dialogs/recolor.rs @@ -412,12 +412,13 @@ fn group_colors<'a>(app: &VectorcraftApp, d: &Dialog, rs: impl Iterator = match which { - "prominent" => prominent_parts(d, &rs).into_iter().map(|p| p.0).collect(), + "prominent" => prominent_parts(d, &rs).into_iter().map(|p| p.0).filter(|&i| to_color(&rs[i]).is_some()).collect(), _ => (0..rs.len()).filter(|&i| !excluded(&rs[i]) && to_color(&rs[i]).is_some()).collect(), }; let colors = group_colors(app, d, order.iter().filter_map(|&i| rs.get(i))); @@ -1756,7 +1757,7 @@ fn edit_tab(app: &VectorcraftApp, ui: &mut Ui, d: &mut Dialog, rows: &mut Vec Date: Sun, 15 Nov 2026 18:07:28 -0800 Subject: [PATCH 08/78] Swatches: Add to Swatches checks a picked color group before skipping repeated names A library color group named together with one of its own members, as in names ["Sunset", "Brand"], is now refused when it holds a gradient or pattern swatch. The group was checked after a member named first had been taken on its own, so the group came in without it. --- crates/engine/src/cmd/swatchlib.rs | 17 ++++++++++++----- crates/engine/src/tests/swatchlib.rs | 7 +++++-- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/crates/engine/src/cmd/swatchlib.rs b/crates/engine/src/cmd/swatchlib.rs index d6eed98378..9ba2833052 100644 --- a/crates/engine/src/cmd/swatchlib.rs +++ b/crates/engine/src/cmd/swatchlib.rs @@ -789,7 +789,14 @@ fn copy_to_user(s: &mut Session, p: &Value) -> Result { /// The library swatches `names` stand for, each once, with the colour group it goes into (`None`: /// ungrouped): a group's name brings the group, a swatch's name the swatch alone; no names, all. +/// A picked group that holds a gradient or pattern swatch is refused. fn picked<'a>(lib: &'a SwatchLibrary, names: &[String], cmd: &str) -> Result, &'a Swatch)>> { + // Color groups hold solid colors only, as swatch.new, swatch.newGroup and swatch.move keep them. + // Each picked group is checked whole, so a member also named on its own is not skipped. + let solid = |g: &SwatchGroup| match g.swatches.iter().find(|w| w.paint.color().is_none()) { + Some(w) => Err(bad(cmd, format!("`{}`: colour groups hold solid colours only", w.name))), + None => Ok(()), + }; let mut out: Vec<(Option<&str>, &Swatch)> = vec![]; let mut seen: HashSet<&str> = HashSet::new(); let mut push = |g: Option<&'a str>, w: &'a Swatch| { @@ -798,12 +805,16 @@ fn picked<'a>(lib: &'a SwatchLibrary, names: &[String], cmd: &str) -> Result g.swatches.iter().for_each(|w| push(Some(&g.name), w)), + (Some(g), _) => { + solid(g)?; + g.swatches.iter().for_each(|w| push(Some(&g.name), w)); + } (None, Some(w)) => push(None, w), (None, None) => return Err(bad(cmd, format!("no swatch or colour group `{n}` in `{}`", lib.name))), } @@ -839,10 +850,6 @@ fn add(s: &mut Session, p: &Value) -> Result { }; let focus = switch_or(p, "focus", true, C)?; let picked = picked(&lib, &names_param(p, C)?, C)?; - // Color groups hold solid colors only, as swatch.new, swatch.newGroup and swatch.move keep them. - if let Some((_, w)) = picked.iter().find(|(g, w)| g.is_some() && w.paint.color().is_none()) { - return Err(bad(C, format!("`{}`: colour groups hold solid colours only", w.name))); - } // Swatches the document already has (same name and paint; for a pattern swatch, a swatch of the // same pattern) are reused, not added again. let patterns = patternlib::library_doc(&info.id); diff --git a/crates/engine/src/tests/swatchlib.rs b/crates/engine/src/tests/swatchlib.rs index fb088508c4..9be829fdf5 100644 --- a/crates/engine/src/tests/swatchlib.rs +++ b/crates/engine/src/tests/swatchlib.rs @@ -178,11 +178,14 @@ fn add_refuses_a_library_color_group_holding_a_gradient() { let (_, loaded) = cmd::swatchlib::library(&s, &id).unwrap(); assert!(matches!(loaded.groups[0].swatches[1].paint, Paint::Gradient(_)), "the reader keeps the gradient in the group"); run(&mut s, "swatch.delete", json!({"names": ["Brand", "Sunset"]})); - let (before, undo) = (doc(&s).swatch_groups.clone(), undo_len(&s)); - for p in [json!({"library": id}), json!({"library": id, "names": ["Brand"]})] { + let (before, swatches, undo) = (doc(&s).swatch_groups.clone(), doc(&s).swatches.len(), undo_len(&s)); + // A group is refused whole even when its gradient was also named on its own before it. + let cases = [json!({"library": id}), json!({"library": id, "names": ["Brand"]}), json!({"library": id, "names": ["Sunset", "Brand"]})]; + for p in cases { let e = s.execute("swatch.library.add", &p).unwrap_err().to_string(); assert!(e.contains("`Sunset`: colour groups hold solid colours only"), "{p}: {e}"); assert_eq!(doc(&s).swatch_groups, before, "{p}"); + assert_eq!(doc(&s).swatches.len(), swatches, "{p}"); assert_eq!(undo_len(&s), undo, "{p}"); } // The gradient on its own comes in ungrouped. From 93be92cc21c9789827e88d130cea5d4a1d3dc153 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Mon, 16 Nov 2026 09:11:51 -0800 Subject: [PATCH 09/78] Command Palette: an empty search shows recent picks With an empty search, or one of spaces only, the palette lists the picks of the Recent Commands list under a Recent Commands heading, most recent first, instead of the first commands of the catalog. The first row is highlighted, so opening the palette and pressing Enter runs the last pick again. With no picks yet the palette lists no results and shows a dimmed No recent commands line in place of the result count. Closing the palette forgets the highlighted result, so the palette opens with its first result highlighted and its list scrolled to the top. Before, a palette opened again on the same search kept the row that was highlighted when it closed. The held-Enter test of the shortcuts gives the app a recent pick, since an empty search with none lists no result to run. --- crates/ui-egui/src/palette.rs | 106 ++++++++++++++++++++++++-- crates/ui-egui/src/shortcuts/tests.rs | 2 + docs/target-app-parity.md | 1 + 3 files changed, 104 insertions(+), 5 deletions(-) diff --git a/crates/ui-egui/src/palette.rs b/crates/ui-egui/src/palette.rs index 16ff3990dc..6b01518575 100644 --- a/crates/ui-egui/src/palette.rs +++ b/crates/ui-egui/src/palette.rs @@ -584,8 +584,12 @@ pub fn show(app: &mut VectorcraftApp, ctx: &egui::Context) { // closed it focused another widget, such as a field in a window above the backdrop. let focus_id = egui::Id::unique("palette-focus-before"); let field_id = egui::Id::unique("palette-field"); + let sel_id = egui::Id::unique("palette-selected"); if !app.ui.palette_open { + // The palette opens again with its first row highlighted and its list scrolled to the top + // (a list height of 0 scrolls it to the highlighted row). let field = ctx.data_mut(|d| { + d.remove::(sel_id); let field = d.get_temp::(field_id); d.remove::(field_id); field @@ -607,11 +611,13 @@ pub fn show(app: &mut VectorcraftApp, ctx: &egui::Context) { let t = Tokens::get(ctx); let q = app.ui.palette_query.to_lowercase(); let entries = entries_in(ctx, crate::i18n::current(), app.services.native_menu.is_some()); - let mut matches = matching(&entries, &q); + let recent = recent(&entries.list, &app.ui.recent_commands); + // An empty search lists the recent picks, most recent first, so Enter runs the last pick again. + let empty = app.ui.palette_query.trim().is_empty(); + let mut matches = if empty { recent.clone() } else { matching(&entries, &q) }; let total = matches.len(); // The highlighted result (#1757): Up and Down move it (wrapping), Page Up and Page Down move it // by a page, the pointer over a result takes it, and a new query starts again from the first. - let sel_id = egui::Id::unique("palette-selected"); let (mut sel, last_q, mut offset, last_view, last_id) = ctx.data(|d| d.get_temp::(sel_id)).unwrap_or_default(); let mut view = last_view; let new_query = last_q != q; @@ -629,7 +635,6 @@ pub fn show(app: &mut VectorcraftApp, ctx: &egui::Context) { kept = Some(at); } matches.truncate(MAX_RESULTS); - let recent = recent(&entries.list, &app.ui.recent_commands); // While the Recent Commands list is open, the arrow keys and Enter go to its rows, and the // search field leaves them the keyboard. let list_open = recent_list_open(ctx); @@ -735,6 +740,9 @@ pub fn show(app: &mut VectorcraftApp, ctx: &egui::Context) { .inner; ui.ctx().data_mut(|d| d.insert_temp(field_id, r.id)); ui.add_space(6.0); + if empty && n > 0 { + ui.label(egui::RichText::new(tl!("Recent Commands")).color(t.text_dim)); + } // The list shows as many rows as fit above the footer in the window, up to // VISIBLE_ROWS; a page is that many rows. let spacing = ui.spacing().item_spacing.y; @@ -803,8 +811,13 @@ pub fn show(app: &mut VectorcraftApp, ctx: &egui::Context) { } }); } - ui.add_space(6.0); - ui.label(egui::RichText::new(footer(n, total)).color(t.text_dim)); + // Under the recent picks no count is shown; with none, one dimmed line says so. + if !empty { + ui.add_space(6.0); + ui.label(egui::RichText::new(footer(n, total)).color(t.text_dim)); + } else if n == 0 { + ui.label(egui::RichText::new(tl!("No recent commands")).color(t.text_dim)); + } if !list_open && !history_focused && ui.input(|i| i.key_pressed(egui::Key::Enter)) @@ -1418,6 +1431,89 @@ mod tests { assert!(h.state().ui.palette_open); } + /// The row labels the palette shows for the commands `ids`, in that order. + fn row_labels(ctx: &egui::Context, ids: &[&str]) -> Vec { + let entries = entries(ctx, Lang::EN); + ids.iter().map(|id| row_label(entries.iter().find(|e| e.id == *id).unwrap())).collect() + } + + /// An empty search, or one of spaces only, lists the recent picks under a Recent Commands + /// heading, most recent first, with the first highlighted. A pick whose command is gone is left + /// out, and no count is shown. + #[test] + fn an_empty_search_lists_the_recent_picks_most_recent_first() { + for query in ["", " "] { + let mut open = Open::new("select", WINDOW); + open.app.ui.recent_commands = ["paint.swap", "plugin:test.UI.palette_gone", "object.group"].map(str::to_string).into(); + open.app.ui.palette_query = query.into(); + let nodes = open.frame(vec![]); + let shown: Vec<(String, bool)> = rows(&nodes).into_iter().map(|r| (r.0, r.1)).collect(); + let expected = row_labels(&open.ctx, &["paint.swap", "object.group"]); + assert_eq!(shown, [(expected[0].clone(), true), (expected[1].clone(), false)], "{query:?}"); + let labels = labels(&nodes); + assert!(labels.iter().any(|l| l == tl!("Recent Commands")), "{query:?}: the heading: {labels:?}"); + assert!(!labels.iter().any(|l| l.contains("result")), "{query:?}: no count: {labels:?}"); + } + } + + /// An empty search with nothing picked yet lists no rows and says there are no recent commands. + #[test] + fn an_empty_search_without_picks_says_there_are_none() { + let mut open = Open::new("", WINDOW); + let nodes = open.frame(vec![]); + assert!(rows(&nodes).is_empty(), "{:?}", rows(&nodes)); + let labels = labels(&nodes); + assert!(labels.iter().any(|l| l == tl!("No recent commands")), "{labels:?}"); + assert!(!labels.iter().any(|l| l == tl!("No commands match") || l == tl!("Recent Commands")), "{labels:?}"); + assert!(open.app.ui.palette_open); + } + + /// Enter on an empty search runs the last pick again, and Recent Commands keeps its order. + #[test] + fn enter_on_an_empty_search_runs_the_last_pick_again() { + let mut open = Open::new("", WINDOW); + open.app = VectorcraftApp::new(vectorcraft_testkit::fixtures::Fixture::Multi.session(), crate::Services::default()); + open.app.ui.recent_commands = vec!["paint.swap".into(), "object.group".into()]; + open.app.ui.palette_open = true; + open.frame(vec![]); + let before = open.app.session.active().unwrap().history.undo.len(); + open.press(egui::Key::Enter, 1); + assert!(!open.app.ui.palette_open, "the palette closes"); + assert_eq!(open.app.session.active().unwrap().history.undo.len(), before + 1, "{}", open.app.ui.status); + assert_eq!(open.app.ui.recent_commands, ["paint.swap", "object.group"]); + } + + /// The palette opens again with its first row highlighted, even when it shows the same rows. + #[test] + fn the_palette_opens_again_with_its_first_row_highlighted() { + let mut open = Open::new("", WINDOW); + open.app.ui.recent_commands = vec!["paint.swap".into(), "object.group".into(), "view.zoomIn".into()]; + open.frame(vec![]); + open.press(egui::Key::ArrowDown, 2); + assert_eq!(open.highlighted(), 2); + open.app.ui.palette_open = false; + open.frame(vec![]); + open.app.ui.palette_open = true; + let nodes = open.frame(vec![]); + assert_eq!(open.highlighted(), 0); + assert!(rows(&nodes).first().is_some_and(|r| r.1), "{:?}", rows(&nodes)); + // A list scrolled down shows its first row again, highlighted, when the palette opens with + // the same search. + open.app.ui.palette_query = "select".into(); + open.frame(vec![]); + open.press(egui::Key::ArrowDown, VISIBLE_ROWS + 5); + assert_eq!(open.highlighted(), VISIBLE_ROWS + 5); + open.app.ui.palette_open = false; + open.frame(vec![]); + open.app.ui.palette_open = true; + let nodes = open.frame(vec![]); + let first = open.listed().first().cloned().unwrap(); + let shown = rows(&nodes); + let top = shown.iter().find(|r| r.1).expect("a row is highlighted"); + assert_eq!(top.0, row_labels(&open.ctx, &[&first])[0], "{shown:?}"); + assert!(top.2 >= f64::from(open.popup().top()), "the first row is in view: {shown:?}"); + } + /// #1757: Up and Down move the highlighted result, wrapping at the ends; a new query starts /// from the first again. #[test] diff --git a/crates/ui-egui/src/shortcuts/tests.rs b/crates/ui-egui/src/shortcuts/tests.rs index 3e07419bb4..88ea1dac82 100644 --- a/crates/ui-egui/src/shortcuts/tests.rs +++ b/crates/ui-egui/src/shortcuts/tests.rs @@ -1694,6 +1694,8 @@ fn the_command_search_that_opens_while_enter_is_down_waits_for_a_new_press() { let held = HeldKey::new(Key::Enter, Modifiers::NONE); app.select_tool("rectangle"); held.press(&mut app); + // The empty search lists the recent picks, so the last pick is the highlighted result. + app.ui.recent_commands = vec!["paint.swap".into()]; app.ui.palette_open = true; for repeat in 0..4 { held.press(&mut app); diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index 6ae632237c..2f125432b3 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -1009,6 +1009,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - The Free Transform widget's Constrain works in Free Distort as well as in Free Transform ([the help page](https://helpx.adobe.com/illustrator/using/tool-techniques/free-transform-tool.html)). With Constrain on, or Shift held, a corner dragged in Free Distort moves only along the line through the opposite corner, in the box's own proportions, and the other three corners stay in place; on a turned box the line runs through the box's own corners. The line is VectorCraft's own rule. Cmd/Ctrl+Alt+Shift on a corner still drags in Perspective Distort, where Constrain stays unavailable (tools `xform::free::tests::free_distort_corner_keeps_to_its_diagonal_with_shift_or_constrain`, `shift_pressed_during_a_free_distort_drag_constrains_it`, `a_turned_box_is_constrained_along_its_own_diagonal`, `along_diagonal_of_a_degenerate_box`; engine `xform::free_transform_constrained_distort_keeps_the_corner_on_its_diagonal`; ui-egui `free_transform::tests::the_widget_sets_the_mode_and_a_corner_drag_then_distorts`). - Native macOS menu bar, vector tool cursors, a command palette (Help › Search Commands…), middle-button panning with any tool. Native menus explicitly end tracking on command selection, outside window presses and Escape; menu updates wait until tracking ends, and a dismissing press never starts a canvas gesture (M14.8). - A Recent Commands button beside the Help › Search Commands field lists the last five commands and tools picked from the palette, most recent first, with a command picked again moved to the top. Choosing a row closes the palette and runs it as a pick of the same result does; with no picks yet the list shows a dimmed No recent commands row, and a command that is not available now, such as a filter of a plug-in that is not loaded, is left out until it comes back. The ids are saved with the UI state. While the list is open, Up and Down move through its rows, wrapping at the ends, and Escape closes the list before the palette. This is VectorCraft's own addition and does not raise a score (#6376; `palette` tests `recent_commands_*`, `a_recent_command_runs_what_its_pick_runs`, `the_keys_wrap_within_recent_commands`, `escape_closes_recent_commands_before_the_palette`). + - With an empty search, or one of spaces only, the Command Palette lists the picks of the Recent Commands list under a Recent Commands heading, most recent first, with the first highlighted and no result count, so opening the palette and pressing Enter runs the last pick again. With no picks yet it lists no results and shows a dimmed No recent commands line. The palette opens with its first result highlighted and its list scrolled to the top. This is VectorCraft's own behavior (`palette` tests `an_empty_search_lists_the_recent_picks_most_recent_first`, `an_empty_search_without_picks_says_there_are_none`, `enter_on_an_empty_search_runs_the_last_pick_again`, `the_palette_opens_again_with_its_first_row_highlighted`). - The Learn panel (Window › Learn, or Explore tutorials beside the search icon on the app bar) has a For you tab with a Get started section and a Quick skill guide card, and a Skills tab that lists VectorCraft's own skills with their progress rings and counts of tutorials finished; a skill lists its tutorials, a tutorial shows its numbered steps, and Back goes up a level; `learn.list`, `learn.tab {tab}`, `learn.skill {skill}`, `learn.show {tutorial}` and `learn.back` script it, and the tab buttons, the rows and Back run them ([the help page](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/learn-skills-quick-skill-guide.html); `panels::learn::tests`). - A tool's name in a Learn tutorial step is a blue link that shows where the tool is without choosing it (`learn.locateTool {tool}`): its toolbar button is marked, a collapsed group's flyout opens with the tool's row marked, a torn-off strip comes to the front, and a tool no shown toolbar holds is marked in the All Tools drawer. The mark, its 3 seconds and the hidden-toolbar cases are VectorCraft's own rules ([the help page](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/learn-skills-quick-skill-guide.html); `panels::learn::tests`, the `a_learn_link_*` tests in `toolbar::tests`). - Under a tutorial's steps, View more opens the tutorial's own practice sample as a new untitled document, and once the tutorial is finished, Next Up moves to the next tutorial in the same skill, as the help page describes ([the help page](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/learn-skills-quick-skill-guide.html)). The samples are VectorCraft's own drawings. A Finish tutorial button that shows once the sample is open, the untitled copy, Back to skills in place of Next Up after a skill's last tutorial, and Next Up showing the next tutorial without opening its sample are VectorCraft's own rules. `learn.openSample`, `learn.finish`, `learn.next` and `learn.skills` (Back to skills) script them. Not done: the help page's short video. Regression tests: `view_more_opens_the_tutorial_s_sample_as_a_new_untitled_document`, `finishing_a_tutorial_offers_next_up_in_its_skill`, `the_practice_controls_work_from_the_keyboard`, `the_last_tutorial_of_a_skill_offers_back_to_skills`, `learn_finish_and_learn_next_follow_the_practice`, `learn_skills_shows_the_list_of_skills`, `the_practice_commands_reject_a_missing_or_unknown_tutorial`, `every_tutorial_has_its_own_readable_sample` and `the_next_tutorial_is_the_next_one_in_the_same_skill` in `crates/ui-egui/src/panels/learn/tests.rs`. From f95413552100a7bc988e2006d0fe2d6602a7b8c6 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Mon, 16 Nov 2026 09:03:35 -0800 Subject: [PATCH 10/78] Command Palette: recent picks rank first within their grades MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A command listed in Recent Commands now ranks first among the results that match a query as well as it does, the most recent first. It ranks after the whole-query match, the word grades and the typo, description and same-meaning matches, and before the kind of result and the name's length, so it never passes a result that matches the query better. After a pick of Effect › Convert to Shape › Rectangle…, "rect" lists it above the Rectangle Tool, and Enter runs it again. The ranking uses the list Recent Commands shows, which also holds a pick whose command could not run. The kept ranking of the last query is ranked again when the recent picks change. --- crates/ui-egui/src/palette.rs | 99 ++++++++++++++++++++++------ crates/ui-egui/src/palette/search.rs | 74 ++++++++++++++++++--- docs/target-app-parity.md | 1 + 3 files changed, 143 insertions(+), 31 deletions(-) diff --git a/crates/ui-egui/src/palette.rs b/crates/ui-egui/src/palette.rs index 6b01518575..6c78f0f636 100644 --- a/crates/ui-egui/src/palette.rs +++ b/crates/ui-egui/src/palette.rs @@ -288,11 +288,14 @@ pub(crate) struct Entry { kind: u8, } +/// The last query, the recent picks it was ranked with, and its ranked results. +type Ranked = (String, Vec, Arc<[u32]>); + /// The palette's entries, the index a query is looked up in, and the last query's ranked results. pub(crate) struct Catalog { list: Vec, index: search::Index, - ranked: std::sync::Mutex)>>, + ranked: std::sync::Mutex>, } impl std::ops::Deref for Catalog { @@ -434,17 +437,19 @@ pub(crate) fn run_pick(app: &mut VectorcraftApp, id: &str) { } } -/// The entries the query `q` matches, best first ([`search::rank`]). The ranking of the last query -/// is kept, so a frame that draws the same query does not rank again. [`show`] lists the first -/// [`MAX_RESULTS`] and counts the rest. -fn matching<'a>(catalog: &'a Catalog, q: &str) -> Vec<&'a Entry> { +/// The entries the query `q` matches, best first ([`search::rank`]), with the picks that Recent +/// Commands lists for the ids `recent_ids` ([`recent`]) first among the entries that match as well. +/// The ranking of the last query is kept, so a frame that draws the same query with the same recent +/// picks does not rank again. [`show`] lists the first [`MAX_RESULTS`] and counts the rest. +fn matching<'a>(catalog: &'a Catalog, q: &str, recent_ids: &[String]) -> Vec<&'a Entry> { let q = search::normalize(q); - let kept = catalog.ranked.lock().ok().and_then(|last| last.as_ref().filter(|(k, _)| *k == q).map(|(_, r)| r.clone())); + let picks: Vec = recent_places(&catalog.list, recent_ids).into_iter().filter_map(|i| u32::try_from(i).ok()).collect(); + let kept = catalog.ranked.lock().ok().and_then(|last| last.as_ref().filter(|(k, p, _)| *k == q && *p == picks).map(|(_, _, r)| r.clone())); let ranked = kept.unwrap_or_else(|| { - let ranked: Arc<[u32]> = search::rank(&catalog.list, &catalog.index, &q).into(); + let ranked: Arc<[u32]> = search::rank(&catalog.list, &catalog.index, &q, &picks).into(); // A poisoned lock only loses the kept ranking: the next frame ranks again. if let Ok(mut last) = catalog.ranked.lock() { - *last = Some((q, ranked.clone())); + *last = Some((q, picks, ranked.clone())); } ranked }); @@ -565,7 +570,12 @@ fn remember(list: &mut Vec, id: &str, known: impl Fn(&str) -> bool) { /// The entries the Recent Commands list shows for the ids `ids`, most recent first. An id with no /// entry (a removed plug-in) is skipped. fn recent<'a>(entries: &'a [Entry], ids: &[String]) -> Vec<&'a Entry> { - ids.iter().take(MAX_SAVED_RECENT_COMMANDS).filter_map(|id| entries.iter().find(|e| e.id == *id)).take(MAX_RECENT_COMMANDS).collect() + recent_places(entries, ids).into_iter().filter_map(|i| entries.get(i)).collect() +} + +/// The places in `entries` of the entries [`recent`] lists for the ids `ids`, most recent first. +fn recent_places(entries: &[Entry], ids: &[String]) -> Vec { + ids.iter().take(MAX_SAVED_RECENT_COMMANDS).filter_map(|id| entries.iter().position(|e| e.id == *id)).take(MAX_RECENT_COMMANDS).collect() } /// The id of the Recent Commands list's popup. @@ -614,7 +624,7 @@ pub fn show(app: &mut VectorcraftApp, ctx: &egui::Context) { let recent = recent(&entries.list, &app.ui.recent_commands); // An empty search lists the recent picks, most recent first, so Enter runs the last pick again. let empty = app.ui.palette_query.trim().is_empty(); - let mut matches = if empty { recent.clone() } else { matching(&entries, &q) }; + let mut matches = if empty { recent.clone() } else { matching(&entries, &q, &app.ui.recent_commands) }; let total = matches.len(); // The highlighted result (#1757): Up and Down move it (wrapping), Page Up and Page Down move it // by a page, the pointer over a result takes it, and a new query starts again from the first. @@ -900,7 +910,7 @@ mod tests { let ctx = egui::Context::default(); let query = "use precise cursors"; let entries = entries(&ctx, Lang::EN); - let matches = matching(&entries, query); + let matches = matching(&entries, query, &[]); assert!(matches.iter().any(|e| e.id == "view.preciseCursors"), "preference toggle appears for its name"); assert!(entries.iter().filter(|e| e.id == "view.capsLock").all(|e| e.shown != "Use Precise Cursors")); @@ -1418,6 +1428,49 @@ mod tests { assert_eq!(app.ui.recent_commands, [id, "object.group"]); } + /// A result picked recently ranks first among the results that match the query as well as it + /// does: "rect" lists the Rectangle Tool above Effect › Convert to Shape › Rectangle…, and after + /// a pick of the effect, the effect comes first, so Enter runs it again. + #[test] + fn a_recent_pick_ranks_first_among_results_that_match_as_well() { + let (tool, effect) = ("tool:rectangle", "effect:convertToShape.rectangle"); + let mut open = Open::new("rect", egui::vec2(1200.0, 900.0)); + let before = open.listed(); + assert_eq!(before.first().map(String::as_str), Some(tool)); + let at = before.iter().position(|id| id == effect).unwrap(); + open.press(egui::Key::ArrowDown, at); + open.press(egui::Key::Enter, 1); + assert_eq!(open.app.ui.recent_commands, [effect]); + + open.app.ui.dialog = None; + open.app.ui.palette_open = true; + open.app.ui.palette_query = "rect".into(); + let nodes = open.frame(vec![]); + let after = open.listed(); + assert_eq!(after.first().map(String::as_str), Some(effect)); + assert_eq!(after.get(1).map(String::as_str), Some(tool), "only the pick moves"); + let entries = entries(&open.ctx, Lang::EN); + let label = entries.iter().find(|e| e.id == effect).map(row_label).unwrap(); + assert_eq!(field_description(&nodes), format!("1 of {}: {label}", after.len())); + open.press(egui::Key::Enter, 1); + assert_eq!(open.app.ui.recent_commands, [effect], "Enter ran the effect again"); + } + + /// The kept ranking of a query is ranked again when the recent picks change, and a saved id + /// with no result now is passed over. + #[test] + fn the_kept_ranking_follows_the_recent_picks() { + let ctx = egui::Context::default(); + let entries = entries(&ctx, Lang::EN); + let ids = |recent: &[String]| matching(&entries, "rect", recent).into_iter().map(|e| e.id.clone()).collect::>(); + let plain = ids(&[]); + assert_eq!(plain.first().map(String::as_str), Some("tool:rectangle")); + let effect = "effect:convertToShape.rectangle".to_string(); + assert_eq!(ids(std::slice::from_ref(&effect)).first(), Some(&effect)); + assert_eq!(ids(&[]), plain); + assert_eq!(ids(&["plugin:test.UI.palette_removed".to_string(), effect.clone()]).first(), Some(&effect)); + } + /// #6376: with nothing picked yet, Recent Commands shows a dimmed No recent commands row. #[test] fn recent_commands_without_picks_show_a_dimmed_row() { @@ -1537,7 +1590,7 @@ mod tests { // With more matches than the list holds, Up on the first wraps to the last one it holds, and // Down there wraps to the first. app.ui.palette_query = "select".into(); - assert!(matching(&entries(&ctx, Lang::EN), "select").len() > MAX_RESULTS); + assert!(matching(&entries(&ctx, Lang::EN), "select", &[]).len() > MAX_RESULTS); assert_eq!(frame(&mut app, vec![]), 0); assert_eq!(frame(&mut app, vec![key(egui::Key::ArrowUp)]), MAX_RESULTS - 1); assert_eq!(frame(&mut app, vec![key(egui::Key::ArrowDown)]), 0); @@ -1877,7 +1930,7 @@ mod tests { for (query, want) in [("layers", "panel:layers"), ("color guide", "panel:colorGuide"), ("Layers ", "panel:layers")] { let all: Vec<&str> = entries.iter().filter(|e| query.to_lowercase().split_whitespace().all(|w| e.haystack.contains(w))).map(|e| e.id.as_str()).collect(); - let shown: Vec<&str> = matching(&entries, &query.to_lowercase()).into_iter().map(|e| e.id.as_str()).collect(); + let shown: Vec<&str> = matching(&entries, &query.to_lowercase(), &[]).into_iter().map(|e| e.id.as_str()).collect(); assert_eq!(shown.first(), Some(&want), "{query}: {shown:?}"); // English plural and verb forms can find more results than the text alone. assert!(all.iter().all(|id| shown.contains(id)), "{query}"); @@ -2046,7 +2099,11 @@ mod tests { /// The results the palette lists for its query. fn listed(&self) -> Vec { let entries = entries(&self.ctx, Lang::EN); - matching(&entries, &self.app.ui.palette_query.to_lowercase()).iter().take(MAX_RESULTS).map(|e| e.id.clone()).collect() + matching(&entries, &self.app.ui.palette_query.to_lowercase(), &self.app.ui.recent_commands) + .iter() + .take(MAX_RESULTS) + .map(|e| e.id.clone()) + .collect() } } @@ -2118,7 +2175,7 @@ mod tests { ] ); let mut open = Open::new("select", WINDOW); - let total = matching(&entries(&open.ctx, Lang::EN), "select").len(); + let total = matching(&entries(&open.ctx, Lang::EN), "select", &[]).len(); assert!(total > MAX_RESULTS, "{total}"); let nodes = open.frame(vec![]); assert!(labels(&nodes).contains(&format!("50 of {total} results. Keep typing to narrow them.")), "{:?}", labels(&nodes)); @@ -2269,7 +2326,7 @@ mod tests { let lit: Vec = rows(&nodes).into_iter().filter(|r| r.1).map(|r| r.0).collect(); let label = entries.iter().find(|e| e.id == listed[3]).map(row_label).unwrap(); assert_eq!(lit, std::slice::from_ref(&label)); - assert_eq!(field_description(&nodes), format!("4 of {}: {label}", matching(&entries, "select").len())); + assert_eq!(field_description(&nodes), format!("4 of {}: {label}", matching(&entries, "select", &[]).len())); } /// A name too long for its row is cut short with "…" and stays inside the width it is given. @@ -2342,7 +2399,7 @@ mod tests { let label = |i: usize| entries.iter().find(|e| e.id == listed[i]).map(row_label).unwrap(); let nodes = open.frame(vec![]); // More results match than the list holds: the place counts every match, as the footer does. - let total = matching(&entries, "show panel").len(); + let total = matching(&entries, "show panel", &[]).len(); assert!(total > MAX_RESULTS && listed.len() == MAX_RESULTS, "{total}"); assert_eq!(field_description(&nodes), format!("1 of {total}: {}", label(0))); let lit: Vec = rows(&nodes).into_iter().filter(|r| r.1).map(|r| r.0).collect(); @@ -2650,7 +2707,7 @@ mod tests { assert_eq!(window.app.ui.palette_query, "show panel"); let nodes = window.frame(vec![]); let entries = entries(&window.ctx, Lang::EN); - let listed: Vec<_> = matching(&entries, "show panel").into_iter().take(MAX_RESULTS).collect(); + let listed: Vec<_> = matching(&entries, "show panel", &[]).into_iter().take(MAX_RESULTS).collect(); let hidden = |e: &&&Entry| e.id.strip_prefix("panel:").is_some_and(|p| !crate::panel_docking::showing(&window.app.ui, p)); let e = listed.iter().find(hidden).expect("a hidden panel's result"); let label = row_label(e); @@ -2710,7 +2767,7 @@ mod tests { open.frame(vec![]); let (sel, .., now) = held(&open); let de = entries(&open.ctx, Lang::from_code("de").unwrap()); - let de_listed: Vec = matching(&de, "group").iter().map(|e| e.id.clone()).collect(); + let de_listed: Vec = matching(&de, "group", &[]).iter().map(|e| e.id.clone()).collect(); crate::i18n::set_current(Lang::EN); assert_eq!((de_listed.get(sel), &now), (Some(&id), &id), "after the language changed"); } @@ -2723,7 +2780,7 @@ mod tests { use vectorcraft_plugins::wat as tpl; // A query no other test searches for, so the plug-in below leaves their results alone. let mut open = Open::new("path", WINDOW); - assert!(matching(&entries(&open.ctx, Lang::EN), "path").len() > MAX_RESULTS); + assert!(matching(&entries(&open.ctx, Lang::EN), "path", &[]).len() > MAX_RESULTS); open.press(egui::Key::ArrowUp, 1); let held = |open: &Open| open.ctx.data(|d| d.get_temp::(egui::Id::unique("palette-selected"))).unwrap(); let (sel, .., id) = held(&open); @@ -2733,7 +2790,7 @@ mod tests { vectorcraft_plugins::registry::install_bytes(&wat::parse_str(tpl::returning(&manifest, r#"{"objects":[]}"#)).unwrap()).unwrap(); open.frame(vec![]); let entries = entries(&open.ctx, Lang::EN); - let ranked: Vec<&Entry> = matching(&entries, "path"); + let ranked: Vec<&Entry> = matching(&entries, "path", &[]); let nodes = open.frame(vec![]); let (sel, .., now) = held(&open); vectorcraft_plugins::registry::remove(filter); diff --git a/crates/ui-egui/src/palette/search.rs b/crates/ui-egui/src/palette/search.rs index 7fe8fc09be..2e73b13436 100644 --- a/crates/ui-egui/src/palette/search.rs +++ b/crates/ui-egui/src/palette/search.rs @@ -645,8 +645,9 @@ fn phrase(e: &Entry, query: &str, initials: bool) -> u8 { /// What results are ordered by, compared field by field: whether a word matched only through a /// description, whether a word matched only through a typo, how the whole query matches, the worst /// grade a word gets, the sum of the grades, how the whole query matches when read with the words -/// of the same meaning it matched through, the kind of result and the label's length. -type RankKey = (bool, bool, u8, u8, u32, u8, u8, usize); +/// of the same meaning it matched through, the result's place among the recent picks, the kind of +/// result and the label's length. +type RankKey = (bool, bool, u8, u8, u32, u8, usize, u8, usize); /// The results of `entries` that the lowercased `query` matches, best first, as places in /// `entries`. A result matches when every word of the query is text in one of its names or ids @@ -663,9 +664,12 @@ type RankKey = (bool, bool, u8, u8, u32, u8, u8, usize); /// "group"). Results are ordered by that, by how the whole query matches ([`phrase`]), then by the /// worst grade a word gets, the sum of the grades, how the whole query matches when read with each /// word matched through a word of the same meaning replaced by that word ("colour" as "color"), -/// the kind of result ([`kind`]), the label's length and the catalog order. An empty query lists -/// every result in catalog order. -pub(crate) fn rank(entries: &[Entry], index: &Index, query: &str) -> Vec { +/// then by the result's place in `recent`, the places in `entries` of the recent picks, most +/// recent first (a result not in it comes after every result in it), then the kind of result +/// ([`kind`]), the label's length and the catalog order. So a recent pick ranks above the results +/// that match the query as well as it does and below every result that matches it better. An +/// empty query lists every result in catalog order. +pub(crate) fn rank(entries: &[Entry], index: &Index, query: &str, recent: &[u32]) -> Vec { let query = normalize(query); if query.is_empty() { return (0..entries.len()).filter_map(|i| u32::try_from(i).ok()).collect(); @@ -792,7 +796,8 @@ pub(crate) fn rank(entries: &[Entry], index: &Index, query: &str) -> Vec { tier }; let length = split_name(&e.shown).0.chars().count(); - ranked.push(((described, typo, tier, worst, sum, meant_tier, e.kind, length), place)); + let picked = recent.iter().position(|&r| r == place).unwrap_or(recent.len()); + ranked.push(((described, typo, tier, worst, sum, meant_tier, picked, e.kind, length), place)); } ranked.sort_by_key(|&(key, place)| (key, place)); ranked.into_iter().map(|(_, place)| place).collect() @@ -857,7 +862,14 @@ mod tests { /// The ids of the results `query` lists, best first. fn ranked(c: &Catalog, query: &str) -> Vec { - rank(&c.list, &c.index, query).iter().filter_map(|&i| c.list.get(i as usize)).map(|e| e.id.clone()).collect() + recently(c, query, &[]) + } + + /// The ids of the results `query` lists, best first, with the results of ids `picked` as the + /// recent picks, most recent first. + fn recently(c: &Catalog, query: &str, picked: &[&str]) -> Vec { + let recent: Vec = picked.iter().filter_map(|id| c.list.iter().position(|e| e.id == *id)).filter_map(|i| u32::try_from(i).ok()).collect(); + rank(&c.list, &c.index, query, &recent).iter().filter_map(|&i| c.list.get(i as usize)).map(|e| e.id.clone()).collect() } /// A result named `name` (`›`-separated, its last part the label) with id `id`. @@ -983,6 +995,48 @@ mod tests { assert_eq!(ranked(&c, "same zz"), ranked(&c, "same zz")); } + /// For each pair of adjacent grades and whole-query tiers, a recent pick ranks above a result + /// that matches the query as well as it does and comes earlier in the catalog, and below the + /// result that matches better; of two such recent picks, the more recent ranks first. + #[test] + fn a_recent_pick_ranks_first_within_its_grades() { + let description = "{} keeps the art central on the page"; + for (query, better, worse, said) in [ + ("cut zz", entry("Zz Cut", "a.one"), entry("Zz Cutter", "b.two"), ""), + ("scale zz", entry("Zz Scale", "a.one"), entry("Zz Scaling", "b.two"), ""), + ("scale zz", entry("Zz Scaling", "a.one"), entry("Zz Scalers", "scale.two"), ""), + ("fill zz", entry("Zz Fillet", "a.one"), entry("Fill › Zz Other", "b.two"), ""), + ("zap zz", entry("Zap › Zz One", "a.one"), entry("Zz Two", "zap.two"), ""), + ("zip zz", entry("Zz Three", "zip.three"), entry("Zz Unzipped", "b.two"), ""), + ("zz.one", entry("Alpha", "zz.one"), entry("zz.one", "b.two"), ""), + ("snap", entry("Snap", "a.one"), entry("Snapshot", "b.two"), ""), + ("ab", entry("Abacus", "a.one"), entry("Alpha Beta", "b.two"), ""), + ("gb", entry("Green Blue", "a.one"), entry("Zz Gb", "b.two"), ""), + // Text inside a word, then a typo of a word of the label. + ("colr", entry("Zz Bcolrb", "b.two"), entry("Zz Color", "a.one"), ""), + // A typo of a word of the label, then a word of the description. + ("centr", entry("Zz Center", "a.one"), entry("Zz Beta", "b.two"), description), + // The word itself in the label, then a word of the same meaning in the label. + ("remove", entry("Zz Remove", "a.one"), entry("Zz Delete", "b.two"), ""), + // Matches through a word of the same meaning: the whole label, then a word of it. + ("colour", entry("Color", "a.one"), entry("Zz Color", "b.two"), ""), + ] { + let (b, w) = (better.id.clone(), worse.id.clone()); + // A second result that matches as the worse one does and comes before it. + let twin = entry(&worse.shown, &format!("{w}x")); + let t = twin.id.clone(); + let c = described(vec![twin, worse, better], &[said, said, ""]); + let (b, w, t) = (b.as_str(), w.as_str(), t.as_str()); + assert_eq!(recently(&c, query, &[]), [b, t, w], "{query}: with no recent picks"); + assert_eq!(recently(&c, query, &[w]), [b, w, t], "{query}: the recent pick first within its grades"); + assert_eq!(recently(&c, query, &[w, t]), [b, w, t], "{query}: the more recent first"); + assert_eq!(recently(&c, query, &[t, w]), [b, t, w], "{query}: the more recent first"); + } + // An empty query lists every result in catalog order. + let c = synthetic(vec![entry("Zz One", "a.one"), entry("Zz Two", "b.two")]); + assert_eq!(recently(&c, "", &["b.two"]), ["a.one", "b.two"]); + } + /// A query that is a menu's title ranks a result whose label holds it as a word above the items /// of that menu, which match only by their menu path. A query that names the menu with `›` /// still starts the item's name. @@ -993,7 +1047,7 @@ mod tests { assert_eq!(ranked(&c, "object › pa"), ["a.one"]); let en = catalog(Lang::EN, false); for q in ["object", "effect", "select", "view", "type", "edit"] { - let first = rank(&en.list, &en.index, q).first().and_then(|&i| en.list.get(i as usize)).map(|e| e.shown.to_lowercase()); + let first = rank(&en.list, &en.index, q, &[]).first().and_then(|&i| en.list.get(i as usize)).map(|e| e.shown.to_lowercase()); let label = first.as_deref().map(|n| split_name(n).0.to_string()).unwrap_or_default(); assert!(words(&label).any(|w| w.starts_with(q)), "{q}: {first:?}"); } @@ -1181,7 +1235,7 @@ mod tests { ] { assert!(substring_rule(&c, typo).is_empty(), "{typo} matched nothing before"); let top = |q: &str| ranked(&c, q).into_iter().take(4).collect::>(); - let spelled_right: Vec = rank(&c.list, &plain, word).iter().take(4).map(id).collect(); + let spelled_right: Vec = rank(&c.list, &plain, word, &[]).iter().take(4).map(id).collect(); assert_eq!(top(typo), spelled_right, "{typo}"); assert!(place(&c, typo, tool).is_some_and(|p| p < 4), "{typo}: {:?}", ranked(&c, typo)); } @@ -1660,7 +1714,7 @@ mod tests { let started = std::time::Instant::now(); let runs = 100; for _ in 0..runs { - std::hint::black_box(rank(&c.list, &c.index, q)); + std::hint::black_box(rank(&c.list, &c.index, q, &[])); } println!("{:>12}: {:?} per query", q.get(..12).unwrap_or(q), started.elapsed() / runs); } diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index 2f125432b3..288a328aa4 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -1309,6 +1309,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur A Command Palette query word in an English plural or verb form finds a result whose English name or menu path holds the base word: "rounded corners" lists Effect › Stylize › Round Corners… first, and "scaling" finds Object › Transform › Scale…. The search drops `'s`; `es` after `s`, `x`, `z`, `ch` or `sh` (also trying the word with only its `s` dropped, so "rasterizes" finds Rasterize…); a final `s` in words of more than 3 letters, except after `ss`, `us` or `is`; `ing` in words of more than 5 letters and `ed` in words of more than 4. After `ing` or `ed`, a doubled `b`, `d`, `g`, `m`, `n`, `p`, `r` or `t` is tried both single and doubled, the single letter only when at least 3 letters are left ("cutting" meets Cut, "added" meets Add); otherwise the word is also tried with an `e` ("scaling" meets Scale…). It turns `ies` into `y` or `ie` in words of more than 5 letters and `sses` into `ss`, and leaves `series` and `species` as they are. Among results that the whole query matches the same way (as an id, as a label, at the start of a label, as initials, or none of these), a result whose name holds the base word of a query word ranks below one that holds the query word whole and above one where the query word only starts a word of the name, so "scale zz" lists a name with "Zz Scaling" above one with "Zz Scalers". "scale" alone still lists "Scalers" above "Scaling", because "Scalers" starts with the query. A partly typed word that is not itself a word of any result ("scal") does not meet a base word. Names shown in other languages and ids are not changed this way, and every result found before is still found (`palette::search` tests `plurals_and_verb_forms_meet_their_base_word`, `a_plural_or_verb_form_finds_the_result`, `a_better_word_grade_ranks_first`, `a_partly_typed_word_does_not_lift_a_verb_form`, `a_whole_query_tier_comes_before_a_stem_form`, `results_matched_without_a_stem_keep_their_order`). A Command Palette query word with a typo still finds the result: "gruop" lists Object › Group first, and "eyedroper", "rectange" and "elipse" list the same first results as the words spelled right, the Eyedropper, Rectangle and Ellipse tools among them. When a query word of 4 or more letters is not a word, a base word or the start of a word of any result's name, menu path or id, the search compares it with the words of result names and menu paths, and a word 1 edit away (2 for a query word of 8 or more letters) matches; a letter added, left out or changed, or two letters next to each other swapped, is one edit. A query word meets at most the 32 nearest such words. Results matched through a typo come after every result the query matches without one, and among them the query is read with the misspelled word replaced by the word it meets, so they come in the order the word spelled right gives; then a result whose label holds the word comes before one whose menu path holds it. Ids, and query words and result words with Chinese, Japanese or Korean letters, are not compared this way, and results without typos keep their order (`palette::search` tests `edits_are_counted_up_to_a_bound`, `a_word_with_a_typo_finds_the_result`, `a_typo_meets_at_most_32_words`, `misspelled_words_find_the_command`). A Command Palette query word also finds a result whose name or menu path holds a word with the same meaning: "remove bg" lists Remove Background… first, "outline text" lists Type › Create Outlines first, and "flip", "combine", "vectorize" and "colour" list Reflect…, Unite, an Image Trace command and the Color panel among the first 3 results. The words come from VectorCraft's own table of 21 groups of English words (`palette/words.rs`, at most 60 groups of at most 6 words); a word that is the whole label of another command, such as Merge or Mirror, is in no group, and neither is Insert. A word or its English base word that is in a group meets the other words of its group in labels and menu paths, and their base words, but not ids or word starts. A result whose label holds the word itself ranks above one whose label holds a word with the same meaning, which ranks above one whose menu path holds the word, so "type" now lists Scale Text Attributes above Type › Orientation › Vertical. A catalog may add a group's words in its language with a row in the `search` context (the group's English words joined by ", ", then that language's words), used while that language is the UI language; no catalog has to have these rows (`palette::search` tests `a_word_with_the_same_meaning_finds_the_result`, `a_catalog_row_adds_words_to_a_group`, `words_with_the_same_meaning_find_the_command`; `palette::words` tests; `i18n` test `search_rows_name_a_group_and_add_single_words`). + The Command Palette ranks the commands listed in Recent Commands first among the results that match a query as well as they do, the most recent first, and below every result that matches it better: after a pick of Effect › Convert to Shape › Rectangle…, "rect" lists it above the Rectangle Tool, so Enter runs it again. A recent pick ranks after the whole-query match, the word grades and the matches through a typo, a description or a word with the same meaning, and before the kind of result and the name's length. The ranking uses the list Recent Commands shows, which also holds a pick whose command could not run. This is VectorCraft's own behavior (`palette::search` test `a_recent_pick_ranks_first_within_its_grades`; `palette` tests `a_recent_pick_ranks_first_among_results_that_match_as_well`, `the_kept_ranking_follows_the_recent_picks`). A Command Palette query word also finds a command by what the command's description says: "transparent background" lists Remove Background… among the first 3 results, and "png" lists it after every result with "png" in its name or menu path. The description is the command's params text (an engine or plug-in command's, a UI command's, or an effect's) without each `{…}` group that is not inside a `{`, `[` or `(` group, without each such `[…]` or `(…)` group just after a `→`, and without the `→` before a removed group, cut to its first 300 characters at the end of a word. The words of a schema ("corners" for Remove Background…) and of a result written as a group do not find the command; a result written as words after a `→` stays in the description. Words of 2 characters or fewer, words with no letter, and "the", "and", "ids", "true", "false" and "null" are left out. A query word that is a word of a description, shares an English base word with one, starts one or has the same meaning as one finds the result, and such a result ranks below every result that the query matches in its name, menu path or id, as text inside a word or through a typo. Descriptions are English only, and a typo does not match them. Tools, panels and filter plug-ins have no description (`palette::search` tests `a_description_leaves_out_the_schema_and_the_result`, `a_word_of_the_description_finds_the_result`, `a_description_match_ranks_below_a_typo`, `words_of_a_description_find_the_command`). `object.setProps` with `visible: false` or `locked: true` deselects every selected object that is then hidden or locked, the key object included, as the eye and lock columns do. Ctrl/Cmd+Alt-clicking an eye switches the other layers to Outline and the row's layer to Preview, or switches all layers back to Preview when the others are in Outline (`layer.outlineOthers`, `layer.previewAll`). From 7c2bb2aff8e2bf28ca915ad79db72d3eb9805d3d Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Mon, 16 Nov 2026 09:59:02 -0800 Subject: [PATCH 11/78] Command Palette: a word inside a word combines with the other matches A query word that is text inside a word of a result now counts as matched when the other words match through a stem form, a word of the same meaning, a typo or the description: "bg mov" finds Remove Background. Before, such a word left the result out unless every word was text in its names or ids. A word that is text inside some result's names or ids also keeps the later words compared for typos. --- crates/ui-egui/src/palette/search.rs | 33 ++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/crates/ui-egui/src/palette/search.rs b/crates/ui-egui/src/palette/search.rs index 7fe8fc09be..b236a63557 100644 --- a/crates/ui-egui/src/palette/search.rs +++ b/crates/ui-egui/src/palette/search.rs @@ -654,6 +654,7 @@ type RankKey = (bool, bool, u8, u8, u32, u8, u8, usize); /// or starts a word of its label, menu path, description ([`description`]) or id, shares an English /// stem form with a word of its label, menu path or description ("rounded corners" for Round /// Corners…) or means the same as a word of its label, menu path or description ("remove bg" for +/// Remove Background…), where a word may also be text in one of its names or ids ("bg mov" for /// Remove Background…), or when the query is the initials of a label ("ea" for Export As…). A query /// word that is no word, stem form or word start of any result's label, menu path or id also /// matches the words of labels and menu paths it is a typo of ([`Index::typos`]). @@ -680,9 +681,9 @@ pub(crate) fn rank(entries: &[Entry], index: &Index, query: &str) -> Vec { let mut indexed: Vec> = Vec::with_capacity(tokens.len()); let mut typos: Vec> = Vec::with_capacity(tokens.len()); let mut meanings: Vec> = Vec::with_capacity(tokens.len()); - // After a word that is nothing in any result and a typo of nothing, a result is found only by - // the substring rule or its initials, where a typo grade changes nothing, so the later words are - // not compared. + // After a word that is nothing in any result, a typo of nothing and text inside no result's names + // or ids, a result is found only by its initials, where a typo grade changes nothing, so the later + // words are not compared. let mut compare = true; for (k, t) in tokens.iter().enumerate() { // A repeated word is graded once. @@ -699,7 +700,7 @@ pub(crate) fn rank(entries: &[Entry], index: &Index, query: &str) -> Vec { // A word that matches only words of descriptions is still compared with the words of labels // and menu paths it may be a typo of. let near = if compare && grades.iter().all(|&g| g == NONE || g == DESCRIPTION_WORD) { index.typos(t) } else { vec![] }; - if near.is_empty() && grades.iter().all(|&g| g == NONE) { + if near.is_empty() && grades.iter().all(|&g| g == NONE) && !entries.iter().any(|e| e.haystack.contains(t)) { compare = false; } index.mark_typos(&near, &mut grades); @@ -736,12 +737,15 @@ pub(crate) fn rank(entries: &[Entry], index: &Index, query: &str) -> Vec { }; for (k, (grades, token)) in indexed.iter().zip(&tokens).enumerate() { let mut g = grades.get(i).copied().unwrap_or(NONE); - if g == NONE { - all_indexed = false; - } if g > SUBSTRING && e.haystack.contains(token) { g = SUBSTRING; } + // A word that is text inside a word of the result counts as matched, so it combines + // with words matched through a stem form, a word of the same meaning, a typo or the + // description. + if g == NONE { + all_indexed = false; + } let g = if initials { g.min(LABEL_PREFIX) } else if g == NONE { @@ -1215,6 +1219,21 @@ mod tests { assert_eq!(ranked(&c, "colour"), ["c.three", "panel:color", "tool:zz"]); } + /// A word that is text inside a word of the result combines with a word matched through a word + /// of the same meaning, a stem form, a typo or the description, and a word that is text inside + /// a word of no result finds nothing. + #[test] + fn a_word_inside_a_word_combines_with_the_other_matches() { + let c = described(vec![entry("Remove Background…", "a.one"), entry("Zz Group", "b.two")], &["{} make the images transparent", ""]); + assert_eq!(ranked(&c, "bg remove"), ["a.one"]); + assert_eq!(ranked(&c, "background mov"), ["a.one"]); + assert_eq!(ranked(&c, "bg mov"), ["a.one"], "a word of the same meaning"); + assert_eq!(ranked(&c, "removing kgrou"), ["a.one"], "a stem form"); + assert_eq!(ranked(&c, "transparent kgrou"), ["a.one"], "the description"); + assert_eq!(ranked(&c, "emov backgruond"), ["a.one"], "a typo after a word inside a word"); + assert!(ranked(&c, "bg qxq").is_empty()); + } + /// A catalog row adds words in the UI language to a group, and a word that is not a single word /// or that is a word of another group is left out. #[test] From a83cb1fadbada14117ab6c3bab205b717bf2d7a3 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Mon, 16 Nov 2026 09:41:02 -0800 Subject: [PATCH 12/78] =?UTF-8?q?Command=20Palette:=20a=20pick=20of=20Sear?= =?UTF-8?q?ch=20Commands=E2=80=A6=20is=20not=20a=20recent=20pick?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As the first recent pick, the palette's own toggle made Enter on an empty search close the palette and open it again. A pick of it is no longer recorded, and one saved earlier is not listed. - The rows of the empty search's list take the room the result count used to take, and the No recent commands line keeps the count's spacing. - The palette tests' list of shown results follows the empty search. - Tests: the toggle is not recorded or listed; a click on a lower recent pick runs it and moves it first. --- crates/ui-egui/src/palette.rs | 76 ++++++++++++++++++++++++++++++++--- docs/target-app-parity.md | 2 +- 2 files changed, 72 insertions(+), 6 deletions(-) diff --git a/crates/ui-egui/src/palette.rs b/crates/ui-egui/src/palette.rs index 6b01518575..451e198685 100644 --- a/crates/ui-egui/src/palette.rs +++ b/crates/ui-egui/src/palette.rs @@ -562,10 +562,20 @@ fn remember(list: &mut Vec, id: &str, known: impl Fn(&str) -> bool) { list.truncate(end.unwrap_or(list.len()).min(MAX_SAVED_RECENT_COMMANDS)); } +/// The command that opens and closes the palette. A pick of it is not recorded in Recent Commands: +/// as the first recent pick, Enter on an empty search would close the palette and open it again. +const PALETTE_TOGGLE: &str = "help.commandPalette"; + /// The entries the Recent Commands list shows for the ids `ids`, most recent first. An id with no -/// entry (a removed plug-in) is skipped. +/// entry (a removed plug-in) and the palette's own toggle, saved before its picks were left out, +/// are skipped. fn recent<'a>(entries: &'a [Entry], ids: &[String]) -> Vec<&'a Entry> { - ids.iter().take(MAX_SAVED_RECENT_COMMANDS).filter_map(|id| entries.iter().find(|e| e.id == *id)).take(MAX_RECENT_COMMANDS).collect() + ids.iter() + .take(MAX_SAVED_RECENT_COMMANDS) + .filter(|id| *id != PALETTE_TOGGLE) + .filter_map(|id| entries.iter().find(|e| e.id == *id)) + .take(MAX_RECENT_COMMANDS) + .collect() } /// The id of the Recent Commands list's popup. @@ -746,7 +756,9 @@ pub fn show(app: &mut VectorcraftApp, ctx: &egui::Context) { // The list shows as many rows as fit above the footer in the window, up to // VISIBLE_ROWS; a page is that many rows. let spacing = ui.spacing().item_spacing.y; - let footer_height = spacing + 6.0 + ui.text_style_height(&egui::TextStyle::Body) + f32::from(margin) + BOTTOM_GAP; + // Under the recent picks no footer line is drawn. + let footer_line = if empty { 0.0 } else { spacing + 6.0 + ui.text_style_height(&egui::TextStyle::Body) }; + let footer_height = footer_line + f32::from(margin) + BOTTOM_GAP; let room = screen.bottom() - footer_height - ui.cursor().top() - spacing; let rows = ((room / ROW_HEIGHT).floor().max(1.0) as usize).min(VISIBLE_ROWS); sel = moves.apply(sel, n, rows); @@ -816,6 +828,7 @@ pub fn show(app: &mut VectorcraftApp, ctx: &egui::Context) { ui.add_space(6.0); ui.label(egui::RichText::new(footer(n, total)).color(t.text_dim)); } else if n == 0 { + ui.add_space(6.0); ui.label(egui::RichText::new(tl!("No recent commands")).color(t.text_dim)); } if !list_open @@ -854,7 +867,9 @@ pub fn show(app: &mut VectorcraftApp, ctx: &egui::Context) { }); if let Some(id) = run { app.ui.palette_open = false; - remember(&mut app.ui.recent_commands, &id, |c| entries.list.iter().any(|e| e.id == c)); + if id != PALETTE_TOGGLE { + remember(&mut app.ui.recent_commands, &id, |c| entries.list.iter().any(|e| e.id == c)); + } run_pick(app, &id); } else if outside { app.ui.palette_open = false; @@ -1514,6 +1529,51 @@ mod tests { assert!(top.2 >= f64::from(open.popup().top()), "the first row is in view: {shown:?}"); } + /// A pick of the palette's own toggle is not recorded, and one saved earlier is not listed, so + /// Enter on an empty search runs the last other pick. + #[test] + fn the_palette_toggle_is_not_a_recent_pick() { + let mut open = Open::new("search commands", WINDOW); + open.app.ui.recent_commands = vec!["paint.swap".into()]; + let k = open.listed().iter().position(|id| id == PALETTE_TOGGLE).expect("the toggle's result"); + open.frame(vec![]); + open.press(egui::Key::ArrowDown, k); + assert_eq!(open.highlighted(), k); + open.press(egui::Key::Enter, 1); + assert_eq!(open.app.ui.recent_commands, ["paint.swap"]); + open.app.ui.recent_commands = vec![PALETTE_TOGGLE.into(), "paint.swap".into()]; + open.app.ui.palette_query.clear(); + open.app.ui.palette_open = true; + open.frame(vec![]); + assert_eq!(open.listed(), ["paint.swap"]); + let nodes = open.frame(vec![]); + let shown: Vec<(String, bool)> = rows(&nodes).into_iter().map(|r| (r.0, r.1)).collect(); + assert_eq!(shown, [(row_labels(&open.ctx, &["paint.swap"])[0].clone(), true)]); + } + + /// A click on a lower row of the empty search's list runs that pick and moves it to the top of + /// Recent Commands. + #[test] + fn a_click_on_a_recent_pick_runs_it_and_moves_it_first() { + let mut open = Open::new("", WINDOW); + open.app = VectorcraftApp::new(vectorcraft_testkit::fixtures::Fixture::Multi.session(), crate::Services::default()); + open.app.ui.recent_commands = vec!["object.group".into(), "paint.swap".into()]; + open.app.ui.palette_open = true; + let nodes = open.frame(vec![]); + let row = rows(&nodes).into_iter().nth(1).expect("the second pick's row"); + assert_eq!(row.0, row_labels(&open.ctx, &["paint.swap"])[0]); + let before = open.app.session.active().unwrap().history.undo.len(); + let at = egui::pos2(open.popup().right() - 24.0, ((row.2 + row.3) / 2.0) as f32); + let button = + |pressed| egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE }; + open.frame(vec![egui::Event::PointerMoved(at)]); + open.frame(vec![button(true)]); + open.frame(vec![button(false)]); + assert!(!open.app.ui.palette_open, "the palette closes"); + assert_eq!(open.app.session.active().unwrap().history.undo.len(), before + 1, "{}", open.app.ui.status); + assert_eq!(open.app.ui.recent_commands, ["paint.swap", "object.group"]); + } + /// #1757: Up and Down move the highlighted result, wrapping at the ends; a new query starts /// from the first again. #[test] @@ -2046,7 +2106,13 @@ mod tests { /// The results the palette lists for its query. fn listed(&self) -> Vec { let entries = entries(&self.ctx, Lang::EN); - matching(&entries, &self.app.ui.palette_query.to_lowercase()).iter().take(MAX_RESULTS).map(|e| e.id.clone()).collect() + // An empty search lists the recent picks, as `show` does. + let listed = if self.app.ui.palette_query.trim().is_empty() { + recent(&entries.list, &self.app.ui.recent_commands) + } else { + matching(&entries, &self.app.ui.palette_query.to_lowercase()) + }; + listed.iter().take(MAX_RESULTS).map(|e| e.id.clone()).collect() } } diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index abefc8cf52..1b18fee682 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -1027,7 +1027,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - The Free Transform widget's Constrain works in Free Distort as well as in Free Transform ([the help page](https://helpx.adobe.com/illustrator/using/tool-techniques/free-transform-tool.html)). With Constrain on, or Shift held, a corner dragged in Free Distort moves only along the line through the opposite corner, in the box's own proportions, and the other three corners stay in place; on a turned box the line runs through the box's own corners. The line is VectorCraft's own rule. Cmd/Ctrl+Alt+Shift on a corner still drags in Perspective Distort, where Constrain stays unavailable (tools `xform::free::tests::free_distort_corner_keeps_to_its_diagonal_with_shift_or_constrain`, `shift_pressed_during_a_free_distort_drag_constrains_it`, `a_turned_box_is_constrained_along_its_own_diagonal`, `along_diagonal_of_a_degenerate_box`; engine `xform::free_transform_constrained_distort_keeps_the_corner_on_its_diagonal`; ui-egui `free_transform::tests::the_widget_sets_the_mode_and_a_corner_drag_then_distorts`). - Native macOS menu bar, vector tool cursors, a command palette (Help › Search Commands…), middle-button panning with any tool. Native menus explicitly end tracking on command selection, outside window presses and Escape; menu updates wait until tracking ends, and a dismissing press never starts a canvas gesture (M14.8). - A Recent Commands button beside the Help › Search Commands field lists the last five commands and tools picked from the palette, most recent first, with a command picked again moved to the top. Choosing a row closes the palette and runs it as a pick of the same result does; with no picks yet the list shows a dimmed No recent commands row, and a command that is not available now, such as a filter of a plug-in that is not loaded, is left out until it comes back. The ids are saved with the UI state. While the list is open, Up and Down move through its rows, wrapping at the ends, and Escape closes the list before the palette. This is VectorCraft's own addition and does not raise a score (#6376; `palette` tests `recent_commands_*`, `a_recent_command_runs_what_its_pick_runs`, `the_keys_wrap_within_recent_commands`, `escape_closes_recent_commands_before_the_palette`). - - With an empty search, or one of spaces only, the Command Palette lists the picks of the Recent Commands list under a Recent Commands heading, most recent first, with the first highlighted and no result count, so opening the palette and pressing Enter runs the last pick again. With no picks yet it lists no results and shows a dimmed No recent commands line. The palette opens with its first result highlighted and its list scrolled to the top. This is VectorCraft's own behavior (`palette` tests `an_empty_search_lists_the_recent_picks_most_recent_first`, `an_empty_search_without_picks_says_there_are_none`, `enter_on_an_empty_search_runs_the_last_pick_again`, `the_palette_opens_again_with_its_first_row_highlighted`). + - With an empty search, or one of spaces only, the Help › Search Commands field lists the picks of the Recent Commands list (at most five, leaving out a filter of a plug-in that is not loaded) under a Recent Commands heading, most recent first, with the first highlighted and no result count, so opening the palette and pressing Enter picks the last pick again; a pick that is dimmed now shows why in the status line, as from a search. With no picks yet it lists no results and shows a dimmed No recent commands line. A pick of Search Commands… itself is not recorded. The palette opens with its first result highlighted and its list scrolled to the top. This is VectorCraft's own behavior (`palette` tests `an_empty_search_lists_the_recent_picks_most_recent_first`, `an_empty_search_without_picks_says_there_are_none`, `enter_on_an_empty_search_runs_the_last_pick_again`, `the_palette_opens_again_with_its_first_row_highlighted`, `the_palette_toggle_is_not_a_recent_pick`, `a_click_on_a_recent_pick_runs_it_and_moves_it_first`). - The Learn panel (Window › Learn, or Explore tutorials beside the search icon on the app bar) has a For you tab with a Get started section and a Quick skill guide card, and a Skills tab that lists VectorCraft's own skills with their progress rings and counts of tutorials finished; a skill lists its tutorials, a tutorial shows its numbered steps, and Back goes up a level; `learn.list`, `learn.tab {tab}`, `learn.skill {skill}`, `learn.show {tutorial}` and `learn.back` script it, and the tab buttons, the rows and Back run them ([the help page](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/learn-skills-quick-skill-guide.html); `panels::learn::tests`). - A tool's name in a Learn tutorial step is a blue link that shows where the tool is without choosing it (`learn.locateTool {tool}`): its toolbar button is marked, a collapsed group's flyout opens with the tool's row marked, a torn-off strip comes to the front, and a tool no shown toolbar holds is marked in the All Tools drawer. The mark, its 3 seconds and the hidden-toolbar cases are VectorCraft's own rules ([the help page](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/learn-skills-quick-skill-guide.html); `panels::learn::tests`, the `a_learn_link_*` tests in `toolbar::tests`). - Under a tutorial's steps, View more opens the tutorial's own practice sample as a new untitled document, and once the tutorial is finished, Next Up moves to the next tutorial in the same skill, as the help page describes ([the help page](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/learn-skills-quick-skill-guide.html)). The samples are VectorCraft's own drawings. A Finish tutorial button that shows once the sample is open, the untitled copy, Back to skills in place of Next Up after a skill's last tutorial, and Next Up showing the next tutorial without opening its sample are VectorCraft's own rules. `learn.openSample`, `learn.finish`, `learn.next` and `learn.skills` (Back to skills) script them. Not done: the help page's short video. Regression tests: `view_more_opens_the_tutorial_s_sample_as_a_new_untitled_document`, `finishing_a_tutorial_offers_next_up_in_its_skill`, `the_practice_controls_work_from_the_keyboard`, `the_last_tutorial_of_a_skill_offers_back_to_skills`, `learn_finish_and_learn_next_follow_the_practice`, `learn_skills_shows_the_list_of_skills`, `the_practice_commands_reject_a_missing_or_unknown_tutorial`, `every_tutorial_has_its_own_readable_sample` and `the_next_tutorial_is_the_next_one_in_the_same_skill` in `crates/ui-egui/src/panels/learn/tests.rs`. From c834fa0daf494e0da10f8869943dd3c80b7cd201 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Mon, 16 Nov 2026 12:39:30 -0800 Subject: [PATCH 13/78] Command Palette: an empty search lists eight recent picks, and a refused pick is not recorded An empty search lists up to eight recent picks under a Recent heading. With no picks yet it shows a dimmed line, "Type to search commands, tools, panels and effects", with a row in every catalog. The Recent Commands button's list also shows up to eight picks, and the saved list holds at most 20 ids. A pick now reports whether it ran, opened a dialog or was refused. Only a pick that ran or opened a dialog is recorded in Recent Commands, so a canceled dialog's command stays there. A pick that is refused because its menu item is dimmed, or because its panel can't be shown in Presentation Mode, is no longer recorded; a refused recent pick keeps its place. --- crates/ui-egui/src/i18n/bg.tsv | 1 + crates/ui-egui/src/i18n/bs.tsv | 1 + crates/ui-egui/src/i18n/ca.tsv | 1 + crates/ui-egui/src/i18n/cs.tsv | 1 + crates/ui-egui/src/i18n/da.tsv | 1 + crates/ui-egui/src/i18n/de.tsv | 1 + crates/ui-egui/src/i18n/el.tsv | 1 + crates/ui-egui/src/i18n/es.tsv | 1 + crates/ui-egui/src/i18n/fi.tsv | 1 + crates/ui-egui/src/i18n/fr.tsv | 1 + crates/ui-egui/src/i18n/gu.tsv | 2 + crates/ui-egui/src/i18n/hi.tsv | 1 + crates/ui-egui/src/i18n/hu.tsv | 1 + crates/ui-egui/src/i18n/id.tsv | 1 + crates/ui-egui/src/i18n/it.tsv | 1 + crates/ui-egui/src/i18n/ja.tsv | 1 + crates/ui-egui/src/i18n/ka.tsv | 1 + crates/ui-egui/src/i18n/ko.tsv | 1 + crates/ui-egui/src/i18n/nl.tsv | 1 + crates/ui-egui/src/i18n/pl.tsv | 1 + crates/ui-egui/src/i18n/pt-br.tsv | 1 + crates/ui-egui/src/i18n/ru.tsv | 1 + crates/ui-egui/src/i18n/sv.tsv | 1 + crates/ui-egui/src/i18n/tr.tsv | 1 + crates/ui-egui/src/i18n/uk.tsv | 1 + crates/ui-egui/src/i18n/vi.tsv | 1 + crates/ui-egui/src/i18n/zh-hans.tsv | 1 + crates/ui-egui/src/i18n/zh-hant.tsv | 1 + crates/ui-egui/src/palette.rs | 172 ++++++++++++++++++++++------ docs/target-app-parity.md | 4 +- 30 files changed, 169 insertions(+), 36 deletions(-) diff --git a/crates/ui-egui/src/i18n/bg.tsv b/crates/ui-egui/src/i18n/bg.tsv index b27a198fc1..bbbed1d8e0 100644 --- a/crates/ui-egui/src/i18n/bg.tsv +++ b/crates/ui-egui/src/i18n/bg.tsv @@ -3196,6 +3196,7 @@ digits Malayalam Малаялам @plural {shown} of {n} result. Keep typing to narrow them.|{shown} of {n} results. Keep typing to narrow them. {shown} от {n} резултат. Продължете да пишете, за да ги стесните.|{shown} от {n} резултата. Продължете да пишете, за да ги стесните. Recent Commands Последни команди No recent commands Няма последни команди + Type to search commands, tools, panels and effects Въведете текст, за да търсите команди, инструменти, панели и ефекти Search Commands… Търсене на команди… Secondary Вторичен Section Symbol Символ за раздел diff --git a/crates/ui-egui/src/i18n/bs.tsv b/crates/ui-egui/src/i18n/bs.tsv index df8c34eeeb..5e60dd12a1 100644 --- a/crates/ui-egui/src/i18n/bs.tsv +++ b/crates/ui-egui/src/i18n/bs.tsv @@ -4395,6 +4395,7 @@ font-technology Variable Varijabilni @plural {shown} of {n} result. Keep typing to narrow them.|{shown} of {n} results. Keep typing to narrow them. {shown} od {n} rezultata. Nastavite kucati da ih suzite.|{shown} od {n} rezultata. Nastavite kucati da ih suzite.|{shown} od {n} rezultata. Nastavite kucati da ih suzite. Recent Commands Nedavne naredbe No recent commands Nema nedavnih naredbi + Type to search commands, tools, panels and effects Upišite za pretragu naredbi, alata, panela i efekata Dashed Line Isprekidana linija Panel menu Meni panela Unembed… Poništi ugrađivanje… diff --git a/crates/ui-egui/src/i18n/ca.tsv b/crates/ui-egui/src/i18n/ca.tsv index a3f6252a3f..1d0245fd67 100644 --- a/crates/ui-egui/src/i18n/ca.tsv +++ b/crates/ui-egui/src/i18n/ca.tsv @@ -4125,6 +4125,7 @@ digits Malayalam Malaiàlam @plural {shown} of {n} result. Keep typing to narrow them.|{shown} of {n} results. Keep typing to narrow them. {shown} de {n} resultat. Continueu escrivint per reduir-los.|{shown} de {n} resultats. Continueu escrivint per reduir-los. Recent Commands Ordres recents No recent commands No hi ha ordres recents + Type to search commands, tools, panels and effects Escriviu per cercar ordres, eines, panells i efectes Search Commands… Cerca ordres… Search Fonts Folder Cerca a la carpeta de tipus de lletra Searching… Cercant… diff --git a/crates/ui-egui/src/i18n/cs.tsv b/crates/ui-egui/src/i18n/cs.tsv index 83662e4b5b..5b16e26687 100644 --- a/crates/ui-egui/src/i18n/cs.tsv +++ b/crates/ui-egui/src/i18n/cs.tsv @@ -4500,6 +4500,7 @@ font-technology Variable Variabilní @plural {shown} of {n} result. Keep typing to narrow them.|{shown} of {n} results. Keep typing to narrow them. {shown} z {n} výsledku. Pište dál a výsledky se zúží.|{shown} z {n} výsledků. Pište dál a výsledky se zúží.|{shown} z {n} výsledků. Pište dál a výsledky se zúží. Recent Commands Nedávné příkazy No recent commands Žádné nedávné příkazy + Type to search commands, tools, panels and effects Pište pro hledání příkazů, nástrojů, panelů a efektů Dashed Line Čárkovaná čára Panel menu Nabídka panelu Unembed… Zrušit vložení… diff --git a/crates/ui-egui/src/i18n/da.tsv b/crates/ui-egui/src/i18n/da.tsv index 6a7c29cbce..2dfcca0f61 100644 --- a/crates/ui-egui/src/i18n/da.tsv +++ b/crates/ui-egui/src/i18n/da.tsv @@ -6874,6 +6874,7 @@ font-technology Variable Variable @plural {shown} of {n} result. Keep typing to narrow them.|{shown} of {n} results. Keep typing to narrow them. {shown} af {n} resultat. Skriv videre for at indsnævre dem.|{shown} af {n} resultater. Skriv videre for at indsnævre dem. Recent Commands Seneste kommandoer No recent commands Ingen seneste kommandoer + Type to search commands, tools, panels and effects Skriv for at søge i kommandoer, værktøjer, paneler og effekter Dashed Line Stiplet linje Panel menu Panelmenu Unembed… Ophæv integrering… diff --git a/crates/ui-egui/src/i18n/de.tsv b/crates/ui-egui/src/i18n/de.tsv index 1b1ec46863..614fe3fe9f 100644 --- a/crates/ui-egui/src/i18n/de.tsv +++ b/crates/ui-egui/src/i18n/de.tsv @@ -3260,6 +3260,7 @@ digits Malayalam Malayalam @plural {shown} of {n} result. Keep typing to narrow them.|{shown} of {n} results. Keep typing to narrow them. {shown} von {n} Ergebnis. Tippen Sie weiter, um sie einzugrenzen.|{shown} von {n} Ergebnissen. Tippen Sie weiter, um sie einzugrenzen. Recent Commands Zuletzt verwendete Befehle No recent commands Keine zuletzt verwendeten Befehle + Type to search commands, tools, panels and effects Tippen, um Befehle, Werkzeuge, Bedienfelder und Effekte zu suchen Search Commands… Befehle suchen… Secondary Sekundär Section Symbol Paragrafenzeichen diff --git a/crates/ui-egui/src/i18n/el.tsv b/crates/ui-egui/src/i18n/el.tsv index 618db0a6a8..7bd4d77f4a 100644 --- a/crates/ui-egui/src/i18n/el.tsv +++ b/crates/ui-egui/src/i18n/el.tsv @@ -3962,6 +3962,7 @@ digits Malayalam Μαλαγιάλαμ @plural {shown} of {n} result. Keep typing to narrow them.|{shown} of {n} results. Keep typing to narrow them. {shown} από {n} αποτέλεσμα. Συνεχίστε να πληκτρολογείτε για να τα περιορίσετε.|{shown} από {n} αποτελέσματα. Συνεχίστε να πληκτρολογείτε για να τα περιορίσετε. Recent Commands Πρόσφατες εντολές No recent commands Δεν υπάρχουν πρόσφατες εντολές + Type to search commands, tools, panels and effects Πληκτρολογήστε για αναζήτηση εντολών, εργαλείων, πλαισίων και εφέ Search Commands… Αναζήτηση εντολών… Secondary Δευτερεύον Section Symbol Σύμβολο ενότητας diff --git a/crates/ui-egui/src/i18n/es.tsv b/crates/ui-egui/src/i18n/es.tsv index 3cf461791e..288039df8f 100644 --- a/crates/ui-egui/src/i18n/es.tsv +++ b/crates/ui-egui/src/i18n/es.tsv @@ -3298,6 +3298,7 @@ digits Malayalam Malayálam @plural {shown} of {n} result. Keep typing to narrow them.|{shown} of {n} results. Keep typing to narrow them. {shown} de {n} resultado. Sigue escribiendo para acotarlos.|{shown} de {n} resultados. Sigue escribiendo para acotarlos. Recent Commands Comandos recientes No recent commands No hay comandos recientes + Type to search commands, tools, panels and effects Escriba para buscar comandos, herramientas, paneles y efectos Search Commands… Buscar comandos… Secondary Secundario Section Symbol Símbolo de sección diff --git a/crates/ui-egui/src/i18n/fi.tsv b/crates/ui-egui/src/i18n/fi.tsv index 0b1e3c881b..0fdd3cd69b 100644 --- a/crates/ui-egui/src/i18n/fi.tsv +++ b/crates/ui-egui/src/i18n/fi.tsv @@ -4419,6 +4419,7 @@ font-technology Variable Muuttuvat @plural {shown} of {n} result. Keep typing to narrow them.|{shown} of {n} results. Keep typing to narrow them. {shown}/{n} tulosta. Kirjoita lisää rajataksesi tuloksia.|{shown}/{n} tulosta. Kirjoita lisää rajataksesi tuloksia. Recent Commands Viimeisimmät komennot No recent commands Ei viimeisimpiä komentoja + Type to search commands, tools, panels and effects Kirjoita hakeaksesi komentoja, työkaluja, paneeleita ja tehosteita Dashed Line Katkoviiva Panel menu Paneelivalikko Unembed… Poista upotus… diff --git a/crates/ui-egui/src/i18n/fr.tsv b/crates/ui-egui/src/i18n/fr.tsv index b8667775fa..8cd4f5a995 100644 --- a/crates/ui-egui/src/i18n/fr.tsv +++ b/crates/ui-egui/src/i18n/fr.tsv @@ -3286,6 +3286,7 @@ digits Malayalam Malayalam @plural {shown} of {n} result. Keep typing to narrow them.|{shown} of {n} results. Keep typing to narrow them. {shown} sur {n} résultat. Continuez à taper pour les affiner.|{shown} sur {n} résultats. Continuez à taper pour les affiner. Recent Commands Commandes récentes No recent commands Aucune commande récente + Type to search commands, tools, panels and effects Tapez pour chercher commandes, outils, panneaux et effets Search Commands… Rechercher des commandes… Secondary Secondaire Section Symbol Symbole de section diff --git a/crates/ui-egui/src/i18n/gu.tsv b/crates/ui-egui/src/i18n/gu.tsv index 385fccc138..645d913550 100644 --- a/crates/ui-egui/src/i18n/gu.tsv +++ b/crates/ui-egui/src/i18n/gu.tsv @@ -3401,6 +3401,8 @@ @plural {shown} of {n} result. Keep typing to narrow them.|{shown} of {n} results. Keep typing to narrow them. {n} માંથી {shown} પરિણામ. તેમને સંકુચિત કરવા લખતા રહો.|{n} માંથી {shown} પરિણામો. તેમને સંકુચિત કરવા લખતા રહો. Recent Commands તાજેતરના આદેશો No recent commands કોઈ તાજેતરના આદેશો નથી + Type to search commands, tools, panels and effects આદેશો, ટૂલ્સ, પેનલ્સ અને ઇફેક્ટ્સ શોધવા માટે લખો + Recent તાજેતરના Search images છબીઓ શોધો Searching… શોધી રહ્યા છીએ… Secondary ગૌણ diff --git a/crates/ui-egui/src/i18n/hi.tsv b/crates/ui-egui/src/i18n/hi.tsv index e332f6be32..7a7049ee97 100644 --- a/crates/ui-egui/src/i18n/hi.tsv +++ b/crates/ui-egui/src/i18n/hi.tsv @@ -4475,6 +4475,7 @@ antiAlias Sharp शार्प @plural {shown} of {n} result. Keep typing to narrow them.|{shown} of {n} results. Keep typing to narrow them. {n} में से {shown} परिणाम। इन्हें सीमित करने के लिए लिखते रहें।|{n} में से {shown} परिणाम। इन्हें सीमित करने के लिए लिखते रहें। Recent Commands हाल के आदेश No recent commands कोई हाल का आदेश नहीं + Type to search commands, tools, panels and effects आदेश, टूल, पैनल्स और इफ़ेक्ट्स खोजने के लिए टाइप करें Search Commands… कमांड खोजें… Search Fonts Folder खोज फ़ॉन्ट फ़ोल्डर Search images इमेज खोजना diff --git a/crates/ui-egui/src/i18n/hu.tsv b/crates/ui-egui/src/i18n/hu.tsv index e4452cb211..a22bfca5aa 100644 --- a/crates/ui-egui/src/i18n/hu.tsv +++ b/crates/ui-egui/src/i18n/hu.tsv @@ -3919,6 +3919,7 @@ mark-style Japanese Japán @plural {shown} of {n} result. Keep typing to narrow them.|{shown} of {n} results. Keep typing to narrow them. {n} találatból {shown} látható. Gépeljen tovább a szűkítéshez. Recent Commands Legutóbbi parancsok No recent commands Nincsenek legutóbbi parancsok + Type to search commands, tools, panels and effects Gépeljen parancsok, eszközök, panelek és effektusok kereséséhez Search Commands… Parancsok keresése… Search Fonts Folder Keresés betűtípusmappában Searching… Keresés… diff --git a/crates/ui-egui/src/i18n/id.tsv b/crates/ui-egui/src/i18n/id.tsv index 37ea827f3c..3315f24c79 100644 --- a/crates/ui-egui/src/i18n/id.tsv +++ b/crates/ui-egui/src/i18n/id.tsv @@ -4151,6 +4151,7 @@ font-technology Variable Variabel @plural {shown} of {n} result. Keep typing to narrow them.|{shown} of {n} results. Keep typing to narrow them. {shown} dari {n} hasil. Terus ketik untuk mempersempitnya. Recent Commands Perintah terbaru No recent commands Tidak ada perintah terbaru + Type to search commands, tools, panels and effects Ketik untuk mencari perintah, alat, panel, dan efek Dashed Line Garis putus-putus Panel menu Menu panel Unembed… Lepaskan sematan… diff --git a/crates/ui-egui/src/i18n/it.tsv b/crates/ui-egui/src/i18n/it.tsv index 7005d218f7..511ef30374 100644 --- a/crates/ui-egui/src/i18n/it.tsv +++ b/crates/ui-egui/src/i18n/it.tsv @@ -3341,6 +3341,7 @@ digits Malayalam Malayalam @plural {shown} of {n} result. Keep typing to narrow them.|{shown} of {n} results. Keep typing to narrow them. {shown} di {n} risultato. Continua a digitare per restringerli.|{shown} di {n} risultati. Continua a digitare per restringerli. Recent Commands Comandi recenti No recent commands Nessun comando recente + Type to search commands, tools, panels and effects Digita per cercare comandi, strumenti, pannelli ed effetti Search Commands… Cerca comandi… Secondary Secondario Section Symbol Simbolo di sezione diff --git a/crates/ui-egui/src/i18n/ja.tsv b/crates/ui-egui/src/i18n/ja.tsv index 9b403f103c..ab8fcf8be4 100644 --- a/crates/ui-egui/src/i18n/ja.tsv +++ b/crates/ui-egui/src/i18n/ja.tsv @@ -3219,6 +3219,7 @@ mark-style Japanese 日本式 @plural {shown} of {n} result. Keep typing to narrow them.|{shown} of {n} results. Keep typing to narrow them. {n} 件中 {shown} 件。続けて入力すると絞り込めます。 Recent Commands 最近使ったコマンド No recent commands 最近使ったコマンドはありません + Type to search commands, tools, panels and effects 入力してコマンド、ツール、パネル、効果を検索 Secondary セカンダリ Select All Art on Layer レイヤー上のすべてのアートを選択 Select All Assets すべてのアセットを選択 diff --git a/crates/ui-egui/src/i18n/ka.tsv b/crates/ui-egui/src/i18n/ka.tsv index a069c9bac6..26f82167bc 100644 --- a/crates/ui-egui/src/i18n/ka.tsv +++ b/crates/ui-egui/src/i18n/ka.tsv @@ -6103,6 +6103,7 @@ font-technology Variable ცვლადი @plural {shown} of {n} result. Keep typing to narrow them.|{shown} of {n} results. Keep typing to narrow them. {n} შედეგიდან {shown}. გააგრძელეთ აკრეფა მათ შესამცირებლად. Recent Commands ბოლო ბრძანებები No recent commands ბოლო ბრძანებები არ არის + Type to search commands, tools, panels and effects აკრიფეთ ბრძანებების, ხელსაწყოების, პანელებისა და ეფექტების მოსაძებნად Dashed Line ტირეებიანი ხაზი Panel menu პანელის მენიუ Unembed… ჩაშენების მოხსნა… diff --git a/crates/ui-egui/src/i18n/ko.tsv b/crates/ui-egui/src/i18n/ko.tsv index e2de2a8d46..347b0acb7d 100644 --- a/crates/ui-egui/src/i18n/ko.tsv +++ b/crates/ui-egui/src/i18n/ko.tsv @@ -3208,6 +3208,7 @@ mark-style Japanese 일본식 @plural {shown} of {n} result. Keep typing to narrow them.|{shown} of {n} results. Keep typing to narrow them. 결과 {n}개 중 {shown}개. 계속 입력하여 범위를 좁히세요. Recent Commands 최근 명령 No recent commands 최근 명령 없음 + Type to search commands, tools, panels and effects 입력하여 명령, 도구, 패널 및 효과 검색 Secondary 보조 Select All Art on Layer 레이어의 모든 아트웍 선택 Select All Assets 모든 에셋 선택 diff --git a/crates/ui-egui/src/i18n/nl.tsv b/crates/ui-egui/src/i18n/nl.tsv index aaa159876e..191ded853f 100644 --- a/crates/ui-egui/src/i18n/nl.tsv +++ b/crates/ui-egui/src/i18n/nl.tsv @@ -4768,6 +4768,7 @@ font-technology Variable Variabel @plural {shown} of {n} result. Keep typing to narrow them.|{shown} of {n} results. Keep typing to narrow them. {shown} van {n} resultaat. Typ verder om ze te beperken.|{shown} van {n} resultaten. Typ verder om ze te beperken. Recent Commands Recente opdrachten No recent commands Geen recente opdrachten + Type to search commands, tools, panels and effects Typ om opdrachten, gereedschappen, panelen en effecten te zoeken Dashed Line Streepjeslijn Panel menu Paneelmenu Unembed… Insluiten ongedaan maken… diff --git a/crates/ui-egui/src/i18n/pl.tsv b/crates/ui-egui/src/i18n/pl.tsv index 6f7c6eb49a..cde2a77dad 100644 --- a/crates/ui-egui/src/i18n/pl.tsv +++ b/crates/ui-egui/src/i18n/pl.tsv @@ -4341,6 +4341,7 @@ font-technology Variable Zmienne @plural {shown} of {n} result. Keep typing to narrow them.|{shown} of {n} results. Keep typing to narrow them. {shown} z {n} wyniku. Pisz dalej, aby je zawęzić.|{shown} z {n} wyników. Pisz dalej, aby je zawęzić.|{shown} z {n} wyników. Pisz dalej, aby je zawęzić. Recent Commands Ostatnie polecenia No recent commands Brak ostatnich poleceń + Type to search commands, tools, panels and effects Pisz, aby szukać poleceń, narzędzi, paneli i efektów Dashed Line Linia przerywana Panel menu Menu panelu Unembed… Wyodrębnij… diff --git a/crates/ui-egui/src/i18n/pt-br.tsv b/crates/ui-egui/src/i18n/pt-br.tsv index 4138d050c8..640e7a76be 100644 --- a/crates/ui-egui/src/i18n/pt-br.tsv +++ b/crates/ui-egui/src/i18n/pt-br.tsv @@ -2757,6 +2757,7 @@ digits Malayalam Malaiala @plural {shown} of {n} result. Keep typing to narrow them.|{shown} of {n} results. Keep typing to narrow them. {shown} de {n} resultado. Continue digitando para filtrá-los.|{shown} de {n} resultados. Continue digitando para filtrá-los. Recent Commands Comandos recentes No recent commands Nenhum comando recente + Type to search commands, tools, panels and effects Digite para pesquisar comandos, ferramentas, painéis e efeitos Secondary Secundária Section Symbol Símbolo de Seção Select Selecionar diff --git a/crates/ui-egui/src/i18n/ru.tsv b/crates/ui-egui/src/i18n/ru.tsv index 5f73b0dd78..0dbdf2b0a1 100644 --- a/crates/ui-egui/src/i18n/ru.tsv +++ b/crates/ui-egui/src/i18n/ru.tsv @@ -3330,6 +3330,7 @@ digits Malayalam Малаялам @plural {shown} of {n} result. Keep typing to narrow them.|{shown} of {n} results. Keep typing to narrow them. {shown} из {n} результата. Продолжайте вводить, чтобы сузить их.|{shown} из {n} результатов. Продолжайте вводить, чтобы сузить их.|{shown} из {n} результатов. Продолжайте вводить, чтобы сузить их. Recent Commands Недавние команды No recent commands Нет недавних команд + Type to search commands, tools, panels and effects Начните вводить для поиска команд, инструментов, панелей и эффектов Search Commands… Поиск команд… Secondary Вторичный Section Symbol Символ параграфа diff --git a/crates/ui-egui/src/i18n/sv.tsv b/crates/ui-egui/src/i18n/sv.tsv index 769e5c7873..ca58813532 100644 --- a/crates/ui-egui/src/i18n/sv.tsv +++ b/crates/ui-egui/src/i18n/sv.tsv @@ -3216,6 +3216,7 @@ digits Malayalam Malayalam @plural {shown} of {n} result. Keep typing to narrow them.|{shown} of {n} results. Keep typing to narrow them. {shown} av {n} resultat. Fortsätt skriva för att begränsa dem.|{shown} av {n} resultat. Fortsätt skriva för att begränsa dem. Recent Commands Senaste kommandon No recent commands Inga senaste kommandon + Type to search commands, tools, panels and effects Skriv för att söka efter kommandon, verktyg, paneler och effekter Search Commands… Sök kommandon… Secondary Sekundär Section Symbol Paragraftecken diff --git a/crates/ui-egui/src/i18n/tr.tsv b/crates/ui-egui/src/i18n/tr.tsv index 8937e9fe77..7be721f903 100644 --- a/crates/ui-egui/src/i18n/tr.tsv +++ b/crates/ui-egui/src/i18n/tr.tsv @@ -3088,6 +3088,7 @@ digits Malayalam Malayalam @plural {shown} of {n} result. Keep typing to narrow them.|{shown} of {n} results. Keep typing to narrow them. {n} sonuçtan {shown} tanesi. Daraltmak için yazmaya devam edin. Recent Commands Son komutlar No recent commands Son komut yok + Type to search commands, tools, panels and effects Komutları, araçları, panelleri ve efektleri aramak için yazın Search Commands… Arama Komutları… Secondary İkincil Section Symbol Bölüm Sembolü diff --git a/crates/ui-egui/src/i18n/uk.tsv b/crates/ui-egui/src/i18n/uk.tsv index 99f8038a30..9b138474ff 100644 --- a/crates/ui-egui/src/i18n/uk.tsv +++ b/crates/ui-egui/src/i18n/uk.tsv @@ -3333,6 +3333,7 @@ digits Malayalam Малаялам @plural {shown} of {n} result. Keep typing to narrow them.|{shown} of {n} results. Keep typing to narrow them. {shown} з {n} результату. Продовжуйте вводити, щоб звузити їх.|{shown} з {n} результатів. Продовжуйте вводити, щоб звузити їх.|{shown} з {n} результатів. Продовжуйте вводити, щоб звузити їх. Recent Commands Нещодавні команди No recent commands Немає нещодавніх команд + Type to search commands, tools, panels and effects Почніть вводити для пошуку команд, інструментів, панелей та ефектів Search Commands… Пошук команд… Secondary Вторинний Section Symbol Символ параграфа diff --git a/crates/ui-egui/src/i18n/vi.tsv b/crates/ui-egui/src/i18n/vi.tsv index cece3dcf1b..30893b6db6 100644 --- a/crates/ui-egui/src/i18n/vi.tsv +++ b/crates/ui-egui/src/i18n/vi.tsv @@ -3676,6 +3676,7 @@ mark-style Japanese Kiểu Nhật @plural {shown} of {n} result. Keep typing to narrow them.|{shown} of {n} results. Keep typing to narrow them. {shown} trên {n} kết quả. Tiếp tục gõ để thu hẹp. Recent Commands Lệnh gần đây No recent commands Không có lệnh gần đây + Type to search commands, tools, panels and effects Nhập để tìm kiếm lệnh, công cụ, bảng và hiệu ứng Search Commands… Tìm kiếm lệnh… Search Fonts Folder Tìm kiếm thư mục phông chữ Searching… Đang tìm kiếm… diff --git a/crates/ui-egui/src/i18n/zh-hans.tsv b/crates/ui-egui/src/i18n/zh-hans.tsv index 677f7268b4..b60cec37c0 100644 --- a/crates/ui-egui/src/i18n/zh-hans.tsv +++ b/crates/ui-egui/src/i18n/zh-hans.tsv @@ -3160,6 +3160,7 @@ digits Malayalam 马拉雅拉姆数字 @plural {shown} of {n} result. Keep typing to narrow them.|{shown} of {n} results. Keep typing to narrow them. 共 {n} 个结果,显示 {shown} 个。继续输入以缩小范围。 Recent Commands 最近使用的命令 No recent commands 没有最近使用的命令 + Type to search commands, tools, panels and effects 输入以搜索命令、工具、面板和效果 Search Commands… 搜索命令… Secondary 次要 Section Symbol 章节符号 diff --git a/crates/ui-egui/src/i18n/zh-hant.tsv b/crates/ui-egui/src/i18n/zh-hant.tsv index b50f0671b0..47c45d01a5 100644 --- a/crates/ui-egui/src/i18n/zh-hant.tsv +++ b/crates/ui-egui/src/i18n/zh-hant.tsv @@ -4466,6 +4466,7 @@ digits Malayalam 馬來亞拉姆數字 @plural {shown} of {n} result. Keep typing to narrow them.|{shown} of {n} results. Keep typing to narrow them. 共 {n} 個結果,顯示 {shown} 個。繼續輸入以縮小範圍。 Recent Commands 最近使用的指令 No recent commands 沒有最近使用的指令 + Type to search commands, tools, panels and effects 輸入以搜尋指令、工具、面板與效果 Search Commands… 搜尋指令… Secondary 次要 Section Symbol 章節符號 diff --git a/crates/ui-egui/src/palette.rs b/crates/ui-egui/src/palette.rs index 451e198685..ed80d067fc 100644 --- a/crates/ui-egui/src/palette.rs +++ b/crates/ui-egui/src/palette.rs @@ -401,8 +401,9 @@ fn build_in(lang: crate::i18n::Lang, native: bool) -> Vec { /// ([`crate::shortcut_editor::menu_target_now`]), so Clean Up… and Find and Replace… open their /// dialogs. While that item is dimmed, no dialog opens and the status line says why the command /// can't run. A panel's result shows the panel, and an effect's result runs what its Effect menu -/// item runs ([`crate::keymap::command_of`]). -pub(crate) fn run_pick(app: &mut VectorcraftApp, id: &str) { +/// item runs ([`crate::keymap::command_of`]). Returns what the pick did. +pub(crate) fn run_pick(app: &mut VectorcraftApp, id: &str) -> Picked { + let had_dialog = app.ui.dialog.is_some(); if let Some(tool) = id.strip_prefix("tool:") { app.select_tool(tool); } else if let Some(panel) = id.strip_prefix("panel:") { @@ -411,27 +412,57 @@ pub(crate) fn run_pick(app: &mut VectorcraftApp, id: &str) { // `window.panel` does. if app.ui.screen_mode >= 3 { app.status("panels can't be shown in Presentation Mode"); - } else if let Err(e) = crate::panel_docking::reveal_panel(app, panel) { + return Picked::Refused; + } + if let Err(e) = crate::panel_docking::reveal_panel(app, panel) { app.status(e); + return Picked::Refused; } } else if id.starts_with("plugin:") || id.starts_with("effect:") { let command = crate::keymap::command_of(id); + let on = menus::enabled(app, &command.id); // While the Effect menu dims the item (nothing selected), no dialog opens and the status // line says why. - if id.starts_with("effect:") && !menus::enabled(app, &command.id) { + if id.starts_with("effect:") && !on { if let Err(why) = crate::shortcut_editor::dimmed(app, &command.id) { app.status(why); } - } else { - menus::invoke(app, &command.id, command.params); + return Picked::Refused; + } + menus::invoke(app, &command.id, command.params); + if !on { + return Picked::Refused; } } else { match crate::shortcut_editor::menu_target_now(app, id) { Some(Ok((id, p))) => menus::invoke(app, &id, p), - Some(Err(why)) => app.status(why), - None => menus::invoke(app, id, json!({})), + Some(Err(why)) => { + app.status(why); + return Picked::Refused; + } + None => { + // The command is invoked while its menu item is dimmed too, and its own check + // reports why it can't run; the pick counts as refused. + let on = menus::enabled(app, id); + menus::invoke(app, id, json!({})); + if !on { + return Picked::Refused; + } + } } } + if !had_dialog && app.ui.dialog.is_some() { Picked::OpenedDialog } else { Picked::Ran } +} + +/// What a pick of a palette result did ([`run_pick`]). +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub(crate) enum Picked { + /// The command ran, the tool was chosen or the panel was shown. + Ran, + /// The pick opened a dialog, which may still be canceled. + OpenedDialog, + /// The pick's menu item is dimmed now, or its panel can't be shown: the status line says why. + Refused, } /// The entries the query `q` matches, best first ([`search::rank`]). The ranking of the last query @@ -539,11 +570,11 @@ fn nearest_in_view(sel: usize, offset: f32, view: f32, n: usize) -> usize { /// and the highlighted result's id. type Highlight = (usize, String, f32, f32, String); -/// How many picks the Recent Commands list beside the search field holds. -pub(crate) const MAX_RECENT_COMMANDS: usize = 5; +/// How many picks the Recent Commands list beside the search field, and an empty search, show. +pub(crate) const MAX_RECENT_COMMANDS: usize = 8; /// How many ids the saved Recent Commands list holds at most, unavailable ones included. -const MAX_SAVED_RECENT_COMMANDS: usize = 4 * MAX_RECENT_COMMANDS; +const MAX_SAVED_RECENT_COMMANDS: usize = 20; /// Puts `id` first in the Recent Commands ids `list`, removing its earlier place, and keeps the /// newest [`MAX_RECENT_COMMANDS`] ids that are `known`. An id that is not `known` now (a plug-in @@ -751,7 +782,7 @@ pub fn show(app: &mut VectorcraftApp, ctx: &egui::Context) { ui.ctx().data_mut(|d| d.insert_temp(field_id, r.id)); ui.add_space(6.0); if empty && n > 0 { - ui.label(egui::RichText::new(tl!("Recent Commands")).color(t.text_dim)); + ui.label(egui::RichText::new(tl!("Recent")).color(t.text_dim)); } // The list shows as many rows as fit above the footer in the window, up to // VISIBLE_ROWS; a page is that many rows. @@ -823,13 +854,14 @@ pub fn show(app: &mut VectorcraftApp, ctx: &egui::Context) { } }); } - // Under the recent picks no count is shown; with none, one dimmed line says so. + // Under the recent picks no count is shown; with none, one dimmed line says what a search + // finds. if !empty { ui.add_space(6.0); ui.label(egui::RichText::new(footer(n, total)).color(t.text_dim)); } else if n == 0 { ui.add_space(6.0); - ui.label(egui::RichText::new(tl!("No recent commands")).color(t.text_dim)); + ui.label(egui::RichText::new(tl!("Type to search commands, tools, panels and effects")).color(t.text_dim)); } if !list_open && !history_focused @@ -867,10 +899,11 @@ pub fn show(app: &mut VectorcraftApp, ctx: &egui::Context) { }); if let Some(id) = run { app.ui.palette_open = false; - if id != PALETTE_TOGGLE { + // A pick that ran or opened a dialog goes first in Recent Commands, even when the dialog + // is then canceled. A refused pick is not recorded. + if run_pick(app, &id) != Picked::Refused && id != PALETTE_TOGGLE { remember(&mut app.ui.recent_commands, &id, |c| entries.list.iter().any(|e| e.id == c)); } - run_pick(app, &id); } else if outside { app.ui.palette_open = false; } @@ -1194,7 +1227,7 @@ mod tests { } assert_eq!(list, ["object.group", "paint.swap"]); // A pick with Enter in the open palette is remembered. - let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), crate::Services::default()); + let mut app = VectorcraftApp::new(vectorcraft_testkit::fixtures::Fixture::Multi.session(), crate::Services::default()); app.ui.recent_commands = list; app.ui.palette_open = true; app.ui.palette_query = "paint.swap".into(); @@ -1209,15 +1242,15 @@ mod tests { assert_eq!(restored.recent_commands, app.ui.recent_commands); } - /// #6376: Recent Commands keeps the last five picks. + /// Recent Commands keeps the last eight picks. #[test] - fn recent_commands_keep_the_last_five_picks() { + fn recent_commands_keep_the_last_eight_picks() { let mut list = vec![]; - let ids = ["a", "b", "c", "d", "e", "f", "g"]; + let ids = ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j"]; for id in ids { remember(&mut list, id, |_| true); } - assert_eq!(list, ["g", "f", "e", "d", "c"]); + assert_eq!(list, ["j", "i", "h", "g", "f", "e", "d", "c"]); let entries = build(Lang::EN); let many: Vec = entries.iter().take(MAX_RECENT_COMMANDS + 2).map(|e| e.id.clone()).collect(); assert_eq!(recent(&entries, &many).len(), MAX_RECENT_COMMANDS); @@ -1225,7 +1258,7 @@ mod tests { /// #6376: a command that does not exist now, such as a plug-in's filter while the plug-in is /// not loaded, is left out of Recent Commands. A pick keeps it in the saved list, so it shows - /// again when the command comes back; five other commands picked after it push it out. + /// again when the command comes back; eight other commands picked after it push it out. #[test] fn recent_commands_skip_ids_that_no_longer_exist() { let entries = build(Lang::EN); @@ -1236,13 +1269,14 @@ mod tests { let mut list = saved; remember(&mut list, "paint.swap", known); assert_eq!(list, ["paint.swap", "plugin:test.UI.palette_removed", "object.group", "tool:no-such-tool"]); - let four: Vec = entries.iter().filter(|e| e.id != "paint.swap" && e.id != "object.group").take(4).map(|e| e.id.clone()).collect(); - for id in &four { + let others: Vec = + entries.iter().filter(|e| e.id != "paint.swap" && e.id != "object.group").take(MAX_RECENT_COMMANDS - 1).map(|e| e.id.clone()).collect(); + for id in &others { remember(&mut list, id, known); } let expected: Vec = - four.iter().rev().cloned().chain(["paint.swap".to_string(), "plugin:test.UI.palette_removed".to_string()]).collect(); - assert_eq!(list, expected, "object.group, the sixth known id, and the ids after it go"); + others.iter().rev().cloned().chain(["paint.swap".to_string(), "plugin:test.UI.palette_removed".to_string()]).collect(); + assert_eq!(list, expected, "object.group, the ninth known id, and the ids after it go"); // Unavailable ids are capped too. let mut list: Vec = (0..50).map(|i| format!("plugin:test.UI.gone{i}")).collect(); remember(&mut list, "paint.swap", known); @@ -1362,7 +1396,7 @@ mod tests { /// result. Only the Recent Commands list takes them. #[test] fn another_popup_leaves_enter_to_the_palette() { - let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), crate::Services::default()); + let mut app = VectorcraftApp::new(vectorcraft_testkit::fixtures::Fixture::Multi.session(), crate::Services::default()); app.ui.palette_open = true; app.ui.palette_query = "paint.swap".into(); let first = build(crate::i18n::current()).into_iter().find(|e| e.haystack.contains("paint.swap")).unwrap().id; @@ -1452,8 +1486,8 @@ mod tests { ids.iter().map(|id| row_label(entries.iter().find(|e| e.id == *id).unwrap())).collect() } - /// An empty search, or one of spaces only, lists the recent picks under a Recent Commands - /// heading, most recent first, with the first highlighted. A pick whose command is gone is left + /// An empty search, or one of spaces only, lists the recent picks under a Recent heading, most + /// recent first, with the first highlighted. A pick whose command is gone is left /// out, and no count is shown. #[test] fn an_empty_search_lists_the_recent_picks_most_recent_first() { @@ -1466,20 +1500,21 @@ mod tests { let expected = row_labels(&open.ctx, &["paint.swap", "object.group"]); assert_eq!(shown, [(expected[0].clone(), true), (expected[1].clone(), false)], "{query:?}"); let labels = labels(&nodes); - assert!(labels.iter().any(|l| l == tl!("Recent Commands")), "{query:?}: the heading: {labels:?}"); + assert!(labels.iter().any(|l| l == tl!("Recent")), "{query:?}: the heading: {labels:?}"); assert!(!labels.iter().any(|l| l.contains("result")), "{query:?}: no count: {labels:?}"); } } - /// An empty search with nothing picked yet lists no rows and says there are no recent commands. + /// An empty search with nothing picked yet lists no rows and says what a search finds. #[test] - fn an_empty_search_without_picks_says_there_are_none() { + fn an_empty_search_without_picks_says_what_to_type() { let mut open = Open::new("", WINDOW); let nodes = open.frame(vec![]); assert!(rows(&nodes).is_empty(), "{:?}", rows(&nodes)); let labels = labels(&nodes); - assert!(labels.iter().any(|l| l == tl!("No recent commands")), "{labels:?}"); - assert!(!labels.iter().any(|l| l == tl!("No commands match") || l == tl!("Recent Commands")), "{labels:?}"); + assert!(labels.iter().any(|l| l == tl!("Type to search commands, tools, panels and effects")), "{labels:?}"); + let other = [tl!("No commands match"), tl!("Recent"), tl!("No recent commands")]; + assert!(!labels.iter().any(|l| other.contains(&l.as_str())), "{labels:?}"); assert!(open.app.ui.palette_open); } @@ -1574,6 +1609,75 @@ mod tests { assert_eq!(open.app.ui.recent_commands, ["paint.swap", "object.group"]); } + /// A pick says what it did: it ran, it opened a dialog, or it was refused because its menu item + /// is dimmed or its panel can't be shown. + #[test] + fn a_pick_says_whether_it_ran_opened_a_dialog_or_was_refused() { + use vectorcraft_testkit::fixtures::Fixture; + let app = |session| VectorcraftApp::new(session, crate::Services::default()); + assert_eq!(run_pick(&mut app(Fixture::Multi.session()), "object.group"), Picked::Ran); + assert_eq!(run_pick(&mut app(Fixture::Multi.session()), "tool:knife"), Picked::Ran); + assert_eq!(run_pick(&mut app(Fixture::Multi.session()), "panel:swatches"), Picked::Ran); + let mut dialog = app(Fixture::Single.session()); + assert_eq!(run_pick(&mut dialog, "object.path.cleanUp"), Picked::OpenedDialog); + assert!(dialog.ui.dialog.is_some()); + for id in ["edit.findReplace", "object.group"] { + assert_eq!(run_pick(&mut app(vectorcraft_engine::Session::new()), id), Picked::Refused, "{id}"); + } + let mut presenting = app(Fixture::Multi.session()); + presenting.ui.screen_mode = 3; + assert_eq!(run_pick(&mut presenting, "panel:swatches"), Picked::Refused); + } + + /// A pick that is refused while its menu item is dimmed is not recorded in Recent Commands, + /// from a search or from the recent picks, which keep their order. + #[test] + fn a_refused_pick_is_not_recorded() { + for (query, id) in [("find and replace", "edit.findReplace"), ("group", "object.group")] { + let mut open = Open::new(query, WINDOW); + open.app.ui.recent_commands = vec!["paint.swap".into()]; + let k = open.listed().iter().position(|c| c == id).unwrap_or_else(|| panic!("{query:?} finds {id}")); + open.frame(vec![]); + open.press(egui::Key::ArrowDown, k); + assert_eq!(open.highlighted(), k, "{id}"); + open.app.ui.status.clear(); + open.press(egui::Key::Enter, 1); + assert!(!open.app.ui.palette_open, "{id}: the palette closes"); + assert!(open.app.ui.dialog.is_none(), "{id}"); + assert_eq!(open.app.ui.recent_commands, ["paint.swap"], "{id}"); + } + let mut open = Open::new("", WINDOW); + open.app.ui.recent_commands = vec!["paint.swap".into(), "object.group".into()]; + open.frame(vec![]); + open.press(egui::Key::ArrowDown, 1); + assert_eq!(open.highlighted(), 1); + open.press(egui::Key::Enter, 1); + assert!(!open.app.ui.palette_open, "the palette closes"); + assert_eq!(open.app.ui.recent_commands, ["paint.swap", "object.group"]); + } + + /// A pick that opens a dialog is recorded in Recent Commands when the dialog opens, so it stays + /// there when the dialog is canceled. + #[test] + fn a_pick_that_opens_a_dialog_is_recorded_even_when_canceled() { + let id = "object.path.cleanUp"; + let mut open = Open::new("clean up", WINDOW); + open.app = VectorcraftApp::new(vectorcraft_testkit::fixtures::Fixture::Single.session(), crate::Services::default()); + open.app.ui.palette_open = true; + open.app.ui.palette_query = "clean up".into(); + open.app.ui.recent_commands = vec!["paint.swap".into()]; + let k = open.listed().iter().position(|c| c == id).expect("the search finds Clean Up…"); + open.frame(vec![]); + open.press(egui::Key::ArrowDown, k); + open.press(egui::Key::Enter, 1); + assert!(open.app.ui.dialog.is_some(), "{}", open.app.ui.status); + assert_eq!(open.app.ui.recent_commands, [id, "paint.swap"]); + // Cancel closes the dialog without running the command. + open.app.ui.dialog = None; + open.frame(vec![]); + assert_eq!(open.app.ui.recent_commands, [id, "paint.swap"]); + } + /// #1757: Up and Down move the highlighted result, wrapping at the ends; a new query starts /// from the first again. #[test] diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index 1b18fee682..8de60ad58a 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -1026,8 +1026,8 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - Perspective Distort and Free Distort (`object.distort`) turn each warped object's bounding box as the warp turns the object at its own center, the objects inside groups, compound paths and clip groups and the art of linked opacity masks included, so the next Selection or Free Transform drag uses the tilted box; Object › Transform › Reset Bounding Box squares it again, and corners left where they are add no undo step (VectorCraft's own rule; `bboxrotate::distort_turns_an_upright_box_with_the_warp_at_its_center`, `distort_turns_each_member_and_linked_mask_by_its_own_warp`, `mirrored_and_collapsing_distorts_keep_valid_angles`, `distort_angles_undo_redo_and_reopen_together`, `xform::unchanged_distort_records_no_history`). - The Free Transform widget's Constrain works in Free Distort as well as in Free Transform ([the help page](https://helpx.adobe.com/illustrator/using/tool-techniques/free-transform-tool.html)). With Constrain on, or Shift held, a corner dragged in Free Distort moves only along the line through the opposite corner, in the box's own proportions, and the other three corners stay in place; on a turned box the line runs through the box's own corners. The line is VectorCraft's own rule. Cmd/Ctrl+Alt+Shift on a corner still drags in Perspective Distort, where Constrain stays unavailable (tools `xform::free::tests::free_distort_corner_keeps_to_its_diagonal_with_shift_or_constrain`, `shift_pressed_during_a_free_distort_drag_constrains_it`, `a_turned_box_is_constrained_along_its_own_diagonal`, `along_diagonal_of_a_degenerate_box`; engine `xform::free_transform_constrained_distort_keeps_the_corner_on_its_diagonal`; ui-egui `free_transform::tests::the_widget_sets_the_mode_and_a_corner_drag_then_distorts`). - Native macOS menu bar, vector tool cursors, a command palette (Help › Search Commands…), middle-button panning with any tool. Native menus explicitly end tracking on command selection, outside window presses and Escape; menu updates wait until tracking ends, and a dismissing press never starts a canvas gesture (M14.8). - - A Recent Commands button beside the Help › Search Commands field lists the last five commands and tools picked from the palette, most recent first, with a command picked again moved to the top. Choosing a row closes the palette and runs it as a pick of the same result does; with no picks yet the list shows a dimmed No recent commands row, and a command that is not available now, such as a filter of a plug-in that is not loaded, is left out until it comes back. The ids are saved with the UI state. While the list is open, Up and Down move through its rows, wrapping at the ends, and Escape closes the list before the palette. This is VectorCraft's own addition and does not raise a score (#6376; `palette` tests `recent_commands_*`, `a_recent_command_runs_what_its_pick_runs`, `the_keys_wrap_within_recent_commands`, `escape_closes_recent_commands_before_the_palette`). - - With an empty search, or one of spaces only, the Help › Search Commands field lists the picks of the Recent Commands list (at most five, leaving out a filter of a plug-in that is not loaded) under a Recent Commands heading, most recent first, with the first highlighted and no result count, so opening the palette and pressing Enter picks the last pick again; a pick that is dimmed now shows why in the status line, as from a search. With no picks yet it lists no results and shows a dimmed No recent commands line. A pick of Search Commands… itself is not recorded. The palette opens with its first result highlighted and its list scrolled to the top. This is VectorCraft's own behavior (`palette` tests `an_empty_search_lists_the_recent_picks_most_recent_first`, `an_empty_search_without_picks_says_there_are_none`, `enter_on_an_empty_search_runs_the_last_pick_again`, `the_palette_opens_again_with_its_first_row_highlighted`, `the_palette_toggle_is_not_a_recent_pick`, `a_click_on_a_recent_pick_runs_it_and_moves_it_first`). + - A Recent Commands button beside the Help › Search Commands field lists the last eight commands and tools picked from the palette, most recent first, with a command picked again moved to the top. A pick is recorded when it runs or opens a dialog, even if the dialog is then canceled; a pick that is refused because its menu item is dimmed, or because its panel can't be shown, is not recorded. Choosing a row closes the palette and runs it as a pick of the same result does; with no picks yet the list shows a dimmed No recent commands row, and a command that is not available now, such as a filter of a plug-in that is not loaded, is left out until it comes back. The ids are saved with the UI state. While the list is open, Up and Down move through its rows, wrapping at the ends, and Escape closes the list before the palette. This is VectorCraft's own addition and does not raise a score (#6376; `palette` tests `recent_commands_*`, `a_recent_command_runs_what_its_pick_runs`, `the_keys_wrap_within_recent_commands`, `escape_closes_recent_commands_before_the_palette`). + - With an empty search, or one of spaces only, the Help › Search Commands field lists the picks of the Recent Commands list (at most eight, leaving out a filter of a plug-in that is not loaded) under a Recent heading, most recent first, with the first highlighted and no result count, so opening the palette and pressing Enter picks the last pick again; a pick that is dimmed now shows why in the status line, as from a search, and keeps its place in the list. With no picks yet it lists no results and shows a dimmed line, "Type to search commands, tools, panels and effects". A pick of Search Commands… itself is not recorded. The palette opens with its first result highlighted and its list scrolled to the top. This is VectorCraft's own behavior (`palette` tests `an_empty_search_lists_the_recent_picks_most_recent_first`, `an_empty_search_without_picks_says_what_to_type`, `enter_on_an_empty_search_runs_the_last_pick_again`, `the_palette_opens_again_with_its_first_row_highlighted`, `the_palette_toggle_is_not_a_recent_pick`, `a_click_on_a_recent_pick_runs_it_and_moves_it_first`, `a_pick_says_whether_it_ran_opened_a_dialog_or_was_refused`, `a_refused_pick_is_not_recorded`, `a_pick_that_opens_a_dialog_is_recorded_even_when_canceled`). - The Learn panel (Window › Learn, or Explore tutorials beside the search icon on the app bar) has a For you tab with a Get started section and a Quick skill guide card, and a Skills tab that lists VectorCraft's own skills with their progress rings and counts of tutorials finished; a skill lists its tutorials, a tutorial shows its numbered steps, and Back goes up a level; `learn.list`, `learn.tab {tab}`, `learn.skill {skill}`, `learn.show {tutorial}` and `learn.back` script it, and the tab buttons, the rows and Back run them ([the help page](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/learn-skills-quick-skill-guide.html); `panels::learn::tests`). - A tool's name in a Learn tutorial step is a blue link that shows where the tool is without choosing it (`learn.locateTool {tool}`): its toolbar button is marked, a collapsed group's flyout opens with the tool's row marked, a torn-off strip comes to the front, and a tool no shown toolbar holds is marked in the All Tools drawer. The mark, its 3 seconds and the hidden-toolbar cases are VectorCraft's own rules ([the help page](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/learn-skills-quick-skill-guide.html); `panels::learn::tests`, the `a_learn_link_*` tests in `toolbar::tests`). - Under a tutorial's steps, View more opens the tutorial's own practice sample as a new untitled document, and once the tutorial is finished, Next Up moves to the next tutorial in the same skill, as the help page describes ([the help page](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/learn-skills-quick-skill-guide.html)). The samples are VectorCraft's own drawings. A Finish tutorial button that shows once the sample is open, the untitled copy, Back to skills in place of Next Up after a skill's last tutorial, and Next Up showing the next tutorial without opening its sample are VectorCraft's own rules. `learn.openSample`, `learn.finish`, `learn.next` and `learn.skills` (Back to skills) script them. Not done: the help page's short video. Regression tests: `view_more_opens_the_tutorial_s_sample_as_a_new_untitled_document`, `finishing_a_tutorial_offers_next_up_in_its_skill`, `the_practice_controls_work_from_the_keyboard`, `the_last_tutorial_of_a_skill_offers_back_to_skills`, `learn_finish_and_learn_next_follow_the_practice`, `learn_skills_shows_the_list_of_skills`, `the_practice_commands_reject_a_missing_or_unknown_tutorial`, `every_tutorial_has_its_own_readable_sample` and `the_next_tutorial_is_the_next_one_in_the_same_skill` in `crates/ui-egui/src/panels/learn/tests.rs`. From 007356257f27b46c7ae546955e335903a56fa233 Mon Sep 17 00:00:00 2001 From: Sven Lafebre Date: Mon, 16 Nov 2026 22:19:03 +0100 Subject: [PATCH 14/78] #8188: .ai import keeps a stroke's arrowheads A stroke's arrowheads are symbols of the file that its style's stroke dictionary names (BSArrowBeginSymbol / BSArrowEndSymbol, with BSArrowBeginScale / BSArrowEndScale). The importer didn't read them, so lines came in without their heads. The style parser now records those symbol references, and the reader turns each arrowhead symbol into a custom arrowhead: the symbol's level, 1 pt sample of the line gives the axis and where the line stops under the head, the rest of its art is the head, tip at its rightmost point. A custom arrowhead can now carry that stop. The head goes on the path with its tip on the end or past it (Extend), whichever gives the object its drawn art's bounds; otherwise, and for heads that can't be read faithfully, the object keeps its drawn look. --- crates/doc/src/appearance/layers.rs | 6 +- crates/doc/src/appearance/stroke_style.rs | 30 +++- crates/doc/src/appearance/tests.rs | 13 +- crates/effects/src/stroke/arrow.rs | 3 +- crates/engine/src/cmd/stroke.rs | 2 +- crates/engine/tests/import_fuzz.rs | 48 ++++++ crates/eps/src/import/ai.rs | 1 + crates/eps/src/import/ai/arrowhead.rs | 174 +++++++++++++++++++ crates/eps/src/import/ai/read.rs | 9 +- crates/eps/src/import/ai/read/containers.rs | 2 + crates/eps/src/import/ai/read/directives.rs | 9 + crates/eps/src/import/ai/read/document.rs | 2 +- crates/eps/src/import/ai/read/ops.rs | 137 +++++++++++++-- crates/eps/src/import/ai/style.rs | 90 ++++++++++ crates/eps/src/import/ai/style/tests.rs | 21 ++- crates/eps/src/import/ai/tests.rs | 181 ++++++++++++++++++++ docs/file-format-parity.md | 3 +- docs/mcp.md | 4 +- 18 files changed, 707 insertions(+), 28 deletions(-) create mode 100644 crates/eps/src/import/ai/arrowhead.rs diff --git a/crates/doc/src/appearance/layers.rs b/crates/doc/src/appearance/layers.rs index f8a58758d8..882ba348ca 100644 --- a/crates/doc/src/appearance/layers.rs +++ b/crates/doc/src/appearance/layers.rs @@ -183,12 +183,14 @@ impl StrokeLayer { rotation: None, } } + /// The least weight an arrowhead is drawn at, in points ([`Self::arrow_weight`]). + pub const LEAST_ARROW_WEIGHT: f64 = 0.25; /// Weight of the start (`end == false`) or end arrowhead: stroke weight × its scale, at least - /// a quarter point. A head of weight `hw` fits a box about `4·hw` long and wide (see + /// [`Self::LEAST_ARROW_WEIGHT`]. A head of weight `hw` fits a box about `4·hw` long and wide (see /// [`Arrowhead::reach`] and [`Arrowhead::half_width`]). pub fn arrow_weight(&self, end: bool) -> f64 { let pct = if end { self.arrow_scale.1 } else { self.arrow_scale.0 }; - (self.width * pct / 100.0).max(0.25) + (self.width * pct / 100.0).max(Self::LEAST_ARROW_WEIGHT) } /// How far the start (`end == false`) or end arrowhead can reach from its end point (0 /// without one): the head's diagonal, or with [`ArrowAlign::Extend`] its length, plus the cap. diff --git a/crates/doc/src/appearance/stroke_style.rs b/crates/doc/src/appearance/stroke_style.rs index 18b226c676..7a39d6cbb2 100644 --- a/crates/doc/src/appearance/stroke_style.rs +++ b/crates/doc/src/appearance/stroke_style.rs @@ -68,6 +68,10 @@ pub struct CustomArrowhead { /// across it, positive to the right of the direction the head points. A head is 4 units wide, /// as the built-in heads are, and a unit is the head's weight. pub path: PathData, + /// Where the stroke ends under the head, in head units back from the tip, when the head says + /// so ([`Self::with_stop`]); `None`: halfway along its length ([`Self::stop`]). + #[serde(default, skip_serializing_if = "Option::is_none")] + pub stop: Option, } #[derive(Deserialize)] @@ -75,11 +79,17 @@ struct CustomArrowheadData { name: String, #[serde(default)] path: PathData, + #[serde(default)] + stop: Option, } impl From for CustomArrowhead { fn from(d: CustomArrowheadData) -> Self { - CustomArrowhead::new(d.name, d.path) + let head = CustomArrowhead::new(d.name, d.path); + match d.stop { + Some(stop) => head.with_stop(stop), + None => head, + } } } @@ -94,7 +104,17 @@ impl CustomArrowhead { /// than [`Self::MAX_UNITS`] from the tip is dropped: the head then draws nothing. pub fn new(name: String, path: PathData) -> Self { let path = if Self::fits(&path) { path } else { PathData::default() }; - CustomArrowhead { name, path } + CustomArrowhead { name, path, stop: None } + } + /// The head with the stroke ending `stop` head units back from its tip (an arrowhead an + /// Illustrator file defines draws its line to a point of its own). A stop that is not finite, + /// is negative or is farther than [`Self::MAX_UNITS`] is left out: the stroke then ends + /// halfway along the head. + /// A head whose outline was dropped ([`Self::new`]) draws nothing and keeps no stop. + pub fn with_stop(mut self, stop: f64) -> Self { + let fits = !self.path.subpaths.is_empty() && stop.is_finite() && (0.0..=Self::MAX_UNITS).contains(&stop); + self.stop = fits.then_some(stop); + self } /// Whether outline `path` has at most [`Self::MAX_ANCHORS`] anchors and as many subpaths, with /// finite points within [`Self::MAX_UNITS`] only. @@ -116,10 +136,10 @@ impl CustomArrowhead { pub fn half_width(&self) -> f64 { self.bounds().map_or(0.0, |b| b.y0.abs().max(b.y1.abs())) } - /// Where the stroke ends under the head, in head units back from the tip: halfway along the - /// head's length. + /// Where the stroke ends under the head, in head units back from the tip: its own stop + /// ([`Self::with_stop`]), else halfway along the head's length. pub fn stop(&self) -> f64 { - self.bounds().map_or(0.0, |b| b.x1.max(0.0) / 2.0) + self.stop.unwrap_or_else(|| self.bounds().map_or(0.0, |b| b.x1.max(0.0) / 2.0)) } } diff --git a/crates/doc/src/appearance/tests.rs b/crates/doc/src/appearance/tests.rs index cb5f8fed66..c4cbe5ab18 100644 --- a/crates/doc/src/appearance/tests.rs +++ b/crates/doc/src/appearance/tests.rs @@ -381,6 +381,15 @@ fn custom_arrowheads_carry_their_art_and_measure_it() { assert_eq!(head.half_width(), 2.0); let Arrowhead::Custom(c) = &head else { panic!("custom") }; assert_eq!(c.stop(), 1.5, "the line stops halfway along the head"); + // A head with a stop of its own (an Illustrator file's arrowhead) keeps it, saved and read back. + let stopped = (**c).clone().with_stop(0.5); + assert_eq!(stopped.stop(), 0.5); + let back: CustomArrowhead = serde_json::from_value(serde_json::to_value(&stopped).unwrap()).unwrap(); + assert_eq!(back, stopped); + assert!(!serde_json::to_string(&**c).unwrap().contains("stop"), "a head without one writes none"); + for odd in [f64::NAN, -0.5, CustomArrowhead::MAX_UNITS + 1.0] { + assert_eq!((**c).clone().with_stop(odd).stop(), 1.5, "{odd} is left out"); + } // Saved with the stroke, art and all, beside the built-in heads' names. let mut st = StrokeLayer::new(Paint::solid(Color::BLACK), 2.0); (st.start_arrow, st.end_arrow) = (Some(Arrowhead::Triangle), Some(head.clone())); @@ -402,7 +411,7 @@ fn custom_arrowheads_out_of_bounds_draw_nothing() { let mut path = c.path.clone(); path.subpaths[0].anchors[1] = vectorcraft_geom::Anchor::corner(vectorcraft_geom::Point::new(1e9, 0.0)); // A file can hold what `new` drops: reading it drops it too. - let json = serde_json::to_value(CustomArrowhead { name: "Wedge".into(), path }).unwrap(); + let json = serde_json::to_value(CustomArrowhead { name: "Wedge".into(), path, stop: None }).unwrap(); let far: CustomArrowhead = serde_json::from_value(json).unwrap(); assert_eq!((far.name.as_str(), far.path.subpaths.len()), ("Wedge", 0)); assert_eq!((far.reach(), far.half_width(), far.stop()), (0.0, 0.0, 0.0)); @@ -413,7 +422,7 @@ fn custom_arrowheads_out_of_bounds_draw_nothing() { let mut hollow = c.path.clone(); hollow.subpaths.extend(std::iter::repeat_n(vectorcraft_geom::SubPath::new(vec![], false), CustomArrowhead::MAX_ANCHORS)); assert!(!CustomArrowhead::fits(&hollow), "too many subpaths"); - let json = serde_json::to_value(CustomArrowhead { name: "Hollow".into(), path: hollow }).unwrap(); + let json = serde_json::to_value(CustomArrowhead { name: "Hollow".into(), path: hollow, stop: None }).unwrap(); let hollow: CustomArrowhead = serde_json::from_value(json).unwrap(); assert!(hollow.path.subpaths.is_empty(), "too many subpaths, read back"); } diff --git a/crates/effects/src/stroke/arrow.rs b/crates/effects/src/stroke/arrow.rs index d188bcafd6..1047e4d0dd 100644 --- a/crates/effects/src/stroke/arrow.rs +++ b/crates/effects/src/stroke/arrow.rs @@ -5,7 +5,8 @@ //! corner. With [`ArrowAlign::Tip`] the tip sits on the end point and the stroke is shortened by //! the inset; with [`ArrowAlign::Extend`] the path keeps its length and the tip sits the inset //! past the end point. Heads added after the first ten are drawn in local units ([`local`]), as are -//! custom heads, whose stroke ends halfway along their length. +//! custom heads, whose stroke ends at their own stop or else halfway along their length +//! ([`vectorcraft_doc::CustomArrowhead::stop`]). use std::borrow::Cow; diff --git a/crates/engine/src/cmd/stroke.rs b/crates/engine/src/cmd/stroke.rs index e8fb1349c3..737fbee6de 100644 --- a/crates/engine/src/cmd/stroke.rs +++ b/crates/engine/src/cmd/stroke.rs @@ -22,7 +22,7 @@ pub fn specs() -> Vec { "Stroke Options", ["Window", "Stroke"], None, - "{weight?: pt, cap?: butt|round|square, join?: miter|round|bevel, miterLimit?, align?: center|inside|outside, dash?: [d,g,…]|null (a 0 dash with a round or projecting cap draws dots or squares; a new pattern keeps the current offset and alignment), dashOffset? (exact dashes only), alignDashes?: bool (true: dashes fitted to corners and path ends, every run between them holding whole periods with a dash centred on each corner and end; false, the default for a new pattern: exact lengths), startArrow?, endArrow?: Arrow|ArrowOpen|LineArrow|Barbed|Concave|DoubleArrow|HalfArrowLeft|HalfArrowRight|Chevron|Feather|Swallowtail|Triangle|TriangleOpen|TriangleReverse|TriangleBar|Kite|Leaf|Drop|Circle|CircleOpen|HalfCircle|Oval|Target|Square|SquareOpen|Tag|TagOpen|Diamond|DiamondOpen|Hexagon|HexagonOpen|Star|Cross|Plus|Bar|DoubleBar|DotOnBar|Slash|DoubleSlash|Bracket|Fork|null|{custom: name} (a custom arrowhead of the arrowheads file, stroke.arrowheads.list)|{Custom: {name, path}} (a custom head with its art, as document.inspect reports one; refused when the path fills no area, parts thinner than a millionth of a head unit counting as none, or has more than 4096 anchors, more than 4096 subpaths or a point more than 64 head units from the tip) (HalfArrowLeft/Right: one barb, left or right of the direction the head points), arrowAlign?: \"extend\" (tip past the end point, default)|\"tip\" (tip on the end point; the stroke is shortened), profile?: \"uniform\"|\"lens\"|\"taperStart\"|\"taperEnd\"|\"pinch\"|\"teardrop\"|\"wave\"|a saved profile's name (stroke.widthProfile.list), widthPoints?, gradientMode? (as document.inspect reports them in strokeOptions, so those read back unchanged; ignored here: a custom profile is set with the Width tool, gradientMode with paint.editGradient), item?: stroke item index|null (omitted: the Appearance panel's active item if it is a stroke, else the top stroke, created when missing), ids?|id?, target?: \"object\"|\"contents\", aligned?: bool (index and item are rows of the first target's stack: each other target edits its equal one, as the Appearance panel does for a mixed selection; with the art of a graph design in a series given first, rows of the art's stack: docs/mcp.md)} Without a stroke item, type takes weight, cap, join, miterLimit, align (around its glyph outlines; the type stays live) and the dash options as its characters' stroke (every run; text.setRangeStyle `strokeOptions` styles a range), and images and symbol instances (also in groups) are left alone. With nothing selected (and no ids) they set up the next object drawn (appearance.newArt; weight always does). On a path directly in a graph series, the graph also stores a weight it changes on the topmost visible stroke (docs/mcp.md); on a graph label's stroke row, the graph stores the label's topmost visible fill and stroke rows for every label of its kind, and on its characters the stroke options they take; on a graph's axis line, tick mark or radar ring, the graph stores the paint, weight, opacity and blend mode of its topmost visible fill and stroke rows that the edit changes, and the weight it writes to the topmost visible stroke, for every line of its kind, and not its caps, joins, dashes, alignment or arrowheads → {objects: how many objects took the stroke options}", + "{weight?: pt, cap?: butt|round|square, join?: miter|round|bevel, miterLimit?, align?: center|inside|outside, dash?: [d,g,…]|null (a 0 dash with a round or projecting cap draws dots or squares; a new pattern keeps the current offset and alignment), dashOffset? (exact dashes only), alignDashes?: bool (true: dashes fitted to corners and path ends, every run between them holding whole periods with a dash centred on each corner and end; false, the default for a new pattern: exact lengths), startArrow?, endArrow?: Arrow|ArrowOpen|LineArrow|Barbed|Concave|DoubleArrow|HalfArrowLeft|HalfArrowRight|Chevron|Feather|Swallowtail|Triangle|TriangleOpen|TriangleReverse|TriangleBar|Kite|Leaf|Drop|Circle|CircleOpen|HalfCircle|Oval|Target|Square|SquareOpen|Tag|TagOpen|Diamond|DiamondOpen|Hexagon|HexagonOpen|Star|Cross|Plus|Bar|DoubleBar|DotOnBar|Slash|DoubleSlash|Bracket|Fork|null|{custom: name} (a custom arrowhead of the arrowheads file, stroke.arrowheads.list)|{Custom: {name, path, stop?}} (a custom head with its art, as document.inspect reports one; stop: where the stroke ends under the head, in head units back from the tip, 0..64 (otherwise, or without one, halfway along the head); refused when the path fills no area, parts thinner than a millionth of a head unit counting as none, or has more than 4096 anchors, more than 4096 subpaths or a point more than 64 head units from the tip) (HalfArrowLeft/Right: one barb, left or right of the direction the head points), arrowAlign?: \"extend\" (tip past the end point, default)|\"tip\" (tip on the end point; the stroke is shortened), profile?: \"uniform\"|\"lens\"|\"taperStart\"|\"taperEnd\"|\"pinch\"|\"teardrop\"|\"wave\"|a saved profile's name (stroke.widthProfile.list), widthPoints?, gradientMode? (as document.inspect reports them in strokeOptions, so those read back unchanged; ignored here: a custom profile is set with the Width tool, gradientMode with paint.editGradient), item?: stroke item index|null (omitted: the Appearance panel's active item if it is a stroke, else the top stroke, created when missing), ids?|id?, target?: \"object\"|\"contents\", aligned?: bool (index and item are rows of the first target's stack: each other target edits its equal one, as the Appearance panel does for a mixed selection; with the art of a graph design in a series given first, rows of the art's stack: docs/mcp.md)} Without a stroke item, type takes weight, cap, join, miterLimit, align (around its glyph outlines; the type stays live) and the dash options as its characters' stroke (every run; text.setRangeStyle `strokeOptions` styles a range), and images and symbol instances (also in groups) are left alone. With nothing selected (and no ids) they set up the next object drawn (appearance.newArt; weight always does). On a path directly in a graph series, the graph also stores a weight it changes on the topmost visible stroke (docs/mcp.md); on a graph label's stroke row, the graph stores the label's topmost visible fill and stroke rows for every label of its kind, and on its characters the stroke options they take; on a graph's axis line, tick mark or radar ring, the graph stores the paint, weight, opacity and blend mode of its topmost visible fill and stroke rows that the edit changes, and the weight it writes to the topmost visible stroke, for every line of its kind, and not its caps, joins, dashes, alignment or arrowheads → {objects: how many objects took the stroke options}", has_doc, stroke_set ), diff --git a/crates/engine/tests/import_fuzz.rs b/crates/engine/tests/import_fuzz.rs index 7fc7285dbb..1ab40972c0 100644 --- a/crates/engine/tests/import_fuzz.rs +++ b/crates/engine/tests/import_fuzz.rs @@ -8125,3 +8125,51 @@ proptest! { prop_assert_eq!(paths, 2, "{:?}", notes); } } + +proptest! { + #![proptest_config(config())] + + /// A stroke's arrowheads (#8188): its arrowhead entries with any scale of any kind, naming a + /// symbol the file defines, one it doesn't or one named in Chinese, the symbol's art any run of + /// paths (frames, samples of the line, heads, open and closed, filled, stroked or neither), at + /// any weight, the style section cut anywhere, the line drawn as any look. Read as a `.ai` and + /// as an EPS, then rendered. + #[test] + fn ai_arrowhead_strokes_never_panic( + scale in prop_oneof![arb_num(), Just("50".to_string())], + kind in prop::sample::select(vec!["Real", "Int", "Bool"]), + named in prop::sample::select(vec!["W", "Missing", "\u{6954}"]), + both in any::(), + art in prop::collection::vec(prop::sample::select(vec![ + "-10 5 m\n10 5 L\n10 -5 L\n-10 -5 L\nn\n", + "0 G\n1 w\n-9 0 m\n4 0 l\nS\n", + "0 G\n0.5 w\n-9 0 m\n4 0 l\nS\n", + "0 g\n2 3 m\n8 0 l\n2 -3 l\nf\n", + "0 G\n1 w\n2 3 m\n8 0 l\n2 -3 l\nS\n", + "0 g\n1e300 0 m\n-1e300 1 l\nf\n", + "0 g\n0 0 m\n0 0 l\nf\n", + ]), 0..6), + width in arb_num(), + cut in 0usize..2000, + look in prop::sample::select(vec!["0 G\n2 w\n0 50 m\n96 50 l\nS\n0 g\n94 53 m\n100 50 l\n94 47 l\nf\n", "0 G\n2 w\n0 50 m\n100 50 l\nS\n", ""]), + ) { + use vectorcraft_testkit::ai; + let symbol = format!("%AI5_Begin_NonPrinting\n%AI14_BeginSymbol\n(W)\n0 A\n0 Xw\n0 Ae\nu\n{}U\n%AI10_EndSymbol\n%AI5_End_NonPrinting--\n", art.concat()); + let start = if both { format!("{scale} /{kind} (BSArrowBeginScale) ,\n/GObjRef : ({named}) /SymbolArt ; (BSArrowBeginSymbol) ,\n") } else { String::new() }; + let styles = format!( + "%AI9_BeginArtStyles\n/KnownStyle :\n(Arrowed) /Name ,\n/ActiveStyle :\n/CompoundFilter :\n(Chain Style Filter) 0 0 /Filter ,\n1 /Visible ,\n\ + /CompoundFilter :\n(Stack Style Filter) 0 0 /Filter ,\n1 /Visible ,\n\ + /BasicFilter :\n(Stroke Style Filter) 0 0 /Filter ,\n1 /Visible ,\n/Dictionary : /NotRecorded ,\n/Dictionary : /NotRecorded ,\n\ + {start}{scale} /{kind} (BSArrowEndScale) ,\n/GObjRef : ({named}) /SymbolArt ; (BSArrowEndSymbol) ,\n; (kAIBeautifulStrokesParamsDictKey) ,\n\ + /StrokeStyle : 0 R\n0 0 0 1 0 0 0 XA\n0 J 0 j {width} w 10 M []0 d\n0 XR\n1 0 Xd\n/Def ;\n (StrokeStyle) ,\n; /Dict ;\n /Part ,\n\ + /BasicFilter :\n(Conduit Filter) 0 0 /Filter ,\n1 /Visible ,\n;\n /Part ,\n;\n /Part ,\n;\n%AI9_EndArtStyles\n\ + %AI9_BeginArtStyleList\n(Arrowed)\n%AI9_EndArtStyleList\n" + ); + let styles: String = styles.chars().take(cut).collect(); + let line = format!("0 Ae\nu\n{look}U\n%_0 50 m\n%_100 50 L\n%_N\n1 (Arrowed) XW\n"); + let data = ai::editing_data(200.0, 100.0, &format!("{symbol}{styles}{}", ai::layer("L", &line))); + survive("arrowhead strokes", || Some(vectorcraft_eps::layered_ai(data.as_bytes(), Document::new(200.0, 100.0), vec![], false, false, 1.0).0))?; + let eps = ai::eps(data.as_bytes(), ai::page_ps()); + survive("arrowhead strokes in an EPS", || vectorcraft_engine::cmd::fileio::load("x.eps", &eps).ok().map(|l| l.doc))?; + } +} diff --git a/crates/eps/src/import/ai.rs b/crates/eps/src/import/ai.rs index 1a73f64a50..c882a2627b 100644 --- a/crates/eps/src/import/ai.rs +++ b/crates/eps/src/import/ai.rs @@ -17,6 +17,7 @@ //! objects and points. Anything it doesn't read is an error: the caller opens the file the way it //! did before (the printed page, or the PDF), with a warning saying why. +mod arrowhead; mod blend; mod brush; mod envelope; diff --git a/crates/eps/src/import/ai/arrowhead.rs b/crates/eps/src/import/ai/arrowhead.rs new file mode 100644 index 0000000000..11d098c759 --- /dev/null +++ b/crates/eps/src/import/ai/arrowhead.rs @@ -0,0 +1,174 @@ +//! Arrowheads a file defines: the art of a symbol that a stroke's arrowhead entry names +//! ([`super::style::StrokeArrows`]), read into a head ([`head`]). +//! +//! Not publicly documented. As the files have it, an arrowhead symbol's art (y down here, as the +//! document's symbols are) points right along a straight, level sample of the line it ends: an +//! open stroked path with no fill whose anchors and handles all lie on that line, 1 pt wide. The +//! sample ends where the line stops under the head. The rest of the art that paints is the head; +//! its tip is its rightmost point, and a symbol unit is one point on a 1 pt stroke at 100 %, so a +//! unit is the head's weight as it is for VectorCraft's own heads. Art that paints nothing (the +//! frame of the symbol's box, hidden or fully transparent art) is left out. + +use vectorcraft_doc::{AppearanceItem, CustomArrowhead, Node, NodeKind, StrokeLayer}; +use vectorcraft_geom::{Affine, FillRule, PathData, Point}; + +/// The most anchors an arrowhead symbol's art is read with, outlined strokes included, before its +/// shapes are united. +const MAX_ART_ANCHORS: usize = 65_536; +/// How deep the groups of an arrowhead symbol's art are read. +const MAX_DEPTH: usize = 16; + +/// The head that symbol art `art` (in the document's symbol space) draws, named `name`. `None` when +/// the art doesn't have exactly one sample of the line, its sample isn't 1 pt wide, it holds +/// anything but paths, compound paths and groups (a clip group, say), has an effect, a brush or a +/// group with fills or strokes of its own, paints no head, or is too detailed for one; or when the +/// line would stop past the head's tip or farther back than a head can reach +/// ([`CustomArrowhead::MAX_UNITS`]). +pub(super) fn head(name: &str, art: &Node) -> Option { + let mut parts = Parts::default(); + match &art.kind { + // The members of the symbol's group are its art's top level, where the sample is. + NodeKind::Group { children, clip: false } if art.visible && !paints(art) && art.appearance.effects.is_empty() => { + for c in children { + parts.member(c, true, 1)?; + } + } + _ => parts.member(art, true, 0)?, + } + let [(axis, line_end)] = parts.lines.as_slice() else { return None }; + if parts.shapes.is_empty() { + return None; + } + let refs: Vec<(&PathData, FillRule)> = parts.shapes.iter().map(|(p, r)| (p, *r)).collect(); + let area = vectorcraft_pathops::try_unite_all(&refs).ok()?; + let b = area.bounds().filter(|b| b.is_finite() && b.height() > 1e-9)?; + let tip = b.x1; + // Head units: x back from the tip, y across to the right of the way the head points (down). + let h = CustomArrowhead::new(name.to_string(), area.transformed(Affine::new([-1.0, 0.0, 0.0, 1.0, tip, -axis]))); + let h = h.with_stop(tip - line_end); + (!h.path.subpaths.is_empty() && h.stop.is_some()).then_some(h) +} + +/// What an arrowhead symbol's art is made of. +#[derive(Default)] +struct Parts { + /// Each sample of the line: the line's y, and the x where the sample ends. + lines: Vec<(f64, f64)>, + /// The areas the head paints. + shapes: Vec<(PathData, FillRule)>, + anchors: usize, +} + +impl Parts { + /// Read `n`, a member of the art (`top`: of its top level) `depth` groups down. `None` when it + /// is something [`head`] doesn't read. + fn member(&mut self, n: &Node, top: bool, depth: usize) -> Option<()> { + if depth > MAX_DEPTH { + return None; + } + // Hidden or fully transparent art paints nothing. + if !n.visible || n.opacity <= 0.0 { + return Some(()); + } + if !n.appearance.effects.is_empty() { + return None; + } + match &n.kind { + NodeKind::Group { children, clip: false } => { + if paints(n) { + return None; + } + children.iter().try_for_each(|c| self.member(c, false, depth + 1)) + } + NodeKind::Path { guide: true, .. } => Some(()), + NodeKind::Path { path, rule, .. } => self.painted(n, path, *rule, top), + NodeKind::Compound { children, rule } => { + let mut subpaths = vec![]; + for c in children { + subpaths.extend(c.path_data()?.subpaths.iter().cloned()); + } + self.painted(n, &PathData::new(subpaths), *rule, false) + } + _ => None, + } + } + + /// Read the fills and strokes of path or compound path `n`, its outline `path` filled under + /// `rule` (`top`: a member of the art's top level, which may be the sample of the line). + fn painted(&mut self, n: &Node, path: &PathData, rule: FillRule, top: bool) -> Option<()> { + self.room(path.anchor_count())?; + let mut filled = false; + let mut strokes: Vec<&StrokeLayer> = vec![]; + for item in &n.appearance.items { + match item { + AppearanceItem::Fill(f) if f.visible && f.opacity > 0.0 && !f.paint.is_none() => { + if !f.effects.is_empty() { + return None; + } + filled = true; + } + AppearanceItem::Stroke(s) if s.visible && s.opacity > 0.0 && !s.paint.is_none() && s.width > 0.0 => { + if !s.effects.is_empty() || s.brush.is_some() { + return None; + } + strokes.push(s); + } + _ => {} + } + } + if top + && !filled + && let [line] = strokes.as_slice() + && let Some(sample) = sample_line(path) + { + // The sample is 1 pt, the weight of a head at one unit; another weight (art stored + // at another scale, as a Large Canvas file's) gives the units no known size. + if (line.width - 1.0).abs() > 1e-6 { + return None; + } + self.lines.push(sample); + return Some(()); + } + if filled { + self.shapes.push((path.clone(), rule)); + } + for s in strokes { + let outline = vectorcraft_effects::stroke::outline_region(path, rule, s); + self.room(outline.anchor_count())?; + if !outline.subpaths.is_empty() { + self.shapes.push((outline, FillRule::NonZero)); + } + } + Some(()) + } + + /// Count `anchors` more; `None` past [`MAX_ART_ANCHORS`]. + fn room(&mut self, anchors: usize) -> Option<()> { + self.anchors = self.anchors.saturating_add(anchors); + (self.anchors <= MAX_ART_ANCHORS).then_some(()) + } +} + +/// Does `n` (a group) have fills or strokes of its own that paint? +fn paints(n: &Node) -> bool { + n.appearance.items.iter().any(|i| match i { + AppearanceItem::Fill(f) => f.visible && !f.paint.is_none(), + AppearanceItem::Stroke(s) => s.visible && !s.paint.is_none(), + }) +} + +/// `path` as a sample of the line, when it is one open subpath of two anchors or more whose anchors +/// and handles all lie level with its first anchor: that y, and the x where it ends (its +/// rightmost anchor). +fn sample_line(path: &PathData) -> Option<(f64, f64)> { + let [sub] = path.subpaths.as_slice() else { return None }; + if sub.closed || sub.anchors.len() < 2 { + return None; + } + let y = sub.anchors.first()?.p.y; + let level = |q: Point| q.x.is_finite() && (q.y - y).abs() <= 1e-6 * (1.0 + y.abs()); + if !y.is_finite() || !sub.anchors.iter().all(|a| level(a.p) && level(a.h_in) && level(a.h_out)) { + return None; + } + Some((y, sub.anchors.iter().map(|a| a.p.x).fold(f64::NEG_INFINITY, f64::max))) +} diff --git a/crates/eps/src/import/ai/read.rs b/crates/eps/src/import/ai/read.rs index 67928785ad..465ef512c6 100644 --- a/crates/eps/src/import/ai/read.rs +++ b/crates/eps/src/import/ai/read.rs @@ -122,8 +122,8 @@ use vectorcraft_color::swatch::Swatch; use vectorcraft_color::{BlendMode, Paint}; use vectorcraft_doc::cmyk::Inks; use vectorcraft_doc::{ - Appearance, AppearanceItem, Artboard, ColorMode, Dash, Document, FillLayer, ImageBlob, ImageObject, Knockout, LayerColor, LineCap, LineJoin, - LinkInfo, Node, NodeId, NodeKind, OpacityMask, PageBox, PatternDef, StrokeLayer, Unit, + Appearance, AppearanceItem, Artboard, ColorMode, CustomArrowhead, Dash, Document, FillLayer, ImageBlob, ImageObject, Knockout, LayerColor, + LineCap, LineJoin, LinkInfo, Node, NodeId, NodeKind, OpacityMask, PageBox, PatternDef, StrokeLayer, Unit, }; use vectorcraft_geom::{AnchorKind, FillRule, PathData}; @@ -537,6 +537,10 @@ struct Reader<'a> { symbol_bounds: HashMap, /// The symbols read, by their name in the file → their name in the document. symbol_names: HashMap, + /// The heads of the arrowhead symbols the art styles' strokes name, by the symbol's name in + /// the file (`None`: not a symbol read, or not one read as a head), read with the styles + /// ([`Reader::read_arrowheads`]). + arrowheads: HashMap>>, /// The names the symbols read have in the document, and for each name read more than once, /// the number its next copy is tried with. symbol_taken: HashSet, @@ -793,6 +797,7 @@ impl<'a> Reader<'a> { unread: Vec::new(), symbol_bounds: HashMap::new(), symbol_names: HashMap::new(), + arrowheads: HashMap::new(), symbol_taken: HashSet::new(), symbol_suffix: HashMap::new(), symbol_art_bounds: HashMap::new(), diff --git a/crates/eps/src/import/ai/read/containers.rs b/crates/eps/src/import/ai/read/containers.rs index 9db1470093..f949ce5ed1 100644 --- a/crates/eps/src/import/ai/read/containers.rs +++ b/crates/eps/src/import/ai/read/containers.rs @@ -723,6 +723,8 @@ impl<'a> Reader<'a> { if std::mem::replace(&mut self.symbols_checked, true) { return; } + // The symbols are all read now: the heads of those defined after the styles. + self.read_arrowheads(); // Each symbol's name in the file (none for one named as an earlier one), and the names its // instances use. let files: HashMap<&str, &str> = self.symbol_names.iter().map(|(file, named)| (named.as_str(), file.as_str())).collect(); diff --git a/crates/eps/src/import/ai/read/directives.rs b/crates/eps/src/import/ai/read/directives.rs index 8ca3781717..68977f171a 100644 --- a/crates/eps/src/import/ai/read/directives.rs +++ b/crates/eps/src/import/ai/read/directives.rs @@ -128,6 +128,7 @@ impl<'a> Reader<'a> { // section inside it would replace the file's own. if self.subreader_depth == 0 { self.styles = crate::import::ai::style::art_styles_in(section, &mut self.names); + self.read_arrowheads(); } return Ok(()); } @@ -398,6 +399,7 @@ impl<'a> Reader<'a> { sub.gradients = std::mem::take(&mut self.gradients); sub.global_names = std::mem::take(&mut self.global_names); sub.styles = std::mem::take(&mut self.styles); + sub.arrowheads = std::mem::take(&mut self.arrowheads); sub.nodes = self.nodes; sub.template = self.template; self.lend_budgets(&mut sub); @@ -408,6 +410,7 @@ impl<'a> Reader<'a> { self.names.absorb(std::mem::take(&mut sub.names)); self.global_names = std::mem::take(&mut sub.global_names); self.styles = std::mem::take(&mut sub.styles); + self.arrowheads = std::mem::take(&mut sub.arrowheads); // Unread art in the definition, hidden or not, leaves the tile incomplete. let whole = read.is_ok() && sub.unsupported.is_empty() @@ -429,6 +432,7 @@ impl<'a> Reader<'a> { sub.gradients = std::mem::take(&mut self.gradients); sub.global_names = std::mem::take(&mut self.global_names); sub.styles = std::mem::take(&mut self.styles); + sub.arrowheads = std::mem::take(&mut self.arrowheads); sub.nodes = self.nodes; sub.template = self.template; self.lend_budgets(&mut sub); @@ -444,6 +448,7 @@ impl<'a> Reader<'a> { self.gradients = std::mem::take(&mut sub.gradients); self.global_names = std::mem::take(&mut sub.global_names); self.styles = std::mem::take(&mut sub.styles); + self.arrowheads = std::mem::take(&mut sub.arrowheads); self.names.absorb(std::mem::take(&mut sub.names)); let whole = read.is_ok() && sub.unsupported.is_empty() @@ -597,6 +602,7 @@ impl<'a> Reader<'a> { sub.gradients = std::mem::take(&mut self.gradients); sub.global_names = std::mem::take(&mut self.global_names); sub.styles = std::mem::take(&mut self.styles); + sub.arrowheads = std::mem::take(&mut self.arrowheads); sub.pattern_tiles = std::mem::take(&mut self.pattern_tiles); sub.v7_patterns.clone_from(&self.v7_patterns); sub.nodes = self.nodes; @@ -607,6 +613,7 @@ impl<'a> Reader<'a> { self.gradients = std::mem::take(&mut sub.gradients); self.global_names = std::mem::take(&mut sub.global_names); self.styles = std::mem::take(&mut sub.styles); + self.arrowheads = std::mem::take(&mut sub.arrowheads); self.pattern_tiles = std::mem::take(&mut sub.pattern_tiles); self.names.absorb(std::mem::take(&mut sub.names)); // Art stopped by a trailer, or with an array, type, image, placed file, gradient mesh or @@ -788,6 +795,7 @@ impl<'a> Reader<'a> { // version 7 form, lent. sub.gradients = std::mem::take(&mut self.gradients); sub.styles = std::mem::take(&mut self.styles); + sub.arrowheads = std::mem::take(&mut self.arrowheads); sub.pattern_tiles = std::mem::take(&mut self.pattern_tiles); sub.v7_patterns = std::mem::take(&mut self.v7_patterns); sub.global_names = std::mem::take(&mut self.global_names); @@ -799,6 +807,7 @@ impl<'a> Reader<'a> { self.nodes = sub.nodes; self.gradients = std::mem::take(&mut sub.gradients); self.styles = std::mem::take(&mut sub.styles); + self.arrowheads = std::mem::take(&mut sub.arrowheads); self.pattern_tiles = std::mem::take(&mut sub.pattern_tiles); self.v7_patterns = std::mem::take(&mut sub.v7_patterns); self.global_names = std::mem::take(&mut sub.global_names); diff --git a/crates/eps/src/import/ai/read/document.rs b/crates/eps/src/import/ai/read/document.rs index 258d7d584b..840b9053bf 100644 --- a/crates/eps/src/import/ai/read/document.rs +++ b/crates/eps/src/import/ai/read/document.rs @@ -1164,7 +1164,7 @@ impl<'a> Reader<'a> { continue; } let Some(st) = self.styles.get(&name) else { continue }; - let Some(mut appearance) = appearance_from_art_style(st, &self.gradients) else { continue }; + let Some(mut appearance) = appearance_from_art_style(st, &self.gradients, &self.arrowheads) else { continue }; // A Large Canvas copy's styles are at its art's scale ([`Self::ensure_space`]). if let Some(s) = self.large_canvas.filter(|s| *s != 1.0) { appearance.scale_strokes(s); diff --git a/crates/eps/src/import/ai/read/ops.rs b/crates/eps/src/import/ai/read/ops.rs index 721a6988ba..f3f2b1d9cc 100644 --- a/crates/eps/src/import/ai/read/ops.rs +++ b/crates/eps/src/import/ai/read/ops.rs @@ -2,9 +2,12 @@ use super::containers::close; use super::document::slot_of; use super::types::{BLENDS, FLIP, Frame, GRAPH_UNENDED, IGNORED, Kind, MAX_DEPTH, MAX_NODES, MAX_TAG_TEXT, MAX_TAGS, Place, URL_TAG, line_width}; use super::{ - Affine, Appearance, AppearanceItem, Arc, BlendMode, BrushesKept, Dash, FillLayer, FillRule, Global, Gradient, GradientDef, HashMap, HashSet, - Instance, Knockout, LayerColor, LineCap, LineJoin, Node, NodeId, NodeKind, Paint, Reader, Rect, ShownNames, StrokeLayer, V, obj, paint, + Affine, Appearance, AppearanceItem, Arc, BlendMode, BrushesKept, CustomArrowhead, Dash, FillLayer, FillRule, Global, Gradient, GradientDef, + HashMap, HashSet, Instance, Knockout, LayerColor, LineCap, LineJoin, Node, NodeId, NodeKind, Paint, Reader, Rect, ShownNames, StrokeLayer, V, + obj, paint, }; +use vectorcraft_doc::{ArrowAlign, Arrowhead}; +use vectorcraft_geom::PathData; impl<'a> Reader<'a> { // ---- operators ------------------------------------------------------------------------- @@ -710,6 +713,30 @@ impl<'a> Reader<'a> { self.note_state(); } + /// Read the heads of the arrowhead symbols the art styles' strokes name into + /// [`Reader::arrowheads`] ([`crate::import::ai::arrowhead::head`]), each symbol once. Called + /// when the styles are read and again when the symbols have all been read ([`Self::check_symbols`]), + /// for a file that defines its symbols after its styles: a name with no symbol read yet is + /// left for then. + pub(super) fn read_arrowheads(&mut self) { + use crate::import::ai::style::StyleItem; + for st in self.styles.values() { + for item in &st.items { + let StyleItem::Stroke { arrows: Some(arrows), .. } = item else { continue }; + for name in arrows.symbols() { + if self.arrowheads.contains_key(name) { + continue; + } + let symbol = self.symbol_names.get(name).and_then(|named| self.doc.symbols.iter().find(|s| &s.name == named)); + if let Some(s) = symbol { + let head = crate::import::ai::arrowhead::head(name, &s.art).map(Arc::new); + self.arrowheads.insert(name.to_string(), head); + } + } + } + } + } + /// Brings [`Reader::brushes_kept`] up to date with the brushes and brush art read so far. fn note_brushes_kept(&mut self) { use super::super::brush; @@ -821,6 +848,7 @@ impl<'a> Reader<'a> { brushes: &self.brush_drafts, kept: &self.brushes_kept.kept, bending: &self.brushes_kept.bending, + arrowheads: &self.arrowheads, space, }, ) @@ -1047,6 +1075,8 @@ struct StylePaints<'a> { kept: &'a [bool], /// The art an Art brush draws as the file does, with its length ([`super::super::brush::bending_art`]). bending: &'a HashMap, + /// The heads of the arrowhead symbols strokes name ([`Reader::arrowheads`]). + arrowheads: &'a HashMap>>, space: Affine, } @@ -1332,7 +1362,7 @@ fn styled(object: &Node, look: &Node, st: &crate::import::ai::style::ArtStyle, p return None; } } - stroke_layer(item)? + stroke_layer(item, paints.arrowheads)? } }; if let Some(look) = st.looks.get(n) { @@ -1345,7 +1375,73 @@ fn styled(object: &Node, look: &Node, st: &crate::import::ai::style::ArtStyle, p } else { object.appearance.contents_index }; - Some(Appearance { items, effects: st.effects.clone(), contents_index }) + heads_placed(object, look, Appearance { items, effects: st.effects.clone(), contents_index }, paints.space) +} + +/// What `appearance` paints on path or compound path `object`: its fills' outline and its strokes' +/// areas, heads included, measured exactly (a node's visual bounds allow a head its whole reach on +/// every side). `None` for another object or an appearance that paints nothing. +fn painted_bounds(object: &Node, appearance: &Appearance) -> Option { + let (path, rule) = match &object.kind { + NodeKind::Path { path, rule, .. } => (path.clone(), *rule), + NodeKind::Compound { children, rule } => { + (PathData::new(children.iter().filter_map(|c| c.path_data()).flat_map(|p| p.subpaths.iter().cloned()).collect()), *rule) + } + _ => return None, + }; + let mut out = None; + for item in &appearance.items { + let painted = match item { + AppearanceItem::Fill(f) if f.visible && !f.paint.is_none() => path.bounds(), + AppearanceItem::Stroke(s) if s.visible && !s.paint.is_none() => vectorcraft_effects::stroke::outline_region(&path, rule, s).bounds(), + _ => None, + }; + out = vectorcraft_geom::union_opt(out, painted); + } + out +} + +/// `appearance` (on `object`, whose drawn look is `look`, in a space `space` takes to the +/// document) with its strokes' arrowheads placed as the look draws them: the tips on the ends of +/// the path, or past them by the line's length under each head (Extend), whichever gives the +/// object the look's bounds within a quarter of the least distance a head moves between the two +/// (at least 0.05 pt, at most 0.5 pt). `None` +/// when neither does: the file draws the heads elsewhere (on other subpaths, say). +fn heads_placed(object: &Node, look: &Node, mut appearance: Appearance, space: Affine) -> Option { + let k = space.determinant().abs().sqrt(); + let k = if k.is_finite() && k > 0.0 { k } else { 1.0 }; + // How far each head moves between the placements: its line's length under it. + let mut shift = f64::INFINITY; + for item in &appearance.items { + let AppearanceItem::Stroke(s) = item else { continue }; + for (head, end) in [(&s.start_arrow, false), (&s.end_arrow, true)] { + if let Some(Arrowhead::Custom(c)) = head { + shift = shift.min(c.stop() * s.arrow_weight(end) * k); + } + } + } + if shift.is_infinite() { + return Some(appearance); + } + let want = look.visual_bounds()?; + // Well under the distance between the placements, and under half a point: a look without + // those heads, or with them elsewhere, is off by more. + let tolerance = (shift / 4.0).clamp(0.05, 0.5); + for align in [ArrowAlign::Tip, ArrowAlign::Extend] { + for item in &mut appearance.items { + if let AppearanceItem::Stroke(s) = item { + s.arrow_align = align; + } + } + let mut scaled = appearance.clone(); + scaled.scale_strokes(k); + let got = painted_bounds(object, &scaled)?; + let off = [got.x0 - want.x0, got.y0 - want.y0, got.x1 - want.x1, got.y1 - want.y1].iter().fold(0.0f64, |m, d| m.max(d.abs())); + if off <= tolerance { + return Some(appearance); + } + } + None } /// A graphic style's appearance from art style `st`, on no object: `None` when the style isn't one @@ -1353,7 +1449,11 @@ fn styled(object: &Node, look: &Node, st: &crate::import::ai::style::ArtStyle, p /// A style that is one paint is its fill and stroke ([`crate::import::ai::style::ArtStyle::one_paint`]). /// A style keeps only its gradients' names and angles, so each one's gradient, by VectorCraft's own /// rule, is fitted to the bounds of whatever object the style is applied to, at its angle. -pub(super) fn appearance_from_art_style(st: &crate::import::ai::style::ArtStyle, gradients: &HashMap) -> Option { +pub(super) fn appearance_from_art_style( + st: &crate::import::ai::style::ArtStyle, + gradients: &HashMap, + arrowheads: &HashMap>>, +) -> Option { use crate::import::ai::style::StyleItem; if !st.plain { return None; @@ -1368,7 +1468,7 @@ pub(super) fn appearance_from_art_style(st: &crate::import::ai::style::ArtStyle, StyleItem::Fill(paint) => AppearanceItem::Fill(FillLayer::new(paint.clone())), // A graphic style's brush isn't checked against the file's brushes: it is left out. StyleItem::Stroke { brush: Some(_), .. } => return None, - StyleItem::Stroke { .. } => stroke_layer(item)?, + StyleItem::Stroke { .. } => stroke_layer(item, arrowheads)?, StyleItem::Gradient { name, angle } => AppearanceItem::Fill(FillLayer::new(named_gradient(name.as_deref()?, *angle, gradients)?)), StyleItem::Pattern { .. } => return None, }; @@ -1445,7 +1545,7 @@ pub(crate) fn read_art_style(section: &[u8], name: &str, own_gradient: Option<&P .collect(); // No gradient is taken by name: on an object, one that isn't its own is placed where its drawn // look has it. - let mut appearance = appearance_from_art_style(&st, &HashMap::new())?; + let mut appearance = appearance_from_art_style(&st, &HashMap::new(), &HashMap::new())?; for (item, brush) in appearance.items.iter_mut().zip(brushes) { if let (AppearanceItem::Stroke(s), Some(brush)) = (item, brush) { s.brush = Some(brush); @@ -1461,12 +1561,27 @@ pub(crate) fn style_moves_with(section: &[u8], name: &str, object: &Node) -> boo crate::import::ai::style::art_styles(section).remove(name).is_some_and(|st| !st.moves_outline() || moves_with(object, &st)) } -/// A style's stroke as an appearance item (`None` for a fill). -fn stroke_layer(item: &crate::import::ai::style::StyleItem) -> Option { - let crate::import::ai::style::StyleItem::Stroke { paint, width, cap, join, miter, dash, profile, align, brush } = item else { return None }; +/// A style's stroke as an appearance item, its arrowheads the heads of `arrowheads` by symbol +/// name, each tip on its end of the path (where [`heads_placed`] finds the file draws them on an +/// object; a graphic style keeps that). `None` for a fill, or for a stroke +/// whose arrowhead symbol has no head there or whose head's weight would be under the least one +/// draws at ([`StrokeLayer::arrow_weight`]), so the head would draw larger than in the file. +fn stroke_layer(item: &crate::import::ai::style::StyleItem, arrowheads: &HashMap>>) -> Option { + let crate::import::ai::style::StyleItem::Stroke { paint, width, cap, join, miter, dash, profile, align, brush, arrows } = item else { + return None; + }; let mut layer = StrokeLayer::new(paint.clone(), line_width(*width)); (layer.cap, layer.join, layer.miter_limit, layer.dash, layer.profile, layer.align) = (*cap, *join, *miter, dash.clone(), profile.clone(), *align); layer.brush = brush.as_ref().map(|(name, _)| name.clone()); + if let Some(arrows) = arrows { + let head = |end: &Option<(String, f64)>| -> Option<(Option, f64)> { + let Some((name, pct)) = end else { return Some((None, 100.0)) }; + let head = arrowheads.get(name)?.clone()?; + (layer.width * pct / 100.0 >= StrokeLayer::LEAST_ARROW_WEIGHT).then_some((Some(Arrowhead::Custom(head)), *pct)) + }; + let ((start, start_pct), (end, end_pct)) = (head(&arrows.start)?, head(&arrows.end)?); + (layer.start_arrow, layer.end_arrow, layer.arrow_scale, layer.arrow_align) = (start, end, (start_pct, end_pct), ArrowAlign::Tip); + } Some(AppearanceItem::Stroke(layer)) } @@ -1651,6 +1766,7 @@ mod tests { brushes: &brushes, kept: &[true], bending: &bending, + arrowheads: &HashMap::new(), space: Affine::IDENTITY, }; let look = Node::group(NodeId(1), vec![square(2, Paint::solid(vectorcraft_color::Color::rgb(1.0, 0.0, 0.0)))]); @@ -1697,6 +1813,7 @@ mod tests { brushes: &[], kept: &[], bending: &bending, + arrowheads: &HashMap::new(), space: Affine::IDENTITY, }; let look = Node::group(NodeId(1), vec![square(2, Paint::solid(vectorcraft_color::Color::rgb(1.0, 0.0, 0.0)))]); diff --git a/crates/eps/src/import/ai/style.rs b/crates/eps/src/import/ai/style.rs index e0068a52be..50b590702d 100644 --- a/crates/eps/src/import/ai/style.rs +++ b/crates/eps/src/import/ai/style.rs @@ -229,6 +229,8 @@ impl ArtStyle { } } +// A stroke takes about 300 bytes and the other items about 100; a style holds a few of each. +#[allow(clippy::large_enum_variant)] #[derive(Clone, Debug, PartialEq)] pub(super) enum StyleItem { Fill(Paint), @@ -257,9 +259,35 @@ pub(super) enum StyleItem { align: StrokeAlign, /// A brush: its name, and its settings for this object. brush: Option<(String, PathBrush)>, + /// Its arrowheads, as symbols of the file (`None`: it has none). + arrows: Option>, }, } +/// A stroke's arrowheads: each end's symbol (`/GObjRef : (name) /SymbolArt ; (BSArrowBeginSymbol)` +/// or `(BSArrowEndSymbol)` in the stroke's dictionary) by its name in the file, with its scale in +/// percent (`BSArrowBeginScale`, `BSArrowEndScale`; 100 without one). The symbol's art is the head +/// and a sample of the line it ends, which `read::ops` reads into a head once the symbols are read. +#[derive(Clone, Debug, Default, PartialEq)] +pub(super) struct StrokeArrows { + pub start: Option<(String, f64)>, + pub end: Option<(String, f64)>, +} + +impl StrokeArrows { + /// The names of the symbols, start first. + pub fn symbols(&self) -> impl Iterator { + [&self.start, &self.end].into_iter().flatten().map(|(name, _)| name.as_str()) + } +} + +/// The arrowhead entries of a stroke's dictionary that [`stroke_arrows`] reads. Beside heads, any +/// other entry whose key starts with `BSArrow` isn't read, so the stroke keeps its drawn look. +const ARROW_ENTRIES: [&str; 4] = ["BSArrowBeginSymbol", "BSArrowEndSymbol", "BSArrowBeginScale", "BSArrowEndScale"]; + +/// The scales an arrowhead takes, in percent. +const ARROW_SCALES: std::ops::RangeInclusive = 1.0..=1000.0; + /// A fill's or stroke's own state in the stack. #[derive(Clone, Debug, PartialEq)] pub(super) struct ItemLook { @@ -319,6 +347,9 @@ struct Filter { /// The plug-in object it refers to (`/GObjRef : (name) (plug-in) /PluginObject`): its name and /// plug-in name. plugin_object: Option<(String, String)>, + /// The symbols its dictionary refers to (`/GObjRef : (name) /SymbolArt ; (key) ,`): each one's + /// name, by key. + symbols: HashMap, /// `mode opacity … Xy`. xy: Option<(usize, f32)>, /// `… isolate knockout … Xy`. @@ -351,6 +382,7 @@ impl Default for Filter { pattern: None, fill_last: LastPaint::None, plugin_object: None, + symbols: HashMap::new(), xy: None, xy_group: None, data: None, @@ -524,6 +556,11 @@ pub(super) fn art_styles_in(data: &[u8], names: &mut Names) -> HashMap dict_array = Some(vec![]), + // A symbol the dictionary refers to: `/GObjRef : (name) /SymbolArt ; (key) ,`. + b"SymbolArt" => { + symbol_entry(&mut lex, &mut operands, &mut other_entry, names, filters.last_mut().filter(|_| in_basic)); + continue; + } b"PluginObject" if in_basic => { let mut texts = operands.iter().rev().filter_map(|v| names.text(v)); if let (Some(plugin), Some(name), Some(f)) = (texts.next(), texts.next(), filters.last_mut()) { @@ -882,6 +919,7 @@ impl OnePaint { profile: None, align: StrokeAlign::Center, brush: None, + arrows: None, }), _ => return Err(()), } @@ -1477,11 +1515,61 @@ fn stroke_item(f: &Filter, align: StrokeAlign) -> Result, ()> profile: width_profile(&f.arrays), align, brush: None, + arrows: stroke_arrows(f)?, })), _ => Err(()), } } +/// The arrowheads of stroke filter `f` ([`StrokeArrows`]; `None` without any). `Err` for heads +/// beside an arrowhead entry [`ARROW_ENTRIES`] doesn't name, a scale that isn't a number in +/// [`ARROW_SCALES`], or a symbol entry with no symbol's name. +fn stroke_arrows(f: &Filter) -> Result>, ()> { + let end = |symbol: &str, scale: &str| -> Result, ()> { + if !f.kinds.contains_key(symbol) { + return Ok(None); + } + let name = f.symbols.get(symbol).ok_or(())?; + let pct = match f.kinds.get(scale) { + None => Some(100.0), + Some(Kind::Real) => entry(f, scale, Kind::Real)?, + Some(_) => entry(f, scale, Kind::Int)?, + }; + Ok(Some((name.clone(), pct.filter(|p| ARROW_SCALES.contains(p)).ok_or(())?))) + }; + let arrows = StrokeArrows { start: end("BSArrowBeginSymbol", "BSArrowBeginScale")?, end: end("BSArrowEndSymbol", "BSArrowEndScale")? }; + if arrows.start.is_none() && arrows.end.is_none() { + return Ok(None); + } + // Another arrowhead entry may change how the heads draw. + if f.kinds.keys().any(|k| k.starts_with("BSArrow") && !ARROW_ENTRIES.contains(&k.as_str())) { + return Err(()); + } + Ok(Some(Box::new(arrows))) +} + +/// A symbol the dictionary of `filter`, the basic filter being read, refers to, +/// `/GObjRef : (name) /SymbolArt ; (key) ,`, whose `/SymbolArt` `lex` has just read (`operands`: +/// the values before it, read by `names`): the symbol's name by its key in [`Filter::symbols`], the +/// key an entry of another kind. Outside a basic filter (`None`) nothing is read. +fn symbol_entry(lex: &mut Lexer, operands: &mut Vec, other_entry: &mut Option>, names: &mut Names, filter: Option<&mut Filter>) { + let Some(f) = filter else { return }; + let symbol = operands.iter().rev().find_map(|v| names.text(v)); + (*other_entry, *operands) = (None, vec![]); + let at = lex.offset(); + let (close, key) = (lex.next_token().map(|t| t.tok), lex.next_token().map(|t| t.tok)); + // Anything else is read as it comes (a `/KnownStyle` starting the next style, say). + let (Some(Tok::Word(b";")), Some(Tok::Str(key))) = (close, key) else { + lex.seek(at); + return; + }; + let key = String::from_utf8_lossy(&key).into_owned(); + f.repeated |= f.kinds.insert(key.clone(), Kind::Other).is_some(); + if let Some(symbol) = symbol { + f.symbols.insert(key, symbol); + } +} + /// A Stroke Offset filter `f`: a stroke whose own style is in its dictionary, aligned inside its /// path when `StrokeOffsetInside` is 1 and outside when it is 0 (its `DisplayString` says which). /// `Err` when that switch is missing or not a switch, or for a stroke [`paint_item`] doesn't read. @@ -1544,6 +1632,7 @@ fn calligraphic_stroke(f: &Filter) -> Option { profile: None, align: StrokeAlign::Center, brush: Some((name.clone(), PathBrush::Calligraphic(super::brush::calligraphic(values, variation, codes)))), + arrows: None, }) } @@ -1627,6 +1716,7 @@ fn art_stroke(f: &Filter) -> Option { profile: None, align: StrokeAlign::Center, brush: Some((name.clone(), PathBrush::Art(settings))), + arrows: None, }) } diff --git a/crates/eps/src/import/ai/style/tests.rs b/crates/eps/src/import/ai/style/tests.rs index c4b006fe2a..331e733e92 100644 --- a/crates/eps/src/import/ai/style/tests.rs +++ b/crates/eps/src/import/ai/style/tests.rs @@ -1545,8 +1545,10 @@ fn a_style_of_one_paint_reads_as_the_fill_and_stroke_its_xd_turns_on() { }; let stroke = "0 R\n0 1 1 0 K\n1 J 2 j 3 w 4 M [2 1]0 d\n"; let Some(Ok(items)) = one(&format!("0 O\n0 0 1 0 k\n{stroke}1 1 Xd\n")) else { panic!("{:?}", one(stroke)) }; - let [StyleItem::Fill(fill), StyleItem::Stroke { paint, width, cap, join, miter, dash, profile: None, align: StrokeAlign::Center, brush: None }] = - items.as_slice() + let [ + StyleItem::Fill(fill), + StyleItem::Stroke { paint, width, cap, join, miter, dash, profile: None, align: StrokeAlign::Center, brush: None, arrows: _ }, + ] = items.as_slice() else { panic!("{items:?}") }; @@ -1587,3 +1589,18 @@ fn a_style_of_one_paint_reads_as_the_fill_and_stroke_its_xd_turns_on() { assert_eq!(one(&paint), Some(Err(())), "{paint}"); } } + +/// A `/SymbolArt` entry cut short (no `; (key)` after it) leaves what follows to be read: here the +/// next style. +#[test] +fn a_symbol_entry_cut_short_leaves_the_next_style_read() { + let stroke = "/BasicFilter :\n(Stroke Style Filter) 0 0 /Filter ,\n1 /Visible ,\n/Dictionary : /NotRecorded ,\n\ + /StrokeStyle : 0 R\n0 0 0 1 0 0 0 XA\n0 J 0 j 1 w 10 M []0 d\n0 XR\n1 0 Xd\n/Def ;\n (StrokeStyle) ,\n"; + let text = format!( + "/KnownStyle :\n(Cut) /Name ,\n/ActiveStyle :\n/CompoundFilter :\n(Chain Style Filter) 0 0 /Filter ,\n1 /Visible ,\n{stroke}/GObjRef : (W) /SymbolArt\n\ + /KnownStyle :\n(Next) /Name ,\n/ActiveStyle :\n/CompoundFilter :\n(Chain Style Filter) 0 0 /Filter ,\n1 /Visible ,\n{stroke}; /Dict ;\n /Part ,\n;\n" + ); + let styles = art_styles(text.as_bytes()); + assert!(styles.contains_key("Cut") && styles.contains_key("Next"), "{:?}", styles.keys().collect::>()); + assert!(matches!(styles["Next"].items.as_slice(), [StyleItem::Stroke { arrows: None, .. }]), "{:?}", styles["Next"].items); +} diff --git a/crates/eps/src/import/ai/tests.rs b/crates/eps/src/import/ai/tests.rs index ca625a13c2..bf5143b15d 100644 --- a/crates/eps/src/import/ai/tests.rs +++ b/crates/eps/src/import/ai/tests.rs @@ -6254,6 +6254,187 @@ fn a_default_style_with_a_stroke_aligned_outside_comes_in() { assert_eq!(a[0].extras().graphic_style, Some(1)); } +/// An arrowhead symbol's art: an unpainted frame, a 1 pt sample of the line from x = −9 to 4 on +/// y = 0, and the head, a filled wedge from x = 2 back to its tip at x = 8, 3 either side. +const WEDGE_ART: &str = "-10 5 m\n10 5 L\n10 -5 L\n-10 -5 L\n-10 5 L\nn\n0 G\n1 w\n-9 0 m\n4 0 l\nS\n0 g\n2 3 m\n8 0 l\n2 -3 l\nf\n"; + +/// The end arrowhead entries of a stroke's dictionary: symbol `Wedge` at 50 %. +const END_WEDGE: &str = "50 /Real (BSArrowEndScale) ,\n/GObjRef : (Wedge) /SymbolArt ; (BSArrowEndSymbol) ,\n"; + +/// An art style named `name`: a black stroke of weight `width` whose stroke dictionary holds +/// `entries`, as a stroke's arrowheads are written. +fn arrow_style(name: &str, entries: &str, width: f64) -> String { + format!( + "/KnownStyle :\n({name}) /Name ,\n/ActiveStyle :\n/CompoundFilter :\n(Chain Style Filter) 0 0 /Filter ,\n1 /Visible ,\n\ + /CompoundFilter :\n(Stack Style Filter) 0 0 /Filter ,\n1 /Visible ,\n\ + /BasicFilter :\n(Stroke Style Filter) 0 0 /Filter ,\n1 /Visible ,\n2 /FillOrStroke ,\n/Dictionary : /NotRecorded ,\n\ + /Dictionary : /NotRecorded ,\n1 /Int (BSAdvStrokeDictionaryVersion) ,\n{entries}; (kAIBeautifulStrokesParamsDictKey) ,\n\ + /StrokeStyle : 0 R\n0 0 0 1 0 0 0 XA\n0 J 0 j {width} w 10 M []0 d\n0 XR\n1 0 Xd\n/Def ;\n (StrokeStyle) ,\n; /Dict ;\n /Part ,\n\ + /BasicFilter :\n(Conduit Filter) 0 0 /Filter ,\n1 /Visible ,\n;\n /Part ,\n;\n /Part ,\n;\n" + ) +} + +/// The drawn look of a 2 pt line from (0, 50) to (100, 50) with [`END_WEDGE`] (weight 1) on its end, +/// the tip on the end: the line to 4 before it, under the head from x = 94 to 100, 3 either side. +const END_WEDGE_LOOK: &str = "0 G\n2 w\n0 50 m\n96 50 l\nS\n0 g\n94 53 m\n100 50 l\n94 47 l\nf\n"; + +/// A line from (0, 50) to (100, 50) drawn as `look`, read as itself with the art style `name`. +fn arrowed_line(name: &str, look: &str) -> String { + format!("0 Ae\nu\n{look}U\n%_0 50 m\n%_100 50 L\n%_N\n1 ({name}) XW\n") +} + +/// A file with the arrowhead symbol `Wedge` (art `symbol_art`), the art style `Arrowed` +/// ([`arrow_style`] with `entries` and `width`), listed, and a line drawn with it as `look`. +fn arrowed_file(symbol_art: &str, entries: &str, width: f64, look: &str) -> String { + named_arrowed_file("Wedge", symbol_art, entries, width, look) +} + +/// [`arrowed_file`] with the symbol named `name`. +fn named_arrowed_file(name: &str, symbol_art: &str, entries: &str, width: f64, look: &str) -> String { + format!( + "{}{}{}", + symbols(&symbol(name, symbol_art, 5)), + styles_and_list(&[arrow_style("Arrowed", entries, width)], &["Arrowed"]), + layer(&arrowed_line("Arrowed", look)) + ) +} + +/// The object `r` reads, its path, and its stroke. +fn arrowed(r: &Structure) -> (Arc, vectorcraft_doc::StrokeLayer) { + let a = art(&r.doc); + assert_eq!(a.len(), 1, "{a:#?}"); + assert!(matches!(a[0].kind, NodeKind::Path { .. }), "the object, not its look: {:#?} {:?}", a[0], r.warnings); + assert!(!r.warnings.iter().any(|w| w.contains("drawn look")), "{:?}", r.warnings); + let s = a[0].appearance.stroke().expect("a stroke").clone(); + (a[0].clone(), s) +} + +/// The bounds of the area stroke `s` paints along path `n` (its heads included). +fn painted(n: &Node, s: &vectorcraft_doc::StrokeLayer) -> Rect { + let NodeKind::Path { path, rule, .. } = &n.kind else { panic!("a path") }; + vectorcraft_effects::stroke::outline_region(path, *rule, s).bounds().unwrap() +} + +#[test] +fn a_strokes_arrowhead_symbols_are_its_arrowheads() { + // GUARDS: a stroke's arrowheads (#8188) were left out: the line came in without its heads. + use vectorcraft_doc::{ArrowAlign, Arrowhead}; + let r = read_ok(&arrowed_file(WEDGE_ART, END_WEDGE, 2.0, END_WEDGE_LOOK)); + let (object, s) = arrowed(&r); + assert_eq!((s.width, s.arrow_scale, s.arrow_align), (2.0, (100.0, 50.0), ArrowAlign::Tip)); + assert!(s.start_arrow.is_none(), "{:?}", s.start_arrow); + let Some(Arrowhead::Custom(head)) = &s.end_arrow else { panic!("a head of the symbol's art: {:?}", s.end_arrow) }; + assert_eq!(head.name, "Wedge"); + // In head units, one a symbol unit: 6 long from the tip, 3 either side, the line stopping 4 + // back from the tip, where the sample ends. + let b = head.path.bounds().expect("an outline"); + for (got, want) in [(b.x0, 0.0), (b.x1, 6.0), (b.y0, -3.0), (b.y1, 3.0), (head.stop(), 4.0)] { + assert!((got - want).abs() < 1e-6, "{b:?}, stop {}", head.stop()); + } + // Drawn with the tip on the line's end: a head of weight 1 (2 pt at 50 %), 6 pt long. + let end = object.path_data().unwrap().subpaths[0].anchors.last().unwrap().p; + let drawn = painted(&object, &s); + assert!((drawn.x1 - end.x).abs() < 1e-6 && (drawn.height() - 6.0).abs() < 1e-6, "{drawn:?} for an end at {end:?}"); + // The listed graphic style has the head too. + let style = r.doc.graphic_styles[0].appearance.stroke().expect("the style's stroke"); + assert!(matches!(&style.end_arrow, Some(Arrowhead::Custom(h)) if h == head), "{:?}", style.end_arrow); +} + +#[test] +fn a_strokes_start_arrowhead_points_back_and_keeps_its_side() { + use vectorcraft_doc::Arrowhead; + // A head with one barb, below the line in the symbol (its space is y down): on the right of + // the way it points. At the start of a 1 pt line drawn left to right it points left, the barb + // above the line (the file's y up), the line starting 4 in. + let barb = "0 G\n1 w\n-9 0 m\n4 0 l\nS\n0 g\n2 3 m\n8 0 l\n2 0 l\nf\n"; + let entries = "/GObjRef : (Wedge) /SymbolArt ; (BSArrowBeginSymbol) ,\n"; + let look = "0 G\n1 w\n4 50 m\n100 50 l\nS\n0 g\n6 53 m\n0 50 l\n6 50 l\nf\n"; + let r = read_ok(&arrowed_file(barb, entries, 1.0, look)); + let (object, s) = arrowed(&r); + assert_eq!(s.arrow_scale, (100.0, 100.0)); + assert!(s.end_arrow.is_none()); + let Some(Arrowhead::Custom(head)) = &s.start_arrow else { panic!("{:?}", s.start_arrow) }; + let b = head.path.bounds().unwrap(); + assert!(b.y0.abs() < 1e-6 && (b.y1 - 3.0).abs() < 1e-6, "right of the way it points: {b:?}"); + // Drawn: the tip on the start, and 3 pt of head on the barb's side of the line (above it: the + // document's y down) against the line's half point on the other. + let start = object.path_data().unwrap().subpaths[0].anchors.first().unwrap().p; + let drawn = painted(&object, &s); + assert!((drawn.x0 - start.x).abs() < 1e-6, "{drawn:?} for a start at {start:?}"); + assert!((start.y - drawn.y0 - 3.0).abs() < 1e-6 && (drawn.y1 - start.y - 0.5).abs() < 1e-6, "{drawn:?} for a start at {start:?}"); +} + +#[test] +fn a_stroke_takes_both_heads_at_their_own_scales() { + use vectorcraft_doc::Arrowhead; + // The start at 100 % written as a whole number (weight 2: 12 long, 6 either side, the line 8 + // in), the end at 50 %, both of a symbol named in Chinese ("wedge"). + let entries = "100 /Int (BSArrowBeginScale) ,\n/GObjRef : (楔) /SymbolArt ; (BSArrowBeginSymbol) ,\n\ + 50 /Real (BSArrowEndScale) ,\n/GObjRef : (楔) /SymbolArt ; (BSArrowEndSymbol) ,\n"; + let look = "0 G\n2 w\n8 50 m\n96 50 l\nS\n0 g\n12 56 m\n0 50 l\n12 44 l\nf\n94 53 m\n100 50 l\n94 47 l\nf\n"; + let r = read_ok(&named_arrowed_file("楔", WEDGE_ART, entries, 2.0, look)); + let (object, s) = arrowed(&r); + assert_eq!(s.arrow_scale, (100.0, 50.0)); + for head in [&s.start_arrow, &s.end_arrow] { + assert!(matches!(head, Some(Arrowhead::Custom(h)) if h.name == "楔"), "{head:?}"); + } + let drawn = painted(&object, &s); + assert!((drawn.width() - 100.0).abs() < 1e-6 && (drawn.height() - 12.0).abs() < 1e-6, "{drawn:?}"); +} + +#[test] +fn heads_drawn_past_the_path_extend_it() { + use vectorcraft_doc::ArrowAlign; + // The file draws the head's tip 4 past the end (the line's length under it at weight 1): the + // line keeps its length. + let look = "0 G\n2 w\n0 50 m\n100 50 l\nS\n0 g\n98 53 m\n104 50 l\n98 47 l\nf\n"; + let r = read_ok(&arrowed_file(WEDGE_ART, END_WEDGE, 2.0, look)); + let (object, s) = arrowed(&r); + assert_eq!(s.arrow_align, ArrowAlign::Extend); + let end = object.path_data().unwrap().subpaths[0].anchors.last().unwrap().p; + assert!((painted(&object, &s).x1 - end.x - 4.0).abs() < 1e-6); +} + +#[test] +fn arrowheads_this_does_not_read_keep_the_drawn_look() { + let two_lines = format!("{WEDGE_ART}0 G\n1 w\n-9 0 m\n4 0 l\nS\n"); + let no_line = "0 g\n2 3 m\n8 0 l\n2 -3 l\nf\n"; + let thin_line = WEDGE_ART.replace("1 w", "0.5 w"); + let missing = "/GObjRef : (Elsewhere) /SymbolArt ; (BSArrowEndSymbol) ,\n"; + let unknown = format!("{END_WEDGE}1 /Int (BSArrowSomethingElse) ,\n"); + let too_large = "2000 /Real (BSArrowEndScale) ,\n/GObjRef : (Wedge) /SymbolArt ; (BSArrowEndSymbol) ,\n"; + let line_only = "0 G\n2 w\n0 50 m\n100 50 l\nS\n"; + let cases: [(&str, &str, &str, f64, &str); 8] = [ + ("a symbol the file doesn't define", WEDGE_ART, missing, 2.0, END_WEDGE_LOOK), + ("an arrowhead entry this doesn't read", WEDGE_ART, &unknown, 2.0, END_WEDGE_LOOK), + ("a scale out of range", WEDGE_ART, too_large, 2.0, END_WEDGE_LOOK), + ("a head lighter than the least weight drawn", WEDGE_ART, END_WEDGE, 0.25, END_WEDGE_LOOK), + ("a symbol without a sample of the line", no_line, END_WEDGE, 2.0, END_WEDGE_LOOK), + ("a symbol with two samples of the line", &two_lines, END_WEDGE, 2.0, END_WEDGE_LOOK), + ("a sample of the line that isn't 1 pt", &thin_line, END_WEDGE, 2.0, END_WEDGE_LOOK), + ("heads drawn neither on nor past the ends", WEDGE_ART, END_WEDGE, 2.0, line_only), + ]; + for (why, symbol_art, entries, width, look) in cases { + let r = read_ok(&arrowed_file(symbol_art, entries, width, look)); + let a = art(&r.doc); + assert!(r.warnings.iter().any(|w| w.contains("drawn look")), "{why}: {:?} {a:#?}", r.warnings); + assert!(!matches!(a[0].kind, NodeKind::Path { .. }), "{why}: the look, not the object"); + // A graphic style with an arrowhead it doesn't read isn't read either, rather than read + // without its heads. + let headless = |i: &AppearanceItem| matches!(i, AppearanceItem::Stroke(s) if s.end_arrow.is_none()); + let styles: Vec<_> = r.doc.graphic_styles.iter().filter(|g| g.name == "Arrowed").collect(); + assert!(styles.iter().all(|g| !g.appearance.items.iter().any(headless)), "{why}: {styles:?}"); + } +} + +#[test] +fn an_arrowhead_entry_without_heads_leaves_the_stroke_read() { + // Only beside heads does an arrowhead entry this doesn't read keep the drawn look. + let r = read_ok(&arrowed_file(WEDGE_ART, "1 /Int (BSArrowSomethingElse) ,\n", 2.0, "0 G\n2 w\n0 50 m\n100 50 l\nS\n")); + let (_, s) = arrowed(&r); + assert!(s.start_arrow.is_none() && s.end_arrow.is_none()); +} + #[test] fn a_symbol_defined_before_the_art_styles_reads_its_styled_objects() { // GUARDS: objects in a symbol defined ahead of `%AI9_BeginArtStyles` (as Illustrator 24 writes diff --git a/docs/file-format-parity.md b/docs/file-format-parity.md index 9c46a01f77..fa4d25b9f2 100644 --- a/docs/file-format-parity.md +++ b/docs/file-format-parity.md @@ -1,6 +1,6 @@ # File format parity -> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-15 · **Change:** minor (PDF import: stroked type keeps the line cap, line join and miter limit the file strokes it with, not butt caps and miter joins, #7741; `.ai` and EPS import: in layers that don't draw as the page, art that differs away from an envelope of type no longer costs it its editable type; it keeps its drawn art where, in the pixels it and its drawn art ink, the layers with it differ from the page more than its own check allows, or past the envelopes' share of the page check, #7141; `.ai` and EPS import: a top-object envelope whose mesh saves its sides' curves in pieces draws its contents along each whole curve, as its drawn art does, #7097; previously: PDF import: glyphs in a span with an empty ActualText come in as outlines, #6971; scores and estimates unchanged; previously: `.ai` and EPS import: type from the text document, type a PostScript program sets and legacy `.ai` type are set in an installed face of their font's PostScript name, exact name first, in the version a text document's record keeps; the `.ai` save writes a static font's version when its name alone gives another copy, #6983; `.ai` and EPS import: type keeps the manual kerning of its text document, #6899; `.ai` and EPS import: type in an envelope with Distort Appearance is also tried mapped from the box of what it paints, its strokes' miter tips and strokes a Transform effect moves included, after its glyphs grown by half its strokes' weight, #6824; `.ai` and EPS import: type filled or stroked with a pattern swatch keeps its pattern, from the art style its text document paint names, #6856; #6865: explicitly requested oversized editing artboard; PDF import: Indic type keeps its marks on their line, and a line whose type would not draw as the file does keeps the file's glyphs as outlines, #5235; previously: newly imported SVG/SVGZ titles are filtered and bounded without changing restored titles, #3626; `.ai` and EPS import, and what every export and `.ai` save draw: type's strokes in an envelope paint at their own weight along its bent outlines, Distort Appearance on or off, #6644; `.ai` and EPS import: centred and right-aligned lines of tracked type are aligned without the tracking after their last character, as the file's page aligns them, #6610; `.ai` and EPS import: an envelope saved in Edit Contents whose mesh lies away from its drawn art by a move opens live on that art, #6570; `.ai` save and open: layer colour presets Yellow, Magenta and Cyan keep their colour, as the `Lb` colour index now follows the file's numbering, #6502; `.ai` save: stroked type keeps its stroke's cap, join and miter limit in the text document, #6472; `.ai` and EPS import, PDF import: tracking and manual kerning in horizontally scaled type take the Horizontal Scale, as the file's page spaces such type; `.ai` and EPS import: stroked type in an envelope maps from its glyphs grown by half its stroke, #3179; `.ai` and EPS import: warps of type open as mesh envelopes on their saved grid, #3179; `.ai` and EPS import: stroked type keeps its stroke's cap, join and miter limit from the text document, #6472; `.ai` save: type in a variable font's named instance names its design-space setting, #6388; `.ai` and EPS import: envelopes of type open live where they draw as their drawn art and the layers with them draw as the page, #3179; `.ai` and EPS import: a note for type in an envelope, #3179; `.ai` and EPS import: the live envelope and warped type check sees white art; PDF import: DeviceN images of one ink or of process plates keep their inks, #6348; `.ai` import: images in a spot ink's Separation space keep their ink, #6350; PDF import: Separation images keep their ink, #6314; PDF editable import preserves authored ActualText once, including empty/nested spans and authored ordering (#6165); cross-line/style layout remains approximate; scores and estimates unchanged; PDF marked-text export (#6309): compatible glyphs stay on one layout line with per-glyph offsets; scores and estimates unchanged; PDF import: image masks open colorized by the color they are painted in, #6313; EPS and `.ai` editing data: a ligature the page names by a private-use glyph matches its text object; EPS import: CIDFonts only named, over a Unicode CMap, set as live type; EPS import: CMap mappings to base-font codes and glyph names; EPS import: CID-keyed fonts in FontSets (CFF) draw their glyphs; EPS import: `kshow` procedures kern live type; EPS import: embedded Type 1 fonts' glyphs and widths; EPS import: CID-keyed fonts draw their glyphs; EPS import: Type 42 fonts' characters and widths from the font they carry, show operators' spacing kept as tracking; EPS import: an image decoder's own buffers stop counting against the memory budget once it is decoded; EPS import: sampled functions interpolate between their samples; `.ai` and EPS type from the text document keeps its tab stops; it keeps auto leading and hyphenation options, and may show more of the file's last lines in an area frame; `.ai` and EPS import: Art brushes in the older form of their objects come into the Brushes panel; EPS import: gradients drawn as abutting strips come in as one gradient, without seams; EPS import: composite fonts draw their Type 42 glyphs; SVG import: filter and mask regions clip, #5876, #5875; SVG import: Gaussian blurs keep `color-interpolation-filters`, #5877; PDF and `.ai` export: objects' URLs as links, #5785; SVG import: `color-interpolation="linearRGB"` gradients, #5878; `.ai` import: paths with a Calligraphic brush open brushed, #372) · **Target:** Adobe Illustrator 2026 (30.x) +> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-16 · **Change:** minor (`.ai` import: a stroke's arrowheads, the symbols its style names, come in as custom arrowheads with their tip on, or past, the path's end, as the drawn art places it, and the line stopping where the symbol's sample of it ends, #8188; PDF import: stroked type keeps the line cap, line join and miter limit the file strokes it with, not butt caps and miter joins, #7741; `.ai` and EPS import: in layers that don't draw as the page, art that differs away from an envelope of type no longer costs it its editable type; it keeps its drawn art where, in the pixels it and its drawn art ink, the layers with it differ from the page more than its own check allows, or past the envelopes' share of the page check, #7141; `.ai` and EPS import: a top-object envelope whose mesh saves its sides' curves in pieces draws its contents along each whole curve, as its drawn art does, #7097; previously: PDF import: glyphs in a span with an empty ActualText come in as outlines, #6971; scores and estimates unchanged; previously: `.ai` and EPS import: type from the text document, type a PostScript program sets and legacy `.ai` type are set in an installed face of their font's PostScript name, exact name first, in the version a text document's record keeps; the `.ai` save writes a static font's version when its name alone gives another copy, #6983; `.ai` and EPS import: type keeps the manual kerning of its text document, #6899; `.ai` and EPS import: type in an envelope with Distort Appearance is also tried mapped from the box of what it paints, its strokes' miter tips and strokes a Transform effect moves included, after its glyphs grown by half its strokes' weight, #6824; `.ai` and EPS import: type filled or stroked with a pattern swatch keeps its pattern, from the art style its text document paint names, #6856; #6865: explicitly requested oversized editing artboard; PDF import: Indic type keeps its marks on their line, and a line whose type would not draw as the file does keeps the file's glyphs as outlines, #5235; previously: newly imported SVG/SVGZ titles are filtered and bounded without changing restored titles, #3626; `.ai` and EPS import, and what every export and `.ai` save draw: type's strokes in an envelope paint at their own weight along its bent outlines, Distort Appearance on or off, #6644; `.ai` and EPS import: centred and right-aligned lines of tracked type are aligned without the tracking after their last character, as the file's page aligns them, #6610; `.ai` and EPS import: an envelope saved in Edit Contents whose mesh lies away from its drawn art by a move opens live on that art, #6570; `.ai` save and open: layer colour presets Yellow, Magenta and Cyan keep their colour, as the `Lb` colour index now follows the file's numbering, #6502; `.ai` save: stroked type keeps its stroke's cap, join and miter limit in the text document, #6472; `.ai` and EPS import, PDF import: tracking and manual kerning in horizontally scaled type take the Horizontal Scale, as the file's page spaces such type; `.ai` and EPS import: stroked type in an envelope maps from its glyphs grown by half its stroke, #3179; `.ai` and EPS import: warps of type open as mesh envelopes on their saved grid, #3179; `.ai` and EPS import: stroked type keeps its stroke's cap, join and miter limit from the text document, #6472; `.ai` save: type in a variable font's named instance names its design-space setting, #6388; `.ai` and EPS import: envelopes of type open live where they draw as their drawn art and the layers with them draw as the page, #3179; `.ai` and EPS import: a note for type in an envelope, #3179; `.ai` and EPS import: the live envelope and warped type check sees white art; PDF import: DeviceN images of one ink or of process plates keep their inks, #6348; `.ai` import: images in a spot ink's Separation space keep their ink, #6350; PDF import: Separation images keep their ink, #6314; PDF editable import preserves authored ActualText once, including empty/nested spans and authored ordering (#6165); cross-line/style layout remains approximate; scores and estimates unchanged; PDF marked-text export (#6309): compatible glyphs stay on one layout line with per-glyph offsets; scores and estimates unchanged; PDF import: image masks open colorized by the color they are painted in, #6313; EPS and `.ai` editing data: a ligature the page names by a private-use glyph matches its text object; EPS import: CIDFonts only named, over a Unicode CMap, set as live type; EPS import: CMap mappings to base-font codes and glyph names; EPS import: CID-keyed fonts in FontSets (CFF) draw their glyphs; EPS import: `kshow` procedures kern live type; EPS import: embedded Type 1 fonts' glyphs and widths; EPS import: CID-keyed fonts draw their glyphs; EPS import: Type 42 fonts' characters and widths from the font they carry, show operators' spacing kept as tracking; EPS import: an image decoder's own buffers stop counting against the memory budget once it is decoded; EPS import: sampled functions interpolate between their samples; `.ai` and EPS type from the text document keeps its tab stops; it keeps auto leading and hyphenation options, and may show more of the file's last lines in an area frame; `.ai` and EPS import: Art brushes in the older form of their objects come into the Brushes panel; EPS import: gradients drawn as abutting strips come in as one gradient, without seams; EPS import: composite fonts draw their Type 42 glyphs; SVG import: filter and mask regions clip, #5876, #5875; SVG import: Gaussian blurs keep `color-interpolation-filters`, #5877; PDF and `.ai` export: objects' URLs as links, #5785; SVG import: `color-interpolation="linearRGB"` gradients, #5878; `.ai` import: paths with a Calligraphic brush open brushed, #372) · **Target:** Adobe Illustrator 2026 (30.x) > > Oversized artboard import update (2026-11-12): Explicit editing-data import retains a single artboard beyond a capped 14,400 pt PDF page (#6865). @@ -344,6 +344,7 @@ Stop opacity on translated artboards remains outside this regression coverage. | Date | Change | Summary | |---|---|---| +| 2026-11-16 | minor | `.ai` import: a stroke's arrowheads were left out, so lines came in without their heads (#8188). A Stroke Style filter's stroke dictionary names each end's head as a symbol of the file (`/GObjRef : (name) /SymbolArt ; (BSArrowBeginSymbol)` or `(BSArrowEndSymbol)`), with its scale in percent (`BSArrowEndScale`, and `BSArrowBeginScale` read the same way; 100 without one). As the files have it, such a symbol's art (y down, as symbols are read) points right along a straight, level sample of the line: an open stroked path with no fill, which ends where the line stops under the head. The rest of the art that paints is the head, its tip its rightmost point, at one symbol unit a head weight (the stroke's weight at the scale). The head comes in as a custom arrowhead with that outline and that stop (a custom head now carries an optional stop, else its line ends halfway along it, as before). Its placement is the one of the two (tip on the end of the path, or Extend, the tip past it by the line's length under the head) that gives the object its drawn art's bounds; the user's file has every tip on its path's end. A stroke keeps its drawn look when neither placement gives those bounds (heads on other subpaths, say), when its symbol isn't read whole or isn't read as a head (no sample or more than one, a sample that isn't 1 pt wide, as in art stored at a Large Canvas scale, art other than paths, compound paths and groups such as a clip group, a group with fills or strokes of its own, effects, brushes), when its dictionary holds another `BSArrow` entry beside heads, when a scale is outside 1–1000 %, or when the head's weight would be under the 0.25 pt least one VectorCraft draws; a graphic style with such a stroke isn't read rather than read without its heads, and one with heads takes them on the end of the path, so an object whose heads are read past its ends isn't linked to its listed style. Measured on a user's file of ten arrows (used locally, never committed): every line gets its heads, and drawn at 4× its pixels match the file's own page but for 3 of 9,825 inked ones (0.24.1: 1,232 differ). Tests `a_strokes_arrowhead_symbols_are_its_arrowheads`, `a_strokes_start_arrowhead_points_back_and_keeps_its_side`, `a_stroke_takes_both_heads_at_their_own_scales`, `heads_drawn_past_the_path_extend_it`, `arrowheads_this_does_not_read_keep_the_drawn_look`, `an_arrowhead_entry_without_heads_leaves_the_stroke_read` in `crates/eps/src/import/ai/tests.rs`, `a_symbol_entry_cut_short_leaves_the_next_style_read` in `crates/eps/src/import/ai/style/tests.rs`, fuzzed by `ai_arrowhead_strokes_never_panic`; scores unchanged | | 2026-11-15 | minor | PDF import: stroked type (text rendering modes 1, 2, 5 and 6, and glyphs under `ActualText`) came in with butt caps, miter joins and a miter limit of 10 whatever the file stroked it with, while paths kept the graphics state's. The characters' stroke now takes the line cap (`J`), line join (`j`) and miter limit (`M`) of the graphics state, as a path's stroke does, and glyphs stroked with other ones start a run of their own, also a glyph filled and then stroked otherwise than the run its fill joined, so the glyphs before it keep their stroke (#7741). Test `imported_stroked_type_keeps_the_files_cap_join_and_miter_limit` in `crates/pdf/src/tests/textstroke.rs`. Scores and estimates unchanged. | | 2026-11-13 | minor | `.ai` and EPS import: layers that don't draw as the page, even with the drawn art of every live envelope put back, no longer put back the drawn art of every envelope of type. Each live envelope of type is weighed in the page check's own drawing of the pages it lies on, on the pixels that it and its drawn art ink there (the two drawn together on a layer of their own, without the rest of the layers; a pixel inks with an alpha above 8 of 255): it keeps its drawn art and its type, hidden, with the note, where the layers with it differ from the page in more of those pixels than its own check allows against its drawn art (10% of them, or 3% differing with all their neighbours, away from type), or where the envelopes of type that stay live, in the order they were read, would together differ there in more of a page than half of what the page check allows (a budget of the same size as the one their own checks share, kept apart from it). Art that differs elsewhere on the page no longer costs them their editable type; art that differs on their pixels still does. An envelope of type that a clip group or a clipping sublayer clips, an opacity mask masks, or a group with an appearance of its own, another envelope, a repeat or a blend holds keeps its drawn art as before, wherever it lies: drawn on its own it would be weighed elsewhere than it draws, and what holds it can draw it onto the page from off it. An envelope on no page stays live, as the page check doesn't see it, unless the page holds all the art that prints (an EPS's page that is its art's box, where art past the page is compared too): there one reaching past the page keeps its drawn art. Past 12 of them on the pages, all keep it. This holds where the editing data is trusted, where the objects that differ come in as the page's art (the placed files' other placement weighed on its own, as it draws them elsewhere under or over the envelopes; layers that draw as the page with only the envelopes the page holds put back are used as they are; where none of the objects that differ can then come in as the page's art, because an object holds type, the drawn art of every envelope of type is put back and that is tried again, as before), and for a `.ai` whose layers would open alone, which still opens alone: its envelopes of type are all settled again as they were with the page, in the same order and with the same checks, so each that opens live draws as it was weighed, and those the page held get their drawn art back. Where putting the drawn art of every live envelope back makes the layers draw as the page, it is still put back (#5065). In 224 users' files (used locally, never committed): envelopes of type that open live go from 174 to 186, in 8 files, none fewer in any file; no file changes between its layers and its PDF part; 7 renders change, by at most 0.7% of their pixels at 40 ppi (1 closer to the page, 1 alike, 5 further, by at most 0.7 of a percentage point, where VectorCraft's own envelope draws a little apart from the drawn art, within its check); the note for type in an envelope goes from 6 files. Of the 14 envelopes of type that had opened live and lost it to the page check, 2 keep their drawn art: one where the page draws something else where it is, and one in a file that comes in as its PDF part (#7141). Tests `build::candidate_tests::the_page_holds_back_only_envelopes_of_type_where_it_differs_from_them`, `envelopes_of_type_stay_live_within_half_of_what_the_page_check_allows`, `an_envelope_of_type_differing_in_more_of_its_pixels_than_its_check_allows_is_held_back`, `envelopes_of_type_the_layers_dont_draw_in_place_are_held_back`, `on_a_page_that_holds_all_the_art_an_envelope_of_type_past_it_is_held_back`, `objects_come_in_as_the_page_art_with_every_envelope_of_type_put_back_where_a_live_one_holds_a_difference`, `tests_native::layers_that_would_open_alone_keep_an_envelope_of_type_live_where_other_art_differs_from_the_page`, `layers_that_would_open_alone_keep_live_only_the_envelopes_of_type_the_page_doesnt_hold`, `trusted_layers_that_would_open_alone_open_alone_with_an_envelope_of_type_the_page_doesnt_hold_live`, `layers_with_objects_that_come_in_as_the_page_art_keep_an_envelope_of_type_that_draws_as_the_page_live`, `trusted_layers_keep_an_envelope_of_type_live_where_other_art_differs_from_the_page`, `trusted_layers_leave_an_envelope_of_type_the_page_draws_otherwise_its_drawn_art`, `build::candidate_tests::the_other_placement_of_placed_files_is_weighed_on_its_own`, `layers_that_draw_as_the_page_with_the_held_envelopes_of_type_put_back_are_used_so` | | 2026-11-13 | minor | PDF import: glyphs inside a marked-content span with an empty `ActualText` come in as outlines in their fill and stroke instead of being left out, adding no text (#6971; `empty_actual_text_keeps_the_glyphs_art` in `crates/pdf/src/tests/actual_text.rs`). Scores and estimates unchanged. | diff --git a/docs/mcp.md b/docs/mcp.md index bee07110e6..a05bca8319 100644 --- a/docs/mcp.md +++ b/docs/mcp.md @@ -5610,7 +5610,9 @@ Arrowheads… is not confined. `stroke.set {endArrow: {"custom": name}}` puts a custom head on a stroke. The stroke keeps a copy of the head's art, so the document draws it, saves it and exports it to SVG and PDF the same way without the arrowheads file. -`document.inspect` reports such a head as `{"Custom": {name, path}}`, which `stroke.set` takes back unchanged. It +`document.inspect` reports such a head as `{"Custom": {name, path}}`, which `stroke.set` takes back unchanged. A head +read from an Illustrator file also carries `stop`, where the stroke ends under it in head units back from the tip +(0 to 64; without it, the stroke ends halfway along the head). It refuses a `path` that fills no area (non-zero rule; parts thinner than a millionth of a head unit count as none) or has more than 4,096 anchors, more than 4,096 subpaths or a point more than 64 head units from the tip. The help page [Apply stroke on an object](https://helpx.adobe.com/illustrator/using/stroke-object.html) describes defining custom From 3ac0c9ee538b0219d0f4c00a21cb8cb411d8d04f Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Mon, 16 Nov 2026 13:50:47 -0800 Subject: [PATCH 15/78] Command Palette: a tool that can't be chosen is not a recent pick A pick is recorded in Recent Commands before it runs again, as before the last commit, so a command that changes the list sees it with the pick already in it. When the pick is refused, the list goes back to what it was. - A tool pick that fails shows the error in the status line and counts as refused, so it is not recorded. - A pick whose menu item is dimmed but that still opens a dialog counts as opening it and is recorded. - The outcome test also covers a dimmed effect, a dimmed plug-in filter, a panel the docking layout can't show and a tool that can't be chosen. - The French help line reads "Tapez pour rechercher des commandes, des outils, des panneaux et des effets", like the other palette rows. --- crates/ui-egui/src/i18n/fr.tsv | 2 +- crates/ui-egui/src/palette.rs | 86 +++++++++++++++++++++++++--------- docs/target-app-parity.md | 4 +- 3 files changed, 67 insertions(+), 25 deletions(-) diff --git a/crates/ui-egui/src/i18n/fr.tsv b/crates/ui-egui/src/i18n/fr.tsv index 8cd4f5a995..f123bdbd03 100644 --- a/crates/ui-egui/src/i18n/fr.tsv +++ b/crates/ui-egui/src/i18n/fr.tsv @@ -3286,7 +3286,7 @@ digits Malayalam Malayalam @plural {shown} of {n} result. Keep typing to narrow them.|{shown} of {n} results. Keep typing to narrow them. {shown} sur {n} résultat. Continuez à taper pour les affiner.|{shown} sur {n} résultats. Continuez à taper pour les affiner. Recent Commands Commandes récentes No recent commands Aucune commande récente - Type to search commands, tools, panels and effects Tapez pour chercher commandes, outils, panneaux et effets + Type to search commands, tools, panels and effects Tapez pour rechercher des commandes, des outils, des panneaux et des effets Search Commands… Rechercher des commandes… Secondary Secondaire Section Symbol Symbole de section diff --git a/crates/ui-egui/src/palette.rs b/crates/ui-egui/src/palette.rs index ed80d067fc..205aa7c08f 100644 --- a/crates/ui-egui/src/palette.rs +++ b/crates/ui-egui/src/palette.rs @@ -404,19 +404,26 @@ fn build_in(lang: crate::i18n::Lang, native: bool) -> Vec { /// item runs ([`crate::keymap::command_of`]). Returns what the pick did. pub(crate) fn run_pick(app: &mut VectorcraftApp, id: &str) -> Picked { let had_dialog = app.ui.dialog.is_some(); - if let Some(tool) = id.strip_prefix("tool:") { - app.select_tool(tool); + let ran = if let Some(tool) = id.strip_prefix("tool:") { + match app.try_select_tool(tool) { + Ok(()) => true, + Err(e) => { + app.status(e); + false + } + } } else if let Some(panel) = id.strip_prefix("panel:") { // A panel that can be seen stays as it is, where `window.panel` would put an open flyout or // a floating panel away. In Presentation Mode the pick fails and changes nothing, as // `window.panel` does. if app.ui.screen_mode >= 3 { app.status("panels can't be shown in Presentation Mode"); - return Picked::Refused; - } - if let Err(e) = crate::panel_docking::reveal_panel(app, panel) { + false + } else if let Err(e) = crate::panel_docking::reveal_panel(app, panel) { app.status(e); - return Picked::Refused; + false + } else { + true } } else if id.starts_with("plugin:") || id.starts_with("effect:") { let command = crate::keymap::command_of(id); @@ -427,31 +434,37 @@ pub(crate) fn run_pick(app: &mut VectorcraftApp, id: &str) -> Picked { if let Err(why) = crate::shortcut_editor::dimmed(app, &command.id) { app.status(why); } - return Picked::Refused; - } - menus::invoke(app, &command.id, command.params); - if !on { - return Picked::Refused; + } else { + menus::invoke(app, &command.id, command.params); } + on } else { match crate::shortcut_editor::menu_target_now(app, id) { - Some(Ok((id, p))) => menus::invoke(app, &id, p), + Some(Ok((id, p))) => { + menus::invoke(app, &id, p); + true + } Some(Err(why)) => { app.status(why); - return Picked::Refused; + false } None => { // The command is invoked while its menu item is dimmed too, and its own check - // reports why it can't run; the pick counts as refused. + // reports why it can't run. let on = menus::enabled(app, id); menus::invoke(app, id, json!({})); - if !on { - return Picked::Refused; - } + on } } + }; + // A dimmed command that still opens its dialog counts as opening it. + if !had_dialog && app.ui.dialog.is_some() { + Picked::OpenedDialog + } else if ran { + Picked::Ran + } else { + Picked::Refused } - if !had_dialog && app.ui.dialog.is_some() { Picked::OpenedDialog } else { Picked::Ran } } /// What a pick of a palette result did ([`run_pick`]). @@ -461,7 +474,8 @@ pub(crate) enum Picked { Ran, /// The pick opened a dialog, which may still be canceled. OpenedDialog, - /// The pick's menu item is dimmed now, or its panel can't be shown: the status line says why. + /// The pick's menu item is dimmed now, its tool can't be chosen or its panel can't be shown: + /// the status line says why. Refused, } @@ -899,11 +913,18 @@ pub fn show(app: &mut VectorcraftApp, ctx: &egui::Context) { }); if let Some(id) = run { app.ui.palette_open = false; - // A pick that ran or opened a dialog goes first in Recent Commands, even when the dialog - // is then canceled. A refused pick is not recorded. - if run_pick(app, &id) != Picked::Refused && id != PALETTE_TOGGLE { + // A pick goes first in Recent Commands before it runs, and stays there when it ran or + // opened a dialog, even when the dialog is then canceled. A refused pick puts the list + // back as it was. + let before = (id != PALETTE_TOGGLE).then(|| app.ui.recent_commands.clone()); + if before.is_some() { remember(&mut app.ui.recent_commands, &id, |c| entries.list.iter().any(|e| e.id == c)); } + if run_pick(app, &id) == Picked::Refused + && let Some(before) = before + { + app.ui.recent_commands = before; + } } else if outside { app.ui.palette_open = false; } @@ -1627,6 +1648,17 @@ mod tests { let mut presenting = app(Fixture::Multi.session()); presenting.ui.screen_mode = 3; assert_eq!(run_pick(&mut presenting, "panel:swatches"), Picked::Refused); + assert_eq!(run_pick(&mut app(Fixture::Multi.session()), "panel:no-such-panel"), Picked::Refused); + let mut stuck = app(Fixture::Multi.session()); + stuck.fail_next_tool_choice = Some("no switch".into()); + assert_eq!(run_pick(&mut stuck, "tool:knife"), Picked::Refused); + assert_eq!(stuck.ui.status, "no switch"); + // With nothing selected, the Effect menu dims every effect, and a plug-in's filter is dimmed. + let effect = crate::shortcut_editor::effect_items().first().map(|e| format!("effect:{}", e.effect)).expect("an effect"); + let mut empty = app(vectorcraft_engine::Session::new()); + assert_eq!(run_pick(&mut empty, &effect), Picked::Refused, "{effect}"); + assert!(empty.ui.dialog.is_none(), "{effect}"); + assert_eq!(run_pick(&mut app(vectorcraft_engine::Session::new()), "plugin:test.UI.palette_missing"), Picked::Refused); } /// A pick that is refused while its menu item is dimmed is not recorded in Recent Commands, @@ -1654,6 +1686,16 @@ mod tests { open.press(egui::Key::Enter, 1); assert!(!open.app.ui.palette_open, "the palette closes"); assert_eq!(open.app.ui.recent_commands, ["paint.swap", "object.group"]); + // A tool that can't be chosen now is not recorded either. + let mut open = Open::new("knife", WINDOW); + open.app.ui.recent_commands = vec!["paint.swap".into()]; + let k = open.listed().iter().position(|c| c == "tool:knife").expect("the search finds the Knife"); + open.frame(vec![]); + open.press(egui::Key::ArrowDown, k); + open.app.fail_next_tool_choice = Some("no switch".into()); + open.press(egui::Key::Enter, 1); + assert_eq!(open.app.ui.status, "no switch"); + assert_eq!(open.app.ui.recent_commands, ["paint.swap"]); } /// A pick that opens a dialog is recorded in Recent Commands when the dialog opens, so it stays diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index 8de60ad58a..1a21849f02 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -1026,8 +1026,8 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - Perspective Distort and Free Distort (`object.distort`) turn each warped object's bounding box as the warp turns the object at its own center, the objects inside groups, compound paths and clip groups and the art of linked opacity masks included, so the next Selection or Free Transform drag uses the tilted box; Object › Transform › Reset Bounding Box squares it again, and corners left where they are add no undo step (VectorCraft's own rule; `bboxrotate::distort_turns_an_upright_box_with_the_warp_at_its_center`, `distort_turns_each_member_and_linked_mask_by_its_own_warp`, `mirrored_and_collapsing_distorts_keep_valid_angles`, `distort_angles_undo_redo_and_reopen_together`, `xform::unchanged_distort_records_no_history`). - The Free Transform widget's Constrain works in Free Distort as well as in Free Transform ([the help page](https://helpx.adobe.com/illustrator/using/tool-techniques/free-transform-tool.html)). With Constrain on, or Shift held, a corner dragged in Free Distort moves only along the line through the opposite corner, in the box's own proportions, and the other three corners stay in place; on a turned box the line runs through the box's own corners. The line is VectorCraft's own rule. Cmd/Ctrl+Alt+Shift on a corner still drags in Perspective Distort, where Constrain stays unavailable (tools `xform::free::tests::free_distort_corner_keeps_to_its_diagonal_with_shift_or_constrain`, `shift_pressed_during_a_free_distort_drag_constrains_it`, `a_turned_box_is_constrained_along_its_own_diagonal`, `along_diagonal_of_a_degenerate_box`; engine `xform::free_transform_constrained_distort_keeps_the_corner_on_its_diagonal`; ui-egui `free_transform::tests::the_widget_sets_the_mode_and_a_corner_drag_then_distorts`). - Native macOS menu bar, vector tool cursors, a command palette (Help › Search Commands…), middle-button panning with any tool. Native menus explicitly end tracking on command selection, outside window presses and Escape; menu updates wait until tracking ends, and a dismissing press never starts a canvas gesture (M14.8). - - A Recent Commands button beside the Help › Search Commands field lists the last eight commands and tools picked from the palette, most recent first, with a command picked again moved to the top. A pick is recorded when it runs or opens a dialog, even if the dialog is then canceled; a pick that is refused because its menu item is dimmed, or because its panel can't be shown, is not recorded. Choosing a row closes the palette and runs it as a pick of the same result does; with no picks yet the list shows a dimmed No recent commands row, and a command that is not available now, such as a filter of a plug-in that is not loaded, is left out until it comes back. The ids are saved with the UI state. While the list is open, Up and Down move through its rows, wrapping at the ends, and Escape closes the list before the palette. This is VectorCraft's own addition and does not raise a score (#6376; `palette` tests `recent_commands_*`, `a_recent_command_runs_what_its_pick_runs`, `the_keys_wrap_within_recent_commands`, `escape_closes_recent_commands_before_the_palette`). - - With an empty search, or one of spaces only, the Help › Search Commands field lists the picks of the Recent Commands list (at most eight, leaving out a filter of a plug-in that is not loaded) under a Recent heading, most recent first, with the first highlighted and no result count, so opening the palette and pressing Enter picks the last pick again; a pick that is dimmed now shows why in the status line, as from a search, and keeps its place in the list. With no picks yet it lists no results and shows a dimmed line, "Type to search commands, tools, panels and effects". A pick of Search Commands… itself is not recorded. The palette opens with its first result highlighted and its list scrolled to the top. This is VectorCraft's own behavior (`palette` tests `an_empty_search_lists_the_recent_picks_most_recent_first`, `an_empty_search_without_picks_says_what_to_type`, `enter_on_an_empty_search_runs_the_last_pick_again`, `the_palette_opens_again_with_its_first_row_highlighted`, `the_palette_toggle_is_not_a_recent_pick`, `a_click_on_a_recent_pick_runs_it_and_moves_it_first`, `a_pick_says_whether_it_ran_opened_a_dialog_or_was_refused`, `a_refused_pick_is_not_recorded`, `a_pick_that_opens_a_dialog_is_recorded_even_when_canceled`). + - A Recent Commands button beside the Help › Search Commands field lists the last eight commands and tools picked from the palette, most recent first, with a command picked again moved to the top. A pick is recorded when it runs or opens a dialog, even if the dialog is then canceled; a pick that is refused because its menu item is dimmed, its tool can't be chosen or its panel can't be shown is not recorded, unless it opened a dialog. Choosing a row closes the palette and runs it as a pick of the same result does; with no picks yet the list shows a dimmed No recent commands row, and a command that is not available now, such as a filter of a plug-in that is not loaded, is left out until it comes back. The ids are saved with the UI state. While the list is open, Up and Down move through its rows, wrapping at the ends, and Escape closes the list before the palette. This is VectorCraft's own addition and does not raise a score (#6376; `palette` tests `recent_commands_*`, `a_recent_command_runs_what_its_pick_runs`, `the_keys_wrap_within_recent_commands`, `escape_closes_recent_commands_before_the_palette`). + - With an empty search, or one of spaces only, the Help › Search Commands field lists the picks of the Recent Commands list (at most eight, leaving out a filter of a plug-in that is not loaded) under a Recent heading, most recent first, with the first highlighted and no result count, so opening the palette and pressing Enter picks the last pick again; a pick that is dimmed now shows why in the status line, as from a search, and keeps its place in the list. With no picks yet it lists no results and shows a dimmed Type to search commands, tools, panels and effects line. A pick of Search Commands… itself is not recorded. The palette opens with its first result highlighted and its list scrolled to the top. This is VectorCraft's own behavior (`palette` tests `an_empty_search_lists_the_recent_picks_most_recent_first`, `an_empty_search_without_picks_says_what_to_type`, `enter_on_an_empty_search_runs_the_last_pick_again`, `the_palette_opens_again_with_its_first_row_highlighted`, `the_palette_toggle_is_not_a_recent_pick`, `a_click_on_a_recent_pick_runs_it_and_moves_it_first`, `a_pick_says_whether_it_ran_opened_a_dialog_or_was_refused`, `a_refused_pick_is_not_recorded`, `a_pick_that_opens_a_dialog_is_recorded_even_when_canceled`). - The Learn panel (Window › Learn, or Explore tutorials beside the search icon on the app bar) has a For you tab with a Get started section and a Quick skill guide card, and a Skills tab that lists VectorCraft's own skills with their progress rings and counts of tutorials finished; a skill lists its tutorials, a tutorial shows its numbered steps, and Back goes up a level; `learn.list`, `learn.tab {tab}`, `learn.skill {skill}`, `learn.show {tutorial}` and `learn.back` script it, and the tab buttons, the rows and Back run them ([the help page](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/learn-skills-quick-skill-guide.html); `panels::learn::tests`). - A tool's name in a Learn tutorial step is a blue link that shows where the tool is without choosing it (`learn.locateTool {tool}`): its toolbar button is marked, a collapsed group's flyout opens with the tool's row marked, a torn-off strip comes to the front, and a tool no shown toolbar holds is marked in the All Tools drawer. The mark, its 3 seconds and the hidden-toolbar cases are VectorCraft's own rules ([the help page](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/learn-skills-quick-skill-guide.html); `panels::learn::tests`, the `a_learn_link_*` tests in `toolbar::tests`). - Under a tutorial's steps, View more opens the tutorial's own practice sample as a new untitled document, and once the tutorial is finished, Next Up moves to the next tutorial in the same skill, as the help page describes ([the help page](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/learn-skills-quick-skill-guide.html)). The samples are VectorCraft's own drawings. A Finish tutorial button that shows once the sample is open, the untitled copy, Back to skills in place of Next Up after a skill's last tutorial, and Next Up showing the next tutorial without opening its sample are VectorCraft's own rules. `learn.openSample`, `learn.finish`, `learn.next` and `learn.skills` (Back to skills) script them. Not done: the help page's short video. Regression tests: `view_more_opens_the_tutorial_s_sample_as_a_new_untitled_document`, `finishing_a_tutorial_offers_next_up_in_its_skill`, `the_practice_controls_work_from_the_keyboard`, `the_last_tutorial_of_a_skill_offers_back_to_skills`, `learn_finish_and_learn_next_follow_the_practice`, `learn_skills_shows_the_list_of_skills`, `the_practice_commands_reject_a_missing_or_unknown_tutorial`, `every_tutorial_has_its_own_readable_sample` and `the_next_tutorial_is_the_next_one_in_the_same_skill` in `crates/ui-egui/src/panels/learn/tests.rs`. From 75c0bbd5d404cd160aa3bb7dcdf350b05669b694 Mon Sep 17 00:00:00 2001 From: Sven Lafebre Date: Mon, 16 Nov 2026 23:14:55 +0100 Subject: [PATCH 16/78] #8188: arrowheads from partly transparent, masked or ambiguous art keep the drawn look Review follow-ups: - A symbol whose art is partly transparent or has an opacity mask makes no head: the head would come in opaque and whole. - When both placements give the drawn art's bounds (a line ending inside the bounds of its other segments) and the heads move 0.2 pt or more between them, the object keeps its drawn look. - A comment line inside a /SymbolArt entry is skipped. --- crates/eps/src/import/ai/arrowhead.rs | 82 +++++++++++++++++++++++-- crates/eps/src/import/ai/read/ops.rs | 20 +++++- crates/eps/src/import/ai/style.rs | 9 ++- crates/eps/src/import/ai/style/tests.rs | 12 ++++ crates/eps/src/import/ai/tests.rs | 19 ++++++ docs/file-format-parity.md | 2 +- 6 files changed, 133 insertions(+), 11 deletions(-) diff --git a/crates/eps/src/import/ai/arrowhead.rs b/crates/eps/src/import/ai/arrowhead.rs index 11d098c759..f1a30c08af 100644 --- a/crates/eps/src/import/ai/arrowhead.rs +++ b/crates/eps/src/import/ai/arrowhead.rs @@ -20,15 +20,16 @@ const MAX_DEPTH: usize = 16; /// The head that symbol art `art` (in the document's symbol space) draws, named `name`. `None` when /// the art doesn't have exactly one sample of the line, its sample isn't 1 pt wide, it holds -/// anything but paths, compound paths and groups (a clip group, say), has an effect, a brush or a -/// group with fills or strokes of its own, paints no head, or is too detailed for one; or when the +/// anything but paths, compound paths and groups (a clip group, say), has an effect, a brush, an +/// opacity mask, partial opacity or a group with fills or strokes of its own, paints no head, or is +/// too detailed for one; or when the /// line would stop past the head's tip or farther back than a head can reach /// ([`CustomArrowhead::MAX_UNITS`]). pub(super) fn head(name: &str, art: &Node) -> Option { let mut parts = Parts::default(); match &art.kind { // The members of the symbol's group are its art's top level, where the sample is. - NodeKind::Group { children, clip: false } if art.visible && !paints(art) && art.appearance.effects.is_empty() => { + NodeKind::Group { children, clip: false } if art.visible && plain(art) && !paints(art) => { for c in children { parts.member(c, true, 1)?; } @@ -70,7 +71,7 @@ impl Parts { if !n.visible || n.opacity <= 0.0 { return Some(()); } - if !n.appearance.effects.is_empty() { + if !plain(n) { return None; } match &n.kind { @@ -102,13 +103,13 @@ impl Parts { for item in &n.appearance.items { match item { AppearanceItem::Fill(f) if f.visible && f.opacity > 0.0 && !f.paint.is_none() => { - if !f.effects.is_empty() { + if !f.effects.is_empty() || f.opacity < 1.0 { return None; } filled = true; } AppearanceItem::Stroke(s) if s.visible && s.opacity > 0.0 && !s.paint.is_none() && s.width > 0.0 => { - if !s.effects.is_empty() || s.brush.is_some() { + if !s.effects.is_empty() || s.brush.is_some() || s.opacity < 1.0 { return None; } strokes.push(s); @@ -149,6 +150,12 @@ impl Parts { } } +/// Does `n` draw as its shapes alone: fully opaque, with no effects and no opacity mask applied? +/// A head is one opaque shape, so partly transparent or masked art isn't read as one. +fn plain(n: &Node) -> bool { + n.opacity >= 1.0 && n.appearance.effects.is_empty() && n.extras().mask.as_ref().is_none_or(|m| m.disabled) +} + /// Does `n` (a group) have fills or strokes of its own that paint? fn paints(n: &Node) -> bool { n.appearance.items.iter().any(|i| match i { @@ -172,3 +179,66 @@ fn sample_line(path: &PathData) -> Option<(f64, f64)> { } Some((y, sub.anchors.iter().map(|a| a.p.x).fold(f64::NEG_INFINITY, f64::max))) } + +#[cfg(test)] +mod tests { + use std::sync::Arc; + + use vectorcraft_color::{Color, Paint}; + use vectorcraft_doc::{Appearance, Node, NodeId, OpacityMask}; + use vectorcraft_geom::{PathData, Point, SubPath}; + + use super::head; + + fn path(id: u64, points: &[(f64, f64)], closed: bool, appearance: Appearance) -> Arc { + let points: Vec = points.iter().map(|(x, y)| Point::new(*x, *y)).collect(); + Arc::new(Node::path(NodeId(id), PathData::single(SubPath::polyline(&points, closed)), appearance)) + } + + /// A 1 pt sample of the line from x = −9 to 4 on y = 0. + fn sample() -> Arc { + path(1, &[(-9.0, 0.0), (4.0, 0.0)], false, Appearance::basic(Paint::None, Paint::solid(Color::BLACK), 1.0)) + } + + /// A filled wedge from x = 2 back to its tip at x = 8, 3 either side. + fn wedge() -> Arc { + path(2, &[(2.0, -3.0), (8.0, 0.0), (2.0, 3.0)], true, Appearance::basic(Paint::solid(Color::BLACK), Paint::None, 1.0)) + } + + fn art(members: Vec>) -> Node { + Node::group(NodeId(10), members) + } + + #[test] + fn a_wedge_and_its_sample_make_a_head() { + let h = head("W", &art(vec![sample(), wedge()])).expect("a head"); + assert_eq!(h.stop(), 4.0); + } + + #[test] + fn partly_transparent_or_masked_art_makes_no_head() { + // The head would come in opaque and whole, with the bounds of the art. + let half = |n: Arc| Arc::new(Node { opacity: 0.5, ..(*n).clone() }); + let mut faint_fill = (*wedge()).clone(); + let mut ap = (*faint_fill.appearance).clone(); + if let Some(f) = ap.fill_mut() { + f.opacity = 0.5; + } + faint_fill.appearance = ap.into(); + let mut masked = (*wedge()).clone(); + masked.extras_mut().mask = Some(Box::new(OpacityMask { art: sample(), clip: true, invert: false, disabled: false, linked: true })); + let cases = [ + ("a head at half opacity", art(vec![sample(), half(wedge())])), + ("a fill at half opacity", art(vec![sample(), Arc::new(faint_fill)])), + ("a group at half opacity", art(vec![sample(), half(Arc::new(art(vec![wedge()])))])), + ("the art at half opacity", Node { opacity: 0.5, ..art(vec![sample(), wedge()]) }), + ("a head with an opacity mask", art(vec![sample(), Arc::new(masked.clone())])), + ]; + for (why, a) in cases { + assert!(head("W", &a).is_none(), "{why}"); + } + // A disabled mask isn't applied. + masked.extras_mut().mask.as_mut().unwrap().disabled = true; + assert!(head("W", &art(vec![sample(), Arc::new(masked)])).is_some()); + } +} diff --git a/crates/eps/src/import/ai/read/ops.rs b/crates/eps/src/import/ai/read/ops.rs index f3f2b1d9cc..4f063bbeec 100644 --- a/crates/eps/src/import/ai/read/ops.rs +++ b/crates/eps/src/import/ai/read/ops.rs @@ -1406,7 +1406,8 @@ fn painted_bounds(object: &Node, appearance: &Appearance) -> Option { /// the path, or past them by the line's length under each head (Extend), whichever gives the /// object the look's bounds within a quarter of the least distance a head moves between the two /// (at least 0.05 pt, at most 0.5 pt). `None` -/// when neither does: the file draws the heads elsewhere (on other subpaths, say). +/// when neither does (the file draws the heads elsewhere: on other subpaths, say), or when both do +/// and the heads move 0.2 pt or more between them (the bounds can't tell which the file draws). fn heads_placed(object: &Node, look: &Node, mut appearance: Appearance, space: Affine) -> Option { let k = space.determinant().abs().sqrt(); let k = if k.is_finite() && k > 0.0 { k } else { 1.0 }; @@ -1427,6 +1428,7 @@ fn heads_placed(object: &Node, look: &Node, mut appearance: Appearance, space: A // Well under the distance between the placements, and under half a point: a look without // those heads, or with them elsewhere, is off by more. let tolerance = (shift / 4.0).clamp(0.05, 0.5); + let mut fits = vec![]; for align in [ArrowAlign::Tip, ArrowAlign::Extend] { for item in &mut appearance.items { if let AppearanceItem::Stroke(s) = item { @@ -1438,10 +1440,22 @@ fn heads_placed(object: &Node, look: &Node, mut appearance: Appearance, space: A let got = painted_bounds(object, &scaled)?; let off = [got.x0 - want.x0, got.y0 - want.y0, got.x1 - want.x1, got.y1 - want.y1].iter().fold(0.0f64, |m, d| m.max(d.abs())); if off <= tolerance { - return Some(appearance); + fits.push(align); } } - None + // Both fit when the bounds can't tell the placements apart (the end inside the bounds of the + // line's other segments), unless the heads move so little that either draws alike. + let align = match fits.as_slice() { + [one] => *one, + [first, _] if shift < 0.2 => *first, + _ => return None, + }; + for item in &mut appearance.items { + if let AppearanceItem::Stroke(s) = item { + s.arrow_align = align; + } + } + Some(appearance) } /// A graphic style's appearance from art style `st`, on no object: `None` when the style isn't one diff --git a/crates/eps/src/import/ai/style.rs b/crates/eps/src/import/ai/style.rs index 50b590702d..7e0ada7071 100644 --- a/crates/eps/src/import/ai/style.rs +++ b/crates/eps/src/import/ai/style.rs @@ -1557,7 +1557,14 @@ fn symbol_entry(lex: &mut Lexer, operands: &mut Vec, other_entry: &mut Option let symbol = operands.iter().rev().find_map(|v| names.text(v)); (*other_entry, *operands) = (None, vec![]); let at = lex.offset(); - let (close, key) = (lex.next_token().map(|t| t.tok), lex.next_token().map(|t| t.tok)); + // A comment line is no part of the entry. + let mut next = || loop { + match lex.next_token().map(|t| t.tok) { + Some(Tok::Comment(_)) => continue, + tok => return tok, + } + }; + let (close, key) = (next(), next()); // Anything else is read as it comes (a `/KnownStyle` starting the next style, say). let (Some(Tok::Word(b";")), Some(Tok::Str(key))) = (close, key) else { lex.seek(at); diff --git a/crates/eps/src/import/ai/style/tests.rs b/crates/eps/src/import/ai/style/tests.rs index 331e733e92..2210ccdbc0 100644 --- a/crates/eps/src/import/ai/style/tests.rs +++ b/crates/eps/src/import/ai/style/tests.rs @@ -1604,3 +1604,15 @@ fn a_symbol_entry_cut_short_leaves_the_next_style_read() { assert!(styles.contains_key("Cut") && styles.contains_key("Next"), "{:?}", styles.keys().collect::>()); assert!(matches!(styles["Next"].items.as_slice(), [StyleItem::Stroke { arrows: None, .. }]), "{:?}", styles["Next"].items); } + +/// A comment line inside a `/SymbolArt` entry is skipped: the entry is still read. +#[test] +fn a_comment_inside_a_symbol_entry_is_skipped() { + let text = "/KnownStyle :\n(Arrowed) /Name ,\n/ActiveStyle :\n/CompoundFilter :\n(Chain Style Filter) 0 0 /Filter ,\n1 /Visible ,\n\ + /BasicFilter :\n(Stroke Style Filter) 0 0 /Filter ,\n1 /Visible ,\n/Dictionary : /NotRecorded ,\n\ + /GObjRef : (W) /SymbolArt\n%a comment\n; (BSArrowEndSymbol) ,\n\ + /StrokeStyle : 0 R\n0 0 0 1 0 0 0 XA\n0 J 0 j 1 w 10 M []0 d\n0 XR\n1 0 Xd\n/Def ;\n (StrokeStyle) ,\n; /Dict ;\n /Part ,\n;\n"; + let styles = art_styles(text.as_bytes()); + let [StyleItem::Stroke { arrows: Some(arrows), .. }] = styles["Arrowed"].items.as_slice() else { panic!("{:?}", styles["Arrowed"].items) }; + assert_eq!(arrows.end, Some(("W".to_string(), 100.0))); +} diff --git a/crates/eps/src/import/ai/tests.rs b/crates/eps/src/import/ai/tests.rs index bf5143b15d..7d8a213f80 100644 --- a/crates/eps/src/import/ai/tests.rs +++ b/crates/eps/src/import/ai/tests.rs @@ -6427,6 +6427,25 @@ fn arrowheads_this_does_not_read_keep_the_drawn_look() { } } +#[test] +fn heads_whose_placement_the_drawn_bounds_leave_open_keep_the_drawn_look() { + // The line bends back so its end, and a head on it either on the end or 4 past it, lie inside + // the bounds of its earlier segments: those bounds can't tell the two placements apart. + let path = "%_0 50 m\n%_0 0 L\n%_200 0 L\n%_200 100 L\n%_100 100 L\n%_100 50 L\n%_N\n"; + let look = "0 G\n2 w\n0 50 m\n0 0 l\n200 0 l\n200 100 l\n100 100 l\n100 54 l\nS\n0 g\n97 56 m\n100 50 l\n103 56 l\nf\n"; + let line = format!("0 Ae\nu\n{look}U\n{path}1 (Arrowed) XW\n"); + let file = format!( + "{}{}{}", + symbols(&symbol("Wedge", WEDGE_ART, 5)), + styles_and_list(&[arrow_style("Arrowed", END_WEDGE, 2.0)], &["Arrowed"]), + layer(&line) + ); + let r = read_ok(&file); + let a = art(&r.doc); + assert!(r.warnings.iter().any(|w| w.contains("drawn look")), "{:?} {a:#?}", r.warnings); + assert!(!matches!(a[0].kind, NodeKind::Path { .. }), "the look, not the object"); +} + #[test] fn an_arrowhead_entry_without_heads_leaves_the_stroke_read() { // Only beside heads does an arrowhead entry this doesn't read keep the drawn look. diff --git a/docs/file-format-parity.md b/docs/file-format-parity.md index fa4d25b9f2..8bbd2d46be 100644 --- a/docs/file-format-parity.md +++ b/docs/file-format-parity.md @@ -344,7 +344,7 @@ Stop opacity on translated artboards remains outside this regression coverage. | Date | Change | Summary | |---|---|---| -| 2026-11-16 | minor | `.ai` import: a stroke's arrowheads were left out, so lines came in without their heads (#8188). A Stroke Style filter's stroke dictionary names each end's head as a symbol of the file (`/GObjRef : (name) /SymbolArt ; (BSArrowBeginSymbol)` or `(BSArrowEndSymbol)`), with its scale in percent (`BSArrowEndScale`, and `BSArrowBeginScale` read the same way; 100 without one). As the files have it, such a symbol's art (y down, as symbols are read) points right along a straight, level sample of the line: an open stroked path with no fill, which ends where the line stops under the head. The rest of the art that paints is the head, its tip its rightmost point, at one symbol unit a head weight (the stroke's weight at the scale). The head comes in as a custom arrowhead with that outline and that stop (a custom head now carries an optional stop, else its line ends halfway along it, as before). Its placement is the one of the two (tip on the end of the path, or Extend, the tip past it by the line's length under the head) that gives the object its drawn art's bounds; the user's file has every tip on its path's end. A stroke keeps its drawn look when neither placement gives those bounds (heads on other subpaths, say), when its symbol isn't read whole or isn't read as a head (no sample or more than one, a sample that isn't 1 pt wide, as in art stored at a Large Canvas scale, art other than paths, compound paths and groups such as a clip group, a group with fills or strokes of its own, effects, brushes), when its dictionary holds another `BSArrow` entry beside heads, when a scale is outside 1–1000 %, or when the head's weight would be under the 0.25 pt least one VectorCraft draws; a graphic style with such a stroke isn't read rather than read without its heads, and one with heads takes them on the end of the path, so an object whose heads are read past its ends isn't linked to its listed style. Measured on a user's file of ten arrows (used locally, never committed): every line gets its heads, and drawn at 4× its pixels match the file's own page but for 3 of 9,825 inked ones (0.24.1: 1,232 differ). Tests `a_strokes_arrowhead_symbols_are_its_arrowheads`, `a_strokes_start_arrowhead_points_back_and_keeps_its_side`, `a_stroke_takes_both_heads_at_their_own_scales`, `heads_drawn_past_the_path_extend_it`, `arrowheads_this_does_not_read_keep_the_drawn_look`, `an_arrowhead_entry_without_heads_leaves_the_stroke_read` in `crates/eps/src/import/ai/tests.rs`, `a_symbol_entry_cut_short_leaves_the_next_style_read` in `crates/eps/src/import/ai/style/tests.rs`, fuzzed by `ai_arrowhead_strokes_never_panic`; scores unchanged | +| 2026-11-16 | minor | `.ai` import: a stroke's arrowheads were left out, so lines came in without their heads (#8188). A Stroke Style filter's stroke dictionary names each end's head as a symbol of the file (`/GObjRef : (name) /SymbolArt ; (BSArrowBeginSymbol)` or `(BSArrowEndSymbol)`), with its scale in percent (`BSArrowEndScale`, and `BSArrowBeginScale` read the same way; 100 without one). As the files have it, such a symbol's art (y down, as symbols are read) points right along a straight, level sample of the line: an open stroked path with no fill, which ends where the line stops under the head. The rest of the art that paints is the head, its tip its rightmost point, at one symbol unit a head weight (the stroke's weight at the scale). The head comes in as a custom arrowhead with that outline and that stop (a custom head now carries an optional stop, else its line ends halfway along it, as before). Its placement is the one of the two (tip on the end of the path, or Extend, the tip past it by the line's length under the head) that gives the object its drawn art's bounds; the user's file has every tip on its path's end. A stroke keeps its drawn look when neither placement gives those bounds (heads on other subpaths, say) or both do while the heads move 0.2 pt or more between them (a line whose end lies inside the bounds of its other segments), when its symbol isn't read whole or isn't read as a head (no sample or more than one, a sample that isn't 1 pt wide, as in art stored at a Large Canvas scale, art other than paths, compound paths and groups such as a clip group, a group with fills or strokes of its own, effects, brushes, partial opacity or an opacity mask), when its dictionary holds another `BSArrow` entry beside heads, when a scale is outside 1–1000 %, or when the head's weight would be under the 0.25 pt least one VectorCraft draws; a graphic style with such a stroke isn't read rather than read without its heads, and one with heads takes them on the end of the path, so an object whose heads are read past its ends isn't linked to its listed style. Measured on a user's file of ten arrows (used locally, never committed): every line gets its heads, and drawn at 4× its pixels match the file's own page but for 3 of 9,825 inked ones (0.24.1: 1,232 differ). Tests `a_strokes_arrowhead_symbols_are_its_arrowheads`, `a_strokes_start_arrowhead_points_back_and_keeps_its_side`, `a_stroke_takes_both_heads_at_their_own_scales`, `heads_drawn_past_the_path_extend_it`, `arrowheads_this_does_not_read_keep_the_drawn_look`, `an_arrowhead_entry_without_heads_leaves_the_stroke_read` in `crates/eps/src/import/ai/tests.rs`, `heads_whose_placement_the_drawn_bounds_leave_open_keep_the_drawn_look` in it, `a_symbol_entry_cut_short_leaves_the_next_style_read` and `a_comment_inside_a_symbol_entry_is_skipped` in `crates/eps/src/import/ai/style/tests.rs`, `partly_transparent_or_masked_art_makes_no_head` in `crates/eps/src/import/ai/arrowhead.rs`, fuzzed by `ai_arrowhead_strokes_never_panic`; scores unchanged | | 2026-11-15 | minor | PDF import: stroked type (text rendering modes 1, 2, 5 and 6, and glyphs under `ActualText`) came in with butt caps, miter joins and a miter limit of 10 whatever the file stroked it with, while paths kept the graphics state's. The characters' stroke now takes the line cap (`J`), line join (`j`) and miter limit (`M`) of the graphics state, as a path's stroke does, and glyphs stroked with other ones start a run of their own, also a glyph filled and then stroked otherwise than the run its fill joined, so the glyphs before it keep their stroke (#7741). Test `imported_stroked_type_keeps_the_files_cap_join_and_miter_limit` in `crates/pdf/src/tests/textstroke.rs`. Scores and estimates unchanged. | | 2026-11-13 | minor | `.ai` and EPS import: layers that don't draw as the page, even with the drawn art of every live envelope put back, no longer put back the drawn art of every envelope of type. Each live envelope of type is weighed in the page check's own drawing of the pages it lies on, on the pixels that it and its drawn art ink there (the two drawn together on a layer of their own, without the rest of the layers; a pixel inks with an alpha above 8 of 255): it keeps its drawn art and its type, hidden, with the note, where the layers with it differ from the page in more of those pixels than its own check allows against its drawn art (10% of them, or 3% differing with all their neighbours, away from type), or where the envelopes of type that stay live, in the order they were read, would together differ there in more of a page than half of what the page check allows (a budget of the same size as the one their own checks share, kept apart from it). Art that differs elsewhere on the page no longer costs them their editable type; art that differs on their pixels still does. An envelope of type that a clip group or a clipping sublayer clips, an opacity mask masks, or a group with an appearance of its own, another envelope, a repeat or a blend holds keeps its drawn art as before, wherever it lies: drawn on its own it would be weighed elsewhere than it draws, and what holds it can draw it onto the page from off it. An envelope on no page stays live, as the page check doesn't see it, unless the page holds all the art that prints (an EPS's page that is its art's box, where art past the page is compared too): there one reaching past the page keeps its drawn art. Past 12 of them on the pages, all keep it. This holds where the editing data is trusted, where the objects that differ come in as the page's art (the placed files' other placement weighed on its own, as it draws them elsewhere under or over the envelopes; layers that draw as the page with only the envelopes the page holds put back are used as they are; where none of the objects that differ can then come in as the page's art, because an object holds type, the drawn art of every envelope of type is put back and that is tried again, as before), and for a `.ai` whose layers would open alone, which still opens alone: its envelopes of type are all settled again as they were with the page, in the same order and with the same checks, so each that opens live draws as it was weighed, and those the page held get their drawn art back. Where putting the drawn art of every live envelope back makes the layers draw as the page, it is still put back (#5065). In 224 users' files (used locally, never committed): envelopes of type that open live go from 174 to 186, in 8 files, none fewer in any file; no file changes between its layers and its PDF part; 7 renders change, by at most 0.7% of their pixels at 40 ppi (1 closer to the page, 1 alike, 5 further, by at most 0.7 of a percentage point, where VectorCraft's own envelope draws a little apart from the drawn art, within its check); the note for type in an envelope goes from 6 files. Of the 14 envelopes of type that had opened live and lost it to the page check, 2 keep their drawn art: one where the page draws something else where it is, and one in a file that comes in as its PDF part (#7141). Tests `build::candidate_tests::the_page_holds_back_only_envelopes_of_type_where_it_differs_from_them`, `envelopes_of_type_stay_live_within_half_of_what_the_page_check_allows`, `an_envelope_of_type_differing_in_more_of_its_pixels_than_its_check_allows_is_held_back`, `envelopes_of_type_the_layers_dont_draw_in_place_are_held_back`, `on_a_page_that_holds_all_the_art_an_envelope_of_type_past_it_is_held_back`, `objects_come_in_as_the_page_art_with_every_envelope_of_type_put_back_where_a_live_one_holds_a_difference`, `tests_native::layers_that_would_open_alone_keep_an_envelope_of_type_live_where_other_art_differs_from_the_page`, `layers_that_would_open_alone_keep_live_only_the_envelopes_of_type_the_page_doesnt_hold`, `trusted_layers_that_would_open_alone_open_alone_with_an_envelope_of_type_the_page_doesnt_hold_live`, `layers_with_objects_that_come_in_as_the_page_art_keep_an_envelope_of_type_that_draws_as_the_page_live`, `trusted_layers_keep_an_envelope_of_type_live_where_other_art_differs_from_the_page`, `trusted_layers_leave_an_envelope_of_type_the_page_draws_otherwise_its_drawn_art`, `build::candidate_tests::the_other_placement_of_placed_files_is_weighed_on_its_own`, `layers_that_draw_as_the_page_with_the_held_envelopes_of_type_put_back_are_used_so` | | 2026-11-13 | minor | PDF import: glyphs inside a marked-content span with an empty `ActualText` come in as outlines in their fill and stroke instead of being left out, adding no text (#6971; `empty_actual_text_keeps_the_glyphs_art` in `crates/pdf/src/tests/actual_text.rs`). Scores and estimates unchanged. | From 5040735bd95894137d7d9ee4638c314f46b33f01 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Mon, 16 Nov 2026 16:03:50 -0800 Subject: [PATCH 17/78] Command Palette: a palette closed and opened again in one step starts at its first row The search icon can open the palette again before the next frame draws it closed, so the highlight kept from before the close survived and Enter on an empty search ran that row instead of the last pick. A palette that closes now forgets its highlight in the same frame. --- crates/ui-egui/src/palette.rs | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/crates/ui-egui/src/palette.rs b/crates/ui-egui/src/palette.rs index 205aa7c08f..1be11bbd94 100644 --- a/crates/ui-egui/src/palette.rs +++ b/crates/ui-egui/src/palette.rs @@ -928,6 +928,11 @@ pub fn show(app: &mut VectorcraftApp, ctx: &egui::Context) { } else if outside { app.ui.palette_open = false; } + // The search icon can open the palette again before the next frame draws it, so a palette that + // closes here forgets its highlight now and opens again at its first row. + if !app.ui.palette_open { + ctx.data_mut(|d| d.remove::(sel_id)); + } } #[cfg(test)] @@ -1585,6 +1590,32 @@ mod tests { assert!(top.2 >= f64::from(open.popup().top()), "the first row is in view: {shown:?}"); } + /// A palette closed by a click outside it and opened again in the next frame, as the search + /// icon does, starts at its first row, so Enter on an empty search runs the last pick. + #[test] + fn the_palette_reopened_in_the_next_frame_starts_at_its_first_row() { + let mut open = Open::new("", WINDOW); + open.app = VectorcraftApp::new(vectorcraft_testkit::fixtures::Fixture::Multi.session(), crate::Services::default()); + open.app.ui.recent_commands = vec!["paint.swap".into(), "object.group".into()]; + open.app.ui.palette_open = true; + open.frame(vec![]); + open.press(egui::Key::ArrowDown, 1); + assert_eq!(open.highlighted(), 1); + let at = egui::pos2(WINDOW.x - 4.0, WINDOW.y - 4.0); + let button = + |pressed| egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE }; + open.frame(vec![egui::Event::PointerMoved(at), button(true), button(false)]); + assert!(!open.app.ui.palette_open, "the click outside closes the palette"); + open.app.ui.palette_open = true; + open.frame(vec![]); + assert_eq!(open.highlighted(), 0); + let before = open.app.session.active().unwrap().history.undo.len(); + open.press(egui::Key::Enter, 1); + assert!(!open.app.ui.palette_open, "the palette closes"); + assert_eq!(open.app.session.active().unwrap().history.undo.len(), before + 1, "{}", open.app.ui.status); + assert_eq!(open.app.ui.recent_commands, ["paint.swap", "object.group"]); + } + /// A pick of the palette's own toggle is not recorded, and one saved earlier is not listed, so /// Enter on an empty search runs the last other pick. #[test] From b11e910bafbe10add9d3f347dd800f79b9434e9a Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Mon, 16 Nov 2026 16:50:30 -0800 Subject: [PATCH 18/78] Command Palette: the recent-pick ranking test checks that the second Enter runs the effect The test asserted only the recent list, which already held the effect, so a refused second pick would also have passed. It now checks that the effect's dialog opens. --- crates/ui-egui/src/palette.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/ui-egui/src/palette.rs b/crates/ui-egui/src/palette.rs index 840fd9d3a4..07fe6e8416 100644 --- a/crates/ui-egui/src/palette.rs +++ b/crates/ui-egui/src/palette.rs @@ -1532,7 +1532,8 @@ mod tests { let label = entries.iter().find(|e| e.id == effect).map(row_label).unwrap(); assert_eq!(field_description(&nodes), format!("1 of {}: {label}", after.len())); open.press(egui::Key::Enter, 1); - assert_eq!(open.app.ui.recent_commands, [effect], "Enter ran the effect again"); + assert!(open.app.ui.dialog.is_some(), "Enter ran the effect again: {}", open.app.ui.status); + assert_eq!(open.app.ui.recent_commands, [effect]); } /// The kept ranking of a query is ranked again when the recent picks change, and a saved id From fb333e757d0e748e1faad3d7205dabdadcdf02b4 Mon Sep 17 00:00:00 2001 From: yoriswind Date: Mon, 16 Nov 2026 17:07:34 -0800 Subject: [PATCH 19/78] #8068: sample Image Trace ignore color from the source --- crates/tools/src/xform/eyedropper.rs | 114 ++++- crates/ui-egui/src/app/commands.rs | 1 + crates/ui-egui/src/canvas.rs | 14 +- crates/ui-egui/src/canvas/drag.rs | 3 + crates/ui-egui/src/dialogs/tools.rs | 5 + crates/ui-egui/src/panels/image_trace.rs | 170 ++++++- crates/ui-egui/src/state.rs | 13 + .../tests/image_trace_ignore_sampler.rs | 419 ++++++++++++++++++ docs/ui-parity.md | 2 + 9 files changed, 736 insertions(+), 5 deletions(-) create mode 100644 crates/ui-egui/tests/image_trace_ignore_sampler.rs diff --git a/crates/tools/src/xform/eyedropper.rs b/crates/tools/src/xform/eyedropper.rs index 2f99c8ca0a..0543797a9a 100644 --- a/crates/tools/src/xform/eyedropper.rs +++ b/crates/tools/src/xform/eyedropper.rs @@ -16,6 +16,9 @@ //! //! Brush Options' Key Color eyedropper sets `brushKeyColor` and `stop`: the next click samples into //! the open dialog (`brushKeyColor` UI request) and switches back. +//! +//! Image Trace's Ignore Color eyedropper passes its bound document point to the panel, which +//! samples the original image pixels; this tool changes neither paint nor selection. use std::collections::HashSet; @@ -28,7 +31,7 @@ use vectorcraft_geom::{Affine, Point, Rect}; use super::paint_owner; use crate::params::color_json; -use crate::{Action, Cursor, Mods, Overlay, PointerEvent, PointerKind, Tool, ToolContext}; +use crate::{Action, Cursor, Mods, Overlay, PointerEvent, PointerKind, Tool, ToolContext, ToolKey}; #[derive(Default)] pub struct EyedropperTool { @@ -38,6 +41,8 @@ pub struct EyedropperTool { text_selection: crate::text::TypeTool, /// Brush Options › Key Color (Hue Shift): sample into the dialog, then [`Self::stop`]. brush_key_color: bool, + /// Image Trace > Ignore Color: the panel's opaque document/object/revision binding. + image_trace_ignore_color: Option, } /// The colour of `paint` at `p` (gradients are sampled along their vector, radial ones honouring @@ -462,6 +467,13 @@ impl Tool for EyedropperTool { if ev.kind != PointerKind::Down { return vec![]; } + if let Some(binding) = self.image_trace_ignore_color.take() { + let back = self.stop.take().unwrap_or_else(|| "selection".to_string()); + return vec![ + Action::Dialog("imageTraceIgnoreColor".into(), json!({ "binding": binding, "point": [ev.pos.x, ev.pos.y] })), + Action::SwitchTool(back), + ]; + } let opts = sample_options(cx); if self.brush_key_color { let Some(c) = sample_color_at(cx, ev.pos) else { return vec![] }; @@ -496,6 +508,23 @@ impl Tool for EyedropperTool { out } + fn key(&mut self, _cx: &ToolContext, key: ToolKey, _mods: Mods) -> Vec { + if key != ToolKey::Escape { + return vec![]; + } + let Some(binding) = self.image_trace_ignore_color.take() else { return vec![] }; + let back = self.stop.take().unwrap_or_else(|| "selection".to_string()); + vec![Action::Dialog("imageTraceIgnoreColor".into(), json!({ "binding": binding, "cancel": true })), Action::SwitchTool(back)] + } + + fn claims_key(&self, _cx: &ToolContext, key: ToolKey) -> bool { + self.image_trace_ignore_color.is_some() && key == ToolKey::Escape + } + + fn ends_on_escape(&self, _cx: &ToolContext) -> bool { + self.image_trace_ignore_color.is_some() + } + /// Expose a transient text range alongside gradient-stop and brush-key sampling state. fn options(&self) -> Value { let selected = self.text_selection.options(); @@ -503,6 +532,9 @@ impl Tool for EyedropperTool { if let Some(o) = options.as_object_mut() { o.insert("stop".into(), json!(self.stop)); o.insert("brushKeyColor".into(), json!(self.brush_key_color)); + if let Some(binding) = &self.image_trace_ignore_color { + o.insert("imageTraceIgnoreColor".into(), binding.clone()); + } } options } @@ -512,6 +544,7 @@ impl Tool for EyedropperTool { match key { "stop" => self.stop = value.as_str().map(str::to_string), "brushKeyColor" => self.brush_key_color = value.as_bool().unwrap_or(false), + "imageTraceIgnoreColor" => self.image_trace_ignore_color = (!value.is_null()).then(|| value.clone()), "textSelection" => self.text_selection.set_option(key, value), _ => {} } @@ -636,6 +669,85 @@ mod tests { assert_eq!(t.options(), json!({ "stop": null, "brushKeyColor": false })); } + /// The panel samples the bound original raster, even on empty canvas or with modifiers held. + #[test] + fn image_trace_sampling_forwards_its_binding_and_document_point_once() { + let (d, id) = doc_with_rect(); + let (s, p) = (Selection::default(), paint()); + let cx = cx(&d, &s, &p); + let binding = json!({"doc": 7, "target": id.0, "revision": 11}); + for mods in [Mods::default(), Mods { alt: true, ..Default::default() }, Mods { alt: true, shift: true, ..Default::default() }] { + let mut t = EyedropperTool::default(); + t.set_option("stop", &json!("gradient")); + t.set_option("imageTraceIgnoreColor", &binding); + assert_eq!(t.options()["imageTraceIgnoreColor"], binding); + assert!(t.pointer(&cx, &PointerEvent::new(PointerKind::Move, -25.5, 400.25)).is_empty()); + assert!(t.pointer(&cx, &PointerEvent::new(PointerKind::Up, -25.5, 400.25)).is_empty()); + assert_eq!( + t.pointer(&cx, &PointerEvent::new(PointerKind::Down, -25.5, 400.25).with_mods(mods)), + vec![ + Action::Dialog("imageTraceIgnoreColor".into(), json!({"binding": binding, "point": [-25.5, 400.25]})), + Action::SwitchTool("gradient".into()), + ] + ); + assert_eq!(t.options(), json!({"stop": null, "brushKeyColor": false})); + assert!(!t.claims_key(&cx, ToolKey::Escape)); + assert!(!t.ends_on_escape(&cx)); + assert!(t.key(&cx, ToolKey::Escape, Mods::default()).is_empty()); + } + } + + /// Escape's UI request is claimed only while this one-shot target is armed. + #[test] + fn image_trace_escape_cancels_its_binding_and_restores_the_tool_once() { + let (d, id) = doc_with_rect(); + let (s, p) = (Selection::default(), paint()); + let cx = cx(&d, &s, &p); + let binding = json!({"doc": 7, "target": id.0, "revision": 11}); + let mut t = EyedropperTool::default(); + assert!(!t.claims_key(&cx, ToolKey::Escape)); + assert!(!t.ends_on_escape(&cx)); + assert!(t.key(&cx, ToolKey::Escape, Mods::default()).is_empty()); + t.set_option("stop", &json!("selection")); + t.set_option("imageTraceIgnoreColor", &binding); + assert!(t.claims_key(&cx, ToolKey::Escape)); + assert!(t.ends_on_escape(&cx)); + assert!(!t.claims_key(&cx, ToolKey::Enter)); + assert!(t.key(&cx, ToolKey::Enter, Mods::default()).is_empty()); + assert_eq!(t.options()["imageTraceIgnoreColor"], binding); + assert_eq!( + t.key(&cx, ToolKey::Escape, Mods::default()), + vec![Action::Dialog("imageTraceIgnoreColor".into(), json!({"binding": binding, "cancel": true})), Action::SwitchTool("selection".into())] + ); + assert_eq!(t.options(), json!({"stop": null, "brushKeyColor": false})); + assert!(!t.claims_key(&cx, ToolKey::Escape)); + assert!(!t.ends_on_escape(&cx)); + assert!(t.key(&cx, ToolKey::Escape, Mods::default()).is_empty()); + } + + /// A cleared Image Trace request leaves the existing brush/stop options and keys alone. + #[test] + fn clearing_image_trace_sampling_preserves_existing_brush_and_stop_options() { + let (d, _) = doc_with_rect(); + let (s, p) = (Selection::default(), paint()); + let cx = cx(&d, &s, &p); + let mut t = EyedropperTool::default(); + t.set_option("brushKeyColor", &json!(true)); + t.set_option("stop", &json!("selection")); + let original = t.options(); + t.set_option("imageTraceIgnoreColor", &json!({"doc": 7, "target": 8, "revision": 11})); + t.set_option("imageTraceIgnoreColor", &Value::Null); + assert_eq!(t.options(), original); + assert!(!t.claims_key(&cx, ToolKey::Escape)); + assert!(!t.ends_on_escape(&cx)); + assert!(t.key(&cx, ToolKey::Escape, Mods::default()).is_empty()); + assert_eq!(t.options(), original); + assert_eq!( + t.pointer(&cx, &PointerEvent::new(PointerKind::Down, 150.0, 150.0)), + vec![Action::Dialog("brushKeyColor".into(), json!({"color": color_json(&Color::WHITE)})), Action::SwitchTool("selection".into())] + ); + } + /// The hex of the colour a `paint.sampleColor` action samples. fn sampled_hex(a: &[Action]) -> String { let [Action::Exec(c, p)] = a else { panic!("one action: {a:?}") }; diff --git a/crates/ui-egui/src/app/commands.rs b/crates/ui-egui/src/app/commands.rs index 8cf742e499..38c947c57c 100644 --- a/crates/ui-egui/src/app/commands.rs +++ b/crates/ui-egui/src/app/commands.rs @@ -467,6 +467,7 @@ impl VectorcraftApp { } self.ui.flyout = None; switched?; + crate::panels::image_trace::cancel_ignore_sampler(self, false); if let Some(g) = vectorcraft_tools::catalog::group_of(id) && let Some(slot) = self.ui.group_tool.get_mut(g) { diff --git a/crates/ui-egui/src/canvas.rs b/crates/ui-egui/src/canvas.rs index 19cae2d9cc..9e007a0890 100644 --- a/crates/ui-egui/src/canvas.rs +++ b/crates/ui-egui/src/canvas.rs @@ -248,6 +248,7 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) { // The meshes of the tools' shared paths. Likewise, a frame that does not draw the tools' // overlays drops them. let mut shared_paths = std::mem::take(&mut app.canvas.shared_paths); + let sampler_cancelled = crate::panels::image_trace::refresh_ignore_sampler(app); // A release ends the Image Trace panel's eye-button hold, also when the panel is no longer // drawn, so a later press elsewhere does not show the source image. if app.ui.trace_hold_source.is_some() && !ui.input(|i| i.pointer.any_down()) { @@ -295,7 +296,7 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) { scroll_bars(app, ui, rect, outer, &t); } let resp = ui.interact(rect, egui::Id::unique("canvas"), Sense::click_and_drag()); - canvas_input(app, ui, &resp, rect); + input_after_sampler_refresh(app, ui, &resp, rect, sampler_cancelled); let v = *app.view().unwrap_or(&View::default()); let xf = Xf::at(rect, &v, app.canvas_ui_zoom); // While the view pans, zooms or turns under the pointer, the art under it isn't hit-tested. @@ -461,6 +462,13 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) { } } +/// A press arriving with an invalidated sampler is consumed, not given to its restored tool. +fn input_after_sampler_refresh(app: &mut VectorcraftApp, ui: &Ui, resp: &egui::Response, rect: egui::Rect, cancelled: bool) { + if !cancelled || !ui.input(|i| i.pointer.any_pressed()) { + canvas_input(app, ui, resp, rect); + } +} + /// The pointer on the canvas: the tool's input, unless the context menu or the 3D gizmo has the press. pub(crate) fn canvas_input(app: &mut VectorcraftApp, ui: &Ui, resp: &egui::Response, rect: egui::Rect) { if app.ui.dialog.as_ref().is_some_and(crate::dialogs::revolve_gizmo::active) { @@ -634,8 +642,8 @@ fn cache_key( rich_black: app.session.prefs.black_on_screen == "rich", // A tool's drag on the canvas, during an interaction (not a dialog's preview). dragging: app.session.in_interaction() && ui.data(|d| d.get_temp::(drag_id())) == Some(Drag::Tool), - // The Image Trace panel's eye button, while it is held. - trace_source: app.ui.trace_hold_source.clone(), + // The sampler keeps its bound original visible between clicks, independently of the eye. + trace_source: crate::panels::image_trace::ignore_sampler_source(app, st.uid).or_else(|| app.ui.trace_hold_source.clone()), // Preferences › Performance › Use Monitor Profile for Canvas. display: app.display_profile.key(app.session.prefs.monitor_profile_display), backdrop: backdrop(app, st, app.outline_view()), diff --git a/crates/ui-egui/src/canvas/drag.rs b/crates/ui-egui/src/canvas/drag.rs index 68f06c70cc..f733fa68f8 100644 --- a/crates/ui-egui/src/canvas/drag.rs +++ b/crates/ui-egui/src/canvas/drag.rs @@ -378,6 +378,9 @@ pub(crate) fn end_art_move(app: &mut VectorcraftApp, ctx: &egui::Context) { /// Send a pointer event to the active tool and act on UI requests (dialogs, tool switches). pub fn dispatch(app: &mut VectorcraftApp, ev: &PointerEvent, view: vectorcraft_engine::ViewInfo) { + if ev.kind == PointerKind::Down && crate::panels::image_trace::discard_stale_ignore_click(app) { + return; + } // A press lent to a selection tool (Cmd/Ctrl held) does not use the tool of a held key. if ev.kind == PointerKind::Down && app.session.lent_tool_id(&ev.mods).is_none() { crate::shortcuts::note_tool_use(app); diff --git a/crates/ui-egui/src/dialogs/tools.rs b/crates/ui-egui/src/dialogs/tools.rs index 6dbcfe28ce..4700d3bc33 100644 --- a/crates/ui-egui/src/dialogs/tools.rs +++ b/crates/ui-egui/src/dialogs/tools.rs @@ -124,6 +124,11 @@ pub fn open_tool_dialog(app: &mut VectorcraftApp, kind: &str, p: Value) { } // Double-clicking a stop on the gradient annotator: its popover, next to the stop's chip. "gradientStop" => Dialog::new(kind, json!({"index": p.get("index").cloned().unwrap_or(json!(0)), "x": x, "y": y, "tab": "color"})), + // Image Trace's Ignore Color eyedropper updates the panel, not the document's paint. + "imageTraceIgnoreColor" => { + crate::panels::image_trace::apply_ignore_color_sample(app, &p); + return; + } // Brush Options › Key Color eyedropper: update the open dialog, do not replace it. "brushKeyColor" => { if let Some(c) = p.get("color") { diff --git a/crates/ui-egui/src/panels/image_trace.rs b/crates/ui-egui/src/panels/image_trace.rs index bca4192b61..1ecb349821 100644 --- a/crates/ui-egui/src/panels/image_trace.rs +++ b/crates/ui-egui/src/panels/image_trace.rs @@ -232,6 +232,155 @@ fn hold_source(app: &mut VectorcraftApp, ctx: &egui::Context, down: bool) { } } +/// The retained original image of a live trace, or the selected placed image itself. +fn source_image(n: &Node) -> Option<&vectorcraft_doc::ImageObject> { + let source = if is_trace(n) { n.children()?.first()?.as_ref() } else { n }; + match &source.kind { + NodeKind::Image(image) => Some(image), + _ => None, + } +} + +fn sampler_binding(s: &crate::state::TraceIgnoreSampler) -> Value { + json!({ "doc": s.doc, "target": s.target.0, "revision": s.revision }) +} + +fn sampler_valid(app: &VectorcraftApp, s: &crate::state::TraceIgnoreSampler) -> bool { + let Some(doc) = app.session.active() else { return false }; + doc.uid == s.doc + && doc.revision == s.revision + && target_key(app) == Some((s.doc, s.target)) + && doc.doc.node(s.target).and_then(source_image).is_some_and(|image| doc.doc.images.contains_key(&image.key)) +} + +fn sampler_tool_active(app: &VectorcraftApp, s: &crate::state::TraceIgnoreSampler) -> bool { + app.session.tool_id() == "eyedropper" && app.session.tool_options()["imageTraceIgnoreColor"] == sampler_binding(s) +} + +/// Clear only this temporary mode. An explicit tool choice keeps the tool the user chose. +pub(crate) fn cancel_ignore_sampler(app: &mut VectorcraftApp, restore: bool) { + let Some(s) = app.ui.trace_ignore_sampler.take() else { return }; + if sampler_tool_active(app, &s) { + app.session.set_tool_option("imageTraceIgnoreColor", &Value::Null); + app.session.set_tool_option("stop", &Value::Null); + } + if restore && app.session.tool_id() == "eyedropper" { + app.return_to_tool(&s.back); + } + if let Some(ctx) = &app.ui_ctx { + ctx.request_repaint(); + } +} + +/// Also runs when the panel is closed: document changes and tool changes end the source preview. +pub(crate) fn refresh_ignore_sampler(app: &mut VectorcraftApp) -> bool { + let Some(s) = app.ui.trace_ignore_sampler.as_ref() else { return false }; + if !sampler_valid(app, s) { + cancel_ignore_sampler(app, true); + } else if !sampler_tool_active(app, s) { + cancel_ignore_sampler(app, false); + } else { + return false; + } + true +} + +/// A stale sampler's click must not become a paint/selection click in the restored tool. +pub(crate) fn discard_stale_ignore_click(app: &mut VectorcraftApp) -> bool { + let Some(s) = app.ui.trace_ignore_sampler.as_ref() else { return false }; + if sampler_valid(app, s) && sampler_tool_active(app, s) { + return false; + } + let restore = app.session.tool_id() == "eyedropper"; + cancel_ignore_sampler(app, restore); + true +} + +/// Render the bound live trace's original without changing its stored View or the eye's hold. +pub(crate) fn ignore_sampler_source(app: &VectorcraftApp, doc: u64) -> Option>> { + let s = app.ui.trace_ignore_sampler.as_ref()?; + (s.doc == doc && sampler_valid(app, s) && sampler_tool_active(app, s) && target(app).0).then(|| Arc::new(vec![s.target])) +} + +fn start_ignore_sampler(app: &mut VectorcraftApp, ctx: &egui::Context) { + if app.ui.trace_ignore_sampler.is_some() { + cancel_ignore_sampler(app, true); + return; + } + let Some((doc, target)) = target_key(app) else { return }; + let Some(revision) = app.session.active().map(|d| d.revision) else { return }; + let s = crate::state::TraceIgnoreSampler { doc, target, revision, back: app.session.tool_id().to_string() }; + if !sampler_valid(app, &s) { + return; + } + if let Err(e) = app.try_select_tool("eyedropper") { + app.status(e); + return; + } + if !sampler_valid(app, &s) { + app.return_to_tool(&s.back); + return; + } + app.session.set_tool_option("imageTraceIgnoreColor", &sampler_binding(&s)); + app.session.set_tool_option("stop", &json!(s.back.as_str())); + // Bind the reply to this panel's state, also when it is drawn without the full app frame. + app.ui_ctx = Some(ctx.clone()); + app.ui.trace_ignore_sampler = Some(s); + if let Some(ctx) = &app.ui_ctx { + ctx.request_repaint(); + } +} + +/// Match Image Trace's input bytes, not the current canvas result or the working-space colour. +fn sampled_ignore_color(app: &VectorcraftApp, s: &crate::state::TraceIgnoreSampler, p: &Value) -> Option { + let point = vectorcraft_geom::Point::new(p["point"][0].as_f64()?, p["point"][1].as_f64()?); + if !point.x.is_finite() || !point.y.is_finite() { + return None; + } + let doc = &app.session.active()?.doc; + let image = source_image(doc.node(s.target)?)?; + if image.xf.determinant().abs() < 1e-12 { + return None; + } + let pixel = image.xf.inverse() * point; + let [r, g, b, alpha] = doc.images.get(&image.key)?.sample_object(pixel.x, pixel.y, (image.width, image.height), 1)?; + (alpha != 0).then(|| format!("#{r:02x}{g:02x}{b:02x}")) +} + +/// Handle the one-shot tool's reply after it has consumed its transient binding. +pub(crate) fn apply_ignore_color_sample(app: &mut VectorcraftApp, p: &Value) { + let Some(s) = app.ui.trace_ignore_sampler.as_ref() else { return }; + if p["binding"] != sampler_binding(s) { + return; + } + let valid = sampler_valid(app, s); + let s = s.clone(); + cancel_ignore_sampler(app, false); + if !valid || p["cancel"] == true { + return; + } + let Some(color) = sampled_ignore_color(app, &s, p) else { return }; + // The canvas UI establishes this context before a real panel click can arm the sampler. + let Some(ctx) = app.ui_ctx.clone() else { return }; + let all = presets(app, &ctx); + let mut st: TraceUi = pstate(&ctx, "image-trace"); + let (is_trace, _, stored) = target(app); + follow_preset_changes(app, &mut st, &all); + let changes: Vec<&TracePresetChange> = app.session.trace_preset_changes_since(0).collect(); + sync_with_object(&mut st, stored, Some((s.doc, s.target)), &all, &changes); + st.params["ignoreColor"] = json!(color); + st.preset = "Custom".into(); + let preview = app.ui.image_trace_preview; + if is_trace || !preview { + st.preview_off = !preview; + } + if is_trace && preview { + trace(app, &ctx, &mut st); + } + set_pstate(&ctx, "image-trace", st); + ctx.request_repaint(); +} + /// The selected Image Trace object's View row (Control bar, Properties). pub(crate) fn view_row(app: &mut VectorcraftApp, ui: &mut Ui, current: TraceView, width: f32) { widgets::dim_label(ui, tl!("View:")); @@ -807,17 +956,36 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) { ui.horizontal(|ui| { let on = st.params["ignoreWhite"].as_bool().unwrap_or(false); if widgets::check(ui, tl!("Ignore Color"), on, true) { + if on { + cancel_ignore_sampler(app, true); + } st.params["ignoreWhite"] = json!(!on); st.preset = "Custom".into(); retrace = true; } if on { let mut rgb = ignore_color(&st.params); - if ui.color_edit_button_srgb(&mut rgb).changed() { + let picker = ui.color_edit_button_srgb(&mut rgb); + if picker.clicked() { + cancel_ignore_sampler(app, true); + } + if picker.changed() { st.params["ignoreColor"] = json!(format!("#{:02x}{:02x}{:02x}", rgb[0], rgb[1], rgb[2])); st.preset = "Custom".into(); retrace = true; } + if widgets::icon_button_enabled( + ui, + "pipette", + tl!("Eyedropper: click the source image to sample the ignored color"), + app.ui.trace_ignore_sampler.is_some(), + is_trace || is_image, + 22.0, + ) + .clicked() + { + start_ignore_sampler(app, ui.ctx()); + } } }); } diff --git a/crates/ui-egui/src/state.rs b/crates/ui-egui/src/state.rs index d3698aaeef..3fd913830e 100644 --- a/crates/ui-egui/src/state.rs +++ b/crates/ui-egui/src/state.rs @@ -6,6 +6,15 @@ use vectorcraft_geom::Point; use crate::theme::Brightness; +/// A one-shot Image Trace Ignore Color sampler, bound to the unchanged selected source. +#[derive(Clone, Debug)] +pub struct TraceIgnoreSampler { + pub doc: u64, + pub target: vectorcraft_doc::NodeId, + pub revision: u64, + pub back: String, +} + /// Per-document view (camera). #[derive(Clone, Copy, Debug, Serialize, Deserialize)] pub struct View { @@ -847,6 +856,9 @@ pub struct UiState { /// panel's eye button is held down ([`vectorcraft_render::RenderOptions::trace_source`]). #[serde(skip)] pub trace_hold_source: Option>>, + /// Ignore Color's one-shot canvas sampler; independent of the eye button's press lifetime. + #[serde(skip)] + pub trace_ignore_sampler: Option, /// Layers panel › Panel Options… (row size, thumbnails, Show Layers Only, Locate Selected Objects). #[serde(default)] pub layers_panel: crate::panels::layers::PanelOptions, @@ -1271,6 +1283,7 @@ impl Default for UiState { psd_import: Value::Null, home: None, trace_hold_source: None, + trace_ignore_sampler: None, layers_panel: Default::default(), navigator_panel: Default::default(), layers_filter: Default::default(), diff --git a/crates/ui-egui/tests/image_trace_ignore_sampler.rs b/crates/ui-egui/tests/image_trace_ignore_sampler.rs new file mode 100644 index 0000000000..225bfec39e --- /dev/null +++ b/crates/ui-egui/tests/image_trace_ignore_sampler.rs @@ -0,0 +1,419 @@ +//! Image Trace Ignore Color's real panel button, tool callback and canvas presentation. +//! All APIs used here exist on the pre-fix base; the first regression fails on the missing button. +#![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)] + +use std::time::{Duration, Instant}; + +use egui::{Event, PointerButton, Pos2, RawInput, Rect, vec2}; +use serde_json::{Value, json}; +use vectorcraft_doc::{Node, NodeId, NodeKind, TraceView}; +use vectorcraft_engine::Session; +use vectorcraft_geom::Point; +use vectorcraft_tools::{PointerEvent, PointerKind}; +use vectorcraft_ui_egui::{CacheKey, VectorcraftApp, canvas, trace_runs}; + +const SAMPLE_TIP: &str = "Eyedropper: click the source image to sample the ignored color"; + +fn frame(app: &mut VectorcraftApp, ctx: &egui::Context, events: Vec) -> egui::FullOutput { + let mut raw = RawInput { events, focused: true, screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(1600.0, 1400.0))), ..Default::default() }; + // raw_input_hook already begins the host iteration; do not begin a second one. + app.raw_input_hook(ctx, &mut raw); + ctx.run_ui(raw, |ui| { + app.tick(ui.ctx()); + app.ui(ui); + }) +} + +fn settle(app: &mut VectorcraftApp, ctx: &egui::Context) { + let deadline = Instant::now() + Duration::from_secs(10); + loop { + trace_runs::poll(app); + frame(app, ctx, vec![]).textures_delta.clear(); + if !trace_runs::any_running(app) { + break; + } + assert!(Instant::now() < deadline, "the tiny fixture's background trace did not finish"); + std::thread::sleep(Duration::from_millis(5)); + } + for _ in 0..2 { + frame(app, ctx, vec![]).textures_delta.clear(); + } +} + +fn click_control(app: &mut VectorcraftApp, ctx: &egui::Context, label: &str) { + let mut found = None; + for _ in 0..3 { + let mut out = frame(app, ctx, vec![]); + if let Some(update) = &out.platform_output.accesskit_update { + found = update.nodes.iter().find(|(_, node)| node.label() == Some(label)).and_then(|(_, node)| node.bounds()); + } + out.textures_delta.clear(); + if found.is_some() { + break; + } + } + let bounds = found.unwrap_or_else(|| panic!("missing accessible Image Trace control: {label}")); + let at = egui::pos2(((bounds.x0 + bounds.x1) * 0.5) as f32, ((bounds.y0 + bounds.y1) * 0.5) as f32); + let press = |pressed| Event::PointerButton { pos: at, button: PointerButton::Primary, pressed, modifiers: Default::default() }; + frame(app, ctx, vec![Event::PointerMoved(at)]).textures_delta.clear(); + frame(app, ctx, vec![press(true)]).textures_delta.clear(); + frame(app, ctx, vec![press(false)]).textures_delta.clear(); + settle(app, ctx); +} + +fn fixture(live_trace: bool, rgb: [u8; 3], preview: bool) -> (VectorcraftApp, egui::Context) { + vectorcraft_ui_egui::i18n::set_current(vectorcraft_ui_egui::i18n::Lang::EN); + let mut app = VectorcraftApp::new(Session::new(), Default::default()); + app.run("file.new", json!({"width": 400, "height": 300})).unwrap(); + let pixels: Vec = (0..400).flat_map(|i| if i % 20 < 10 { [rgb[0], rgb[1], rgb[2], 255] } else { [255; 4] }).collect(); + let image = + craft_image_codecs::Image::from_raw(20, 20, craft_image_codecs::ChannelLayout::Rgba, craft_image_codecs::SampleType::U8, pixels).unwrap(); + let png = craft_image_codecs::encode(&image, craft_image_codecs::Format::Png, &craft_image_codecs::EncodeOptions::default()).unwrap(); + app.run( + "file.place", + json!({"name": "sampler-original.png", "dataBase64": vectorcraft_format::base64_encode(&png), "link": false, "at": [200, 150]}), + ) + .unwrap(); + if live_trace { + app.run( + "imageTrace.make", + json!({"preset": "Default", "params": {"mode": "blackAndWhite", "threshold": 127, "noise": 1, "ignoreWhite": false}}), + ) + .unwrap(); + } + app.select_tool("selection"); + app.ui.image_trace_preview = preview; + app.ui.image_trace_advanced = true; + app.ui.task_bar = false; + app.ui.view.rulers = false; + app.session.prefs.monitor_profile_display = false; + app.canvas.worker_started = true; // the existing same-thread CPU canvas route + // An ordinary dock column gives Advanced the full window height without an auxiliary OS viewport. + app.run("window.panel.dock", json!({"panel": "imageTrace", "side": "End", "collapsed": false})).unwrap(); + app.run("window.panel.activate", json!({"panel": "imageTrace"})).unwrap(); + let ctx = egui::Context::default(); + ctx.enable_accesskit(); + for _ in 0..8 { + frame(&mut app, &ctx, vec![]).textures_delta.clear(); + } + click_control(&mut app, &ctx, "Ignore Color"); + (app, ctx) +} + +fn selected(app: &VectorcraftApp) -> Node { + let state = app.session.active().unwrap(); + state.doc.node(state.selection.objects[0]).unwrap().clone() +} + +fn settings(app: &VectorcraftApp) -> Value { + selected(app).extras().trace.as_deref().unwrap().clone() +} + +fn source_point(app: &VectorcraftApp, x: f64) -> Point { + let selected = selected(app); + let original = selected.children().and_then(|children| children.first()).map_or(&selected, |child| child.as_ref()); + let NodeKind::Image(image) = &original.kind else { panic!("selected source image") }; + image.xf * Point::new(f64::from(image.width) * x, f64::from(image.height) * 0.5) +} + +fn sample(app: &mut VectorcraftApp, ctx: &egui::Context, point: Point) { + click_control(app, ctx, SAMPLE_TIP); + assert_eq!(app.session.tool_id(), "eyedropper", "the actual panel button arms sampling"); + let view = app.view_info(); + canvas::dispatch(app, &PointerEvent::new(PointerKind::Down, point.x, point.y), view); + settle(app, ctx); +} + +#[test] +fn samples_original_trace_pixels_without_painting() { + let (mut app, ctx) = fixture(true, [37; 3], false); + let point = source_point(&app, 0.25); + let state = app.session.active().unwrap(); + let (document, selection, revision) = (state.doc.clone(), state.selection.clone(), state.revision); + let history = (state.history.undo.len(), state.history.redo.len()); + let paint = app.session.paint.clone(); + click_control(&mut app, &ctx, SAMPLE_TIP); + assert_eq!(app.session.tool_id(), "eyedropper"); + let at = canvas::Xf::at(app.canvas_rect.unwrap(), app.view().unwrap(), ctx.zoom_factor()).to_screen(point); + assert!(app.canvas_rect.unwrap().contains(at)); + let press = |pressed| Event::PointerButton { pos: at, button: PointerButton::Primary, pressed, modifiers: Default::default() }; + frame(&mut app, &ctx, vec![Event::PointerMoved(at), press(true)]).textures_delta.clear(); + frame(&mut app, &ctx, vec![press(false)]).textures_delta.clear(); + settle(&mut app, &ctx); + assert_eq!(app.session.tool_id(), "selection"); + assert_eq!(app.session.paint, paint); + let state = app.session.active().unwrap(); + assert_eq!(state.doc, document, "Preview off leaves the document unchanged"); + assert_eq!(state.selection, selection); + assert_eq!(state.revision, revision); + assert_eq!((state.history.undo.len(), state.history.redo.len()), history); + click_control(&mut app, &ctx, "Trace"); + assert_eq!(settings(&app)["params"]["ignoreColor"], "#252525", "persist the original gray, not the black tracing result"); +} + +#[test] +fn colored_placed_image_and_live_trace_keep_preview_off_drafts_until_trace() { + for live_trace in [false, true] { + let (mut app, ctx) = fixture(live_trace, [37, 83, 149], false); + let point = source_point(&app, 0.25); + let id = selected(&app).id; + let state = app.session.active().unwrap(); + let (document, selection, revision) = (state.doc.clone(), state.selection.clone(), state.revision); + let history = (state.history.undo.len(), state.history.redo.len()); + let paint = app.session.paint.clone(); + sample(&mut app, &ctx, point); + let state = app.session.active().unwrap(); + assert_eq!(state.doc, document, "placed/live={live_trace}: sample only the panel draft"); + assert_eq!(state.selection, selection); + assert_eq!(state.revision, revision); + assert_eq!((state.history.undo.len(), state.history.redo.len()), history); + assert_eq!(app.session.paint, paint); + app.run("select.none", json!({})).unwrap(); + settle(&mut app, &ctx); + app.run("select.set", json!({"ids": [id.0]})).unwrap(); + settle(&mut app, &ctx); + click_control(&mut app, &ctx, "Trace"); + assert_eq!(settings(&app)["params"]["ignoreColor"], "#255395", "the raw non-gray draft survives the selection round trip"); + assert_eq!(settings(&app)["preset"], "Custom"); + assert_eq!(app.session.active().unwrap().history.undo.len(), history.0 + 1, "Trace creates the only edit"); + } +} + +#[test] +fn preview_traces_once_and_undo_redo_restore_the_results() { + let (mut app, ctx) = fixture(true, [37, 83, 149], true); + let point = source_point(&app, 0.25); + let state = app.session.active().unwrap(); + let (before, selection, steps) = (state.doc.clone(), state.selection.clone(), state.history.undo.len()); + let paint = app.session.paint.clone(); + let view = selected(&app).trace_view(); + sample(&mut app, &ctx, point); + let after = app.session.active().unwrap().doc.clone(); + assert_ne!(after, before); + assert_eq!(settings(&app)["params"]["ignoreColor"], "#255395"); + assert_eq!(settings(&app)["preset"], "Custom"); + assert_eq!(app.session.active().unwrap().history.undo.len(), steps + 1); + // The existing imageTrace.make replaces the trace group and selects its new ID. + // Keep the logical trace selected, rather than requiring the removed group's ID. + let mut traced_selection = selection.clone(); + traced_selection.set([selected(&app).id]); + assert_eq!(app.session.active().unwrap().selection, traced_selection); + assert!(after.node(selection.objects[0]).is_none()); + assert_eq!(app.session.paint, paint); + assert_eq!(selected(&app).trace_view(), view); + assert_eq!(app.session.tool_id(), "selection"); + settle(&mut app, &ctx); + assert_eq!(app.session.active().unwrap().history.undo.len(), steps + 1, "later frames do not retrace"); + app.run("edit.undo", json!({})).unwrap(); + settle(&mut app, &ctx); + assert_eq!(app.session.active().unwrap().doc, before); + assert_eq!(app.session.active().unwrap().selection, selection); + assert_eq!(app.session.active().unwrap().history.undo.len(), steps); + app.run("edit.redo", json!({})).unwrap(); + settle(&mut app, &ctx); + assert_eq!(app.session.active().unwrap().doc, after); + assert_eq!(app.session.active().unwrap().selection, traced_selection); + assert_eq!(app.session.active().unwrap().history.undo.len(), steps + 1); +} + +#[test] +fn miss_escape_and_explicit_tool_choice_do_not_sample_or_paint() { + for exit in ["outside", "escape", "rectangle", "eyedropper"] { + let (mut app, ctx) = fixture(true, [37, 83, 149], false); + let old_color = settings(&app)["params"]["ignoreColor"].clone(); + let state = app.session.active().unwrap(); + let (document, selection, revision) = (state.doc.clone(), state.selection.clone(), state.revision); + let history = (state.history.undo.len(), state.history.redo.len()); + let paint = app.session.paint.clone(); + click_control(&mut app, &ctx, SAMPLE_TIP); + assert_eq!(app.session.tool_id(), "eyedropper"); + match exit { + "outside" => { + let view = app.view_info(); + canvas::dispatch(&mut app, &PointerEvent::new(PointerKind::Down, -100.0, -100.0), view); + } + "escape" => { + let key = |pressed| Event::Key { + key: egui::Key::Escape, + physical_key: Some(egui::Key::Escape), + pressed, + repeat: false, + modifiers: egui::Modifiers::NONE, + }; + // Full public input path: claims/ends are observed before tool_key, and + // Escape's requests are applied only if the tool claims the key. + frame(&mut app, &ctx, vec![key(true)]).textures_delta.clear(); + frame(&mut app, &ctx, vec![key(false)]).textures_delta.clear(); + } + chosen => app.select_tool(chosen), + } + let expected = if exit == "outside" || exit == "escape" { "selection" } else { exit }; + assert_eq!(app.session.tool_id(), expected, "{exit}: restore or respect the explicit choice"); + assert!(app.session.tool_options_of("eyedropper")["imageTraceIgnoreColor"].is_null()); + settle(&mut app, &ctx); + assert!(app.canvas.key.as_ref().unwrap().trace_source.is_none()); + assert_eq!(app.session.paint, paint); + let state = app.session.active().unwrap(); + assert_eq!(state.doc, document); + assert_eq!(state.selection, selection, "{exit}: Escape does not fall through to deselect"); + assert_eq!(state.revision, revision); + assert_eq!((state.history.undo.len(), state.history.redo.len()), history); + click_control(&mut app, &ctx, "Trace"); + assert_eq!(settings(&app)["params"]["ignoreColor"], old_color, "{exit}: no hidden draft color was sampled"); + } +} + +#[test] +fn stale_target_click_is_consumed_before_the_restored_tool_can_select_or_paint() { + for invalidation in ["selection", "document", "revision_round_trip"] { + let (mut app, ctx) = fixture(true, [37, 83, 149], false); + let point = source_point(&app, 0.25); + let old_document = app.session.active().unwrap().doc.clone(); + let old_uid = app.session.active().unwrap().uid; + let armed_revision = app.session.active().unwrap().revision; + click_control(&mut app, &ctx, SAMPLE_TIP); + match invalidation { + "selection" => { + app.run("select.none", json!({})).unwrap(); + } + "document" => { + app.run("file.new", json!({"width": 400, "height": 300})).unwrap(); + } + _ => { + app.run("imageTrace.setView", json!({"view": TraceView::Outlines.id()})).unwrap(); + app.run("edit.undo", json!({})).unwrap(); + assert_eq!(app.session.active().unwrap().doc, old_document); + assert_ne!(app.session.active().unwrap().revision, armed_revision); + } + } + let state = app.session.active().unwrap(); + let (document, selection, revision) = (state.doc.clone(), state.selection.clone(), state.revision); + let history = (state.history.undo.len(), state.history.redo.len()); + let paint = app.session.paint.clone(); + // No UI refresh intervenes: this must exercise the real dispatch stale-Down guard. + let view = app.view_info(); + canvas::dispatch(&mut app, &PointerEvent::new(PointerKind::Down, point.x, point.y), view); + assert_eq!(app.session.tool_id(), "selection", "{invalidation}: restore prior tool"); + let state = app.session.active().unwrap(); + assert_eq!(state.doc, document); + assert_eq!(state.selection, selection, "the stale click cannot reselect the source"); + assert_eq!(state.revision, revision); + assert_eq!((state.history.undo.len(), state.history.redo.len()), history); + assert_eq!(app.session.paint, paint); + assert_eq!(app.session.documents().iter().find(|d| d.uid == old_uid).unwrap().doc, old_document); + settle(&mut app, &ctx); + assert!(app.canvas.key.as_ref().unwrap().trace_source.is_none()); + } +} + +#[test] +fn a_stale_sampler_and_canvas_press_in_one_frame_do_not_reselect_the_source() { + let (mut app, ctx) = fixture(true, [37, 83, 149], false); + let point = source_point(&app, 0.25); + let target = selected(&app).id; + click_control(&mut app, &ctx, SAMPLE_TIP); + app.run("select.none", json!({})).unwrap(); + // The last real layout supplies the canvas rect and view. Canvas itself records this + // context's zoom_factor as its UI-coordinate scale before routing input. + let at = canvas::Xf::at(app.canvas_rect.unwrap(), app.view().unwrap(), ctx.zoom_factor()).to_screen(point); + assert!(app.canvas_rect.unwrap().contains(at)); + let state = app.session.active().unwrap(); + let (document, selection, revision) = (state.doc.clone(), state.selection.clone(), state.revision); + let history = (state.history.undo.len(), state.history.redo.len()); + let paint = app.session.paint.clone(); + let press = |pressed| Event::PointerButton { pos: at, button: PointerButton::Primary, pressed, modifiers: Default::default() }; + frame(&mut app, &ctx, vec![Event::PointerMoved(at), press(true)]).textures_delta.clear(); + assert_eq!(app.session.tool_id(), "selection"); + let state = app.session.active().unwrap(); + assert_eq!(state.doc, document); + assert_eq!(state.selection, selection, "the press in the cancellation frame is consumed"); + assert_eq!(state.revision, revision); + assert_eq!((state.history.undo.len(), state.history.redo.len()), history); + assert_eq!(app.session.paint, paint); + frame(&mut app, &ctx, vec![press(false)]).textures_delta.clear(); + assert!(app.session.active().unwrap().selection.objects.is_empty()); + // Positive control: the same ordinary, unarmed click really hits and selects this trace. + frame(&mut app, &ctx, vec![Event::PointerMoved(at), press(true)]).textures_delta.clear(); + frame(&mut app, &ctx, vec![press(false)]).textures_delta.clear(); + assert_eq!(app.session.active().unwrap().selection.objects, vec![target]); +} + +fn capture_canvas(app: &mut VectorcraftApp, ctx: &egui::Context) -> (vectorcraft_render::Rendered, CacheKey) { + app.canvas.key = None; // force a complete upload, not a partial delta requiring reconstruction + let mut out = frame(app, ctx, vec![]); + let id = app.canvas.texture.as_ref().expect("real canvas texture").id(); + let upload = + out.textures_delta.set.iter().find(|(texture, _)| **texture == id).and_then(|(_, updates)| updates.last()).expect("CPU canvas upload"); + assert!(upload.pos.is_none()); + let egui::ImageData::Color(image) = &upload.image; + let rendered = vectorcraft_render::Rendered { + width: image.width() as u32, + height: image.height() as u32, + pixels: image.pixels.iter().flat_map(|c| c.to_array()).collect(), + }; + let key = app.canvas.key.as_ref().unwrap().clone(); + out.textures_delta.clear(); + (rendered, key) +} + +fn pixel_at(image: &vectorcraft_render::Rendered, key: &CacheKey, point: Point) -> [u8; 4] { + assert!(key.pixel.is_none() && key.rot == 0.0, "fixture uses the ordinary unrotated canvas"); + let x = (f64::from(image.width) * 0.5 + (point.x - key.cx) * key.zoom * f64::from(key.ppp)).floor(); + let y = (f64::from(image.height) * 0.5 + (point.y - key.cy) * key.zoom * f64::from(key.ppp)).floor(); + assert!(x >= 0.0 && x < f64::from(image.width) && y >= 0.0 && y < f64::from(image.height)); + let at = ((y as usize * image.width as usize) + x as usize) * 4; + image.pixels[at..at + 4].try_into().unwrap() +} + +#[test] +fn actual_canvas_shows_original_while_armed_then_restores_the_stored_view() { + let (mut app, ctx) = fixture(true, [37, 83, 149], false); + let point = source_point(&app, 0.25); + let control = source_point(&app, 0.75); + let target: NodeId = selected(&app).id; + let state = app.session.active().unwrap(); + let (document, selection, revision) = (state.doc.clone(), state.selection.clone(), state.revision); + let history = (state.history.undo.len(), state.history.redo.len()); + let uid = state.uid; + let original = state.doc.node(target).unwrap().children().unwrap()[0].clone(); + assert!(!original.visible, "the live trace retains its hidden original"); + let NodeKind::Image(image) = &original.kind else { panic!("original image") }; + let blob = state.doc.images.get(&image.key).unwrap(); + assert_eq!( + blob.sample_object(f64::from(image.width) * 0.25, f64::from(image.height) * 0.5, (image.width, image.height), 1), + Some([37, 83, 149, 255]) + ); + let source_hash = blob.content_key(); + let stored = settings(&app); + let (before, before_key) = capture_canvas(&mut app, &ctx); + assert_eq!(pixel_at(&before, &before_key, point), [0, 0, 0, 255]); + assert_eq!(pixel_at(&before, &before_key, control), [255; 4]); + click_control(&mut app, &ctx, SAMPLE_TIP); + let (armed, armed_key) = capture_canvas(&mut app, &ctx); + assert!(!ctx.input(|i| i.pointer.any_down()), "the source remains visible after releasing the button"); + assert_eq!(armed_key.trace_source.as_deref().map(Vec::as_slice), Some([target].as_slice())); + assert_eq!(pixel_at(&armed, &armed_key, point), [37, 83, 149, 255]); + assert_eq!(pixel_at(&armed, &armed_key, control), [255; 4]); + app.select_tool("selection"); + let (restored, restored_key) = capture_canvas(&mut app, &ctx); + assert!(restored_key.trace_source.is_none()); + assert_eq!(restored.pixels, before.pixels, "the exact stored result returns"); + let state = app.session.active().unwrap(); + assert_eq!((state.uid, state.revision), (uid, revision)); + assert_eq!(state.doc, document); + assert_eq!(state.selection, selection); + assert_eq!((state.history.undo.len(), state.history.redo.len()), history); + if let Some(dir) = std::env::var_os("VECTORCRAFT_TRACE_SAMPLER_EVIDENCE") { + let dir = std::path::PathBuf::from(dir); + std::fs::create_dir_all(&dir).unwrap(); + for (name, image) in [("before.png", &before), ("armed.png", &armed), ("restored.png", &restored)] { + std::fs::write(dir.join(name), image.to_png().unwrap()).unwrap(); + } + let binding = json!({"doc": uid, "target": target.0, "revision": revision, "storedTrace": stored, "sourceContentKey": source_hash, + "point": [point.x,point.y], "controlPoint": [control.x,control.y], "width": before.width, "height": before.height, + "before": pixel_at(&before,&before_key,point), "armed": pixel_at(&armed,&armed_key,point), "restored": pixel_at(&restored,&restored_key,point), + "sourceIdsWhileArmed": [target.0], "undoRedoLengths": [history.0,history.1], "documentUnchanged": true, + "view": {"zoom":before_key.zoom,"center":[before_key.cx,before_key.cy],"rotation":before_key.rot,"pixelsPerPoint":before_key.ppp}}); + std::fs::write(dir.join("binding.json"), serde_json::to_vec_pretty(&binding).unwrap()).unwrap(); + } +} diff --git a/docs/ui-parity.md b/docs/ui-parity.md index 17a00368b5..f4dd29c4f7 100644 --- a/docs/ui-parity.md +++ b/docs/ui-parity.md @@ -416,6 +416,7 @@ next unit in the order a right-click on a ruler lists them, from Feet back to Po | Window › Toolbars › Manage Toolbars… (also in the All Tools drawer's menu): the dialog lists the toolbars made with New Toolbar; a new name typed for the selected one renames it, + copies it (none selected: a blank toolbar) and the trash can deletes it; the changes stay in the workspace | done | #1759 in part; `window.toolbar.manage`, `window.toolbar.rename`, `window.toolbar.duplicate`, `window.toolbar.delete` | | Quick Image Trace presets trace at once and leave the panel as it was; the Image Trace button (Control bar, Properties) opens the editable controls | done | Per the public documentation, choosing a preset traces the image with it straight away, and the panel is opened with the Image Trace button in the Control panel or in Properties' Image Trace section (). The controls show Threshold, Paths, Corners and Noise with Advanced open; `panels/image_trace.rs` headless tests (`a_quick_trace_leaves_the_panel_as_it_was`, `sketch_quick_trace_reveals_all_adjustments_and_keeps_the_source` for the button's route). No algorithm parity claim. | | Image Trace panel: holding the eye button next to View down shows the selected Image Trace objects' source image on the canvas | done | Per the public documentation, the control next to View is pressed and held to compare the trace result with the source image (). On release the objects show their View again; the document, its View and the undo history are unchanged. `RenderOptions::trace_source`; `panels/image_trace.rs` headless test `holding_the_eye_button_shows_the_source_image_until_released`, render test `trace_source_draws_the_source_image_of_the_listed_objects`. The Control bar and Properties have no such button | +| Image Trace panel: Ignore Color has a canvas eyedropper beside its color picker | done | #8068. Samples original pixels of the selected placed image or the retained source of a live trace. A live trace shows its source temporarily without changing View. The existing color picker remains available. Preview off keeps a draft; Preview on retraces a live trace as one undo step. A sample, Escape or a miss restores the previous tool; changing the target cancels. Paint defaults and selection are retained. `tests/image_trace_ignore_sampler.rs`; no algorithm parity claim. | | Live trace result bounds and selection highlights exclude the retained bitmap; source-image views retain it | done | All TraceView modes and rotated result bounds regression-covered; ordinary hidden group behavior retained | | Image Trace panel: the Preview checkbox before Trace chooses whether a setting change traces the selected Image Trace object again at once | done | Per the public documentation, Preview shows the result of the current settings and Trace traces with them (). Preview is on by default and kept with the UI preferences; Reset to Default leaves it. Off, changes wait in the panel until Trace applies them as one undo step, or until Preview is turned on again. Changes stay with the object they were made for while another object is selected, and come back when it is selected again. `imageTrace.preview {on?}`, `ui.set {imageTracePreview}`; `panels/image_trace.rs` headless tests (`with_preview_off_a_slider_change_waits_for_trace`, `turning_preview_on_traces_the_changes_that_waited`, `preview_turned_on_with_nothing_selected_traces_when_the_object_is_selected_again`, `settings_that_wait_stay_with_their_object`, `settings_that_wait_come_back_when_their_object_is_selected_again`, `settings_that_wait_are_dropped_when_their_object_changed_since`, `preview_is_kept_with_the_preferences_and_reset_to_default_leaves_it`) | | Toolbar without group labels by default, one or two columns; All Tools drawer by flyout group with shortcuts, its menu (Reset, Basic, Advanced) and Show section | done | #1751; a preference brings the labels back; `toolbar.show` sets the Fill/Stroke, Coloring, Draw Mode and Screen Mode controls | @@ -560,6 +561,7 @@ before release (#6373). [Paint faces and edges](https://helpx.adobe.com/illustra | Date | Change | Summary | |---|---|---| +| 2026-11-16 | minor | Image Trace: Ignore Color samples original image pixels with a canvas eyedropper, retaining the manual picker, Preview drafts, source View and Undo behavior (#8068). Scores and estimates unchanged. | | 2026-11-16 | minor | Recolor Artwork follow-up (#8031, remaining #4028): native Lab input, picker swatch libraries and Assign-row menus; UI interaction regression coverage; scores and estimates unchanged. | | 2026-11-16 | minor | Recolor Artwork › Assign: native Lab entry in the Color Picker, swatch libraries access in the picker, and row context menu options (Pick from Swatches, Limit to Library) (#4028). Scores and estimates unchanged. | | 2026-11-16 | minor | Color panel: the spectrum fills the vertical space of a resized panel, with options shown or hidden (#8005). Compact auto-fit flyouts and embedded mixers keep their existing size. Evidence: panels::color::tests::the_spectrum_grows_with_the_color_panel. Scores and estimates unchanged. | From 677d8a8c82730a41772b0e9a683aca91d43d67fd Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Mon, 16 Nov 2026 17:45:16 -0800 Subject: [PATCH 20/78] Docs: one Recent Commands line for the merged code --- docs/target-app-parity.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index 903f0988d1..d5a7fec1a4 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -1033,8 +1033,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - Perspective Distort and Free Distort (`object.distort`) turn each warped object's bounding box as the warp turns the object at its own center, the objects inside groups, compound paths and clip groups and the art of linked opacity masks included, so the next Selection or Free Transform drag uses the tilted box; Object › Transform › Reset Bounding Box squares it again, and corners left where they are add no undo step (VectorCraft's own rule; `bboxrotate::distort_turns_an_upright_box_with_the_warp_at_its_center`, `distort_turns_each_member_and_linked_mask_by_its_own_warp`, `mirrored_and_collapsing_distorts_keep_valid_angles`, `distort_angles_undo_redo_and_reopen_together`, `xform::unchanged_distort_records_no_history`). - The Free Transform widget's Constrain works in Free Distort as well as in Free Transform ([the help page](https://helpx.adobe.com/illustrator/using/tool-techniques/free-transform-tool.html)). With Constrain on, or Shift held, a corner dragged in Free Distort moves only along the line through the opposite corner, in the box's own proportions, and the other three corners stay in place; on a turned box the line runs through the box's own corners. The line is VectorCraft's own rule. Cmd/Ctrl+Alt+Shift on a corner still drags in Perspective Distort, where Constrain stays unavailable (tools `xform::free::tests::free_distort_corner_keeps_to_its_diagonal_with_shift_or_constrain`, `shift_pressed_during_a_free_distort_drag_constrains_it`, `a_turned_box_is_constrained_along_its_own_diagonal`, `along_diagonal_of_a_degenerate_box`; engine `xform::free_transform_constrained_distort_keeps_the_corner_on_its_diagonal`; ui-egui `free_transform::tests::the_widget_sets_the_mode_and_a_corner_drag_then_distorts`). - Native macOS menu bar, vector tool cursors, a command palette (Help › Search Commands…), middle-button panning with any tool. Native menus explicitly end tracking on command selection, outside window presses and Escape; menu updates wait until tracking ends, and a dismissing press never starts a canvas gesture (M14.8). - - A Recent Commands button beside the Help › Search Commands field lists the last eight commands and tools picked from the palette, most recent first, with a command picked again moved to the top. A pick is recorded when it runs or opens a dialog, even if the dialog is then canceled; a pick that is refused because its menu item is dimmed, its tool can't be chosen or its panel can't be shown is not recorded, unless it opened a dialog. Choosing a row closes the palette and runs it as a pick of the same result does; with no picks yet the list shows a dimmed No recent commands row, and a command that is not available now, such as a filter of a plug-in that is not loaded, is left out until it comes back. The ids are saved with the UI state. While the list is open, Up and Down move through its rows, wrapping at the ends, and Escape closes the list before the palette. This is VectorCraft's own addition and does not raise a score (#6376; `palette` tests `recent_commands_*`, `a_recent_command_runs_what_its_pick_runs`, `the_keys_wrap_within_recent_commands`, `escape_closes_recent_commands_before_the_palette`). - - A Recent Commands button beside the Help › Search Commands field lists the last five commands, tools, panels and effects picked from the palette, most recent first, with a command picked again moved to the top. Choosing a row closes the palette and runs it as a pick of the same result does; with no picks yet the list shows a dimmed No recent commands row, and a command that is not available now, such as a filter of a plug-in that is not loaded, is left out until it comes back. The ids are saved with the UI state. While the list is open, Up and Down move through its rows, wrapping at the ends, and Escape closes the list before the palette. This is VectorCraft's own addition and does not raise a score (#6376; `palette` tests `recent_commands_*`, `a_recent_command_runs_what_its_pick_runs`, `the_keys_wrap_within_recent_commands`, `escape_closes_recent_commands_before_the_palette`). + - A Recent Commands button beside the Help › Search Commands field lists the last eight commands, tools, panels and effects picked from the palette, most recent first, with a command picked again moved to the top. A pick is recorded when it runs or opens a dialog, even if the dialog is then canceled; a pick that is refused because its menu item is dimmed, its tool can't be chosen or its panel can't be shown is not recorded, unless it opened a dialog. Choosing a row closes the palette and runs it as a pick of the same result does; with no picks yet the list shows a dimmed No recent commands row, and a command that is not available now, such as a filter of a plug-in that is not loaded, is left out until it comes back. The ids are saved with the UI state. While the list is open, Up and Down move through its rows, wrapping at the ends, and Escape closes the list before the palette. This is VectorCraft's own addition and does not raise a score (#6376; `palette` tests `recent_commands_*`, `a_recent_command_runs_what_its_pick_runs`, `the_keys_wrap_within_recent_commands`, `escape_closes_recent_commands_before_the_palette`). - With an empty search, or one of spaces only, the Help › Search Commands field lists the picks of the Recent Commands list (at most eight, leaving out a filter of a plug-in that is not loaded) under a Recent heading, most recent first, with the first highlighted and no result count, so opening the palette and pressing Enter picks the last pick again; a pick that is dimmed now shows why in the status line, as from a search, and keeps its place in the list. With no picks yet it lists no results and shows a dimmed Type to search commands, tools, panels and effects line. A pick of Search Commands… itself is not recorded. The palette opens with its first result highlighted and its list scrolled to the top. This is VectorCraft's own behavior (`palette` tests `an_empty_search_lists_the_recent_picks_most_recent_first`, `an_empty_search_without_picks_says_what_to_type`, `enter_on_an_empty_search_runs_the_last_pick_again`, `the_palette_opens_again_with_its_first_row_highlighted`, `the_palette_toggle_is_not_a_recent_pick`, `a_click_on_a_recent_pick_runs_it_and_moves_it_first`, `a_pick_says_whether_it_ran_opened_a_dialog_or_was_refused`, `a_refused_pick_is_not_recorded`, `a_pick_that_opens_a_dialog_is_recorded_even_when_canceled`). - The Learn panel (Window › Learn, or Explore tutorials beside the search icon on the app bar) has a For you tab with a Get started section and a Quick skill guide card, and a Skills tab that lists VectorCraft's own skills with their progress rings and counts of tutorials finished; a skill lists its tutorials, a tutorial shows its numbered steps, and Back goes up a level; `learn.list`, `learn.tab {tab}`, `learn.skill {skill}`, `learn.show {tutorial}` and `learn.back` script it, and the tab buttons, the rows and Back run them ([the help page](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/learn-skills-quick-skill-guide.html); `panels::learn::tests`). - A tool's name in a Learn tutorial step is a blue link that shows where the tool is without choosing it (`learn.locateTool {tool}`): its toolbar button is marked, a collapsed group's flyout opens with the tool's row marked, a torn-off strip comes to the front, and a tool no shown toolbar holds is marked in the All Tools drawer. The mark, its 3 seconds and the hidden-toolbar cases are VectorCraft's own rules ([the help page](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/learn-skills-quick-skill-guide.html); `panels::learn::tests`, the `a_learn_link_*` tests in `toolbar::tests`). From 6b7bbabbf1c8faa3fd19dbed4380f14e84ebb70f Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Mon, 16 Nov 2026 21:19:19 -0800 Subject: [PATCH 21/78] Command search: a saved palette toggle does not take a Recent Commands place MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A Recent Commands list saved before picks of Help › Search Commands… were left out could hold the palette's own toggle. remember counted it toward the eight picks it keeps, so after the next pick the list kept one command fewer. remember now drops the toggle before it counts. --- crates/ui-egui/src/palette.rs | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/crates/ui-egui/src/palette.rs b/crates/ui-egui/src/palette.rs index f7e105db80..fde40c7765 100644 --- a/crates/ui-egui/src/palette.rs +++ b/crates/ui-egui/src/palette.rs @@ -599,9 +599,10 @@ const MAX_SAVED_RECENT_COMMANDS: usize = 20; /// Puts `id` first in the Recent Commands ids `list`, removing its earlier place, and keeps the /// newest [`MAX_RECENT_COMMANDS`] ids that are `known`. An id that is not `known` now (a plug-in /// that is disabled or not loaded yet) keeps its place among them, so it shows again when its -/// command comes back. The list never holds more than [`MAX_SAVED_RECENT_COMMANDS`] ids. +/// command comes back. The palette's own toggle, saved before its picks were left out, is dropped +/// so that it does not take a place. The list never holds more than [`MAX_SAVED_RECENT_COMMANDS`] ids. fn remember(list: &mut Vec, id: &str, known: impl Fn(&str) -> bool) { - list.retain(|c| c != id); + list.retain(|c| c != id && c != PALETTE_TOGGLE); list.insert(0, id.to_string()); let mut kept = 0; let end = list.iter().position(|c| { @@ -1323,6 +1324,24 @@ mod tests { assert_eq!(list.first().map(String::as_str), Some("paint.swap")); } + /// A palette toggle saved in a full Recent Commands list does not take one of its places: after + /// another pick the list keeps that pick and the seven newest commands before it, and the + /// toggle is dropped. + #[test] + fn a_saved_palette_toggle_does_not_take_a_recent_place() { + let entries = build(Lang::EN); + let known = |c: &str| entries.iter().any(|e| e.id == c); + assert!(known(PALETTE_TOGGLE), "the toggle has a result"); + let others: Vec = + entries.iter().filter(|e| e.id != PALETTE_TOGGLE && e.id != "paint.swap").take(MAX_RECENT_COMMANDS).map(|e| e.id.clone()).collect(); + let mut list: Vec = std::iter::once(PALETTE_TOGGLE.to_string()).chain(others.iter().cloned()).collect(); + remember(&mut list, "paint.swap", known); + let expected: Vec = std::iter::once("paint.swap".to_string()).chain(others.iter().take(MAX_RECENT_COMMANDS - 1).cloned()).collect(); + assert_eq!(list, expected); + let shown: Vec<&str> = recent(&entries, &list).iter().map(|e| e.id.as_str()).collect(); + assert_eq!(shown.len(), MAX_RECENT_COMMANDS); + } + /// The open palette drawn over `app`, after the frame's keys go to the shortcuts as in the app, /// with a query no result matches, so the only command buttons are the Recent Commands list's. fn palette_harness(mut app: VectorcraftApp) -> egui_kittest::Harness<'static, VectorcraftApp> { From cf704663684e0736942870028bc63581a8add245 Mon Sep 17 00:00:00 2001 From: yoriswind Date: Tue, 17 Nov 2026 04:02:27 -0800 Subject: [PATCH 22/78] #8068: keep missed color picks armed and preserve the displayed trace --- crates/tools/src/xform/eyedropper.rs | 30 ++--- crates/ui-egui/src/canvas.rs | 3 +- crates/ui-egui/src/panels/image_trace.rs | 30 +++-- .../tests/image_trace_ignore_sampler.rs | 118 +++++++++++++----- docs/roadmap.md | 5 +- docs/target-app-parity.md | 6 +- docs/ui-parity.md | 5 +- 7 files changed, 134 insertions(+), 63 deletions(-) diff --git a/crates/tools/src/xform/eyedropper.rs b/crates/tools/src/xform/eyedropper.rs index 8e0c1bd80b..ac5465942b 100644 --- a/crates/tools/src/xform/eyedropper.rs +++ b/crates/tools/src/xform/eyedropper.rs @@ -21,7 +21,8 @@ //! armed, Escape is left to the application. //! //! Image Trace's Ignore Color eyedropper passes its bound document point to the panel, which -//! samples the original image pixels; this tool changes neither paint nor selection. +//! samples the original image pixels and ends the pick only when a color is accepted. A miss +//! stays armed; this tool changes neither paint nor selection. use std::collections::HashSet; @@ -470,12 +471,10 @@ impl Tool for EyedropperTool { if ev.kind != PointerKind::Down { return vec![]; } - if let Some(binding) = self.image_trace_ignore_color.take() { - let back = self.stop.take().unwrap_or_else(|| "selection".to_string()); - return vec![ - Action::Dialog("imageTraceIgnoreColor".into(), json!({ "binding": binding, "point": [ev.pos.x, ev.pos.y] })), - Action::SwitchTool(back), - ]; + if let Some(binding) = &self.image_trace_ignore_color { + // The panel knows whether this hits an opaque source pixel. It clears the binding + // and restores the previous tool only after accepting a color, not on a miss. + return vec![Action::Dialog("imageTraceIgnoreColor".into(), json!({ "binding": binding, "point": [ev.pos.x, ev.pos.y] }))]; } let opts = sample_options(cx); if self.brush_key_color { @@ -726,7 +725,7 @@ mod tests { } #[test] - fn image_trace_sampling_forwards_its_binding_and_document_point_once() { + fn image_trace_sampling_keeps_forwarding_its_binding_until_the_panel_accepts_a_color() { let (d, id) = doc_with_rect(); let (s, p) = (Selection::default(), paint()); let cx = cx(&d, &s, &p); @@ -740,14 +739,17 @@ mod tests { assert!(t.pointer(&cx, &PointerEvent::new(PointerKind::Up, -25.5, 400.25)).is_empty()); assert_eq!( t.pointer(&cx, &PointerEvent::new(PointerKind::Down, -25.5, 400.25).with_mods(mods)), - vec![ - Action::Dialog("imageTraceIgnoreColor".into(), json!({"binding": binding, "point": [-25.5, 400.25]})), - Action::SwitchTool("gradient".into()), - ] + vec![Action::Dialog("imageTraceIgnoreColor".into(), json!({"binding": binding, "point": [-25.5, 400.25]}))] ); + assert_eq!(t.options()["imageTraceIgnoreColor"], binding, "a point is only a request until the panel accepts its source color"); + assert_eq!(t.options()["stop"], "gradient"); + assert!(t.claims_key(&cx, ToolKey::Escape)); + assert!(t.ends_on_escape(&cx)); + let next = t.pointer(&cx, &PointerEvent::new(PointerKind::Down, 10.0, 20.0)); + assert_eq!(next, vec![Action::Dialog("imageTraceIgnoreColor".into(), json!({"binding": binding, "point": [10.0, 20.0]}))]); + t.set_option("imageTraceIgnoreColor", &Value::Null); + t.set_option("stop", &Value::Null); assert_eq!(t.options(), json!({"stop": null, "brushKeyColor": false})); - assert!(!t.claims_key(&cx, ToolKey::Escape)); - assert!(!t.ends_on_escape(&cx)); assert!(t.key(&cx, ToolKey::Escape, Mods::default()).is_empty()); } } diff --git a/crates/ui-egui/src/canvas.rs b/crates/ui-egui/src/canvas.rs index a30b5a3053..7b879fc646 100644 --- a/crates/ui-egui/src/canvas.rs +++ b/crates/ui-egui/src/canvas.rs @@ -643,8 +643,7 @@ fn cache_key( rich_black: app.session.prefs.black_on_screen == "rich", // A tool's drag on the canvas, during an interaction (not a dialog's preview). dragging: app.session.in_interaction() && ui.data(|d| d.get_temp::(drag_id())) == Some(Drag::Tool), - // The sampler keeps its bound original visible between clicks, independently of the eye. - trace_source: crate::panels::image_trace::ignore_sampler_source(app, st.uid).or_else(|| app.ui.trace_hold_source.clone()), + trace_source: app.ui.trace_hold_source.clone(), // Preferences › Performance › Use Monitor Profile for Canvas. display: app.display_profile.key(app.session.prefs.monitor_profile_display), backdrop: backdrop(app, st, app.outline_view()), diff --git a/crates/ui-egui/src/panels/image_trace.rs b/crates/ui-egui/src/panels/image_trace.rs index f73257f0d2..a453e4f136 100644 --- a/crates/ui-egui/src/panels/image_trace.rs +++ b/crates/ui-egui/src/panels/image_trace.rs @@ -272,7 +272,7 @@ pub(crate) fn cancel_ignore_sampler(app: &mut VectorcraftApp, restore: bool) { } } -/// Also runs when the panel is closed: document changes and tool changes end the source preview. +/// Also runs when the panel is closed: document changes and tool changes end the pick. pub(crate) fn refresh_ignore_sampler(app: &mut VectorcraftApp) -> bool { let Some(s) = app.ui.trace_ignore_sampler.as_ref() else { return false }; if !sampler_valid(app, s) { @@ -296,12 +296,6 @@ pub(crate) fn discard_stale_ignore_click(app: &mut VectorcraftApp) -> bool { true } -/// Render the bound live trace's original without changing its stored View or the eye's hold. -pub(crate) fn ignore_sampler_source(app: &VectorcraftApp, doc: u64) -> Option>> { - let s = app.ui.trace_ignore_sampler.as_ref()?; - (s.doc == doc && sampler_valid(app, s) && sampler_tool_active(app, s) && target(app).0).then(|| Arc::new(vec![s.target])) -} - fn start_ignore_sampler(app: &mut VectorcraftApp, ctx: &egui::Context) { if app.ui.trace_ignore_sampler.is_some() { cancel_ignore_sampler(app, true); @@ -347,21 +341,28 @@ fn sampled_ignore_color(app: &VectorcraftApp, s: &crate::state::TraceIgnoreSampl (alpha != 0).then(|| format!("#{r:02x}{g:02x}{b:02x}")) } -/// Handle the one-shot tool's reply after it has consumed its transient binding. +/// A miss keeps the pick armed; only a valid source color, Escape or invalid binding ends it. pub(crate) fn apply_ignore_color_sample(app: &mut VectorcraftApp, p: &Value) { let Some(s) = app.ui.trace_ignore_sampler.as_ref() else { return }; if p["binding"] != sampler_binding(s) { return; } - let valid = sampler_valid(app, s); - let s = s.clone(); - cancel_ignore_sampler(app, false); - if !valid || p["cancel"] == true { + if p["cancel"] == true { + // Escape already carries its one deferred SwitchTool request. + cancel_ignore_sampler(app, false); return; } - let Some(color) = sampled_ignore_color(app, &s, p) else { return }; + if !sampler_valid(app, s) { + cancel_ignore_sampler(app, true); + return; + } + // Outside the source or over a transparent pixel there is no color to accept. Keep the + // binding and previous tool so the next canvas click can still complete this pick. + let Some(color) = sampled_ignore_color(app, s, p) else { return }; + let s = s.clone(); // The canvas UI establishes this context before a real panel click can arm the sampler. let Some(ctx) = app.ui_ctx.clone() else { return }; + cancel_ignore_sampler(app, false); let all = presets(app, &ctx); let mut st: TraceUi = pstate(&ctx, "image-trace"); let (is_trace, _, stored) = target(app); @@ -379,6 +380,9 @@ pub(crate) fn apply_ignore_color_sample(app: &mut VectorcraftApp, p: &Value) { } set_pstate(&ctx, "image-trace", st); ctx.request_repaint(); + // The old deferred SwitchTool ran after the panel accepted the color. Keep that order and + // fresh tool choice; a miss above has no switch request and remains armed. + app.select_tool(&s.back); } /// The selected Image Trace object's View row (Control bar, Properties). diff --git a/crates/ui-egui/tests/image_trace_ignore_sampler.rs b/crates/ui-egui/tests/image_trace_ignore_sampler.rs index 3c7051fab2..edd197195d 100644 --- a/crates/ui-egui/tests/image_trace_ignore_sampler.rs +++ b/crates/ui-egui/tests/image_trace_ignore_sampler.rs @@ -62,10 +62,24 @@ fn click_control(app: &mut VectorcraftApp, ctx: &egui::Context, label: &str) { } fn fixture(live_trace: bool, rgb: [u8; 3], preview: bool) -> (VectorcraftApp, egui::Context) { + fixture_with_transparent_edge(live_trace, rgb, preview, false) +} + +fn fixture_with_transparent_edge(live_trace: bool, rgb: [u8; 3], preview: bool, transparent: bool) -> (VectorcraftApp, egui::Context) { vectorcraft_ui_egui::i18n::set_current(vectorcraft_ui_egui::i18n::Lang::EN); let mut app = VectorcraftApp::new(Session::new(), Default::default()); app.run("file.new", json!({"width": 400, "height": 300})).unwrap(); - let pixels: Vec = (0..400).flat_map(|i| if i % 20 < 10 { [rgb[0], rgb[1], rgb[2], 255] } else { [255; 4] }).collect(); + let pixels: Vec = (0..400) + .flat_map(|i| { + if transparent && i % 20 == 19 { + [0; 4] + } else if i % 20 < 10 { + [rgb[0], rgb[1], rgb[2], 255] + } else { + [255; 4] + } + }) + .collect(); let image = craft_image_codecs::Image::from_raw(20, 20, craft_image_codecs::ChannelLayout::Rgba, craft_image_codecs::SampleType::U8, pixels).unwrap(); let png = craft_image_codecs::encode(&image, craft_image_codecs::Format::Png, &craft_image_codecs::EncodeOptions::default()).unwrap(); @@ -124,6 +138,14 @@ fn sample(app: &mut VectorcraftApp, ctx: &egui::Context, point: Point) { settle(app, ctx); } +fn press_armed_canvas(app: &mut VectorcraftApp, ctx: &egui::Context, point: Point) { + assert_eq!(app.session.tool_id(), "eyedropper", "this is a continuation of the existing armed pick"); + let view = app.view_info(); + canvas::dispatch(app, &PointerEvent::new(PointerKind::Down, point.x, point.y), view); + canvas::dispatch(app, &PointerEvent::new(PointerKind::Up, point.x, point.y), view); + settle(app, ctx); +} + #[test] fn samples_original_trace_pixels_without_painting() { let (mut app, ctx) = fixture(true, [37; 3], false); @@ -217,8 +239,8 @@ fn preview_traces_once_and_undo_redo_restore_the_results() { } #[test] -fn miss_escape_and_explicit_tool_choice_do_not_sample_or_paint() { - for exit in ["outside", "escape", "rectangle", "eyedropper"] { +fn escape_and_explicit_tool_choice_do_not_sample_or_paint() { + for exit in ["escape", "rectangle", "eyedropper"] { let (mut app, ctx) = fixture(true, [37, 83, 149], false); let old_color = settings(&app)["params"]["ignoreColor"].clone(); let state = app.session.active().unwrap(); @@ -228,10 +250,6 @@ fn miss_escape_and_explicit_tool_choice_do_not_sample_or_paint() { click_control(&mut app, &ctx, SAMPLE_TIP); assert_eq!(app.session.tool_id(), "eyedropper"); match exit { - "outside" => { - let view = app.view_info(); - canvas::dispatch(&mut app, &PointerEvent::new(PointerKind::Down, -100.0, -100.0), view); - } "escape" => { let key = |pressed| Event::Key { key: egui::Key::Escape, @@ -247,7 +265,7 @@ fn miss_escape_and_explicit_tool_choice_do_not_sample_or_paint() { } chosen => app.select_tool(chosen), } - let expected = if exit == "outside" || exit == "escape" { "selection" } else { exit }; + let expected = if exit == "escape" { "selection" } else { exit }; assert_eq!(app.session.tool_id(), expected, "{exit}: restore or respect the explicit choice"); assert!(app.session.tool_options_of("eyedropper")["imageTraceIgnoreColor"].is_null()); settle(&mut app, &ctx); @@ -263,6 +281,55 @@ fn miss_escape_and_explicit_tool_choice_do_not_sample_or_paint() { } } +#[test] +fn outside_and_transparent_misses_stay_armed_until_an_opaque_source_pixel_is_picked() { + for live_trace in [false, true] { + let (mut app, ctx) = fixture_with_transparent_edge(live_trace, [37, 83, 149], false, true); + let hit = source_point(&app, 0.25); + let outside = source_point(&app, -0.25); + let transparent = source_point(&app, 0.975); + let state = app.session.active().unwrap(); + let (document, selection, revision) = (state.doc.clone(), state.selection.clone(), state.revision); + let history = (state.history.undo.len(), state.history.redo.len()); + let paint = app.session.paint.clone(); + let node = selected(&app); + let original = if live_trace { node.children().unwrap()[0].as_ref() } else { &node }; + let NodeKind::Image(image) = &original.kind else { panic!("original fixture image") }; + let blob = &state.doc.images[&image.key]; + let keep = |_: f64, _: f64| true; + assert_eq!( + blob.sample_pixels(&[(Some([0.95, 0.5, 1.0, 0.55]), 1, &keep)]), + Some(vec![vec![[0; 4]]]), + "the missed point is really transparent in the source" + ); + assert!(blob.sample_object(19.5, 10.0, (image.width, image.height), 1).is_none(), "a transparent source pixel has no color to pick"); + click_control(&mut app, &ctx, SAMPLE_TIP); + let binding = app.session.tool_options()["imageTraceIgnoreColor"].clone(); + assert!(!binding.is_null()); + for miss in [outside, transparent] { + press_armed_canvas(&mut app, &ctx, miss); + assert_eq!(app.session.tool_id(), "eyedropper", "live={live_trace}: a miss stays armed"); + assert!(app.ui.trace_ignore_sampler.is_some()); + assert_eq!(app.session.tool_options()["imageTraceIgnoreColor"], binding); + assert_eq!(app.session.tool_options()["stop"], "selection"); + assert_eq!(app.session.paint, paint); + let state = app.session.active().unwrap(); + assert_eq!(state.doc, document); + assert_eq!(state.selection, selection); + assert_eq!(state.revision, revision); + assert_eq!((state.history.undo.len(), state.history.redo.len()), history); + } + press_armed_canvas(&mut app, &ctx, hit); + assert_eq!(app.session.tool_id(), "selection", "the valid pick restores the previous tool"); + assert!(app.ui.trace_ignore_sampler.is_none()); + assert!(app.session.tool_options_of("eyedropper")["imageTraceIgnoreColor"].is_null()); + assert_eq!(app.session.paint, paint); + assert_eq!(app.session.active().unwrap().doc, document, "Preview off keeps the accepted color in the draft"); + click_control(&mut app, &ctx, "Trace"); + assert_eq!(settings(&app)["params"]["ignoreColor"], "#255395", "the next valid source pixel completes the same armed pick"); + } +} + #[test] fn stale_target_click_is_consumed_before_the_restored_tool_can_select_or_paint() { for invalidation in ["selection", "document", "revision_round_trip"] { @@ -366,7 +433,7 @@ fn pixel_at(image: &vectorcraft_render::Rendered, key: &CacheKey, point: Point) } #[test] -fn actual_canvas_shows_original_while_armed_then_restores_the_stored_view() { +fn actual_canvas_keeps_its_displayed_view_while_the_original_pixels_are_sampled() { let (mut app, ctx) = fixture(true, [37, 83, 149], false); let point = source_point(&app, 0.25); let control = source_point(&app, 0.75); @@ -383,39 +450,34 @@ fn actual_canvas_shows_original_while_armed_then_restores_the_stored_view() { blob.sample_object(f64::from(image.width) * 0.25, f64::from(image.height) * 0.5, (image.width, image.height), 1), Some([37, 83, 149, 255]) ); - let source_hash = blob.content_key(); let stored = settings(&app); let (before, before_key) = capture_canvas(&mut app, &ctx); assert_eq!(pixel_at(&before, &before_key, point), [0, 0, 0, 255]); assert_eq!(pixel_at(&before, &before_key, control), [255; 4]); click_control(&mut app, &ctx, SAMPLE_TIP); let (armed, armed_key) = capture_canvas(&mut app, &ctx); - assert!(!ctx.input(|i| i.pointer.any_down()), "the source remains visible after releasing the button"); - assert_eq!(armed_key.trace_source.as_deref().map(Vec::as_slice), Some([target].as_slice())); - assert_eq!(pixel_at(&armed, &armed_key, point), [37, 83, 149, 255]); + assert!(!ctx.input(|i| i.pointer.any_down()), "the button press has ended"); + assert_eq!(armed_key.trace_source, before_key.trace_source, "arming does not override the existing eye hold or trace View"); + assert_eq!(armed.pixels, before.pixels, "sampling original pixels does not change the displayed tracing result"); + assert_eq!(pixel_at(&armed, &armed_key, point), [0, 0, 0, 255]); assert_eq!(pixel_at(&armed, &armed_key, control), [255; 4]); - app.select_tool("selection"); + press_armed_canvas(&mut app, &ctx, point); + assert_eq!(app.session.tool_id(), "selection"); let (restored, restored_key) = capture_canvas(&mut app, &ctx); assert!(restored_key.trace_source.is_none()); - assert_eq!(restored.pixels, before.pixels, "the exact stored result returns"); + assert_eq!(restored.pixels, before.pixels, "the valid Preview-off pick leaves the displayed result unchanged"); + assert_eq!(settings(&app), stored, "the stored View and trace settings are unchanged"); let state = app.session.active().unwrap(); assert_eq!((state.uid, state.revision), (uid, revision)); assert_eq!(state.doc, document); assert_eq!(state.selection, selection); assert_eq!((state.history.undo.len(), state.history.redo.len()), history); - if let Some(dir) = std::env::var_os("VECTORCRAFT_TRACE_SAMPLER_EVIDENCE") { - let dir = std::path::PathBuf::from(dir); - std::fs::create_dir_all(&dir).unwrap(); - for (name, image) in [("before.png", &before), ("armed.png", &armed), ("restored.png", &restored)] { - std::fs::write(dir.join(name), image.to_png().unwrap()).unwrap(); - } - let binding = json!({"doc": uid, "target": target.0, "revision": revision, "storedTrace": stored, "sourceContentKey": source_hash, - "point": [point.x,point.y], "controlPoint": [control.x,control.y], "width": before.width, "height": before.height, - "before": pixel_at(&before,&before_key,point), "armed": pixel_at(&armed,&armed_key,point), "restored": pixel_at(&restored,&restored_key,point), - "sourceIdsWhileArmed": [target.0], "undoRedoLengths": [history.0,history.1], "documentUnchanged": true, - "view": {"zoom":before_key.zoom,"center":[before_key.cx,before_key.cy],"rotation":before_key.rot,"pixelsPerPoint":before_key.ppp}}); - std::fs::write(dir.join("binding.json"), serde_json::to_vec_pretty(&binding).unwrap()).unwrap(); - } + click_control(&mut app, &ctx, "Trace"); + assert_eq!( + settings(&app)["params"]["ignoreColor"], + "#255395", + "the source color is sampled while the canvas still shows its black tracing result" + ); } /// Cancelling while Cmd/Ctrl borrows Selection also clears the parked eyedropper's one-shot. diff --git a/docs/roadmap.md b/docs/roadmap.md index 9373b1f499..18f8f29d4e 100644 --- a/docs/roadmap.md +++ b/docs/roadmap.md @@ -1,6 +1,6 @@ # Roadmap: milestones and what's next -> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-17 · **Change:** minor (PDF import: translucent type filled and stroked comes in as a filled type object and a stroked one, as the file composites them, and an upright glyph is never kept as the outline of its glyph alone, #8015; PDF import: type filled and stroked by one text-showing operator comes in as one type object, filled and stroked, not a stroked copy over a filled one, #8015; M1: Layers panel Alt-drag shows the copy cursor, #8217; scores and estimates unchanged; previously: Gradient panel: the add-stop strip shows the white arrow with a plus on Windows and X11, #8241; scores and estimates unchanged; previously: Recolor Artwork follow-up (#8031, remaining #4028): native Lab input, picker swatch libraries and Assign-row menus; UI interaction regression coverage; scores and estimates unchanged; previously: #8005: the Color spectrum fills a resized panel; scores and estimates unchanged; previously: M7: Check Spelling modal dialog (Edit › Spelling › Check Spelling…), #4936; spell check complete; previously: PDF import: stroked type keeps the line cap, line join and miter limit the file strokes it with, a glyph stroked otherwise than the run it joins coming in as a run of its own, #7741; M10/G5: Neon & Glow built-in graphic style library (Cyan Neon, Magenta Laser, Amber Tube, Electric Lime, Pulse Violet, Cobalt Phosphor); previously: Tech Circuit brush library, G5; previously: Graphic Styles list fills a taller panel, #2992; scores and estimates unchanged; previously: PDF import: glyphs in a span with an empty ActualText come in as outlines, #6971; scores and estimates unchanged; previously: library panels' lists fill a taller panel, #2992; scores and estimates unchanged; previously: Swatches list fills a taller panel, #1638; scores and estimates unchanged; previously: icon-strip flyouts also resize from the top edge and the canvas-side top corner, keeping the moved top in workspaces (storytold/craft-libs#1094); scores and estimates unchanged; previously: #6865: explicitly requested oversized editing artboard; Live Paint Bucket fills faces crossed in one drag (#6373); previously: #6404: transform-aware Eyedropper character copying; scores and estimates unchanged; previously: M10/G5: Energy Beams brush library; MCP docs list Energy Beams; previously minor: M10/G5: Skill Icons symbol library; MCP docs list Skill Icons; previously minor: M10/G5: Status Effects graphic style library; MCP docs catch-up for symbol libraries; previously minor: M10/G5: Inventory Icons built-in symbol library; previously minor: Edit › Edit Custom Dictionary…: its dialog adds, deletes and changes the custom dictionary's words, #4936; previously minor: M10/G5: Game HUD graphic style library; previously minor: resizable icon-strip flyouts and bottom-aligned panel footers, #5713; previously minor: M10/G5: Map Markers built-in symbol library; previously minor: right-click on type: Spelling › Auto Spell Check, with its check mark, #4936; previously minor: right-click on a word Auto Spell Check underlined: its suggestions, Ignore All and Add to Dictionary, #4936; previously minor: G2: Effect Gallery thumbnails and in-dialog preview are in; Auto Spell Check: `edit.autoSpellCheck` underlines the unknown words, #4936; previously minor: PDF editable import preserves authored ActualText once, including empty/nested spans and authored ordering (#6165); cross-line/style layout remains approximate; scores and estimates unchanged; PDF marked-text export (#6309): compatible glyphs stay on one layout line with per-glyph offsets; scores and estimates unchanged; interim macOS cursor delivery, #2292; native validation pending; scores and estimates unchanged; Control bar › Snapping includes the existing Snap to Glyph and Alignment Guides toggles (#6164); scores and estimates unchanged; custom dictionary and Ignore All: `text.spelling.addWord`, `removeWord`, `changeWord`, `dictionary` and `ignoreAll`, #4936; previously minor: EPS import: embedded fonts (composite, Type 42, CID-keyed, Type 1, CFF FontSet) draw their glyphs; spell check engine: `text.spelling.check` and `text.spelling.suggest` on craft-proof, #4936; previously minor: floating tab groups collapse into the side icon rail and opened rail panels fold back into it, #5925 in part; M4/M7: `.ai`/EPS type keeps its tab stops, and right-aligned lines with tabs lay out as the file's page, #6147; M4/M7: `.ai`/EPS type from the text document lays its lines out closer to the file's page, within limits, #6137; numeric fields step on wheel hover without taking keyboard focus, #5949; Character Styles panel: a double-click on a style's row opens its Character Style Options; the dialog keeps a fixed width and scrolls its sections, so its buttons stay on screen; Selection QoL: marquee modes and visible feedback, #5313; SVG CSS classes survive export and repeated import in all four styling modes (#2480); current-main integration retains event attributes and scripts; #3380 deletion-only review follow-up: independent survivors keep gradient placement, owned subpaths avoid discarded copies, and contracts/status/evidence are clarified; endpoint highlighting remains open; scores and estimates unchanged; Indian-language hyphenation review and license allowlist, #4947; Hindi catalog and contributor loanword preferences; full wording review in progress; Effect dialogs: a colour swatch beside a hex colour opens the Color Picker, #5365; shape tools move the selection from its centre point and turn it from the zone outside a box corner, #5477; scores and estimates unchanged) · **Target:** Adobe Illustrator 2026 (30.x) +> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-17 · **Change:** minor (Image Trace Ignore Color keeps the canvas View and stays armed on a missed pixel (#8068); PDF import: translucent type filled and stroked comes in as a filled type object and a stroked one, as the file composites them, and an upright glyph is never kept as the outline of its glyph alone, #8015; PDF import: type filled and stroked by one text-showing operator comes in as one type object, filled and stroked, not a stroked copy over a filled one, #8015; M1: Layers panel Alt-drag shows the copy cursor, #8217; scores and estimates unchanged; previously: Gradient panel: the add-stop strip shows the white arrow with a plus on Windows and X11, #8241; scores and estimates unchanged; previously: Recolor Artwork follow-up (#8031, remaining #4028): native Lab input, picker swatch libraries and Assign-row menus; UI interaction regression coverage; scores and estimates unchanged; previously: #8005: the Color spectrum fills a resized panel; scores and estimates unchanged; previously: M7: Check Spelling modal dialog (Edit › Spelling › Check Spelling…), #4936; spell check complete; previously: PDF import: stroked type keeps the line cap, line join and miter limit the file strokes it with, a glyph stroked otherwise than the run it joins coming in as a run of its own, #7741; M10/G5: Neon & Glow built-in graphic style library (Cyan Neon, Magenta Laser, Amber Tube, Electric Lime, Pulse Violet, Cobalt Phosphor); previously: Tech Circuit brush library, G5; previously: Graphic Styles list fills a taller panel, #2992; scores and estimates unchanged; previously: PDF import: glyphs in a span with an empty ActualText come in as outlines, #6971; scores and estimates unchanged; previously: library panels' lists fill a taller panel, #2992; scores and estimates unchanged; previously: Swatches list fills a taller panel, #1638; scores and estimates unchanged; previously: icon-strip flyouts also resize from the top edge and the canvas-side top corner, keeping the moved top in workspaces (storytold/craft-libs#1094); scores and estimates unchanged; previously: #6865: explicitly requested oversized editing artboard; Live Paint Bucket fills faces crossed in one drag (#6373); previously: #6404: transform-aware Eyedropper character copying; scores and estimates unchanged; previously: M10/G5: Energy Beams brush library; MCP docs list Energy Beams; previously minor: M10/G5: Skill Icons symbol library; MCP docs list Skill Icons; previously minor: M10/G5: Status Effects graphic style library; MCP docs catch-up for symbol libraries; previously minor: M10/G5: Inventory Icons built-in symbol library; previously minor: Edit › Edit Custom Dictionary…: its dialog adds, deletes and changes the custom dictionary's words, #4936; previously minor: M10/G5: Game HUD graphic style library; previously minor: resizable icon-strip flyouts and bottom-aligned panel footers, #5713; previously minor: M10/G5: Map Markers built-in symbol library; previously minor: right-click on type: Spelling › Auto Spell Check, with its check mark, #4936; previously minor: right-click on a word Auto Spell Check underlined: its suggestions, Ignore All and Add to Dictionary, #4936; previously minor: G2: Effect Gallery thumbnails and in-dialog preview are in; Auto Spell Check: `edit.autoSpellCheck` underlines the unknown words, #4936; previously minor: PDF editable import preserves authored ActualText once, including empty/nested spans and authored ordering (#6165); cross-line/style layout remains approximate; scores and estimates unchanged; PDF marked-text export (#6309): compatible glyphs stay on one layout line with per-glyph offsets; scores and estimates unchanged; interim macOS cursor delivery, #2292; native validation pending; scores and estimates unchanged; Control bar › Snapping includes the existing Snap to Glyph and Alignment Guides toggles (#6164); scores and estimates unchanged; custom dictionary and Ignore All: `text.spelling.addWord`, `removeWord`, `changeWord`, `dictionary` and `ignoreAll`, #4936; previously minor: EPS import: embedded fonts (composite, Type 42, CID-keyed, Type 1, CFF FontSet) draw their glyphs; spell check engine: `text.spelling.check` and `text.spelling.suggest` on craft-proof, #4936; previously minor: floating tab groups collapse into the side icon rail and opened rail panels fold back into it, #5925 in part; M4/M7: `.ai`/EPS type keeps its tab stops, and right-aligned lines with tabs lay out as the file's page, #6147; M4/M7: `.ai`/EPS type from the text document lays its lines out closer to the file's page, within limits, #6137; numeric fields step on wheel hover without taking keyboard focus, #5949; Character Styles panel: a double-click on a style's row opens its Character Style Options; the dialog keeps a fixed width and scrolls its sections, so its buttons stay on screen; Selection QoL: marquee modes and visible feedback, #5313; SVG CSS classes survive export and repeated import in all four styling modes (#2480); current-main integration retains event attributes and scripts; #3380 deletion-only review follow-up: independent survivors keep gradient placement, owned subpaths avoid discarded copies, and contracts/status/evidence are clarified; endpoint highlighting remains open; scores and estimates unchanged; Indian-language hyphenation review and license allowlist, #4947; Hindi catalog and contributor loanword preferences; full wording review in progress; Effect dialogs: a colour swatch beside a hex colour opens the Color Picker, #5365; shape tools move the selection from its centre point and turn it from the zone outside a box corner, #5477; scores and estimates unchanged) · **Target:** Adobe Illustrator 2026 (30.x) > > Oversized artboard import update (2026-11-12): Explicit editing-data import retains a single artboard beyond a capped 14,400 pt PDF page (#6865). > @@ -168,7 +168,7 @@ Gujarati interface follow-up (2026-11-14): the catalog and zero/one plural rule | M9 | Live effects (+ 3D & Materials) | 🟡 2D effects done incl. Effect → Pathfinder, Color Adjustments and Document Raster Effects Settings; PDF export warns when the pixel cap lowers raster-effect resolution; Artistic › Colored Pencil, Cutout, Dry Brush, Film Grain, Fresco, Neon Glow, Paint Daubs, Palette Knife, Poster Edges, Rough Pastels, Smudge Stick, Sponge, Underpainting and Watercolor and Sketch › Halftone Pattern, Bas Relief, Charcoal, Conté Crayon, Photocopy, Stamp, Torn Edges and Water Paper done (57/57 Photoshop filters); Revolve with automatic smooth vector shading, default-on circular caps and continuous rims, Extrude & Bevel, Inflate and Rotate with one to ten colored directional lights and four original lighting presets; SVG Filters, remaining raster effects and 3D materials and shadows pending | 81–130 | | M10 | Brushes, symbols, patterns, Repeat | 🟡 pattern swatches (5 tile types, Pattern Options, editing mode, SVG ``/PDF export) and live Repeat (radial/grid/mirror) done; interactive selected mirror axis implemented (focused and native checks passed; full CI blocked by an unrelated text test); symbol libraries done (Window › Symbol Libraries, six generated libraries (Basic Shapes, UI Frames, Map Markers, Inventory Icons, Skill Icons, Weather Icons), User Defined, Other Library…, Save Symbols); brush libraries done (Window › Brush Libraries, ten generated libraries including Tech Circuit, Ink and Wash, Bristle Brushes and Dry Media, User Defined, Other Library…, Save Brushes); symbol editing shows draggable 9-slice guides (#5280), with guides outside the artwork still unsupported; brushes/symbols in progress | 23–37 | | M11 | Artboards & views (selected-set deletion shared by Artboards menu, trash and Properties, retaining artboard 1 when all are selected; Artboard deletion keys keep the first of an all-selected set and protect artwork; history prunes invalid indices while preserving valid multiselection (history tests and full workspace CI pass); click-to-fit objects with the Artboard tool (#1227), artboard escape routing and document setup modal handoff done; artboard panel/tool with Move Artwork for X/Y fields and Artboard Options, Trim View, middle-button pan, print tiling and the status bar's artboard navigator with synchronized Artboard tool selection done; Window › Arrange › Tile and Consolidate All Windows done; multiple windows, presentation polish) (cached canvas reprojection preserves scale during resize, rotation and DPI changes; regression-tested and contributor-confirmed 2026-10-19; estimates unchanged) (cached canvas dimensions match the renderer limit before cache-key creation, view construction and worker submission; regression-tested; estimates unchanged); status-bar pointer coordinates follow the active ruler origin and General units | 🟡; Artboard Options shares existing presets and orientation controls and can fit artwork without moving it; artwork fitting includes all drawn document art across artboards and off-board; artwork bounds are cached by active document and revision, and selection uses the shared bounds cache across artboards | 15–25 | -| M12 | Advanced color & art (CMYK/ICC, separations, Gradient Mesh, Live Paint, Image Trace, Graphs) | 🟡 Gradient Mesh, Live Paint, Image Trace (junction-returning pieces retain their positioned boundaries; a simpler contour walk with identical output; an edge's sub-pixel shift is the same from either side; notches read only their own piece; collapsed loops keep few segments; large images trace with a warning; Auto Color keeps rare distinct colours; quick presets trace at once and the Image Trace button opens the adjustment controls; Properties reopens them; tiny fitted contours retain islands and holes; Create Strokes: exact crop EDT, Guo–Hall thinning and maximal-disc graph simplification; 15 presets, the 14 documented ones each with an enhanced version; Ignore Color, Shapes, Auto Grouping and Gradients options; measured in `image-trace-quality.md`; closed outlines retain their interior after straightening; the Flat Logo mode places edges to a fraction of a pixel, restores sharp corners, snaps lines and circles, and refuses gradients; live trace result bounds and selection highlights exclude the retained bitmap except in source-image views), Recolor Artwork, colour management (ICC, soft proofing, separations preview), Graphs (all 9 tools, Graph Data/Type, group-selected series colours persist through regenerate/save/open) done; Graph Design and Marker designs, Transpose and Switch x/y, `\|` label line breaks, the pie options, drop shadows, the legend across the top, overlapping widths, First Row/Column in Front, filled lines, kept label formatting and the Graph Data worksheet done; graph Column designs pending; Vector Halftone Preview keeps the selection box without drawing dot selection marks (#6369); Live Paint Bucket fills faces crossed in one drag (#6373) | 6–10 | +| M12 | Advanced color & art (CMYK/ICC, separations, Gradient Mesh, Live Paint, Image Trace, Graphs) | 🟡 Gradient Mesh, Live Paint, Image Trace (junction-returning pieces retain their positioned boundaries; a simpler contour walk with identical output; an edge's sub-pixel shift is the same from either side; notches read only their own piece; collapsed loops keep few segments; large images trace with a warning; Auto Color keeps rare distinct colours; quick presets trace at once and the Image Trace button opens the adjustment controls; Properties reopens them; tiny fitted contours retain islands and holes; Create Strokes: exact crop EDT, Guo–Hall thinning and maximal-disc graph simplification; 15 presets, the 14 documented ones each with an enhanced version; Ignore Color (manual picker and canvas eyedropper from original pixels, no canvas View change, missed pixels keep the pick armed, Preview/Undo retained; #8068), Shapes, Auto Grouping and Gradients options; measured in `image-trace-quality.md`; closed outlines retain their interior after straightening; the Flat Logo mode places edges to a fraction of a pixel, restores sharp corners, snaps lines and circles, and refuses gradients; live trace result bounds and selection highlights exclude the retained bitmap except in source-image views), Recolor Artwork, colour management (ICC, soft proofing, separations preview), Graphs (all 9 tools, Graph Data/Type, group-selected series colours persist through regenerate/save/open) done; Graph Design and Marker designs, Transpose and Switch x/y, `\|` label line breaks, the pie options, drop shadows, the legend across the top, overlapping widths, First Row/Column in Front, filled lines, kept label formatting and the Graph Data worksheet done; graph Column designs pending; Vector Halftone Preview keeps the selection box without drawing dot selection marks (#6369); Live Paint Bucket fills faces crossed in one drag (#6373) | 6–10 | | M13 | Automation (Actions ✅ record/playback, persisted; variables, scripting, batch) | 🟡 MCP `add_text` exposes existing vertical point, area and path type; `script.run` and File › Scripts › Other Script… run JavaScript files, and Window › Script Console shows their output; the script document model and batch work remain | 18–27 | | M14 | 1.0 polish (preferences, shortcut editor, workspaces, accessibility, packaging for all OSes) (status messages and readouts use stable responsive allocations sized for localized labels and ordinary coordinates; sample widths cached by language/unit/DPI; regression-tested and contributor-confirmed 2026-10-19; estimates unchanged) | 🟡 Icon-strip flyouts resize on their free edges and retain sizes (#5713); interim macOS cursor delivery (#2292) uses existing artwork and host-owned AppKit cursors; headless coverage only, native menu/focus/handback and display validation pending. Dock groups collapse to their tabs by a double-click on a tab (UI.8); Preferences › General › Constrain Angle acts for the arrow keys, Shift drags and new objects (#394, 2026-10-21); numeric-field pointer selection and focus regression-tested (#1326; a release more than 1 pt from the press keeps the caret, a tap within 1 pt selects all, #6659); RPM runtime capabilities and glibc floor checked (#1275; real-distro install/start-up pending), Eyedropper cursor with precise-setting checks (#1269), Preferences, shortcut editor (chords with Shift and a punctuation key fire as typed; other apps' text shortcut sets imported), workspaces (each keeps its layout changes until Reset , UI.7), Window › Help Bar shown or hidden apart from the status bar and kept in saved workspaces, panels docked by dragging into any dock group (as tabs or a top/bottom split) or into the icon column, and closed from a dock tab's context menu (UI.6), a custom title bar on Windows/Linux with a Home button, content-sized dialogs, menus that scroll when longer than the window and macOS native menu dismissal done (M14.8), and native macOS save sheets with a Format menu (#866); titled PDF exports set `DisplayDocTitle` for viewers and accessibility checkers (#3646); accessibility and broader Windows/Linux packaging/QA pending; floating tab groups collapse into the side icon rail and opened rail panels fold back into it (#5925, in part), with pointer and native-window regression coverage; estimates unchanged; numeric spinner arrows keep repeating while held with the mouse (#6307); Swatches item context menus tested in all five views and rendered layouts inspected; Linux full CI passed, Windows engine baseline limitations documented (G12) | 18–28 | | — | Interaction fidelity pass (every tool's modifiers, Properties panel per context, isolation, nuance; width-point creation and adjoining adjustment regression-tested; dialog layout reviewed) | ⬜ (new ruler-guide Alt orientation implemented; existing-guide Escape cancellation regression-tested; broader pass remains) | 60–90 | @@ -212,6 +212,7 @@ not take the artwork yet. Overflow-menu drag remains separate. Scores and hours | Date | Change | Summary | |---|---|---| +| 2026-11-17 | minor | Image Trace Ignore Color: sample original source pixels without changing the canvas View; outside and transparent misses keep the pick armed, while valid picks and cancellation retain the existing tool and Preview behavior (#8068). Scores, gaps and hours unchanged. | | 2026-11-17 | minor | PDF import (#8015 follow-up): type filled and stroked at less than full opacity is no longer joined into one type object, since the file composites the fill and the stroke apiece, darker where they overlap, while one object's opacity applies to both together; it stays a filled object and a stroked one, as a fill and stroke at different opacities already did. An upright glyph (vertical type) filled and stroked is no longer kept as an outline for a line that comes in as its outlines, as glyphs filled only weren't, so such a line can't lose them. The #8015 entries now say what is left: translucent type filled and stroked, and a `TJ` whose kerning starts a new line part way through, still come in as two objects. Tests: `translucent_fill_and_stroke_text_stays_two_objects`, `a_vertical_line_with_one_glyph_filled_and_stroked_keeps_every_glyph_filled`; scores and estimates unchanged. | | 2026-11-16 | minor | PDF import: fill and stroke rendering (text rendering modes 2 and 6) draws all the glyphs of a text-showing operator (`Tj`, `TJ`, `'`, `"`) filled, then the same glyphs stroked, so a word shown at once came in as two type objects: a stroke-only copy over a fill-only one. Each stroke is now matched, in order, to the glyph filled with the same placement (where, how large, how wide, slanted and turned) in the same font with the same text on the line, and only that glyph takes the stroke, so the word comes in as one type object, filled and stroked; glyphs stroked with another join part way through still split into runs of their own, and stroked type over no filled glyph (modes 1 and 5) stays stroke only (#8015; `a_word_filled_then_stroked_imports_as_one_filled_and_stroked_type` in `crates/pdf/src/tests/textstroke.rs`, `a_vertical_column_filled_then_stroked_is_one_filled_and_stroked_type` in `crates/pdf/src/tests/text_placement.rs`). Scores and estimates unchanged. | | 2026-11-16 | minor | M1: rows or the selected-art square dragged over the Layers panel's list show the copy cursor while Alt is held, as the drop then copies, and the grabbing hand otherwise (#8217). Scores and estimates unchanged. | diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index 12c9a707d1..76fd58b282 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -1,6 +1,6 @@ # Parity with Adobe Illustrator -> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-17 · **Change:** minor (PDF import: translucent type filled and stroked comes in as a filled type object and a stroked one, as the file composites them, and an upright glyph is never kept as the outline of its glyph alone, #8015; PDF import: type filled and stroked by one text-showing operator comes in as one type object, filled and stroked, not a stroked copy over a filled one, #8015; Layers panel: Alt over the list shows the copy cursor while rows or the selection square are dragged, #8217; scores and estimates unchanged; previously: Gradient panel: the add-stop strip under the ramp shows the white arrow with a plus on Windows and X11, #8241; scores and estimates unchanged; previously: Properties panel: the Character section shows the font of the Type tool's selection, not the first run's (#8189); scores and estimates unchanged; previously: Recolor Artwork follow-up (#8031, remaining #4028): native Lab input, picker swatch libraries and Assign-row menus; UI interaction regression coverage; scores and estimates unchanged; previously: #8005: the Color spectrum fills a resized panel; scores and estimates unchanged; previously: Paragraph composers (#4935): the Paragraph panel menu and paragraph styles offer four composers, the Middle Eastern & South Asian Single-line and Every-line (how all type is set, and the default) and a Standard Single-line and Every-line that set Indic, Arabic and Hebrew type glyph by glyph as the font maps it, for legacy fonts that keep a script on Latin character codes; PDF import: stroked type keeps the line cap, line join and miter limit the file strokes it with, a glyph stroked otherwise than the run it joins coming in as a run of its own, #7741; G5: Neon & Glow joins built-in graphic style libraries (Cyan Neon, Magenta Laser, Amber Tube, Electric Lime, Pulse Violet, Cobalt Phosphor); scores and estimates unchanged; previously: Pencil ignores Smart Guides and Snap to Point and shows no Smart Guides, #7252; previously: Pencil continuation, straight-line and closing cursors; scores and estimates unchanged; previously: G5: Weather Icons joins built-in symbol libraries (Sun, Moon, Cloud, Rain, Thunder, Snow); scores and estimates unchanged; previously: a closed Pencil stroke closes with a straight segment; previously: Snap to Point with Smart Guides off draws no Smart Guides labels or lines, #7250; previously: 3D: the seams of Extrude & Bevel, Inflate and Rotate under a white light, and of the faces of Extrude & Bevel (Classic), Revolve (Classic) and Rotate (Classic), went from miter to round joins, so white-light 3D output is expected to differ from the 2026-10-17 comparison at facet corners (not measured: the scenes were not exported again); previously: `.ai` and EPS import: in layers that don't draw as the page, art that differs away from an envelope of type no longer costs it its editable type; it keeps its drawn art where, in the pixels it and its drawn art ink, the layers with it differ from the page more than its own check allows, or past the envelopes' share of the page check, #7141; Character panel: the Set Font Height Reference dropdown shows an icon before each reference, #6304; scores and estimates unchanged; previously: Envelopes: a top object's side whose pieces are all one curve split at anchors follows that curve's parameter, so a top object saved with its sides' curves in pieces draws as its `.ai` drawn art, #7097; scores and estimates unchanged; previously: Graphic Styles list fills a taller panel, #2992; scores and estimates unchanged; previously: PDF import: glyphs in a span with an empty ActualText come in as outlines, #6971; scores and estimates unchanged; previously: library panels' lists fill a taller panel, #2992; scores and estimates unchanged; previously: Swatches list fills a taller panel, #1638; scores and estimates unchanged; previously minor: Object › Rasterize with the Grayscale or Bitmap colour model makes a grayscale image, #6969; scores and estimates unchanged; previously minor: `.ai` and EPS import: type in an envelope with Distort Appearance is also tried mapped from the box of what it paints, miter tips and moved strokes included, after its glyphs grown by half its strokes' weight (#6824; #6617: Swatches panel menu: Show Recent Colors; scores unchanged; previously minor: icon-strip flyouts also resize from the top edge and the canvas-side top corner, keeping the moved top in workspaces (storytold/craft-libs#1094); scores and estimates unchanged; previously: #6865: explicitly requested oversized editing artboard; macOS: the canvas cursor stays after the pointer moves, #6362; scores and estimates unchanged; previously minor: Type tool: kerning at a caret at the start of a line moves the character after it, #5111; scores and estimates unchanged; previously minor: Rulers: the zero point dragged out of the rulers' corner snaps as a drawn point does; previously minor: Live Paint Bucket fills faces crossed in one drag (#6373); previously: #6404: transform-aware Eyedropper character copying; scores and estimates unchanged; previously: Envelopes: with Distort Appearance, type's strokes paint along the bent glyph outlines at their own weight, as users' `.ai` files draw them, which changes how VectorCraft's own envelopes of stroked type draw (#6644; scores and estimates unchanged); previously minor: G5: Energy Beams brush library; bundled content ~44% → ~46%; previously minor: G5: Skill Icons symbol library; bundled content ~42% → ~44%; previously minor: `.ai` and EPS import: an envelope saved in Edit Contents whose mesh lies away from its drawn art by a move opens live on that art (#6570; scores and estimates unchanged); previously minor: ruler double-click adds a guide at the pointer, #5239; G5: Status Effects graphic style library; bundled content ~40% → ~42%; MCP symbol libraries list UI Frames and Map Markers; previously minor: G5: Inventory Icons built-in symbol library; bundled content ~38% → ~40%; previously minor: `.ai` and EPS import: stroked type in an envelope maps from its glyphs grown by half its stroke (#3179; scores and estimates unchanged); previously minor: `.ai` and EPS import: warps of type open as mesh envelopes on their saved grid where VectorCraft's warp doesn't draw as their drawn art (#3179; scores and estimates unchanged); G5: Game Trails brush library; bundled content ~36% → ~38%; previously minor: Edit › Edit Custom Dictionary…: its dialog adds, deletes and changes the custom dictionary's words, #4936; previously minor: `.ai` and EPS import: envelopes of type open live where they draw as their drawn art and the layers with them draw as the page (#3179; scores and estimates unchanged); G5: Game HUD graphic style library; bundled content ~34% → ~36%; previously minor: Line Arrow arrowhead (#5421; scores and estimates unchanged); G5: Map Markers built-in symbol library; bundled content ~32% → ~34%; previously minor: right-click on type: Spelling › Auto Spell Check, with its check mark, #4936; previously minor: right-click on a word Auto Spell Check underlined: its suggestions, Ignore All and Add to Dictionary, #4936; previously minor: Canvas: a 3D effect changed on type or a group redraws where its solid was; Fit to Artwork Bounds and per-artboard SVG export build each solid once for all artboards; previously minor: Effect Gallery: a thumbnail for each filter and a preview area inside the dialog, on an original drawing; Raster effects 52% → 55%, hours 1–2 → none; headline numbers unchanged; Auto Spell Check: `edit.autoSpellCheck` underlines the unknown words, #4936; previously minor: PDF editable import preserves authored ActualText once, including empty/nested spans and authored ordering (#6165); cross-line/style layout remains approximate; scores and estimates unchanged; PDF marked-text export (#6309): compatible glyphs stay on one layout line with per-glyph offsets; scores and estimates unchanged; G5: UI Frames built-in symbol library with default 9-slice; bundled content ~32%; previously minor: G5: dynamic symbol part on-canvas opacity/blend/gradient/pattern; strokes remaining no longer lists Overlap/auto corners; symbols ~88%; previously minor: interim macOS cursor delivery, #2292; native validation pending; scores and estimates unchanged; previously minor: harakat paint fallback clarified; previously minor: current Guides feature-area rows consolidated using existing ruler evidence; scores and estimates unchanged; previously minor: Control bar › Snapping includes the existing Snap to Glyph and Alignment Guides toggles (#6164); scores and estimates unchanged; previously minor: G5 docs: Art brush Overlap and Pattern brush auto corners removed from strokes remaining; symbols remaining lists dynamic on-canvas beyond solid and guides outside the art; previously minor: custom dictionary and Ignore All: `text.spelling.addWord`, `removeWord`, `changeWord`, `dictionary` and `ignoreAll`, #4936; previously minor: EPS import: embedded fonts (composite, Type 42, CID-keyed, Type 1, CFF FontSet) draw their glyphs; spell check engine: `text.spelling.check` and `text.spelling.suggest` on craft-proof, #4936; previously minor: floating tab groups collapse into the side icon rail and opened rail panels fold back into it, #5925 in part; `.ai`/EPS type keeps its tab stops, and right-aligned lines with tabs lay out as the file's page, #6147; `.ai`/EPS type from the text document lays its lines out closer to the file's page, within limits, #6137; `.ai` and EPS import: older Art brush objects read; numeric fields step on wheel hover without taking keyboard focus, and a panel wheel turn cannot seed a canvas zoom glide, #5949; Character Styles panel: a double-click on a style's row opens its Character Style Options; the dialog keeps a fixed width and scrolls its sections, so its buttons stay on screen; Tools stays beside the canvas with left-side panels; new gradients follow document color mode; Selection QoL: marquee modes and visible feedback, #5313; SVG CSS classes survive export and repeated import in all four styling modes (#2480); current-main integration retains event attributes and scripts; #3380 deletion-only review follow-up: independent survivors keep gradient placement, owned subpaths avoid discarded copies, and contracts/status/evidence are clarified; endpoint highlighting remains open; scores and estimates unchanged; the canvas keeps selection outlines and anchors between frames; Indian-language hyphenation review and license allowlist, #4947; Stroke gradients: an arrowhead aligned to the tip is painted to the corners of its base, #5964; Drop Shadow and glow dialogs: spinner arrows, #5367, #5368; Stroke Weight Up and Down shortcuts, #5797; Hindi catalog and contributor loanword preferences; full wording review in progress; Properties in Edit Artboards: a Transform section with the reference point above the Artboards section, #5219; the Control bar's Stroke: and Opacity: links scrub their fields, #4088; an image zoomed in on is separated, colorized or proofed only where it shows (#4155); a document's first frame renders on the render worker, so opening a heavy file no longer freezes the window, #4155; Control bar Paragraph section with type selected, #5372; translating unchanged type reuses its glyph and character-stroke outlines; scores and estimates unchanged) · **Target:** Adobe Illustrator 2026 (30.x; public release notes through 30.7, August 2026; Units › East Asian Type acts, with Q and Ha units; scores unchanged) +> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-17 · **Change:** minor (Image Trace Ignore Color keeps the canvas View and stays armed on a missed pixel (#8068); PDF import: translucent type filled and stroked comes in as a filled type object and a stroked one, as the file composites them, and an upright glyph is never kept as the outline of its glyph alone, #8015; PDF import: type filled and stroked by one text-showing operator comes in as one type object, filled and stroked, not a stroked copy over a filled one, #8015; Layers panel: Alt over the list shows the copy cursor while rows or the selection square are dragged, #8217; scores and estimates unchanged; previously: Gradient panel: the add-stop strip under the ramp shows the white arrow with a plus on Windows and X11, #8241; scores and estimates unchanged; previously: Properties panel: the Character section shows the font of the Type tool's selection, not the first run's (#8189); scores and estimates unchanged; previously: Recolor Artwork follow-up (#8031, remaining #4028): native Lab input, picker swatch libraries and Assign-row menus; UI interaction regression coverage; scores and estimates unchanged; previously: #8005: the Color spectrum fills a resized panel; scores and estimates unchanged; previously: Paragraph composers (#4935): the Paragraph panel menu and paragraph styles offer four composers, the Middle Eastern & South Asian Single-line and Every-line (how all type is set, and the default) and a Standard Single-line and Every-line that set Indic, Arabic and Hebrew type glyph by glyph as the font maps it, for legacy fonts that keep a script on Latin character codes; PDF import: stroked type keeps the line cap, line join and miter limit the file strokes it with, a glyph stroked otherwise than the run it joins coming in as a run of its own, #7741; G5: Neon & Glow joins built-in graphic style libraries (Cyan Neon, Magenta Laser, Amber Tube, Electric Lime, Pulse Violet, Cobalt Phosphor); scores and estimates unchanged; previously: Pencil ignores Smart Guides and Snap to Point and shows no Smart Guides, #7252; previously: Pencil continuation, straight-line and closing cursors; scores and estimates unchanged; previously: G5: Weather Icons joins built-in symbol libraries (Sun, Moon, Cloud, Rain, Thunder, Snow); scores and estimates unchanged; previously: a closed Pencil stroke closes with a straight segment; previously: Snap to Point with Smart Guides off draws no Smart Guides labels or lines, #7250; previously: 3D: the seams of Extrude & Bevel, Inflate and Rotate under a white light, and of the faces of Extrude & Bevel (Classic), Revolve (Classic) and Rotate (Classic), went from miter to round joins, so white-light 3D output is expected to differ from the 2026-10-17 comparison at facet corners (not measured: the scenes were not exported again); previously: `.ai` and EPS import: in layers that don't draw as the page, art that differs away from an envelope of type no longer costs it its editable type; it keeps its drawn art where, in the pixels it and its drawn art ink, the layers with it differ from the page more than its own check allows, or past the envelopes' share of the page check, #7141; Character panel: the Set Font Height Reference dropdown shows an icon before each reference, #6304; scores and estimates unchanged; previously: Envelopes: a top object's side whose pieces are all one curve split at anchors follows that curve's parameter, so a top object saved with its sides' curves in pieces draws as its `.ai` drawn art, #7097; scores and estimates unchanged; previously: Graphic Styles list fills a taller panel, #2992; scores and estimates unchanged; previously: PDF import: glyphs in a span with an empty ActualText come in as outlines, #6971; scores and estimates unchanged; previously: library panels' lists fill a taller panel, #2992; scores and estimates unchanged; previously: Swatches list fills a taller panel, #1638; scores and estimates unchanged; previously minor: Object › Rasterize with the Grayscale or Bitmap colour model makes a grayscale image, #6969; scores and estimates unchanged; previously minor: `.ai` and EPS import: type in an envelope with Distort Appearance is also tried mapped from the box of what it paints, miter tips and moved strokes included, after its glyphs grown by half its strokes' weight (#6824; #6617: Swatches panel menu: Show Recent Colors; scores unchanged; previously minor: icon-strip flyouts also resize from the top edge and the canvas-side top corner, keeping the moved top in workspaces (storytold/craft-libs#1094); scores and estimates unchanged; previously: #6865: explicitly requested oversized editing artboard; macOS: the canvas cursor stays after the pointer moves, #6362; scores and estimates unchanged; previously minor: Type tool: kerning at a caret at the start of a line moves the character after it, #5111; scores and estimates unchanged; previously minor: Rulers: the zero point dragged out of the rulers' corner snaps as a drawn point does; previously minor: Live Paint Bucket fills faces crossed in one drag (#6373); previously: #6404: transform-aware Eyedropper character copying; scores and estimates unchanged; previously: Envelopes: with Distort Appearance, type's strokes paint along the bent glyph outlines at their own weight, as users' `.ai` files draw them, which changes how VectorCraft's own envelopes of stroked type draw (#6644; scores and estimates unchanged); previously minor: G5: Energy Beams brush library; bundled content ~44% → ~46%; previously minor: G5: Skill Icons symbol library; bundled content ~42% → ~44%; previously minor: `.ai` and EPS import: an envelope saved in Edit Contents whose mesh lies away from its drawn art by a move opens live on that art (#6570; scores and estimates unchanged); previously minor: ruler double-click adds a guide at the pointer, #5239; G5: Status Effects graphic style library; bundled content ~40% → ~42%; MCP symbol libraries list UI Frames and Map Markers; previously minor: G5: Inventory Icons built-in symbol library; bundled content ~38% → ~40%; previously minor: `.ai` and EPS import: stroked type in an envelope maps from its glyphs grown by half its stroke (#3179; scores and estimates unchanged); previously minor: `.ai` and EPS import: warps of type open as mesh envelopes on their saved grid where VectorCraft's warp doesn't draw as their drawn art (#3179; scores and estimates unchanged); G5: Game Trails brush library; bundled content ~36% → ~38%; previously minor: Edit › Edit Custom Dictionary…: its dialog adds, deletes and changes the custom dictionary's words, #4936; previously minor: `.ai` and EPS import: envelopes of type open live where they draw as their drawn art and the layers with them draw as the page (#3179; scores and estimates unchanged); G5: Game HUD graphic style library; bundled content ~34% → ~36%; previously minor: Line Arrow arrowhead (#5421; scores and estimates unchanged); G5: Map Markers built-in symbol library; bundled content ~32% → ~34%; previously minor: right-click on type: Spelling › Auto Spell Check, with its check mark, #4936; previously minor: right-click on a word Auto Spell Check underlined: its suggestions, Ignore All and Add to Dictionary, #4936; previously minor: Canvas: a 3D effect changed on type or a group redraws where its solid was; Fit to Artwork Bounds and per-artboard SVG export build each solid once for all artboards; previously minor: Effect Gallery: a thumbnail for each filter and a preview area inside the dialog, on an original drawing; Raster effects 52% → 55%, hours 1–2 → none; headline numbers unchanged; Auto Spell Check: `edit.autoSpellCheck` underlines the unknown words, #4936; previously minor: PDF editable import preserves authored ActualText once, including empty/nested spans and authored ordering (#6165); cross-line/style layout remains approximate; scores and estimates unchanged; PDF marked-text export (#6309): compatible glyphs stay on one layout line with per-glyph offsets; scores and estimates unchanged; G5: UI Frames built-in symbol library with default 9-slice; bundled content ~32%; previously minor: G5: dynamic symbol part on-canvas opacity/blend/gradient/pattern; strokes remaining no longer lists Overlap/auto corners; symbols ~88%; previously minor: interim macOS cursor delivery, #2292; native validation pending; scores and estimates unchanged; previously minor: harakat paint fallback clarified; previously minor: current Guides feature-area rows consolidated using existing ruler evidence; scores and estimates unchanged; previously minor: Control bar › Snapping includes the existing Snap to Glyph and Alignment Guides toggles (#6164); scores and estimates unchanged; previously minor: G5 docs: Art brush Overlap and Pattern brush auto corners removed from strokes remaining; symbols remaining lists dynamic on-canvas beyond solid and guides outside the art; previously minor: custom dictionary and Ignore All: `text.spelling.addWord`, `removeWord`, `changeWord`, `dictionary` and `ignoreAll`, #4936; previously minor: EPS import: embedded fonts (composite, Type 42, CID-keyed, Type 1, CFF FontSet) draw their glyphs; spell check engine: `text.spelling.check` and `text.spelling.suggest` on craft-proof, #4936; previously minor: floating tab groups collapse into the side icon rail and opened rail panels fold back into it, #5925 in part; `.ai`/EPS type keeps its tab stops, and right-aligned lines with tabs lay out as the file's page, #6147; `.ai`/EPS type from the text document lays its lines out closer to the file's page, within limits, #6137; `.ai` and EPS import: older Art brush objects read; numeric fields step on wheel hover without taking keyboard focus, and a panel wheel turn cannot seed a canvas zoom glide, #5949; Character Styles panel: a double-click on a style's row opens its Character Style Options; the dialog keeps a fixed width and scrolls its sections, so its buttons stay on screen; Tools stays beside the canvas with left-side panels; new gradients follow document color mode; Selection QoL: marquee modes and visible feedback, #5313; SVG CSS classes survive export and repeated import in all four styling modes (#2480); current-main integration retains event attributes and scripts; #3380 deletion-only review follow-up: independent survivors keep gradient placement, owned subpaths avoid discarded copies, and contracts/status/evidence are clarified; endpoint highlighting remains open; scores and estimates unchanged; the canvas keeps selection outlines and anchors between frames; Indian-language hyphenation review and license allowlist, #4947; Stroke gradients: an arrowhead aligned to the tip is painted to the corners of its base, #5964; Drop Shadow and glow dialogs: spinner arrows, #5367, #5368; Stroke Weight Up and Down shortcuts, #5797; Hindi catalog and contributor loanword preferences; full wording review in progress; Properties in Edit Artboards: a Transform section with the reference point above the Artboards section, #5219; the Control bar's Stroke: and Opacity: links scrub their fields, #4088; an image zoomed in on is separated, colorized or proofed only where it shows (#4155); a document's first frame renders on the render worker, so opening a heavy file no longer freezes the window, #4155; Control bar Paragraph section with type selected, #5372; translating unchanged type reuses its glyph and character-stroke outlines; scores and estimates unchanged) · **Target:** Adobe Illustrator 2026 (30.x; public release notes through 30.7, August 2026; Units › East Asian Type acts, with Q and Ha units; scores unchanged) > > Tech Circuit update (2026-11-14): three original procedural brushes; ten built-in brush libraries (G5). > @@ -261,7 +261,7 @@ dominate; 3D, graphs and automation are specialist). They sum to 105. Feature de | Symbols, blends, envelopes, Repeat, perspective | 5 | 88% | remaining: dynamic symbols' `.ai` round trip, further built-in symbol libraries (Basic Shapes, UI Frames with default 9-slice, Map Markers, Inventory Icons, Skill Icons and Weather Icons are done), envelope Anti-Alias/Preserve Shape, 9-slice guides outside the art; Symbol Options › Registration, Export Type (Graphic / Movie Clip) and 9-slice guides (drawn and draggable during symbol editing, #5280) and Symbol Type (dynamic on-canvas fill/stroke including gradient/pattern, opacity and blend, #4938) are done | 4–7 | estimated; Blend panel Type and Ramp control step easing with a separate color Shift (#2539); Blend Options retains spacing and orientation; polynomial curves are original approximations; interactive selected mirror axis implemented; bounding-box handles take priority over the axis line (focused regression and native checks passed; full CI blocked by an unrelated text test); #2544 spine Anchor Point conversion and picking regression-tested | | Type advanced (CJK, spelling, Touch Type, Retype) | 4 | 50% | CJK vertical composition (ruby, mojikumi), tab leaders, Touch Type, Retype | 20–28 | estimated; upright fallback for fullwidth `!` / `?` regression-tested; score and hours unchanged | | Symbols, blends, envelopes, Repeat, perspective | 5 | 88% | remaining: dynamic symbols' `.ai` round trip, further built-in symbol libraries (Basic Shapes, UI Frames with default 9-slice, Map Markers, Inventory Icons, Skill Icons and Weather Icons are done), envelope Anti-Alias/Preserve Shape, 9-slice guides outside the art; Symbol Options › Registration, Export Type (Graphic / Movie Clip) and 9-slice guides (drawn and draggable during symbol editing, #5280) and Symbol Type (dynamic on-canvas fill/stroke including gradient/pattern, opacity and blend, #4938) are done | 4–7 | estimated; Blend panel Type and Ramp control step easing with a separate color Shift (#2539); Blend Options retains spacing and orientation; polynomial curves are original approximations; interactive selected mirror axis implemented; bounding-box handles take priority over the axis line (focused regression and native checks passed; full CI blocked by an unrelated text test); #2544 spine Anchor Point conversion and picking regression-tested | -| Image Trace, graphs, image tools | 3 | 75% | graph Column designs, Image Trace Create Strokes depth (Create Object Mosaic is done; junction-returning piece survival has source-generated regressions in `image-trace-quality.md`; simpler contour walk, identical output; an edge's sub-pixel shift is the same from either side; notches read only their own piece; collapsed loops keep few segments, so Paths is monotone on the code-drawn sweep) | 5–8 | estimated (raised from 72%); quick presets reveal adjustment controls, Properties reopens them; Live trace result bounds and selection highlights exclude the retained bitmap except in source-image views (scores/hours unchanged) | +| Image Trace, graphs, image tools | 3 | 75% | graph Column designs, Image Trace Create Strokes depth (Create Object Mosaic is done; junction-returning piece survival has source-generated regressions in `image-trace-quality.md`; simpler contour walk, identical output; an edge's sub-pixel shift is the same from either side; notches read only their own piece; collapsed loops keep few segments, so Paths is monotone on the code-drawn sweep) | 5–8 | estimated (raised from 72%); quick presets reveal adjustment controls, Properties reopens them; Live trace result bounds and selection highlights exclude the retained bitmap except in source-image views (scores/hours unchanged); Ignore Color canvas sampling reads the original pixels without changing View, keeps a missed pick armed, and retains the manual picker and Preview controls (#8068; scores, gaps and hours unchanged) | | Live vector effects | 5 | 85% | Outline Object, SVG Filters | 4–8 | measured count 49/50 (Pathfinder 13/13 with Trap), depth estimated; Warp Options controls verified by focused checks and original-image review | | 3D and Materials (and Turntable) | 4 | ~25% | live Revolve with automatic smooth vector shading and default-on continuous circular caps, Extrude & Bevel (twist, taper, caps, five bevel shapes), Inflate and Rotate with Position presets (colored Inflate uses smooth membrane lighting; white-light Inflate retains its existing shading; Extrude & Bevel and Rotate retain planar shading; one to ten colored lights, shared neutral ambient, original lighting presets, painter visibility), Revolve (Classic) with Angle, Cap, Offset and the Plastic, Diffuse, No Shading and Wireframe surfaces, the Quick Actions › Expand as Wireframes command (#6354), the Render Settings › Wireframe mode on Extrude & Bevel, Revolve, Inflate and Rotate; materials, shadows, ray tracing, the rest of 3D Classic (Map Art), Turntable views, textures, map art and shading in 3D export | 30–55 | estimated (Extrude & Bevel, Inflate and Rotate added 2026-10-12); Revolve (Classic) is covered by the `revolve::classic` tests and `dialogs::revolve::tests::classic_revolve_shows_its_options_and_applies_as_one_step`; Expand as Wireframes is covered by `crates/effects/src/solids/wireframe/tests.rs` and `crates/engine/src/cmd/wireframe/tests.rs`, and Render Settings › Wireframe by `crates/effects/src/solids/wireframe/tests.rs` and `crates/ui-egui/src/panels/tests_three_d.rs` (score, gaps and hours unchanged); every 3D seam has round joins (2026-11-12, [three-d.md](three-d.md#seams)), score, gaps and hours unchanged | | Type advanced (CJK, spelling, Touch Type, Retype) | 4 | 50% | CJK vertical composition (mojikumi), variable font axes, tab leaders, Touch Type, Retype | 20–28 | estimated; No Break keeps marked characters on one line; upright fallback for fullwidth `!` / `?` regression-tested; score and hours unchanged | @@ -1613,6 +1613,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur Pattern editing mode and opacity mask editing exclude each other, by a rule of VectorCraft itself: in pattern editing mode a click or Alt-click on the mask thumbnail does not edit the mask, and Make Mask is off for one object; while a mask is edited, Object › Pattern › Make and Edit Pattern are off. Disable, Enable, Unlink and Link Opacity Mask and Opacity Mask Options (`transparency.setOpacityMask`) record no undo step when every mask they act on already has the flags they set. - **Linked opacity masks follow geometry effects, the Free Transform distort and envelopes:** when masked art moves, a linked opacity mask moves with it and an unlinked one stays in place ([Transparency and blending modes](https://helpx.adobe.com/illustrator/using/transparency-blending-modes-alt.html)). Applying that rule when art is reshaped, as below, is VectorCraft's own rule. When a group's or layer's geometry effects (Transform, Free Distort, the Warp effects and the others) reshape its members, the linked masks of the paths, compound paths and groups inside it take the same effects, nested and inverted masks included, with the type and live objects in a mask's art outlined first. Each Transform copy of a masked path carries its own mask. An image or symbol instance that a group's Transform effect moves carries its linked mask too, and with Scale Strokes & Effects on, the mask's strokes scale as a path's mask's do. With Transform Objects off, a member's mask takes the effect's stroke and pattern changes as the member does. The linked masks in the art of a symbol instance in perspective are projected with that art. A Free Transform tool distort drag (`object.distort`) warps a linked mask with its object, in a group too, in the same undo step. An envelope bends only a linked mask. When a mask can't take an effect as the art it masks does (a path in either would pass the geometry budget, the mask would get fewer Transform copies, the mask's art holds an image or symbol instance and the effect is not Transform, a Warp effect would bend an image that has a linked mask, or the effect is a live-effect plug-in that paints its pieces), the art and its masks keep their shape under that effect. The copies of a masked path count the art of its mask against the budget. Existing documents draw differently in four cases: a geometry effect on a group whose members have linked masks moves those masks; an envelope no longer bends an unlinked mask; art with linked masks keeps its shape under an effect that its masks can't take; and a Transform effect can make fewer copies of a masked path near the budget (effects `group::tests::a_groups_geometry_effects_reshape_a_members_linked_mask_with_it`, `group::tests::a_groups_geometry_effects_reshape_nested_and_inverted_masks`, `group::tests::a_compound_paths_and_a_layers_members_masks_take_the_effects`, `group::tests::a_groups_effects_reshape_a_live_object_in_a_members_mask`, `group::tests::each_transform_copy_of_a_masked_member_carries_its_mask`, `group::tests::a_groups_transform_moves_an_image_members_linked_mask`, `group::tests::a_groups_transform_moves_a_symbol_instance_members_linked_mask`, `group::tests::a_groups_transform_moves_a_linked_mask_whose_art_is_an_image`, `group::tests::art_whose_mask_holds_an_image_keeps_its_shape_under_a_warp`, `group::tests::art_with_a_masked_image_keeps_its_shape_under_a_warp`, `group::tests::a_transform_with_scale_strokes_scales_the_masks_of_images_and_paths_alike`, `group::tests::a_transform_of_strokes_only_scales_a_members_mask_strokes`, `group::tests::perspective_projects_the_masks_in_a_symbols_art`, `group::tests::a_mask_whose_art_passes_the_budget_stays_whole`, `group::tests::art_whose_mask_would_take_fewer_copies_keeps_its_shape`, `group::tests::transform_copies_count_the_art_of_their_masks`, `group::tests::the_mask_of_a_masks_art_copied_whole_counts_against_the_budget`; engine `xform::distort_command_warps_a_linked_opacity_mask_with_its_object`, `xform::distort_command_warps_the_linked_mask_of_a_path_in_a_group`, `envelope_distort::an_envelope_bends_a_linked_opacity_mask_and_leaves_an_unlinked_one`, `plugins::a_painted_group_effect_leaves_art_with_a_linked_mask_as_it_is`). Scores and hours unchanged. +- **Image Trace, Ignore Color canvas sampling (#8068):** the panel eyedropper reads the selected placed image or the retained original image of a live trace without changing the canvas View. Outside and transparent pixels leave it armed; a valid pixel restores the previous tool. The manual picker, Preview-off drafts and Preview-on single-step retrace remain available. `tests/image_trace_ignore_sampler.rs` covers original-pixel sampling, the unchanged CPU canvas, missed-pick continuation, Preview/Undo, Escape, explicit tool choices, stale document/target/revision presses and cancellation while Selection borrows the Eyedropper; the restored lender is no longer armed. This is UI interaction evidence, not algorithm parity; scores, gaps and hours unchanged. - **Image Trace, thin closed outlines:** generated `fit::snap_area_tests` verify nonzero interiors after straightening, opposite closed-boundary winding and Noise controls; see [quality notes](image-trace-quality.md#thin-closed-outlines-with-snap-curves-to-lines). Scores and hours unchanged; open-piece fitting is unchanged. - **Image Trace, curve fitting tolerance:** the outline fitter keeps cutting a run while a point stays farther than the tolerance from its curve, so a run of fewer than six points or one cut 14 times no longer keeps a piece over the tolerance. Pieces already within the tolerance do not change, and noisy art can get more anchors. Tests: `logo::bezier::tests`, `logo::outline::tests`. Scores and hours unchanged. - **Image Trace, gray photos:** Color and Grayscale smooth a gray photo within its tones before choosing its colors, as they do a color photo. A picture with at least 95% of its opaque pixels within 8 levels across their channels counts as continuous tone when 8 colors leave an error of more than 6 levels and more than 0.065 of the error of one color, instead of 0.1, unless 16 colors leave at most a tenth of the error of 8 (VectorCraft's own values). That exception keeps gray flat art of up to 16 clean levels on its old route; anti-aliased or noisy gray flat art can now count as continuous tone too. Most gray photos the change reaches, and very noisy gray scans of flat art, trace with fewer specks and fewer staircase edges. Some 16 Colors and High Fidelity Photo palettes of gray photos grow toward the requested count, with more anchors and regions. Some gray illustrations and sketches get more anchors and staircase edges at 16 Colors and High Fidelity Photo, and some 6 Colors traces get more staircase edges. Tests: `tests::a_gray_photo_is_continuous_tone_as_its_color_original_is`, `tests::a_gray_photo_is_smoothed_before_it_is_traced`. Scores and hours unchanged. @@ -2776,6 +2777,7 @@ Edit › Copy and Cut put the selected ruler guides on the clipboard, with the s | Date | Change | Summary | |---|---|---| +| 2026-11-17 | minor | Image Trace Ignore Color: sample original source pixels without changing the canvas View; outside and transparent misses keep the pick armed, while valid picks and cancellation retain the existing tool and Preview behavior (#8068). Scores, gaps and hours unchanged. | | 2026-11-16 | minor | Layers panel: rows or the selected-art square dragged over the list show the copy cursor while Alt is held, as the drop then copies, and the grabbing hand otherwise (#8217). Scores and estimates unchanged. | | 2026-11-16 | minor | Gradient panel: the strip under the ramp, where a click adds a stop, shows the white arrow with a plus on Windows and X11, where the system copy cursor showed as the plain arrow (#8241). Scores and estimates unchanged. | | 2026-11-16 | minor | Properties panel: while the Type tool edits text, the Character section shows the font family and style and the Variable Font button of the first selected character (or of the character before the caret), not those of the text object's first run (#8189). Evidence: `panels::properties::tests::character_section_shows_the_type_tool_selections_style`. Scores and estimates unchanged. | diff --git a/docs/ui-parity.md b/docs/ui-parity.md index 9c7ad9e16f..21f8e6d45d 100644 --- a/docs/ui-parity.md +++ b/docs/ui-parity.md @@ -1,6 +1,6 @@ # UI and interaction parity -> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-16 · **Change:** minor (Layers panel: Alt over the list shows the copy cursor while rows or the selected-art square are dragged, #8217; scores and estimates unchanged; previously: Gradient panel: the add-stop strip under the ramp shows the white arrow with a plus on Windows and X11, #8241; scores and estimates unchanged; previously: Recolor Artwork follow-up (#8031, remaining #4028): native Lab input, picker swatch libraries and Assign-row menus; UI interaction regression coverage; scores and estimates unchanged; previously: #8005: the Color spectrum fills a resized panel; scores and estimates unchanged; previously: Pencil continuation, straight-line and closing cursors; scores and estimates unchanged; previously: Graphic Styles list fills a taller panel, #2992; scores and estimates unchanged; previously: library panels' lists fill a taller panel, #2992; scores and estimates unchanged; previously: Swatches list fills a taller panel, #1638; scores and estimates unchanged; previously: icon-strip flyouts also resize from the top edge and the canvas-side top corner, keeping the moved top in workspaces (storytold/craft-libs#1094); scores and estimates unchanged; previously: macOS: the canvas cursor stays after the pointer moves, #6362; scores and estimates unchanged; previously minor: Remove Background in the Contextual Task Bar, Properties › Quick Actions and the Control bar; previously minor: Ruler origin: the corner drag snaps as a drawn point does; previously minor: Live Paint Bucket fills faces crossed in one drag (#6373); previously: #6404: transform-aware Eyedropper character copying; scores and estimates unchanged; previously: Outline view: images and gradient meshes are picked on what Outline draws, so a click inside them reaches the path behind, #6437; previously minor: a middle-click on a document tab closes it, #6506; previously minor: Blob Brush: a round tip's preview is the outline of the area it adds, round at both ends, as the stroke it commits (#4343); scores and estimates unchanged; previously:; ruler double-click adds a guide at the pointer, #5239; G5: Inventory Icons built-in symbol library (four built-ins); previously minor: files that record no units open in Preferences › Units › General, #5820; previously minor: interim macOS cursor delivery, #2292; native validation pending; scores and estimates unchanged; Control bar › Snapping includes the existing Snap to Glyph and Alignment Guides toggles (#6164); scores and estimates unchanged; floating tab groups collapse into the side icon rail and opened rail panels fold back into it, #5925 in part; numeric fields step on wheel hover without taking keyboard focus, #5949; Character Styles panel: a double-click on a style's row opens its Character Style Options; the dialog keeps a fixed width and scrolls its sections, so its buttons stay on screen; Selection QoL: marquee modes and visible feedback, #5313; #3380 deletion-only review follow-up: independent survivors keep gradient placement, owned subpaths avoid discarded copies, and contracts/status/evidence are clarified; endpoint highlighting remains open; scores and estimates unchanged; Drop Shadow and glow dialogs: spinner arrows, #5367, #5368; Stroke Weight Up and Down shortcuts, #5797; Layers: Rename (`ui.rename`) opens the name field of the selected layer, group or object, #5324; Properties in Edit Artboards: Transform section above the Artboards section, #5219; scrubby labels: the Control bar's Stroke: and Opacity: links and the Properties panel's Stroke link scrub their fields, #4088; Properties: Quick Actions has Repeat Options for one selected repeat, #5181; Direct Selection: Shift-click picks several blend spine points, which drag together, #5285; Direct Selection: Cmd/Ctrl held lends the Selection tool and shows its bounding box, #3901; Join tool trims two crossing open paths and joins them at the crossing, #5844; Control bar: Paragraph: link and Align left/center/right while type is selected, #5372; shape tools: a press on the selection's centre point moves it and one in the rotate zone outside a box corner turns it, #5477; scores and estimates unchanged) · **Target:** Adobe Illustrator 2026 (30.x; Units › East Asian Type acts, with Q and Ha units; scores unchanged) +> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-17 · **Change:** minor (Image Trace Ignore Color keeps the canvas View and stays armed on a missed pixel (#8068); Layers panel: Alt over the list shows the copy cursor while rows or the selected-art square are dragged, #8217; scores and estimates unchanged; previously: Gradient panel: the add-stop strip under the ramp shows the white arrow with a plus on Windows and X11, #8241; scores and estimates unchanged; previously: Recolor Artwork follow-up (#8031, remaining #4028): native Lab input, picker swatch libraries and Assign-row menus; UI interaction regression coverage; scores and estimates unchanged; previously: #8005: the Color spectrum fills a resized panel; scores and estimates unchanged; previously: Pencil continuation, straight-line and closing cursors; scores and estimates unchanged; previously: Graphic Styles list fills a taller panel, #2992; scores and estimates unchanged; previously: library panels' lists fill a taller panel, #2992; scores and estimates unchanged; previously: Swatches list fills a taller panel, #1638; scores and estimates unchanged; previously: icon-strip flyouts also resize from the top edge and the canvas-side top corner, keeping the moved top in workspaces (storytold/craft-libs#1094); scores and estimates unchanged; previously: macOS: the canvas cursor stays after the pointer moves, #6362; scores and estimates unchanged; previously minor: Remove Background in the Contextual Task Bar, Properties › Quick Actions and the Control bar; previously minor: Ruler origin: the corner drag snaps as a drawn point does; previously minor: Live Paint Bucket fills faces crossed in one drag (#6373); previously: #6404: transform-aware Eyedropper character copying; scores and estimates unchanged; previously: Outline view: images and gradient meshes are picked on what Outline draws, so a click inside them reaches the path behind, #6437; previously minor: a middle-click on a document tab closes it, #6506; previously minor: Blob Brush: a round tip's preview is the outline of the area it adds, round at both ends, as the stroke it commits (#4343); scores and estimates unchanged; previously:; ruler double-click adds a guide at the pointer, #5239; G5: Inventory Icons built-in symbol library (four built-ins); previously minor: files that record no units open in Preferences › Units › General, #5820; previously minor: interim macOS cursor delivery, #2292; native validation pending; scores and estimates unchanged; Control bar › Snapping includes the existing Snap to Glyph and Alignment Guides toggles (#6164); scores and estimates unchanged; floating tab groups collapse into the side icon rail and opened rail panels fold back into it, #5925 in part; numeric fields step on wheel hover without taking keyboard focus, #5949; Character Styles panel: a double-click on a style's row opens its Character Style Options; the dialog keeps a fixed width and scrolls its sections, so its buttons stay on screen; Selection QoL: marquee modes and visible feedback, #5313; #3380 deletion-only review follow-up: independent survivors keep gradient placement, owned subpaths avoid discarded copies, and contracts/status/evidence are clarified; endpoint highlighting remains open; scores and estimates unchanged; Drop Shadow and glow dialogs: spinner arrows, #5367, #5368; Stroke Weight Up and Down shortcuts, #5797; Layers: Rename (`ui.rename`) opens the name field of the selected layer, group or object, #5324; Properties in Edit Artboards: Transform section above the Artboards section, #5219; scrubby labels: the Control bar's Stroke: and Opacity: links and the Properties panel's Stroke link scrub their fields, #4088; Properties: Quick Actions has Repeat Options for one selected repeat, #5181; Direct Selection: Shift-click picks several blend spine points, which drag together, #5285; Direct Selection: Cmd/Ctrl held lends the Selection tool and shows its bounding box, #3901; Join tool trims two crossing open paths and joins them at the crossing, #5844; Control bar: Paragraph: link and Align left/center/right while type is selected, #5372; shape tools: a press on the selection's centre point moves it and one in the rotate zone outside a box corner turns it, #5477; scores and estimates unchanged) · **Target:** Adobe Illustrator 2026 (30.x; Units › East Asian Type acts, with Q and Ha units; scores unchanged) > > Tech Circuit update (2026-11-14): three original procedural brushes; ten built-in brush libraries (G5). > @@ -421,7 +421,7 @@ next unit in the order a right-click on a ruler lists them, from Feet back to Po | Window › Toolbars › Manage Toolbars… (also in the All Tools drawer's menu): the dialog lists the toolbars made with New Toolbar; a new name typed for the selected one renames it, + copies it (none selected: a blank toolbar) and the trash can deletes it; the changes stay in the workspace | done | #1759 in part; `window.toolbar.manage`, `window.toolbar.rename`, `window.toolbar.duplicate`, `window.toolbar.delete` | | Quick Image Trace presets trace at once and leave the panel as it was; the Image Trace button (Control bar, Properties) opens the editable controls | done | Per the public documentation, choosing a preset traces the image with it straight away, and the panel is opened with the Image Trace button in the Control panel or in Properties' Image Trace section (). The controls show Threshold, Paths, Corners and Noise with Advanced open; `panels/image_trace.rs` headless tests (`a_quick_trace_leaves_the_panel_as_it_was`, `sketch_quick_trace_reveals_all_adjustments_and_keeps_the_source` for the button's route). No algorithm parity claim. | | Image Trace panel: holding the eye button next to View down shows the selected Image Trace objects' source image on the canvas | done | Per the public documentation, the control next to View is pressed and held to compare the trace result with the source image (). On release the objects show their View again; the document, its View and the undo history are unchanged. `RenderOptions::trace_source`; `panels/image_trace.rs` headless test `holding_the_eye_button_shows_the_source_image_until_released`, render test `trace_source_draws_the_source_image_of_the_listed_objects`. The Control bar and Properties have no such button | -| Image Trace panel: Ignore Color has a canvas eyedropper beside its color picker | done | #8068. Samples original pixels of the selected placed image or the retained source of a live trace. A live trace shows its source temporarily without changing View. The existing color picker remains available. Preview off keeps a draft; Preview on retraces a live trace as one undo step. A sample, Escape or a miss restores the previous tool; changing the target cancels. Paint defaults and selection are retained. `tests/image_trace_ignore_sampler.rs`; no algorithm parity claim. | +| Image Trace panel: Ignore Color has a canvas eyedropper beside its color picker | done | #8068. Samples original pixels of the selected placed image or the retained source of a live trace without changing the displayed canvas View. The existing color picker remains available. Preview off keeps a draft; Preview on retraces a live trace as one undo step. An outside or transparent miss leaves the pick armed; a valid sample or Escape restores the previous tool, and changing the target or explicitly choosing a tool cancels. Paint defaults and selection are retained. `tests/image_trace_ignore_sampler.rs`; no algorithm parity claim. | | Live trace result bounds and selection highlights exclude the retained bitmap; source-image views retain it | done | All TraceView modes and rotated result bounds regression-covered; ordinary hidden group behavior retained | | Image Trace panel: the Preview checkbox before Trace chooses whether a setting change traces the selected Image Trace object again at once | done | Per the public documentation, Preview shows the result of the current settings and Trace traces with them (). Preview is on by default and kept with the UI preferences; Reset to Default leaves it. Off, changes wait in the panel until Trace applies them as one undo step, or until Preview is turned on again. Changes stay with the object they were made for while another object is selected, and come back when it is selected again. `imageTrace.preview {on?}`, `ui.set {imageTracePreview}`; `panels/image_trace.rs` headless tests (`with_preview_off_a_slider_change_waits_for_trace`, `turning_preview_on_traces_the_changes_that_waited`, `preview_turned_on_with_nothing_selected_traces_when_the_object_is_selected_again`, `settings_that_wait_stay_with_their_object`, `settings_that_wait_come_back_when_their_object_is_selected_again`, `settings_that_wait_are_dropped_when_their_object_changed_since`, `preview_is_kept_with_the_preferences_and_reset_to_default_leaves_it`) | | Toolbar without group labels by default, one or two columns; All Tools drawer by flyout group with shortcuts, its menu (Reset, Basic, Advanced) and Show section | done | #1751; a preference brings the labels back; `toolbar.show` sets the Fill/Stroke, Coloring, Draw Mode and Screen Mode controls | @@ -566,6 +566,7 @@ before release (#6373). [Paint faces and edges](https://helpx.adobe.com/illustra | Date | Change | Summary | |---|---|---| +| 2026-11-17 | minor | Image Trace Ignore Color: sample original source pixels without changing the canvas View; outside and transparent misses keep the pick armed, while valid picks and cancellation retain the existing tool and Preview behavior (#8068). Scores, gaps and hours unchanged. | | 2026-11-16 | minor | Image Trace: Ignore Color samples original image pixels with a canvas eyedropper, retaining the manual picker, Preview drafts, source View and Undo behavior (#8068). Scores and estimates unchanged. | | 2026-11-16 | minor | Recolor Artwork follow-up (#8031, remaining #4028): native Lab input, picker swatch libraries and Assign-row menus; UI interaction regression coverage; scores and estimates unchanged. | | 2026-11-16 | minor | Recolor Artwork › Assign: native Lab entry in the Color Picker, swatch libraries access in the picker, and row context menu options (Pick from Swatches, Limit to Library) (#4028). Scores and estimates unchanged. | From 71b3877cad0b52e88ccf41cdda210556b1a82ac9 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Tue, 17 Nov 2026 05:39:48 -0800 Subject: [PATCH 23/78] Recolor Artwork: a moved color bar keeps its color group swatch Each row now carries its place from when the rows were made, and OK rewrites the color group by those places. Dragging a color bar no longer moves a new color, or an excluded row's "keep", onto another row's swatch. --- crates/ui-egui/src/dialogs/recolor.rs | 62 ++++++++++++++++++++++++--- docs/control-protocol.md | 3 +- 2 files changed, 57 insertions(+), 8 deletions(-) diff --git a/crates/ui-egui/src/dialogs/recolor.rs b/crates/ui-egui/src/dialogs/recolor.rs index e0c01413a7..badaf9ad37 100644 --- a/crates/ui-egui/src/dialogs/recolor.rs +++ b/crates/ui-egui/src/dialogs/recolor.rs @@ -183,7 +183,8 @@ pub fn open(app: &mut VectorcraftApp, p: &Value) -> Result { None => String::new(), }; // Without art the rows are the group's colours, as they are. - let start: Vec = if art { vec![] } else { assign.iter().map(|k| json!({"from": [k], "to": k})).collect() }; + let mut start: Vec = if art { vec![] } else { assign.iter().map(|k| json!({"from": [k], "to": k})).collect() }; + number_slots(&mut start); // The Preserve checkboxes as they were last confirmed (#2960). let kept = |k: &str, default: bool| app.ui.recolor_preserve.get(k).and_then(Value::as_bool).unwrap_or(default); let fields = json!({ @@ -243,6 +244,7 @@ fn sync(app: &mut VectorcraftApp, d: &mut Dialog) { for (row, to) in rows.iter_mut().zip(assign) { row["to"] = to; } + number_slots(&mut rows); snap(app, d, &mut rows); d.fields.insert("rows".into(), Value::Array(rows)); // Find dims the preserved colors with the rows that aren't selected. @@ -630,7 +632,13 @@ fn apply_params(d: &Dialog) -> Value { let group = d.fields.get("group").and_then(Value::as_str).map(|g| { // A row made with New Row that holds no current colors gives the group no color; a color // added on the Edit tab (`added`) joins it after the others. - let took: Vec<&Value> = rs.iter().filter(|r| !no_current(r)).map(|r| if excluded(r) { &keep } else { &r["to"] }).collect(); + // Each row takes the swatch at its place when the rows were made, so a row moved among the + // color bars keeps its swatch; rows that don't all carry a place go in row order. + let mut current: Vec<&Value> = rs.iter().filter(|r| !no_current(r)).collect(); + if current.iter().all(|r| r[SLOT].is_u64()) { + current.sort_by_key(|r| r[SLOT].as_u64()); + } + let took: Vec<&Value> = current.into_iter().map(|r| if excluded(r) { &keep } else { &r["to"] }).collect(); let assign = d.fields.get("__assign").and_then(Value::as_array).filter(|_| d.bool("__art")); let rest = assign.map_or(&[][..], |a| a.get(took.len()..).unwrap_or_default()); let added = rs.iter().filter(|r| no_current(r) && is_added(r) && !excluded(r)).map(|r| &r["to"]).filter(|c| !c.is_null()); @@ -1478,9 +1486,9 @@ fn separate(rows: &mut Vec, sel: &[usize]) { Some(a) if sel.contains(&i) && a.len() > 1 => { let at = out.len(); out.extend(a.iter().map(|k| json!({"from": [k], "to": k}))); - // A separated row's marks (the base color, a marker's tie, a color it follows) go + // A separated row's marks (the base color, a marker's tie, a color it follows, its place) go // to the row of its first color. - for k in [BASE, TIE, FOLLOWS] { + for k in [BASE, TIE, FOLLOWS, SLOT] { if let Some(v) = row.get(k) { out[at][k] = v.clone(); } @@ -1623,6 +1631,16 @@ const BASE: &str = "base"; const TIE: &str = "tie"; /// A row's mark as a color added on a marker's line: the marker's `tie`, which it moves with. const FOLLOWS: &str = "follows"; +/// A row's place when the rows were made (the group swatch it took), which it keeps when it moves. +const SLOT: &str = "slot"; + +/// Give each row its place in `rows` as its [`SLOT`]. +fn number_slots(rows: &mut [Value]) { + for (i, r) in rows.iter_mut().enumerate() { + r[SLOT] = json!(i); + } +} + /// The target of the wheel's right-click menu: `{marker, line, hs}` (row indexes and the hue and /// saturation clicked). const MENU_AT: &str = "__wheelMenu"; @@ -1681,7 +1699,7 @@ fn keep_marks(before: &[Value], after: &mut [Value]) { return; } for (a, b) in after.iter_mut().zip(before) { - for k in [BASE, TIE, FOLLOWS] { + for k in [BASE, TIE, FOLLOWS, SLOT] { if a.get(k).is_none() && let Some(v) = b.get(k) { @@ -1691,11 +1709,11 @@ fn keep_marks(before: &[Value], after: &mut [Value]) { } } -/// `row` without the dialog's base, tie and follows marks. +/// `row` without the dialog's base, tie, follows and place marks. fn without_marks(row: &Value) -> Value { let mut r = row.clone(); if let Some(o) = r.as_object_mut() { - for k in [BASE, TIE, FOLLOWS] { + for k in [BASE, TIE, FOLLOWS, SLOT] { o.remove(k); } } @@ -2311,6 +2329,36 @@ mod tests { assert_ne!(hex[1], "#ff0000", "{hex:?}"); } + /// A row moved among the color bars keeps the group swatch it took when the rows were made, so + /// an excluded row's swatch stays as it is and the other swatches keep their places. + #[test] + fn a_moved_row_keeps_its_group_swatch() { + let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), Default::default()); + app.run("file.new", json!({"width": 100, "height": 100})).unwrap(); + app.run("swatch.newGroup", json!({"name": "G", "colors": ["#ff0000", "#0000ff", "#00ff00"]})).unwrap(); + app.run("ui.recolorDialog", json!({"group": "G"})).unwrap(); + let mut d = app.ui.dialog.clone().unwrap(); + let mut rs = super::rows(&d); + rs[1]["exclude"] = json!(true); + rs[2]["to"] = json!("#ffff00"); + let active = active_rows(&rs); + assert_eq!(active, [0, 2]); + // Drag the last bar (green, now yellow) above the first (red). + assert_eq!(move_bar(&mut rs, &active, 1, 0), Some(0)); + d.fields.insert("rows".into(), json!(rs)); + let colors = &apply_params(&d)["groupColors"]; + assert_eq!(colors[1], json!("keep"), "{colors}"); + confirm(&mut app, &d).unwrap(); + let g = app.session.doc().unwrap().doc.swatch_groups.iter().find(|g| g.name == "G").unwrap(); + let hex: Vec = g.swatches.iter().map(|w| w.paint.color().unwrap().to_hex()).collect(); + assert_eq!(hex, ["#ff0000", "#0000ff", "#ffff00"]); + // Rows reduced from art carry their place too, and `recolor.apply` gets none. + let mut rows = vec![json!({"from": ["rgb 255 0 0"], "to": "rgb 1 1 1"}), json!({"from": ["rgb 0 0 255"], "to": "rgb 2 2 2"})]; + number_slots(&mut rows); + assert_eq!(rows.iter().map(|r| r[SLOT].clone()).collect::>(), [json!(0), json!(1)]); + assert!(without_marks(&rows[0]).get(SLOT).is_none()); + } + #[test] fn merge_and_separate_rows() { let mut r = rows(); diff --git a/docs/control-protocol.md b/docs/control-protocol.md index 39560b36e8..40ef7099ce 100644 --- a/docs/control-protocol.md +++ b/docs/control-protocol.md @@ -290,7 +290,8 @@ luminosity}`, percent from -100 to 100, 0 by default). The dialog sends a non-ze colors; colors opened alone are saved as a group with the change. `display` sets how the Edit tab shows the new colors: `smooth` (the smooth wheel, also when unset; each opening starts there), `segmented` (a wheel of solid patches, 24 hues by 5 saturations, whose markers move as freely) or `bars` (a solid bar per recolored color in row order; a click -selects its row for the sliders and a drag moves the row without changing a color). `wheelTool` turns on a wheel tool +selects its row for the sliders and a drag moves the row without changing a color; the moved row keeps the color group +swatch it took). `wheelTool` turns on a wheel tool on either wheel: `add` (the Add Color tool) adds a click as a new color, the hue and saturation clicked at the selected color's brightness (the base color's when none is selected; the patch's color on the segmented wheel), in a new row with no current colors (`from: []`) and `added: true` that becomes the selected row; `remove` (the Remove Color tool) removes the color of the marker clicked. From 5cf1bc53b86f7400be83f77134d08705870356e9 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Tue, 17 Nov 2026 07:08:15 -0800 Subject: [PATCH 24/78] Add original Engraving brush library --- crates/engine/src/cmd/brushlib.rs | 44 +++++++++++++++++++ crates/engine/src/tests/brushlib.rs | 27 +++++++++++- crates/ui-egui/src/i18n/bg.tsv | 5 +++ crates/ui-egui/src/i18n/bs.tsv | 5 +++ crates/ui-egui/src/i18n/ca.tsv | 5 +++ crates/ui-egui/src/i18n/cs.tsv | 5 +++ crates/ui-egui/src/i18n/da.tsv | 5 +++ crates/ui-egui/src/i18n/de.tsv | 5 +++ crates/ui-egui/src/i18n/el.tsv | 5 +++ crates/ui-egui/src/i18n/es.tsv | 5 +++ crates/ui-egui/src/i18n/fi.tsv | 5 +++ crates/ui-egui/src/i18n/fr.tsv | 5 +++ crates/ui-egui/src/i18n/gu.tsv | 5 +++ crates/ui-egui/src/i18n/hi.tsv | 5 +++ crates/ui-egui/src/i18n/hu.tsv | 5 +++ crates/ui-egui/src/i18n/id.tsv | 5 +++ crates/ui-egui/src/i18n/it.tsv | 5 +++ crates/ui-egui/src/i18n/ja.tsv | 5 +++ crates/ui-egui/src/i18n/ka.tsv | 5 +++ crates/ui-egui/src/i18n/ko.tsv | 5 +++ crates/ui-egui/src/i18n/nl.tsv | 5 +++ crates/ui-egui/src/i18n/pl.tsv | 5 +++ crates/ui-egui/src/i18n/pt-br.tsv | 5 +++ crates/ui-egui/src/i18n/ru.tsv | 5 +++ crates/ui-egui/src/i18n/sv.tsv | 5 +++ crates/ui-egui/src/i18n/tests.rs | 2 +- crates/ui-egui/src/i18n/tr.tsv | 5 +++ crates/ui-egui/src/i18n/uk.tsv | 5 +++ crates/ui-egui/src/i18n/vi.tsv | 5 +++ crates/ui-egui/src/i18n/zh-hans.tsv | 5 +++ crates/ui-egui/src/i18n/zh-hant.tsv | 5 +++ .../src/panels/tests_brush_libraries.rs | 3 +- docs/gaps.md | 6 +-- docs/mcp.md | 4 +- 34 files changed, 218 insertions(+), 8 deletions(-) diff --git a/crates/engine/src/cmd/brushlib.rs b/crates/engine/src/cmd/brushlib.rs index 34becd7c02..92cf72eee4 100644 --- a/crates/engine/src/cmd/brushlib.rs +++ b/crates/engine/src/cmd/brushlib.rs @@ -179,6 +179,7 @@ pub const BUILTIN: &[BuiltinBrushLibrary] = &[ BuiltinBrushLibrary { id: "energy-beams", name: "Energy Beams", make: energy_beams }, BuiltinBrushLibrary { id: "dry-media", name: "Dry Media", make: dry_media }, BuiltinBrushLibrary { id: "tech-circuit", name: "Tech Circuit", make: tech_circuit }, + BuiltinBrushLibrary { id: "engraving", name: "Engraving", make: engraving }, ]; /// Built-in library `id`, made once. @@ -232,6 +233,49 @@ fn art(name: &str, art: Node, colorization: Colorization) -> Brush { Brush { name: name.into(), kind: BrushKind::Art(ArtBrush { art, colorization, ..Default::default() }) } } +/// Original fine-line art for an engraving-style brush library. +fn engraving() -> BrushLibrary { + let lines = |count: usize, width: f64, spacing: f64| { + group( + (0..count) + .map(|i| { + let y = (i as f64 - (count - 1) as f64 / 2.0) * spacing; + black(shapes::rectangle(Rect::new(0.0, y - width / 2.0, 100.0, y + width / 2.0))) + }) + .collect(), + ) + }; + let taper = group( + (0..5) + .map(|i| { + let y = (i as f64 - 2.0) * 2.2; + black(polygon(&[(0.0, y - 0.35), (80.0, y - 0.35), (100.0, y), (80.0, y + 0.35), (0.0, y + 0.35)])) + }) + .collect(), + ); + let broken = group( + (0..5) + .flat_map(|row| { + (0..4).map(move |segment| { + let x = segment as f64 * 25.0 + if row % 2 == 0 { 0.0 } else { 8.0 }; + let y = (row as f64 - 2.0) * 2.2; + black(shapes::rectangle(Rect::new(x, y - 0.3, (x + 16.0).min(100.0), y + 0.3))) + }) + }) + .collect(), + ); + built( + "Engraving", + Document::new(100.0, 100.0), + vec![ + art("Fine Hatching", lines(5, 0.65, 2.2), Colorization::Tints), + art("Dense Hatching", lines(9, 0.42, 1.2), Colorization::Tints), + art("Tapered Hatching", taper, Colorization::Tints), + art("Broken Hatching", broken, Colorization::Tints), + ], + ) +} + /// Art Ribbons: art brushes, 100 pt long, drawn here; Striped Ribbon is filled with the library's /// own pattern, Pinstripes. fn art_ribbons() -> BrushLibrary { diff --git a/crates/engine/src/tests/brushlib.rs b/crates/engine/src/tests/brushlib.rs index 4f0b739951..5162dc7df1 100644 --- a/crates/engine/src/tests/brushlib.rs +++ b/crates/engine/src/tests/brushlib.rs @@ -116,7 +116,8 @@ fn the_builtin_libraries_are_original_brushes_generated_in_code() { "game-trails", "energy-beams", "dry-media", - "tech-circuit" + "tech-circuit", + "engraving" ] ); assert!(libs.iter().all(|l| l["category"] == "builtIn")); @@ -218,6 +219,30 @@ fn black_stroke() -> vectorcraft_doc::StrokeLayer { vectorcraft_doc::StrokeLayer::new(vectorcraft_color::Paint::solid(vectorcraft_color::Color::BLACK), 1.0) } +#[test] +fn engraving_library_draws_fine_parallel_strokes_and_survives_save() { + let mut s = session(); + let listed = run(&mut s, "brush.libraries", json!({})); + let entry = listed["libraries"].as_array().unwrap().iter().find(|l| l["id"] == "engraving").unwrap(); + assert_eq!((entry["name"].as_str(), entry["category"].as_str(), entry["count"].as_u64()), (Some("Engraving"), Some("builtIn"), Some(4))); + let (_, lib) = cmd::brushlib::library(&s, "Engraving").unwrap(); + for b in &lib.brushes { + for length in [2.0, 200.0] { + let pieces = vectorcraft_brush::stroke_pieces(&lib.doc, b, &line_to(length), &black_stroke()); + let pts = anchors(&pieces.iter().collect::>()); + assert!(!pts.is_empty() && pts.iter().all(|p| p.x.is_finite() && p.y.is_finite()), "{} at {length} pt", b.name); + } + } + let path = run(&mut s, "shape.line", json!({"x1": 10, "y1": 20, "x2": 210, "y2": 20}))["id"].as_u64().unwrap(); + let added = run(&mut s, "brush.addFromLibrary", json!({"library": "engraving", "name": "Fine Hatching", "apply": true, "ids": [path]})); + assert_eq!(strs(&added["added"]), ["Fine Hatching"]); + assert_eq!(added["applied"], json!([path])); + let saved = run(&mut s, "brush.saveLibrary", json!({"names": ["Fine Hatching"]})); + let bytes = vectorcraft_format::base64_decode(saved["dataBase64"].as_str().unwrap()).unwrap(); + let reopened = vectorcraft_format::load(&bytes).unwrap(); + assert_eq!(vectorcraft_brush::find(&reopened, "Fine Hatching").unwrap(), lib.brushes[0]); +} + /// Original circuit art and repeat tiles survive adding, applying and saving a library. #[test] fn the_tech_circuit_library_constructs_adds_and_applies_each_brush() { diff --git a/crates/ui-egui/src/i18n/bg.tsv b/crates/ui-egui/src/i18n/bg.tsv index bb039bb08e..96b490212f 100644 --- a/crates/ui-egui/src/i18n/bg.tsv +++ b/crates/ui-egui/src/i18n/bg.tsv @@ -7237,3 +7237,8 @@ breakText Glyphs Глифи @msg A fold line is on a non-printing layer. Линия на сгъване е на слой, който не се печата. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Панели: {panels}, панти: {hinges}, грешки: {errors}, предупреждения: {warnings} @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer трябва да е "singleLine", "everyLine", "standardSingleLine" или "standardEveryLine" + Engraving Гравюра + Fine Hatching Фино щриховане + Dense Hatching Гъсто щриховане + Tapered Hatching Изтъняващо щриховане + Broken Hatching Прекъснато щриховане diff --git a/crates/ui-egui/src/i18n/bs.tsv b/crates/ui-egui/src/i18n/bs.tsv index 99f23d313c..34d1082ebe 100644 --- a/crates/ui-egui/src/i18n/bs.tsv +++ b/crates/ui-egui/src/i18n/bs.tsv @@ -7291,3 +7291,8 @@ shape Open Otvoren @msg A fold line is on a non-printing layer. Linija savijanja je na sloju koji se ne štampa. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Paneli: {panels}, šarke: {hinges}, greške: {errors}, upozorenja: {warnings} @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer mora biti "singleLine", "everyLine", "standardSingleLine" ili "standardEveryLine" + Engraving Gravura + Fine Hatching Fino šrafiranje + Dense Hatching Gusto šrafiranje + Tapered Hatching Suženo šrafiranje + Broken Hatching Isprekidano šrafiranje diff --git a/crates/ui-egui/src/i18n/ca.tsv b/crates/ui-egui/src/i18n/ca.tsv index c54311799d..9a6e17a8bc 100644 --- a/crates/ui-egui/src/i18n/ca.tsv +++ b/crates/ui-egui/src/i18n/ca.tsv @@ -8126,3 +8126,8 @@ breakText Glyphs Glifs @msg A fold line is on a non-printing layer. Una línia de plegat és en una capa que no s’imprimeix. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Panells: {panels}, frontisses: {hinges}, errors: {errors}, avisos: {warnings} @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer ha de ser "singleLine", "everyLine", "standardSingleLine" o "standardEveryLine" + Engraving Gravat + Fine Hatching Ratllat fi + Dense Hatching Ratllat dens + Tapered Hatching Ratllat afilat + Broken Hatching Ratllat interromput diff --git a/crates/ui-egui/src/i18n/cs.tsv b/crates/ui-egui/src/i18n/cs.tsv index a5d7bb948a..146f465a8a 100644 --- a/crates/ui-egui/src/i18n/cs.tsv +++ b/crates/ui-egui/src/i18n/cs.tsv @@ -9917,3 +9917,8 @@ breakText Glyphs Glyfy @msg A panel is not joined to the rest by a crease. Panel není se zbytkem spojen žádnou linií bigu. @msg A fold line is on a non-printing layer. Linie skladu je na netisknutelné vrstvě. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Panely: {panels}, panty: {hinges}, chyby: {errors}, upozornění: {warnings} + Engraving Rytina + Fine Hatching Jemné šrafování + Dense Hatching Husté šrafování + Tapered Hatching Zúžené šrafování + Broken Hatching Přerušované šrafování diff --git a/crates/ui-egui/src/i18n/da.tsv b/crates/ui-egui/src/i18n/da.tsv index 08100f593f..7b0795e26f 100644 --- a/crates/ui-egui/src/i18n/da.tsv +++ b/crates/ui-egui/src/i18n/da.tsv @@ -10025,3 +10025,8 @@ breakText Glyphs Glyffer @msg A fold line is on a non-printing layer. En foldelinje ligger på et lag, der ikke udskrives. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Paneler: {panels}, hængsler: {hinges}, fejl: {errors}, advarsler: {warnings} @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer skal være "singleLine", "everyLine", "standardSingleLine" eller "standardEveryLine" + Engraving Gravering + Fine Hatching Fin skravering + Dense Hatching Tæt skravering + Tapered Hatching Tilspidset skravering + Broken Hatching Afbrudt skravering diff --git a/crates/ui-egui/src/i18n/de.tsv b/crates/ui-egui/src/i18n/de.tsv index 10147b2d45..860946ad3d 100644 --- a/crates/ui-egui/src/i18n/de.tsv +++ b/crates/ui-egui/src/i18n/de.tsv @@ -9516,3 +9516,8 @@ breakText Glyphs Glyphen @msg A panel is not joined to the rest by a crease. Ein Feld ist durch keine Rilllinie mit den übrigen verbunden. @msg A fold line is on a non-printing layer. Eine Faltlinie liegt auf einer nicht druckbaren Ebene. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Felder: {panels}, Scharniere: {hinges}, Fehler: {errors}, Warnungen: {warnings} + Engraving Gravur + Fine Hatching Feine Schraffur + Dense Hatching Dichte Schraffur + Tapered Hatching Verjüngte Schraffur + Broken Hatching Unterbrochene Schraffur diff --git a/crates/ui-egui/src/i18n/el.tsv b/crates/ui-egui/src/i18n/el.tsv index 1ebf6e5684..b12323b0fa 100644 --- a/crates/ui-egui/src/i18n/el.tsv +++ b/crates/ui-egui/src/i18n/el.tsv @@ -8100,3 +8100,8 @@ breakText Glyphs Γλύφοι @msg A fold line is on a non-printing layer. Μια γραμμή δίπλωσης βρίσκεται σε επίπεδο που δεν εκτυπώνεται. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Πάνελ: {panels}, μεντεσέδες: {hinges}, σφάλματα: {errors}, προειδοποιήσεις: {warnings} @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" το composer πρέπει να είναι "singleLine", "everyLine", "standardSingleLine" ή "standardEveryLine" + Engraving Χαρακτική + Fine Hatching Λεπτή διαγράμμιση + Dense Hatching Πυκνή διαγράμμιση + Tapered Hatching Κωνική διαγράμμιση + Broken Hatching Διακεκομμένη διαγράμμιση diff --git a/crates/ui-egui/src/i18n/es.tsv b/crates/ui-egui/src/i18n/es.tsv index a456910a16..528986e6cf 100644 --- a/crates/ui-egui/src/i18n/es.tsv +++ b/crates/ui-egui/src/i18n/es.tsv @@ -8087,3 +8087,8 @@ breakText Glyphs Glifos @msg A fold line is on a non-printing layer. Una línea de plegado está en una capa que no se imprime. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Paneles: {panels}, bisagras: {hinges}, errores: {errors}, advertencias: {warnings} @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer debe ser "singleLine", "everyLine", "standardSingleLine" o "standardEveryLine" + Engraving Grabado + Fine Hatching Rayado fino + Dense Hatching Rayado denso + Tapered Hatching Rayado afilado + Broken Hatching Rayado discontinuo diff --git a/crates/ui-egui/src/i18n/fi.tsv b/crates/ui-egui/src/i18n/fi.tsv index bff46fc0d7..4c0a987a97 100644 --- a/crates/ui-egui/src/i18n/fi.tsv +++ b/crates/ui-egui/src/i18n/fi.tsv @@ -8183,3 +8183,8 @@ breakText Glyphs Merkit @msg A fold line is on a non-printing layer. Taittoviiva on tasolla, jota ei tulosteta. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Paneelit: {panels}, saranat: {hinges}, virheet: {errors}, varoitukset: {warnings} @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer on oltava "singleLine", "everyLine", "standardSingleLine" tai "standardEveryLine" + Engraving Kaiverrus + Fine Hatching Hieno viivoitus + Dense Hatching Tiheä viivoitus + Tapered Hatching Kapeneva viivoitus + Broken Hatching Katkoviivoitus diff --git a/crates/ui-egui/src/i18n/fr.tsv b/crates/ui-egui/src/i18n/fr.tsv index 3be3497f97..a6ae8c68a6 100644 --- a/crates/ui-egui/src/i18n/fr.tsv +++ b/crates/ui-egui/src/i18n/fr.tsv @@ -9902,3 +9902,8 @@ breakText Glyphs Glyphes @msg A fold line is on a non-printing layer. Une ligne de pliage se trouve sur un calque non imprimable. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} {panels} panneau(x), {hinges} charnière(s), {errors} erreur(s), {warnings} avertissement(s) @msg {_1} × {_2} pixels is too large for GIF (at most 65535 pixels a side): lower the resolution {_1} × {_2} pixels, c’est trop grand pour le GIF (65535 pixels par côté au plus) : réduisez la résolution + Engraving Gravure + Fine Hatching Hachures fines + Dense Hatching Hachures denses + Tapered Hatching Hachures effilées + Broken Hatching Hachures interrompues diff --git a/crates/ui-egui/src/i18n/gu.tsv b/crates/ui-egui/src/i18n/gu.tsv index c427fc527c..af9390c615 100644 --- a/crates/ui-egui/src/i18n/gu.tsv +++ b/crates/ui-egui/src/i18n/gu.tsv @@ -4987,3 +4987,8 @@ swatch [Registration] [રજિસ્ટ્રેશન] Standard Single-line Composer સ્ટાન્ડર્ડ સિંગલ-લાઇન કમ્પોઝર Standard Every-line Composer સ્ટાન્ડર્ડ એવરી-લાઇન કમ્પોઝર @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer આમાંથી એક હોવું જોઈએ: "singleLine", "everyLine", "standardSingleLine" અથવા "standardEveryLine" + Engraving કોતરણી + Fine Hatching ઝીણી રેખાઓ + Dense Hatching ગાઢ રેખાઓ + Tapered Hatching પાતળી થતી રેખાઓ + Broken Hatching તૂટક રેખાઓ diff --git a/crates/ui-egui/src/i18n/hi.tsv b/crates/ui-egui/src/i18n/hi.tsv index cbfb4f51d1..cd285cc985 100644 --- a/crates/ui-egui/src/i18n/hi.tsv +++ b/crates/ui-egui/src/i18n/hi.tsv @@ -9524,3 +9524,8 @@ theme Appearance अपीयरेंस @msg A panel is not joined to the rest by a crease. कोई पैनल किसी क्रीज़ लाइन से बाकी से जुड़ा नहीं है। @msg A fold line is on a non-printing layer. एक फ़ोल्ड लाइन नॉन-प्रिंटिंग लेयर पर है। @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} पैनल: {panels}, हिंज: {hinges}, एरर: {errors}, वॉर्निंग: {warnings} + Engraving नक्काशी + Fine Hatching बारीक रेखांकन + Dense Hatching घना रेखांकन + Tapered Hatching पतला होता रेखांकन + Broken Hatching टूटा रेखांकन diff --git a/crates/ui-egui/src/i18n/hu.tsv b/crates/ui-egui/src/i18n/hu.tsv index 0f81a72036..a792767932 100644 --- a/crates/ui-egui/src/i18n/hu.tsv +++ b/crates/ui-egui/src/i18n/hu.tsv @@ -9905,3 +9905,8 @@ breakText Glyphs Glifák @msg A panel is not joined to the rest by a crease. Egy panelt egyetlen bigvonal sem köt a többihez. @msg A fold line is on a non-printing layer. Egy hajtásvonal nem nyomtatható rétegen van. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Panelek: {panels}, zsanérok: {hinges}, hibák: {errors}, figyelmeztetések: {warnings} + Engraving Metszet + Fine Hatching Finom vonalkázás + Dense Hatching Sűrű vonalkázás + Tapered Hatching Elvékonyodó vonalkázás + Broken Hatching Szaggatott vonalkázás diff --git a/crates/ui-egui/src/i18n/id.tsv b/crates/ui-egui/src/i18n/id.tsv index 28ea2b5ab3..b21d1a3b9c 100644 --- a/crates/ui-egui/src/i18n/id.tsv +++ b/crates/ui-egui/src/i18n/id.tsv @@ -7252,3 +7252,8 @@ breakText Glyphs Glif @msg A fold line is on a non-printing layer. Sebuah garis lipat berada di lapisan yang tidak dicetak. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Panel: {panels}, engsel: {hinges}, galat: {errors}, peringatan: {warnings} @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer harus "singleLine", "everyLine", "standardSingleLine", atau "standardEveryLine" + Engraving Ukiran + Fine Hatching Arsiran halus + Dense Hatching Arsiran rapat + Tapered Hatching Arsiran meruncing + Broken Hatching Arsiran terputus diff --git a/crates/ui-egui/src/i18n/it.tsv b/crates/ui-egui/src/i18n/it.tsv index 8f2ed3216c..e7761a55ce 100644 --- a/crates/ui-egui/src/i18n/it.tsv +++ b/crates/ui-egui/src/i18n/it.tsv @@ -9550,3 +9550,8 @@ breakText Glyphs Glifi @msg A panel is not joined to the rest by a crease. Un pannello non è unito al resto da alcuna linea di cordonatura. @msg A fold line is on a non-printing layer. Una linea di piega si trova su un livello non stampabile. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Pannelli: {panels}, cerniere: {hinges}, errori: {errors}, avvisi: {warnings} + Engraving Incisione + Fine Hatching Tratteggio fine + Dense Hatching Tratteggio fitto + Tapered Hatching Tratteggio affusolato + Broken Hatching Tratteggio spezzato diff --git a/crates/ui-egui/src/i18n/ja.tsv b/crates/ui-egui/src/i18n/ja.tsv index c429f204a1..992f922672 100644 --- a/crates/ui-egui/src/i18n/ja.tsv +++ b/crates/ui-egui/src/i18n/ja.tsv @@ -9617,3 +9617,8 @@ breakText Glyphs 字形 @msg A panel is not joined to the rest by a crease. パネルがどの筋入れ線でも他とつながっていません。 @msg A fold line is on a non-printing layer. 折り線が印刷しないレイヤーにあります。 @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} パネル: {panels}、ヒンジ: {hinges}、エラー: {errors}、警告: {warnings} + Engraving 彫刻 + Fine Hatching 細いハッチング + Dense Hatching 密なハッチング + Tapered Hatching 先細りハッチング + Broken Hatching 途切れたハッチング diff --git a/crates/ui-egui/src/i18n/ka.tsv b/crates/ui-egui/src/i18n/ka.tsv index 414f45171c..df2e797f7a 100644 --- a/crates/ui-egui/src/i18n/ka.tsv +++ b/crates/ui-egui/src/i18n/ka.tsv @@ -10285,3 +10285,8 @@ font-script Japanese იაპონური @msg A fold line is on a non-printing layer. მოკეცვის ხაზი არაბეჭდვად შრეზეა. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} პანელები: {panels}, ანჯამები: {hinges}, შეცდომები: {errors}, გაფრთხილებები: {warnings} @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer უნდა იყოს "singleLine", "everyLine", "standardSingleLine" ან "standardEveryLine" + Engraving გრავიურა + Fine Hatching წვრილი შტრიხები + Dense Hatching მჭიდრო შტრიხები + Tapered Hatching შევიწროებული შტრიხები + Broken Hatching წყვეტილი შტრიხები diff --git a/crates/ui-egui/src/i18n/ko.tsv b/crates/ui-egui/src/i18n/ko.tsv index dbda53243f..7c8a841bb5 100644 --- a/crates/ui-egui/src/i18n/ko.tsv +++ b/crates/ui-egui/src/i18n/ko.tsv @@ -9514,3 +9514,8 @@ breakText Glyphs 글리프 @msg A panel is not joined to the rest by a crease. 패널이 어떤 오시선으로도 나머지와 연결되어 있지 않습니다. @msg A fold line is on a non-printing layer. 접는 선이 인쇄되지 않는 레이어에 있습니다. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} 패널: {panels}, 힌지: {hinges}, 오류: {errors}, 경고: {warnings} + Engraving 판화 + Fine Hatching 가는 해칭 + Dense Hatching 촘촘한 해칭 + Tapered Hatching 가늘어지는 해칭 + Broken Hatching 끊긴 해칭 diff --git a/crates/ui-egui/src/i18n/nl.tsv b/crates/ui-egui/src/i18n/nl.tsv index 69aef91cfc..e5eacbe535 100644 --- a/crates/ui-egui/src/i18n/nl.tsv +++ b/crates/ui-egui/src/i18n/nl.tsv @@ -9953,3 +9953,8 @@ breakText Glyphs Glyphs @msg A panel is not joined to the rest by a crease. Een paneel is door geen rillijn met de rest verbonden. @msg A fold line is on a non-printing layer. Een vouwlijn staat op een laag die niet wordt afgedrukt. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Panelen: {panels}, scharnieren: {hinges}, fouten: {errors}, waarschuwingen: {warnings} + Engraving Gravure + Fine Hatching Fijne arcering + Dense Hatching Dichte arcering + Tapered Hatching Taps toelopende arcering + Broken Hatching Onderbroken arcering diff --git a/crates/ui-egui/src/i18n/pl.tsv b/crates/ui-egui/src/i18n/pl.tsv index 0147515ffe..f18c3499e3 100644 --- a/crates/ui-egui/src/i18n/pl.tsv +++ b/crates/ui-egui/src/i18n/pl.tsv @@ -9770,3 +9770,8 @@ breakText Glyphs Glify @msg A panel is not joined to the rest by a crease. Panel nie jest połączony z resztą żadną linią bigowania. @msg A fold line is on a non-printing layer. Linia zgięcia znajduje się na warstwie niedrukowanej. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Panele: {panels}, zawiasy: {hinges}, błędy: {errors}, ostrzeżenia: {warnings} + Engraving Grawerowanie + Fine Hatching Drobne kreskowanie + Dense Hatching Gęste kreskowanie + Tapered Hatching Zwężane kreskowanie + Broken Hatching Przerywane kreskowanie diff --git a/crates/ui-egui/src/i18n/pt-br.tsv b/crates/ui-egui/src/i18n/pt-br.tsv index 8201db7ab6..953dd829a7 100644 --- a/crates/ui-egui/src/i18n/pt-br.tsv +++ b/crates/ui-egui/src/i18n/pt-br.tsv @@ -9988,3 +9988,8 @@ swatch Yellow Green Verde-amarelado @msg A panel is not joined to the rest by a crease. Um painel não está unido ao restante por nenhuma linha de vinco. @msg A fold line is on a non-printing layer. Uma linha de dobra está em uma camada não imprimível. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Painéis: {panels}, dobradiças: {hinges}, erros: {errors}, avisos: {warnings} + Engraving Gravura + Fine Hatching Hachuras finas + Dense Hatching Hachuras densas + Tapered Hatching Hachuras afiladas + Broken Hatching Hachuras interrompidas diff --git a/crates/ui-egui/src/i18n/ru.tsv b/crates/ui-egui/src/i18n/ru.tsv index d1593508d3..ecf6ab22c7 100644 --- a/crates/ui-egui/src/i18n/ru.tsv +++ b/crates/ui-egui/src/i18n/ru.tsv @@ -10011,3 +10011,8 @@ shape Open Открытый @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Панели: {panels}, шарниры: {hinges}, ошибки: {errors}, предупреждения: {warnings} @msg {w} × {h} pixels is too large for PSD (at most {MAX_SIDE} pixels a side): lower the resolution {w} × {h} пикселей — слишком большой размер для PSD (не более {MAX_SIDE} пикселей по стороне): уменьшите разрешение @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer должен быть "singleLine", "everyLine", "standardSingleLine" или "standardEveryLine" + Engraving Гравировка + Fine Hatching Тонкая штриховка + Dense Hatching Плотная штриховка + Tapered Hatching Сужающаяся штриховка + Broken Hatching Прерывистая штриховка diff --git a/crates/ui-egui/src/i18n/sv.tsv b/crates/ui-egui/src/i18n/sv.tsv index 5c0420fcd3..21bdc8009f 100644 --- a/crates/ui-egui/src/i18n/sv.tsv +++ b/crates/ui-egui/src/i18n/sv.tsv @@ -9601,3 +9601,8 @@ digits Hindi Hindi @msg A fold line is on a non-printing layer. En falslinje ligger på ett lager som inte skrivs ut. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Paneler: {panels}, gångjärn: {hinges}, fel: {errors}, varningar: {warnings} @msg {w} × {h} pixels is too large for PSD (at most {MAX_SIDE} pixels a side): lower the resolution {w} × {h} pixlar är för stort för PSD (högst {MAX_SIDE} pixlar per sida): sänk upplösningen + Engraving Gravyr + Fine Hatching Fin skraffering + Dense Hatching Tät skraffering + Tapered Hatching Avsmalnande skraffering + Broken Hatching Bruten skraffering diff --git a/crates/ui-egui/src/i18n/tests.rs b/crates/ui-egui/src/i18n/tests.rs index 97fccd9167..58349c91af 100644 --- a/crates/ui-egui/src/i18n/tests.rs +++ b/crates/ui-egui/src/i18n/tests.rs @@ -502,7 +502,7 @@ fn built_in_library_brush_names_are_in_complete_catalogs() { .collect(); names.sort(); names.dedup(); - assert_eq!(names.len(), 46, "{names:?}"); + assert_eq!(names.len(), 50, "{names:?}"); let mut bad = vec![]; for lang in LANGUAGES.iter().filter(|lang| lang.complete_menus) { let missing: Vec<&String> = names.iter().filter(|n| lang.catalog().plain(n).is_none()).collect(); diff --git a/crates/ui-egui/src/i18n/tr.tsv b/crates/ui-egui/src/i18n/tr.tsv index 910a7fc5b1..a52862681e 100644 --- a/crates/ui-egui/src/i18n/tr.tsv +++ b/crates/ui-egui/src/i18n/tr.tsv @@ -9875,3 +9875,8 @@ breakText Glyphs Glifler @msg A panel is not joined to the rest by a crease. Bir panel geri kalanlara hiçbir pilyaj çizgisiyle bağlı değil. @msg A fold line is on a non-printing layer. Bir katlama çizgisi yazdırılmayan bir katmanda. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Paneller: {panels}, menteşeler: {hinges}, hatalar: {errors}, uyarılar: {warnings} + Engraving Gravür + Fine Hatching İnce tarama + Dense Hatching Yoğun tarama + Tapered Hatching İncelen tarama + Broken Hatching Kesikli tarama diff --git a/crates/ui-egui/src/i18n/uk.tsv b/crates/ui-egui/src/i18n/uk.tsv index dbd6d2609e..d7582e114e 100644 --- a/crates/ui-egui/src/i18n/uk.tsv +++ b/crates/ui-egui/src/i18n/uk.tsv @@ -9526,3 +9526,8 @@ breakText Glyphs Гліфи @msg A panel is not joined to the rest by a crease. Панель не з’єднана з рештою жодною лінією біговки. @msg A fold line is on a non-printing layer. Лінія згину лежить на шарі, що не друкується. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Панелі: {panels}, шарніри: {hinges}, помилки: {errors}, попередження: {warnings} + Engraving Гравіювання + Fine Hatching Тонке штрихування + Dense Hatching Щільне штрихування + Tapered Hatching Звужене штрихування + Broken Hatching Переривчасте штрихування diff --git a/crates/ui-egui/src/i18n/vi.tsv b/crates/ui-egui/src/i18n/vi.tsv index 519c5d8f0d..7aa51e6b57 100644 --- a/crates/ui-egui/src/i18n/vi.tsv +++ b/crates/ui-egui/src/i18n/vi.tsv @@ -7759,3 +7759,8 @@ breakText Glyphs Glyph @msg {width} × {height} pixels is too large for Targa (at most 65535 pixels a side): lower the resolution {width} × {height} điểm ảnh quá lớn cho Targa (tối đa 65535 điểm ảnh mỗi cạnh): hãy giảm độ phân giải @msg {w} × {h} pixels is too large for PSD (at most {MAX_SIDE} pixels a side): lower the resolution {w} × {h} điểm ảnh quá lớn cho PSD (tối đa {MAX_SIDE} điểm ảnh mỗi cạnh): hãy giảm độ phân giải @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer phải là "singleLine", "everyLine", "standardSingleLine" hoặc "standardEveryLine" + Engraving Khắc nét + Fine Hatching Nét gạch mảnh + Dense Hatching Nét gạch dày + Tapered Hatching Nét gạch thuôn + Broken Hatching Nét gạch đứt diff --git a/crates/ui-egui/src/i18n/zh-hans.tsv b/crates/ui-egui/src/i18n/zh-hans.tsv index c6696a9ec6..927e2c395a 100644 --- a/crates/ui-egui/src/i18n/zh-hans.tsv +++ b/crates/ui-egui/src/i18n/zh-hans.tsv @@ -9758,3 +9758,8 @@ breakText Glyphs 字形 @msg A fold line is on a non-printing layer. 一条折线位于不打印的图层上。 @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} 面板:{panels},铰链:{hinges},错误:{errors},警告:{warnings} @msg {w} × {h} pixels is too large for PSD (at most {MAX_SIDE} pixels a side): lower the resolution {w} × {h} 像素对 PSD 而言过大 (每边最多 {MAX_SIDE} 像素):请降低分辨率 + Engraving 雕刻 + Fine Hatching 细线排线 + Dense Hatching 密集排线 + Tapered Hatching 渐细排线 + Broken Hatching 断续排线 diff --git a/crates/ui-egui/src/i18n/zh-hant.tsv b/crates/ui-egui/src/i18n/zh-hant.tsv index 1480422931..0d68f22e69 100644 --- a/crates/ui-egui/src/i18n/zh-hant.tsv +++ b/crates/ui-egui/src/i18n/zh-hant.tsv @@ -9568,3 +9568,8 @@ breakText Glyphs 字符 @msg A fold line is on a non-printing layer. 一條摺線位於不列印的圖層上。 @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} 面板:{panels},鉸鏈:{hinges},錯誤:{errors},警告:{warnings} @msg {what} would print on more than {MAX_TILES} tiles: scale it down {what} 會列印在超過 {MAX_TILES} 個拼貼上:請縮小 + Engraving 雕刻 + Fine Hatching 細線排線 + Dense Hatching 密集排線 + Tapered Hatching 漸細排線 + Broken Hatching 斷續排線 diff --git a/crates/ui-egui/src/panels/tests_brush_libraries.rs b/crates/ui-egui/src/panels/tests_brush_libraries.rs index 87fe34953f..297aee817d 100644 --- a/crates/ui-egui/src/panels/tests_brush_libraries.rs +++ b/crates/ui-egui/src/panels/tests_brush_libraries.rs @@ -201,7 +201,8 @@ fn the_window_menu_and_the_brushes_panel_open_brush_libraries() { json!("game-trails"), json!("energy-beams"), json!("dry-media"), - json!("tech-circuit") + json!("tech-circuit"), + json!("engraving") ] ); let dry = entries.iter().find(|e| under(e) && e.params["library"] == "dry-media").map(|e| e.label.as_str()); diff --git a/docs/gaps.md b/docs/gaps.md index a6f6defbb0..14b0d2cbe6 100644 --- a/docs/gaps.md +++ b/docs/gaps.md @@ -670,8 +670,8 @@ macOS cursor delivery (#2292) is narrowed to a native host adapter using the exi libraries ([public source](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/apply-and-edit-strokes/create-new-brush-libraries.html), [import](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/apply-and-edit-strokes/import-brushes-from-brush-libraries-or-other-files.html)): Window › Brush Libraries and the Brushes panel's Brush Libraries Menu open each library in a library panel of - its own (ten original libraries generated in code: Art Ribbons, Ink and Wash, Calligraphic Nibs, Bristle Brushes (one - bristle brush for each tip shape), Pattern Borders, Scatter Shapes, Game Trails, Energy Beams, Dry Media (grainy chalk, pencil, crayon and charcoal art brushes) and Tech Circuit (Circuit Trace, Bus Lines and Terminal Nodes); User Defined; Other Library… reads the brushes of any document VectorCraft opens); a + its own (eleven original libraries generated in code: Art Ribbons, Ink and Wash, Calligraphic Nibs, Bristle Brushes (one + bristle brush for each tip shape), Pattern Borders, Scatter Shapes, Game Trails, Energy Beams, Dry Media (grainy chalk, pencil, crayon and charcoal art brushes), Tech Circuit (Circuit Trace, Bus Lines and Terminal Nodes), and Engraving (Fine, Dense, Tapered and Broken Hatching); User Defined; Other Library… reads the brushes of any document VectorCraft opens); a click adds a brush to the document's Brushes with the patterns, symbols and other resources its art uses, as one undo step (applied to the selected paths in the same step), dragging one onto a path adds and applies it and @@ -693,7 +693,7 @@ macOS cursor delivery (#2292) is narrowed to a native host adapter using the exi Fine Grain, Canvas Weave, Burlap Sack, Cracked Glaze, Mosaic Floor, Quilted Squares, Leaded Glass and Damp Paper, painted with the texture effects; User Defined; Other Library…; `graphicStyle.libraries`, `graphicStyle.addFromLibrary`). -- **Missing:** more built-in brush libraries beyond the ten shipped (and further graphic-style libraries beyond the eleven shipped, and further symbol libraries beyond Basic +- **Missing:** more built-in brush libraries beyond the eleven shipped (and further graphic-style libraries beyond the eleven shipped, and further symbol libraries beyond Basic Shapes, UI Frames, Map Markers, Inventory Icons, Skill Icons and Weather Icons; original, generated in code, never Adobe's); dynamic symbols' `.ai` read and write. - **Estimate:** 3–13 h (estimated). diff --git a/docs/mcp.md b/docs/mcp.md index 092faabc4c..f3ede72111 100644 --- a/docs/mcp.md +++ b/docs/mcp.md @@ -5035,9 +5035,9 @@ error. ## Brush libraries -Brush libraries are read-only sets of brushes: ten generated in code (Art Ribbons, Ink and Wash, Calligraphic Nibs, Bristle +Brush libraries are read-only sets of brushes: eleven generated in code (Art Ribbons, Ink and Wash, Calligraphic Nibs, Bristle Brushes with one bristle brush for each tip shape, Pattern Borders, Scatter Shapes, Game Trails, Energy Beams, and Dry Media with the Chalk Grain, Graphite Pencil, Wax Crayon and -Charcoal Dust art brushes, id `dry-media`, and Tech Circuit with Circuit Trace (art), Bus Lines and Terminal Nodes (pattern), id `tech-circuit`), the `.vectorcraft` files in the user library folder of the desktop app (User +Charcoal Dust art brushes, id `dry-media`, and Tech Circuit with Circuit Trace (art), Bus Lines and Terminal Nodes (pattern), id `tech-circuit`, and Engraving with Fine Hatching, Dense Hatching, Tapered Hatching and Broken Hatching art brushes, id `engraving`), the `.vectorcraft` files in the user library folder of the desktop app (User Defined) and the brushes of any document loaded with `brush.loadLibrary` (a document without brushes of its own has the default ones). `brush.libraries` lists them (`id`, `name`, `category`: `builtIn`, `user` or `loaded`, `count`) and `brush.library {library}` returns one's brushes (`name`, `type`; `library` is an id or a name). From e37a16081689b05bfaba81d5b030fee368df5204 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Tue, 17 Nov 2026 07:44:33 -0800 Subject: [PATCH 25/78] Document Engraving library in G5 evidence --- docs/gaps.md | 3 ++- docs/roadmap.md | 3 ++- docs/target-app-parity.md | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/docs/gaps.md b/docs/gaps.md index 14b0d2cbe6..b9b1c7e147 100644 --- a/docs/gaps.md +++ b/docs/gaps.md @@ -1,6 +1,6 @@ # Gaps -> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-16 · **Change:** minor (Recolor Artwork follow-up (#8031, remaining #4028): native Lab input, picker swatch libraries and Assign-row menus; UI interaction regression coverage; scores and estimates unchanged; previously: G4 type: modal Check Spelling dialog (Edit › Spelling › Check Spelling…), #4936; spell check complete; previously: Type: the Middle Eastern & South Asian composers are done as a per-paragraph choice with the Standard composers (#4935); G5: built-in Neon & Glow graphic style library (Cyan Neon, Magenta Laser, Amber Tube, Electric Lime, Pulse Violet, Cobalt Phosphor); estimate unchanged (3–13 h); previously: Tech Circuit brush library, G5; previously: G5: built-in Weather Icons symbol library (Sun, Moon, Cloud, Rain, Thunder, Snow); estimate 5–15 → 4–14 h; previously: 3D: the seams of white-light Extrude & Bevel, Inflate and Rotate, and the face seams of the 3D (Classic) effects, have round joins instead of miters; previously: PDF import: preserve Type 3 font text runs as named groups , or as live text in TextAs::Text mode if ToUnicode exists on non-colour fonts (TextAs::Outlines produces grouped outlines), #6740; scores and estimates unchanged; previously: icon-strip flyouts also resize from the top edge and the canvas-side top corner, keeping the moved top in workspaces (storytold/craft-libs#1094); scores and estimates unchanged; previously: #6865: oversized editing artboard import; Glyphs panel: Alternates for Current Selection applies an OpenType feature value (`salt=2`) to the selected letter alone, so an Arabic word stays joined, and Entire Font lists the unencoded glyphs, #5514; #6404: transform-aware Eyedropper character copying; scores and estimates unchanged; previously: G5: built-in Energy Beams brush library; estimate 5–15 → 4–14 h; previously minor: G5: built-in Skill Icons symbol library; estimate 6–16 → 5–15 h; previously minor: ruler double-click adds a guide at the pointer, #5239; G5: built-in Status Effects graphic style library; estimate 7–17 → 6–16 h; MCP docs catch-up for UI Frames and Map Markers; previously minor: G5: built-in Inventory Icons symbol library; estimate 8–18 → 7–17 h; previously minor: G9: `.ai` save names a variable font instance's design-space setting, #6388; previously minor: G5: built-in Game Trails brush library; estimate 9–19 → 8–18 h; previously minor: Edit › Edit Custom Dictionary…: its dialog adds, deletes and changes the custom dictionary's words, #4936; previously minor: docs tidy-up, no content change: stray notes at the top moved into the revision table; scores and estimates unchanged; previously minor: G5: built-in Game HUD graphic style library; estimate 10–20 → 9–19 h; previously minor: G5: built-in Map Markers symbol library; estimate 11–21 → 10–20 h; previously minor: right-click on type: Spelling › Auto Spell Check, with its check mark, #4936; previously minor: right-click on a word Auto Spell Check underlined: its suggestions, Ignore All and Add to Dictionary, #4936; previously minor: G2: Effect Gallery thumbnails and in-dialog preview; estimate 1–2 h → 0; Auto Spell Check: `edit.autoSpellCheck` underlines the unknown words, #4936; previously minor: PDF editable import preserves authored ActualText once, including empty/nested spans and authored ordering (#6165); cross-line/style layout remains approximate; scores and estimates unchanged; PDF marked-text export (#6309): compatible glyphs stay on one layout line with per-glyph offsets; scores and estimates unchanged; G5: built-in UI Frames symbol library with default 9-slice; estimate 11–21 h; previously minor: G5: dynamic symbol part on-canvas takes opacity, blend, gradient and pattern; docs Overlap/auto-corners sync; estimate 12–22 h; previously minor: interim macOS cursor delivery, #2292; native validation pending; scores and estimates unchanged; previously minor: Control bar › Snapping includes the existing Snap to Glyph and Alignment Guides toggles (#6164); scores and estimates unchanged; previously minor: G5 docs: Art brush Overlap, Pattern brush auto corners and Global Edit Shift-click leave-out moved from Missing to Done (code already shipped); previously minor: custom dictionary and Ignore All: `text.spelling.addWord`, `removeWord`, `changeWord`, `dictionary` and `ignoreAll`, #4936; previously minor: EPS import: embedded fonts (composite, Type 42, CID-keyed, Type 1, CFF FontSet) draw their glyphs; spell check engine: `text.spelling.check` and `text.spelling.suggest` on craft-proof, #4936; previously minor: floating tab groups collapse into the side icon rail and opened rail panels fold back into it, #5925 in part; G9: EPS gradients drawn as abutting strips import as one gradient, without seams; Tools stays beside the canvas with left-side panels; new gradients follow document color mode; Selection QoL: marquee modes and visible feedback, #5313; #3380 deletion-only review follow-up: independent survivors keep gradient placement, owned subpaths avoid discarded copies, and contracts/status/evidence are clarified; endpoint highlighting remains open; scores and estimates unchanged; Indian-language hyphenation review and license allowlist, #4947; opening a slow file shows a progress window, part of #5930; Hindi catalog and contributor loanword preferences; agent wording pass complete; wider native proofreading welcome; an image zoomed in on is separated, colorized or proofed only where it shows (#4155); scores and estimates unchanged; a document's first frame renders on the render worker, so opening a heavy file no longer freezes the window; scores and estimates unchanged; large images in CMYK documents are shrunk before they are separated into ink planes (#4155); scores and estimates unchanged; `.ai` paths with a Calligraphic brush open brushed, with the 6D Art Pen's channels, and Windows reads the pen's tilt and barrel rotation, #372; scores and estimates unchanged; Compound Shapes add-on, beyond Illustrator; scores and estimates unchanged; Contour add-on, beyond Illustrator; scores and estimates unchanged; a slow first frame is waited for instead of restarting without the graphics adapter, and the menu bar no longer waits for the installed fonts' scan; scores and estimates unchanged) · **Target:** Adobe Illustrator 2026 (30.x) +> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-17 · **Change:** minor (G5: Engraving adds four original hatching brushes; eleven built-in brush libraries; G5 estimate and parity scores unchanged; previously: Recolor Artwork follow-up (#8031, remaining #4028): native Lab input, picker swatch libraries and Assign-row menus; UI interaction regression coverage; scores and estimates unchanged; previously: G4 type: modal Check Spelling dialog (Edit › Spelling › Check Spelling…), #4936; spell check complete; previously: Type: the Middle Eastern & South Asian composers are done as a per-paragraph choice with the Standard composers (#4935); G5: built-in Neon & Glow graphic style library (Cyan Neon, Magenta Laser, Amber Tube, Electric Lime, Pulse Violet, Cobalt Phosphor); estimate unchanged (3–13 h); previously: Tech Circuit brush library, G5; previously: G5: built-in Weather Icons symbol library (Sun, Moon, Cloud, Rain, Thunder, Snow); estimate 5–15 → 4–14 h; previously: 3D: the seams of white-light Extrude & Bevel, Inflate and Rotate, and the face seams of the 3D (Classic) effects, have round joins instead of miters; previously: PDF import: preserve Type 3 font text runs as named groups , or as live text in TextAs::Text mode if ToUnicode exists on non-colour fonts (TextAs::Outlines produces grouped outlines), #6740; scores and estimates unchanged; previously: icon-strip flyouts also resize from the top edge and the canvas-side top corner, keeping the moved top in workspaces (storytold/craft-libs#1094); scores and estimates unchanged; previously: #6865: oversized editing artboard import; Glyphs panel: Alternates for Current Selection applies an OpenType feature value (`salt=2`) to the selected letter alone, so an Arabic word stays joined, and Entire Font lists the unencoded glyphs, #5514; #6404: transform-aware Eyedropper character copying; scores and estimates unchanged; previously: G5: built-in Energy Beams brush library; estimate 5–15 → 4–14 h; previously minor: G5: built-in Skill Icons symbol library; estimate 6–16 → 5–15 h; previously minor: ruler double-click adds a guide at the pointer, #5239; G5: built-in Status Effects graphic style library; estimate 7–17 → 6–16 h; MCP docs catch-up for UI Frames and Map Markers; previously minor: G5: built-in Inventory Icons symbol library; estimate 8–18 → 7–17 h; previously minor: G9: `.ai` save names a variable font instance's design-space setting, #6388; previously minor: G5: built-in Game Trails brush library; estimate 9–19 → 8–18 h; previously minor: Edit › Edit Custom Dictionary…: its dialog adds, deletes and changes the custom dictionary's words, #4936; previously minor: docs tidy-up, no content change: stray notes at the top moved into the revision table; scores and estimates unchanged; previously minor: G5: built-in Game HUD graphic style library; estimate 10–20 → 9–19 h; previously minor: G5: built-in Map Markers symbol library; estimate 11–21 → 10–20 h; previously minor: right-click on type: Spelling › Auto Spell Check, with its check mark, #4936; previously minor: right-click on a word Auto Spell Check underlined: its suggestions, Ignore All and Add to Dictionary, #4936; previously minor: G2: Effect Gallery thumbnails and in-dialog preview; estimate 1–2 h → 0; Auto Spell Check: `edit.autoSpellCheck` underlines the unknown words, #4936; previously minor: PDF editable import preserves authored ActualText once, including empty/nested spans and authored ordering (#6165); cross-line/style layout remains approximate; scores and estimates unchanged; PDF marked-text export (#6309): compatible glyphs stay on one layout line with per-glyph offsets; scores and estimates unchanged; G5: built-in UI Frames symbol library with default 9-slice; estimate 11–21 h; previously minor: G5: dynamic symbol part on-canvas takes opacity, blend, gradient and pattern; docs Overlap/auto-corners sync; estimate 12–22 h; previously minor: interim macOS cursor delivery, #2292; native validation pending; scores and estimates unchanged; previously minor: Control bar › Snapping includes the existing Snap to Glyph and Alignment Guides toggles (#6164); scores and estimates unchanged; previously minor: G5 docs: Art brush Overlap, Pattern brush auto corners and Global Edit Shift-click leave-out moved from Missing to Done (code already shipped); previously minor: custom dictionary and Ignore All: `text.spelling.addWord`, `removeWord`, `changeWord`, `dictionary` and `ignoreAll`, #4936; previously minor: EPS import: embedded fonts (composite, Type 42, CID-keyed, Type 1, CFF FontSet) draw their glyphs; spell check engine: `text.spelling.check` and `text.spelling.suggest` on craft-proof, #4936; previously minor: floating tab groups collapse into the side icon rail and opened rail panels fold back into it, #5925 in part; G9: EPS gradients drawn as abutting strips import as one gradient, without seams; Tools stays beside the canvas with left-side panels; new gradients follow document color mode; Selection QoL: marquee modes and visible feedback, #5313; #3380 deletion-only review follow-up: independent survivors keep gradient placement, owned subpaths avoid discarded copies, and contracts/status/evidence are clarified; endpoint highlighting remains open; scores and estimates unchanged; Indian-language hyphenation review and license allowlist, #4947; opening a slow file shows a progress window, part of #5930; Hindi catalog and contributor loanword preferences; agent wording pass complete; wider native proofreading welcome; an image zoomed in on is separated, colorized or proofed only where it shows (#4155); scores and estimates unchanged; a document's first frame renders on the render worker, so opening a heavy file no longer freezes the window; scores and estimates unchanged; large images in CMYK documents are shrunk before they are separated into ink planes (#4155); scores and estimates unchanged; `.ai` paths with a Calligraphic brush open brushed, with the 6D Art Pen's channels, and Windows reads the pen's tilt and barrel rotation, #372; scores and estimates unchanged; Compound Shapes add-on, beyond Illustrator; scores and estimates unchanged; Contour add-on, beyond Illustrator; scores and estimates unchanged; a slow first frame is waited for instead of restarting without the graphics adapter, and the menu bar no longer waits for the installed fonts' scan; scores and estimates unchanged) · **Target:** Adobe Illustrator 2026 (30.x) ## Feature submission evidence @@ -34,6 +34,7 @@ Artboard Options forwards the active Artboard tool's Scale Artwork with Artboard | Date | Change | Summary | |---|---|---| +| 2026-11-17 | minor | G5: Engraving adds four original procedural art brushes (Fine, Dense, Tapered and Broken Hatching); eleven built-in brush libraries. G5 remaining estimate 3–13 h (estimated); parity scores and headline totals unchanged. | | 2026-11-16 | minor | G1: Recolor Artwork - native Lab entry in Color Picker, swatch libraries access in Color Picker, and row right-click context menu ("Pick from Swatches", "Limit to Library") (#4028); scores and estimates unchanged. | | 2026-11-15 | minor | G4 type: modal Check Spelling dialog (Edit › Spelling › Check Spelling…, `ui.checkSpelling`, #4936) with Not in Dictionary sentence context, suggestions, Ignore, Ignore All, Change, Change All, Add to Dictionary, Done/Cancel, keyboard navigation, and one-step Undo/Redo; spell check complete; scores and estimates unchanged. | | 2026-11-15 | minor | G5: Neon & Glow joins Shadows and Glows, Outlines and Rules, Hand-Drawn, Textures, Painted and Sketched, Gradient Finishes, Shape Effects, Blends and Transparency, Game HUD and Status Effects as an eleventh built-in graphic style library (Cyan Neon, Magenta Laser, Amber Tube, Electric Lime, Pulse Violet, Cobalt Phosphor; original procedural styles generated in code); estimate unchanged (3–13 h). | diff --git a/docs/roadmap.md b/docs/roadmap.md index 258b86d04a..19d1bcc755 100644 --- a/docs/roadmap.md +++ b/docs/roadmap.md @@ -1,6 +1,6 @@ # Roadmap: milestones and what's next -> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-17 · **Change:** minor (PDF import: a glyph filled only after a glyph filled and stroked comes in filled only, not stroked, #8300; PDF import: translucent type filled and stroked comes in as a filled type object and a stroked one, as the file composites them, and an upright glyph is never kept as the outline of its glyph alone, #8015; PDF import: type filled and stroked by one text-showing operator comes in as one type object, filled and stroked, not a stroked copy over a filled one, #8015; M1: Layers panel Alt-drag shows the copy cursor, #8217; scores and estimates unchanged; previously: Gradient panel: the add-stop strip shows the white arrow with a plus on Windows and X11, #8241; scores and estimates unchanged; previously: Recolor Artwork follow-up (#8031, remaining #4028): native Lab input, picker swatch libraries and Assign-row menus; UI interaction regression coverage; scores and estimates unchanged; previously: #8005: the Color spectrum fills a resized panel; scores and estimates unchanged; previously: M7: Check Spelling modal dialog (Edit › Spelling › Check Spelling…), #4936; spell check complete; previously: PDF import: stroked type keeps the line cap, line join and miter limit the file strokes it with, a glyph stroked otherwise than the run it joins coming in as a run of its own, #7741; M10/G5: Neon & Glow built-in graphic style library (Cyan Neon, Magenta Laser, Amber Tube, Electric Lime, Pulse Violet, Cobalt Phosphor); previously: Tech Circuit brush library, G5; previously: Graphic Styles list fills a taller panel, #2992; scores and estimates unchanged; previously: PDF import: glyphs in a span with an empty ActualText come in as outlines, #6971; scores and estimates unchanged; previously: library panels' lists fill a taller panel, #2992; scores and estimates unchanged; previously: Swatches list fills a taller panel, #1638; scores and estimates unchanged; previously: icon-strip flyouts also resize from the top edge and the canvas-side top corner, keeping the moved top in workspaces (storytold/craft-libs#1094); scores and estimates unchanged; previously: #6865: explicitly requested oversized editing artboard; Live Paint Bucket fills faces crossed in one drag (#6373); previously: #6404: transform-aware Eyedropper character copying; scores and estimates unchanged; previously: M10/G5: Energy Beams brush library; MCP docs list Energy Beams; previously minor: M10/G5: Skill Icons symbol library; MCP docs list Skill Icons; previously minor: M10/G5: Status Effects graphic style library; MCP docs catch-up for symbol libraries; previously minor: M10/G5: Inventory Icons built-in symbol library; previously minor: Edit › Edit Custom Dictionary…: its dialog adds, deletes and changes the custom dictionary's words, #4936; previously minor: M10/G5: Game HUD graphic style library; previously minor: resizable icon-strip flyouts and bottom-aligned panel footers, #5713; previously minor: M10/G5: Map Markers built-in symbol library; previously minor: right-click on type: Spelling › Auto Spell Check, with its check mark, #4936; previously minor: right-click on a word Auto Spell Check underlined: its suggestions, Ignore All and Add to Dictionary, #4936; previously minor: G2: Effect Gallery thumbnails and in-dialog preview are in; Auto Spell Check: `edit.autoSpellCheck` underlines the unknown words, #4936; previously minor: PDF editable import preserves authored ActualText once, including empty/nested spans and authored ordering (#6165); cross-line/style layout remains approximate; scores and estimates unchanged; PDF marked-text export (#6309): compatible glyphs stay on one layout line with per-glyph offsets; scores and estimates unchanged; interim macOS cursor delivery, #2292; native validation pending; scores and estimates unchanged; Control bar › Snapping includes the existing Snap to Glyph and Alignment Guides toggles (#6164); scores and estimates unchanged; custom dictionary and Ignore All: `text.spelling.addWord`, `removeWord`, `changeWord`, `dictionary` and `ignoreAll`, #4936; previously minor: EPS import: embedded fonts (composite, Type 42, CID-keyed, Type 1, CFF FontSet) draw their glyphs; spell check engine: `text.spelling.check` and `text.spelling.suggest` on craft-proof, #4936; previously minor: floating tab groups collapse into the side icon rail and opened rail panels fold back into it, #5925 in part; M4/M7: `.ai`/EPS type keeps its tab stops, and right-aligned lines with tabs lay out as the file's page, #6147; M4/M7: `.ai`/EPS type from the text document lays its lines out closer to the file's page, within limits, #6137; numeric fields step on wheel hover without taking keyboard focus, #5949; Character Styles panel: a double-click on a style's row opens its Character Style Options; the dialog keeps a fixed width and scrolls its sections, so its buttons stay on screen; Selection QoL: marquee modes and visible feedback, #5313; SVG CSS classes survive export and repeated import in all four styling modes (#2480); current-main integration retains event attributes and scripts; #3380 deletion-only review follow-up: independent survivors keep gradient placement, owned subpaths avoid discarded copies, and contracts/status/evidence are clarified; endpoint highlighting remains open; scores and estimates unchanged; Indian-language hyphenation review and license allowlist, #4947; Hindi catalog and contributor loanword preferences; full wording review in progress; Effect dialogs: a colour swatch beside a hex colour opens the Color Picker, #5365; shape tools move the selection from its centre point and turn it from the zone outside a box corner, #5477; scores and estimates unchanged) · **Target:** Adobe Illustrator 2026 (30.x) +> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-17 · **Change:** minor (M10/G5: Engraving adds four original hatching brushes; estimate and parity scores unchanged; previously: PDF import: a glyph filled only after a glyph filled and stroked comes in filled only, not stroked, #8300; PDF import: translucent type filled and stroked comes in as a filled type object and a stroked one, as the file composites them, and an upright glyph is never kept as the outline of its glyph alone, #8015; PDF import: type filled and stroked by one text-showing operator comes in as one type object, filled and stroked, not a stroked copy over a filled one, #8015; M1: Layers panel Alt-drag shows the copy cursor, #8217; scores and estimates unchanged; previously: Gradient panel: the add-stop strip shows the white arrow with a plus on Windows and X11, #8241; scores and estimates unchanged; previously: Recolor Artwork follow-up (#8031, remaining #4028): native Lab input, picker swatch libraries and Assign-row menus; UI interaction regression coverage; scores and estimates unchanged; previously: #8005: the Color spectrum fills a resized panel; scores and estimates unchanged; previously: M7: Check Spelling modal dialog (Edit › Spelling › Check Spelling…), #4936; spell check complete; previously: PDF import: stroked type keeps the line cap, line join and miter limit the file strokes it with, a glyph stroked otherwise than the run it joins coming in as a run of its own, #7741; M10/G5: Neon & Glow built-in graphic style library (Cyan Neon, Magenta Laser, Amber Tube, Electric Lime, Pulse Violet, Cobalt Phosphor); previously: Tech Circuit brush library, G5; previously: Graphic Styles list fills a taller panel, #2992; scores and estimates unchanged; previously: PDF import: glyphs in a span with an empty ActualText come in as outlines, #6971; scores and estimates unchanged; previously: library panels' lists fill a taller panel, #2992; scores and estimates unchanged; previously: Swatches list fills a taller panel, #1638; scores and estimates unchanged; previously: icon-strip flyouts also resize from the top edge and the canvas-side top corner, keeping the moved top in workspaces (storytold/craft-libs#1094); scores and estimates unchanged; previously: #6865: explicitly requested oversized editing artboard; Live Paint Bucket fills faces crossed in one drag (#6373); previously: #6404: transform-aware Eyedropper character copying; scores and estimates unchanged; previously: M10/G5: Energy Beams brush library; MCP docs list Energy Beams; previously minor: M10/G5: Skill Icons symbol library; MCP docs list Skill Icons; previously minor: M10/G5: Status Effects graphic style library; MCP docs catch-up for symbol libraries; previously minor: M10/G5: Inventory Icons built-in symbol library; previously minor: Edit › Edit Custom Dictionary…: its dialog adds, deletes and changes the custom dictionary's words, #4936; previously minor: M10/G5: Game HUD graphic style library; previously minor: resizable icon-strip flyouts and bottom-aligned panel footers, #5713; previously minor: M10/G5: Map Markers built-in symbol library; previously minor: right-click on type: Spelling › Auto Spell Check, with its check mark, #4936; previously minor: right-click on a word Auto Spell Check underlined: its suggestions, Ignore All and Add to Dictionary, #4936; previously minor: G2: Effect Gallery thumbnails and in-dialog preview are in; Auto Spell Check: `edit.autoSpellCheck` underlines the unknown words, #4936; previously minor: PDF editable import preserves authored ActualText once, including empty/nested spans and authored ordering (#6165); cross-line/style layout remains approximate; scores and estimates unchanged; PDF marked-text export (#6309): compatible glyphs stay on one layout line with per-glyph offsets; scores and estimates unchanged; interim macOS cursor delivery, #2292; native validation pending; scores and estimates unchanged; Control bar › Snapping includes the existing Snap to Glyph and Alignment Guides toggles (#6164); scores and estimates unchanged; custom dictionary and Ignore All: `text.spelling.addWord`, `removeWord`, `changeWord`, `dictionary` and `ignoreAll`, #4936; previously minor: EPS import: embedded fonts (composite, Type 42, CID-keyed, Type 1, CFF FontSet) draw their glyphs; spell check engine: `text.spelling.check` and `text.spelling.suggest` on craft-proof, #4936; previously minor: floating tab groups collapse into the side icon rail and opened rail panels fold back into it, #5925 in part; M4/M7: `.ai`/EPS type keeps its tab stops, and right-aligned lines with tabs lay out as the file's page, #6147; M4/M7: `.ai`/EPS type from the text document lays its lines out closer to the file's page, within limits, #6137; numeric fields step on wheel hover without taking keyboard focus, #5949; Character Styles panel: a double-click on a style's row opens its Character Style Options; the dialog keeps a fixed width and scrolls its sections, so its buttons stay on screen; Selection QoL: marquee modes and visible feedback, #5313; SVG CSS classes survive export and repeated import in all four styling modes (#2480); current-main integration retains event attributes and scripts; #3380 deletion-only review follow-up: independent survivors keep gradient placement, owned subpaths avoid discarded copies, and contracts/status/evidence are clarified; endpoint highlighting remains open; scores and estimates unchanged; Indian-language hyphenation review and license allowlist, #4947; Hindi catalog and contributor loanword preferences; full wording review in progress; Effect dialogs: a colour swatch beside a hex colour opens the Color Picker, #5365; shape tools move the selection from its centre point and turn it from the zone outside a box corner, #5477; scores and estimates unchanged) · **Target:** Adobe Illustrator 2026 (30.x) > > Oversized artboard import update (2026-11-12): Explicit editing-data import retains a single artboard beyond a capped 14,400 pt PDF page (#6865). > @@ -212,6 +212,7 @@ not take the artwork yet. Overflow-menu drag remains separate. Scores and hours | Date | Change | Summary | |---|---|---| +| 2026-11-17 | minor | M10/G5: Engraving adds Fine, Dense, Tapered and Broken Hatching as four original procedural art brushes; eleven built-in brush libraries. G5 estimate and parity scores unchanged. | | 2026-11-17 | minor | PDF import (#8300): a glyph filled only (text rendering mode 0) right after one filled and stroked (mode 2) joined the stroked run and came in stroked too: `2 Tr (B) Tj 0 Tr (C) Tj` came in as `BC` stroked throughout. A glyph filled only now joins only a run drawn alike, so it starts a run of its own, filled only, in the same type object, and takes a stroke only when the file draws one over it (the #8015 matching); a word filled whole then stroked whole, and fill and stroke rendering glyph by glyph, still come in as one run filled and stroked. Tests: `a_glyph_filled_only_after_one_filled_and_stroked_is_not_stroked`, `glyphs_filled_and_stroked_one_by_one_stay_one_run`; scores and estimates unchanged. | | 2026-11-17 | minor | PDF import (#8015 follow-up): type filled and stroked at less than full opacity is no longer joined into one type object, since the file composites the fill and the stroke apiece, darker where they overlap, while one object's opacity applies to both together; it stays a filled object and a stroked one, as a fill and stroke at different opacities already did. An upright glyph (vertical type) filled and stroked is no longer kept as an outline for a line that comes in as its outlines, as glyphs filled only weren't, so such a line can't lose them. The #8015 entries now say what is left: translucent type filled and stroked, and a `TJ` whose kerning starts a new line part way through, still come in as two objects. Tests: `translucent_fill_and_stroke_text_stays_two_objects`, `a_vertical_line_with_one_glyph_filled_and_stroked_keeps_every_glyph_filled`; scores and estimates unchanged. | | 2026-11-16 | minor | PDF import: fill and stroke rendering (text rendering modes 2 and 6) draws all the glyphs of a text-showing operator (`Tj`, `TJ`, `'`, `"`) filled, then the same glyphs stroked, so a word shown at once came in as two type objects: a stroke-only copy over a fill-only one. Each stroke is now matched, in order, to the glyph filled with the same placement (where, how large, how wide, slanted and turned) in the same font with the same text on the line, and only that glyph takes the stroke, so the word comes in as one type object, filled and stroked; glyphs stroked with another join part way through still split into runs of their own, and stroked type over no filled glyph (modes 1 and 5) stays stroke only (#8015; `a_word_filled_then_stroked_imports_as_one_filled_and_stroked_type` in `crates/pdf/src/tests/textstroke.rs`, `a_vertical_column_filled_then_stroked_is_one_filled_and_stroked_type` in `crates/pdf/src/tests/text_placement.rs`). Scores and estimates unchanged. | diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index eb8aae5389..1def6a247b 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -575,7 +575,7 @@ since 2026-10-01. | **Interaction fidelity:** modifiers, cursors, small behaviours | ~30–40% | The dedicated pass hasn't started, and there has been no side-by-side session with Illustrator yet. A power user notices this first | | **Look & feel** | ~75–80% | Measured against Illustrator 2026 screenshots (2026-10-02); the panels added since haven't been re-measured | | **File interop** | ~85% | SVG/SVGZ, PDF and PDF-compatible `.ai` (and legacy version 7 `.ai` out, keeping layers, groups and type as text), EPS, DXF, EMF/WMF, raster formats, PSD export and PSD/PSB placement (merged image), Place and Links, Package, Print, clipboard flavours. Affinity documents (Affinity 1–3) open natively as editable art, checked against 51 pinned public files (33 current `.af`), with selected saved-thumbnail comparisons and every-board native/SVG/PDF/PSD checks for current files; Affinity export is missing and effects, adjustments and brushes don't import. Affinity isn't an Illustrator feature, so this doesn't raise the parity score. The editing copy inside an Illustrator EPS or `.ai` is read for its structure: layers, groups, names, hidden objects and type, colours, gradients, transparency, images and every artboard (see Out of scope for what it doesn't read yet); DWG has no open spec | -| **Bundled content:** brush, symbol, style and swatch libraries | ~46% | Ours are original and generated in code, and far fewer than Illustrator ships; symbol libraries have six (Basic Shapes, UI Frames with default 9-slice, Map Markers, Inventory Icons, Skill Icons, Weather Icons), graphic style libraries eleven (including Game HUD, Status Effects and Neon & Glow) and brush libraries ten (Art Ribbons, Ink and Wash, Calligraphic Nibs, Bristle Brushes, Pattern Borders, Scatter Shapes, Game Trails, Energy Beams, Dry Media, Tech Circuit) beside User Defined and Other Library… | +| **Bundled content:** brush, symbol, style and swatch libraries | ~46% | Ours are original and generated in code, and far fewer than Illustrator ships; symbol libraries have six (Basic Shapes, UI Frames with default 9-slice, Map Markers, Inventory Icons, Skill Icons, Weather Icons), graphic style libraries eleven (including Game HUD, Status Effects and Neon & Glow) and brush libraries eleven (Art Ribbons, Ink and Wash, Calligraphic Nibs, Bristle Brushes, Pattern Borders, Scatter Shapes, Game Trails, Energy Beams, Dry Media, Tech Circuit, Engraving) beside User Defined and Other Library… | | **Performance** | unverified | Multithreaded, off-thread rendering and caches are in place. The last budget run (2026-10-01, loaded machine) measured 290 ms for a 50k-path fit against a 16 ms budget. Re-run `vectorcraft-cli perf` on an idle machine | | **Robustness** | good, new | ~2,840 tests, property tests, no panics in shipped code (lints, the `guard` safety net, import fuzzing), Data Recovery. Missing: a corpus of real-world files, Windows/Linux/browser QA | | **Platforms and 1.0 polish** | ~60% | The macOS app and the web build work, and Finder opens every readable format with the macOS app (#295, #354); on macOS the menus are in the system menu bar, laid out as a Mac app's, with the in-window menus as a fallback (`--in-window-menus`; verified on Windows and by cross-compilation, not yet by hand on a Mac); hybrid-graphics laptops render on the power-saving GPU by default on Windows and macOS (#306), and Windows starts on Direct3D 12, falling back to OpenGL, and loads no Vulkan driver unless `WGPU_BACKEND` asks for it (#545: Vulkan flickered black on an Intel GPU, DX12 and OpenGL didn't; #806: a faulty Vulkan driver crashed the app before its window appeared; verified by unit tests and the reporter's runs with `WGPU_BACKEND`), and Linux on the GPU the desktop runs on, since a Wayland compositor may refuse frames from the other one; a window that fails on its GPU while starting up starts again on the next one instead of crashing (#502; the dual-GPU Wayland case is verified by unit tests and cross-compilation, not on such hardware); web drops land in the document they were dropped on (#359); desktop drops carry no pointer position (winit 0.30), so a dropped document opens as a tab of its own and a picture or text is placed in the middle of the view, while the web places anything dropped on the canvas and opens what is dropped off it, as Illustrator does (#472); a web page that loses its WebGPU device or WebGL context restarts its graphics with the same documents (#369); on Linux/Wayland the clipboard reads the compositor's own (data-control) and copied image files paste, but files can't be dropped on the window under native Wayland until eframe moves to winit 0.31 (#398; the Wayland side is verified by compilation only), so Preferences › Performance › Linux Display Server › X11 (XWayland) opens the window through XWayland, where drops work (#1151; verified by unit tests and cross-compilation, not on a Wayland desktop); on Linux the Paste menu checks the system clipboard on a background thread, so a clipboard owner that never answers no longer freezes the window, while Windows and macOS keep their quick in-line check (#510; the X11 hang verified by the contributor, here by headless tests); on KDE Plasma 6.3+ under Wayland, pens and pen displays reach the app only under XWayland (`WAYLAND_DISPLAY=`) or with KWin's `KWIN_WAYLAND_EMULATE_TABLET=1`, since winit 0.30 has no Wayland tablet input (#491, not verified on hardware); Windows/Linux packaging and accessibility are pending | @@ -1098,9 +1098,10 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - **Expand of symbol instances:** Object › Expand turns selected symbol instances (without effects, not in perspective, in groups or placed documents too) into their art as Break Link to Symbol places it, one level deep, as one undo step; the Expand dialog's Fill and Stroke reach that art (`object.expand`, `crates/engine/src/tests/expand_symbols.rs`; estimated, score unchanged). - **Reset Transformation** ([Transform symbols](https://helpx.adobe.com/illustrator/desktop/manage-objects/traces-mockups-symbols/transform-symbols.html), [Symbols panel options](https://helpx.adobe.com/illustrator/desktop/manage-objects/traces-mockups-symbols/symbols-panel-options.html)): the Symbols panel menu's Reset Transformation and the Control bar's Reset, shown while symbol instances are selected, give the selected instances their symbol's own scale again, without rotation or shear, as one undo step (`symbol.instance.resetTransform`); an instance in perspective is left as it is. VectorCraft's own rules: each instance keeps the center of its bounding box in place, reflection is removed too, and the menu item and the button are enabled only while a selected instance would change. Tests: `tests::brushsym::reset_transformation_restores_the_symbols_scale_and_keeps_the_center`, `reset_transformation_keeps_the_center_of_art_away_from_the_origin`, `reset_transformation_ignores_a_stored_size_that_is_not_positive`, `reset_transformation_leaves_unchanged_instances_and_refuses_bad_ids`, `panels::symbols::tests::reset_transformation_is_enabled_for_a_transformed_instance_and_resets_it`. - **Expand of dimensions:** Object › Expand, Expand Appearance, Create Outlines and Outline Stroke turn a dimension whose art they change into a plain group of that art, which stays as it is through later moves, scales and edits of what it measured; undo gives the live dimension back (`crates/engine/tests/it/dimensions.rs`; VectorCraft's own rule; estimated, score unchanged). - - **Brush libraries** ([public source](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/apply-and-edit-strokes/create-new-brush-libraries.html), [import](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/apply-and-edit-strokes/import-brushes-from-brush-libraries-or-other-files.html), [Brushes panel](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/apply-and-edit-strokes/brushes-panel-overview.html)): Window › Brush Libraries, the Brushes panel's Brush Libraries Menu and its menu's Open Brush Library open each library in a library panel of its own, as swatch, graphic style and symbol libraries do. The built-in libraries (Art Ribbons, Ink and Wash, Calligraphic Nibs, Bristle Brushes, Pattern Borders, Scatter Shapes, Game Trails, Energy Beams, Dry Media, Tech Circuit) are original brushes generated in code (`crates/engine/src/cmd/brushlib.rs`); Striped Ribbon's art is filled with the library's own pattern and Sparkles scatters the library's own symbol; Ink and Wash adds ink and wash brushes (the [help page](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/apply-and-edit-strokes/about-brushes.html) lists an Ink brush library of strokes with varied thickness and texture; the names, shapes and opacities are VectorCraft's own): Tapered Ink, an art brush broad near its start that thins to a fine tip; Brush Pen, a calligraphic brush whose size follows the pen pressure; and Soft Wash and Pooling Wash, art brushes of translucent gray layers that take the stroke color as tints; Game Trails adds motion art brushes (Speed Line, Dash Trail, Burst Ray, Zigzag); Energy Beams adds laser and plasma art brushes (Laser Bolt, Plasma Arc, Charge Wave, Spark Trail); Dry Media adds grainy art brushes (Chalk Grain, Graphite Pencil, Wax Crayon, Charcoal Dust). A click on a brush adds it to the document's Brushes as one undo step with every resource its art uses (patterns, symbols, swatches, graphic styles, images), makes it the current brush and, with paths selected, applies it to them in the same step; a brush the document already has is not added again and a different brush of the same name comes in numbered ("Wave 2"). Shift/Cmd-clicks select brushes for Add to Brushes; a brush dragged onto a path is added and applied to it, and one dragged onto the Brushes panel is added. Save Brushes… / the Brushes panel's Save Brush Library… write the document's brushes (or the selected ones) as a `.vectorcraft` library into the `Brushes` folder next to the preferences, listed under User Defined, or to a file; Other Library… reads the brushes of any document VectorCraft opens. Thumbnails, in the library panels, the Brushes panel and Brush Options, render brush art with the patterns and symbols it uses. Copying brushed art now carries the patterns and symbols its brush's art uses too. Tests: `crates/engine/src/tests/brushlib.rs`, `crates/ui-egui/src/panels/tests_brush_libraries.rs`, `panels::brushes::tests::library_brush_previews_show_the_patterns_their_art_uses`, `canvas::tests::a_library_brush_dropped_on_a_path_is_added_and_applied_in_one_step`. + - **Brush libraries** ([public source](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/apply-and-edit-strokes/create-new-brush-libraries.html), [import](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/apply-and-edit-strokes/import-brushes-from-brush-libraries-or-other-files.html), [Brushes panel](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/apply-and-edit-strokes/brushes-panel-overview.html)): Window › Brush Libraries, the Brushes panel's Brush Libraries Menu and its menu's Open Brush Library open each library in a library panel of its own, as swatch, graphic style and symbol libraries do. The built-in libraries (Art Ribbons, Ink and Wash, Calligraphic Nibs, Bristle Brushes, Pattern Borders, Scatter Shapes, Game Trails, Energy Beams, Dry Media, Tech Circuit, Engraving) are original brushes generated in code (`crates/engine/src/cmd/brushlib.rs`); Striped Ribbon's art is filled with the library's own pattern and Sparkles scatters the library's own symbol; Ink and Wash adds ink and wash brushes (the [help page](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/apply-and-edit-strokes/about-brushes.html) lists an Ink brush library of strokes with varied thickness and texture; the names, shapes and opacities are VectorCraft's own): Tapered Ink, an art brush broad near its start that thins to a fine tip; Brush Pen, a calligraphic brush whose size follows the pen pressure; and Soft Wash and Pooling Wash, art brushes of translucent gray layers that take the stroke color as tints; Game Trails adds motion art brushes (Speed Line, Dash Trail, Burst Ray, Zigzag); Energy Beams adds laser and plasma art brushes (Laser Bolt, Plasma Arc, Charge Wave, Spark Trail); Dry Media adds grainy art brushes (Chalk Grain, Graphite Pencil, Wax Crayon, Charcoal Dust). A click on a brush adds it to the document's Brushes as one undo step with every resource its art uses (patterns, symbols, swatches, graphic styles, images), makes it the current brush and, with paths selected, applies it to them in the same step; a brush the document already has is not added again and a different brush of the same name comes in numbered ("Wave 2"). Shift/Cmd-clicks select brushes for Add to Brushes; a brush dragged onto a path is added and applied to it, and one dragged onto the Brushes panel is added. Save Brushes… / the Brushes panel's Save Brush Library… write the document's brushes (or the selected ones) as a `.vectorcraft` library into the `Brushes` folder next to the preferences, listed under User Defined, or to a file; Other Library… reads the brushes of any document VectorCraft opens. Thumbnails, in the library panels, the Brushes panel and Brush Options, render brush art with the patterns and symbols it uses. Copying brushed art now carries the patterns and symbols its brush's art uses too. Tests: `crates/engine/src/tests/brushlib.rs`, `crates/ui-egui/src/panels/tests_brush_libraries.rs`, `panels::brushes::tests::library_brush_previews_show_the_patterns_their_art_uses`, `canvas::tests::a_library_brush_dropped_on_a_path_is_added_and_applied_in_one_step`. - **Bristle Brushes library** ([What's new](https://helpx.adobe.com/illustrator/desktop/new-features/whats-new.html), [About brushes](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/apply-and-edit-strokes/about-brushes.html)): Window › Brush Libraries › Bristle Brushes holds ten bristle brushes, one for each tip shape (Fine Liner, Pointed Flat, Stubby Round, Dry Scrub, Soft Dome, Filbert, Angled Round, Angled Flat, Fan Blender, Grass Fan). The brushes, their names and their values are VectorCraft's own, and every value lies inside the range the bristle brush keeps (`brush.libraries`, `brush.addFromLibrary`; `the_bristle_brushes_library_covers_every_tip_shape_within_the_bristle_ranges`). - **Tech Circuit library:** Circuit Trace is a chamfered art brush with 45-degree elbows and terminal pads; Bus Lines repeats three parallel conductor lanes; Terminal Nodes repeats solder pads, circular test points and connecting leads. Original vector geometry generated in code, with Tints colorization and continuous pattern tile edges. Evidence: `the_tech_circuit_library_constructs_adds_and_applies_each_brush` in `crates/engine/src/tests/brushlib.rs` covers listing, finite geometry on straight, curved, short and closed paths, add/apply, undo/redo, deduplication and saved-library round trips. G5 remaining estimate 3–13 h (estimated); area scores unchanged. + - **Engraving library** ([About brushes](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/apply-and-edit-strokes/about-brushes.html)): Fine Hatching, Dense Hatching, Tapered Hatching and Broken Hatching make fine parallel-line textures along paths. These four 100 pt art brushes are original VectorCraft geometry, with Tints colorization; they can be added, applied and saved through the existing library controls. - **Dry Media library** ([help page](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/apply-and-edit-strokes/about-brushes.html)): Window › Brush Libraries › Dry Media holds four art brushes with textured strokes like dry drawing materials, each 100 pt long: Chalk Grain (about 8 pt high), Graphite Pencil (about 2.3 pt), Wax Crayon (about 5.5 pt) and Charcoal Dust (about 7 pt). The brushes, their names, sizes and art are VectorCraft's own: each is filled vector paths from a fixed seed, at most 80 paths and 500 anchors, stretched along the path with Tints colorization, and the chalk and crayon art has even-odd gaps where the paper shows (`brush.libraries`, `brush.addFromLibrary`; `the_dry_media_library_holds_grainy_art_brushes_with_bounded_art`). - **Brush names in library panels**: a built-in brush library's panel shows its brushes' names in the UI language, in its list rows and tooltips, and its Find field matches the name shown or the English name. This is VectorCraft's own rule. A User Defined or Other Library… library's brushes, and the document's Brushes panel, show names as they are stored. A click, a drag, Add to Brushes and `brush.addFromLibrary` still use the English name, so the brush comes into the document under that name (`built_in_library_brushes_are_listed_in_the_ui_language`, `built_in_library_brush_names_are_in_complete_catalogs`). - A canvas context menu: right-click selects the object under the pointer and lists what applies to the selection (Undo/Redo, clipboard, group, isolation, join, Remove Anchor Points when anchors are selected, masks, compound paths, guides, Transform, Arrange, Select, Export Selection, and on type Bullets and Numbering and Spelling › Auto Spell Check, checked while it is on), or the view commands on empty canvas. From 47b66f87ca11be341e8f34cb4f3e64d8a0525b65 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Tue, 17 Nov 2026 08:00:24 -0800 Subject: [PATCH 26/78] Keep Engraving progress in evidence only --- docs/gaps.md | 3 +-- docs/roadmap.md | 3 +-- docs/target-app-parity.md | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/docs/gaps.md b/docs/gaps.md index b9b1c7e147..14b0d2cbe6 100644 --- a/docs/gaps.md +++ b/docs/gaps.md @@ -1,6 +1,6 @@ # Gaps -> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-17 · **Change:** minor (G5: Engraving adds four original hatching brushes; eleven built-in brush libraries; G5 estimate and parity scores unchanged; previously: Recolor Artwork follow-up (#8031, remaining #4028): native Lab input, picker swatch libraries and Assign-row menus; UI interaction regression coverage; scores and estimates unchanged; previously: G4 type: modal Check Spelling dialog (Edit › Spelling › Check Spelling…), #4936; spell check complete; previously: Type: the Middle Eastern & South Asian composers are done as a per-paragraph choice with the Standard composers (#4935); G5: built-in Neon & Glow graphic style library (Cyan Neon, Magenta Laser, Amber Tube, Electric Lime, Pulse Violet, Cobalt Phosphor); estimate unchanged (3–13 h); previously: Tech Circuit brush library, G5; previously: G5: built-in Weather Icons symbol library (Sun, Moon, Cloud, Rain, Thunder, Snow); estimate 5–15 → 4–14 h; previously: 3D: the seams of white-light Extrude & Bevel, Inflate and Rotate, and the face seams of the 3D (Classic) effects, have round joins instead of miters; previously: PDF import: preserve Type 3 font text runs as named groups , or as live text in TextAs::Text mode if ToUnicode exists on non-colour fonts (TextAs::Outlines produces grouped outlines), #6740; scores and estimates unchanged; previously: icon-strip flyouts also resize from the top edge and the canvas-side top corner, keeping the moved top in workspaces (storytold/craft-libs#1094); scores and estimates unchanged; previously: #6865: oversized editing artboard import; Glyphs panel: Alternates for Current Selection applies an OpenType feature value (`salt=2`) to the selected letter alone, so an Arabic word stays joined, and Entire Font lists the unencoded glyphs, #5514; #6404: transform-aware Eyedropper character copying; scores and estimates unchanged; previously: G5: built-in Energy Beams brush library; estimate 5–15 → 4–14 h; previously minor: G5: built-in Skill Icons symbol library; estimate 6–16 → 5–15 h; previously minor: ruler double-click adds a guide at the pointer, #5239; G5: built-in Status Effects graphic style library; estimate 7–17 → 6–16 h; MCP docs catch-up for UI Frames and Map Markers; previously minor: G5: built-in Inventory Icons symbol library; estimate 8–18 → 7–17 h; previously minor: G9: `.ai` save names a variable font instance's design-space setting, #6388; previously minor: G5: built-in Game Trails brush library; estimate 9–19 → 8–18 h; previously minor: Edit › Edit Custom Dictionary…: its dialog adds, deletes and changes the custom dictionary's words, #4936; previously minor: docs tidy-up, no content change: stray notes at the top moved into the revision table; scores and estimates unchanged; previously minor: G5: built-in Game HUD graphic style library; estimate 10–20 → 9–19 h; previously minor: G5: built-in Map Markers symbol library; estimate 11–21 → 10–20 h; previously minor: right-click on type: Spelling › Auto Spell Check, with its check mark, #4936; previously minor: right-click on a word Auto Spell Check underlined: its suggestions, Ignore All and Add to Dictionary, #4936; previously minor: G2: Effect Gallery thumbnails and in-dialog preview; estimate 1–2 h → 0; Auto Spell Check: `edit.autoSpellCheck` underlines the unknown words, #4936; previously minor: PDF editable import preserves authored ActualText once, including empty/nested spans and authored ordering (#6165); cross-line/style layout remains approximate; scores and estimates unchanged; PDF marked-text export (#6309): compatible glyphs stay on one layout line with per-glyph offsets; scores and estimates unchanged; G5: built-in UI Frames symbol library with default 9-slice; estimate 11–21 h; previously minor: G5: dynamic symbol part on-canvas takes opacity, blend, gradient and pattern; docs Overlap/auto-corners sync; estimate 12–22 h; previously minor: interim macOS cursor delivery, #2292; native validation pending; scores and estimates unchanged; previously minor: Control bar › Snapping includes the existing Snap to Glyph and Alignment Guides toggles (#6164); scores and estimates unchanged; previously minor: G5 docs: Art brush Overlap, Pattern brush auto corners and Global Edit Shift-click leave-out moved from Missing to Done (code already shipped); previously minor: custom dictionary and Ignore All: `text.spelling.addWord`, `removeWord`, `changeWord`, `dictionary` and `ignoreAll`, #4936; previously minor: EPS import: embedded fonts (composite, Type 42, CID-keyed, Type 1, CFF FontSet) draw their glyphs; spell check engine: `text.spelling.check` and `text.spelling.suggest` on craft-proof, #4936; previously minor: floating tab groups collapse into the side icon rail and opened rail panels fold back into it, #5925 in part; G9: EPS gradients drawn as abutting strips import as one gradient, without seams; Tools stays beside the canvas with left-side panels; new gradients follow document color mode; Selection QoL: marquee modes and visible feedback, #5313; #3380 deletion-only review follow-up: independent survivors keep gradient placement, owned subpaths avoid discarded copies, and contracts/status/evidence are clarified; endpoint highlighting remains open; scores and estimates unchanged; Indian-language hyphenation review and license allowlist, #4947; opening a slow file shows a progress window, part of #5930; Hindi catalog and contributor loanword preferences; agent wording pass complete; wider native proofreading welcome; an image zoomed in on is separated, colorized or proofed only where it shows (#4155); scores and estimates unchanged; a document's first frame renders on the render worker, so opening a heavy file no longer freezes the window; scores and estimates unchanged; large images in CMYK documents are shrunk before they are separated into ink planes (#4155); scores and estimates unchanged; `.ai` paths with a Calligraphic brush open brushed, with the 6D Art Pen's channels, and Windows reads the pen's tilt and barrel rotation, #372; scores and estimates unchanged; Compound Shapes add-on, beyond Illustrator; scores and estimates unchanged; Contour add-on, beyond Illustrator; scores and estimates unchanged; a slow first frame is waited for instead of restarting without the graphics adapter, and the menu bar no longer waits for the installed fonts' scan; scores and estimates unchanged) · **Target:** Adobe Illustrator 2026 (30.x) +> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-16 · **Change:** minor (Recolor Artwork follow-up (#8031, remaining #4028): native Lab input, picker swatch libraries and Assign-row menus; UI interaction regression coverage; scores and estimates unchanged; previously: G4 type: modal Check Spelling dialog (Edit › Spelling › Check Spelling…), #4936; spell check complete; previously: Type: the Middle Eastern & South Asian composers are done as a per-paragraph choice with the Standard composers (#4935); G5: built-in Neon & Glow graphic style library (Cyan Neon, Magenta Laser, Amber Tube, Electric Lime, Pulse Violet, Cobalt Phosphor); estimate unchanged (3–13 h); previously: Tech Circuit brush library, G5; previously: G5: built-in Weather Icons symbol library (Sun, Moon, Cloud, Rain, Thunder, Snow); estimate 5–15 → 4–14 h; previously: 3D: the seams of white-light Extrude & Bevel, Inflate and Rotate, and the face seams of the 3D (Classic) effects, have round joins instead of miters; previously: PDF import: preserve Type 3 font text runs as named groups , or as live text in TextAs::Text mode if ToUnicode exists on non-colour fonts (TextAs::Outlines produces grouped outlines), #6740; scores and estimates unchanged; previously: icon-strip flyouts also resize from the top edge and the canvas-side top corner, keeping the moved top in workspaces (storytold/craft-libs#1094); scores and estimates unchanged; previously: #6865: oversized editing artboard import; Glyphs panel: Alternates for Current Selection applies an OpenType feature value (`salt=2`) to the selected letter alone, so an Arabic word stays joined, and Entire Font lists the unencoded glyphs, #5514; #6404: transform-aware Eyedropper character copying; scores and estimates unchanged; previously: G5: built-in Energy Beams brush library; estimate 5–15 → 4–14 h; previously minor: G5: built-in Skill Icons symbol library; estimate 6–16 → 5–15 h; previously minor: ruler double-click adds a guide at the pointer, #5239; G5: built-in Status Effects graphic style library; estimate 7–17 → 6–16 h; MCP docs catch-up for UI Frames and Map Markers; previously minor: G5: built-in Inventory Icons symbol library; estimate 8–18 → 7–17 h; previously minor: G9: `.ai` save names a variable font instance's design-space setting, #6388; previously minor: G5: built-in Game Trails brush library; estimate 9–19 → 8–18 h; previously minor: Edit › Edit Custom Dictionary…: its dialog adds, deletes and changes the custom dictionary's words, #4936; previously minor: docs tidy-up, no content change: stray notes at the top moved into the revision table; scores and estimates unchanged; previously minor: G5: built-in Game HUD graphic style library; estimate 10–20 → 9–19 h; previously minor: G5: built-in Map Markers symbol library; estimate 11–21 → 10–20 h; previously minor: right-click on type: Spelling › Auto Spell Check, with its check mark, #4936; previously minor: right-click on a word Auto Spell Check underlined: its suggestions, Ignore All and Add to Dictionary, #4936; previously minor: G2: Effect Gallery thumbnails and in-dialog preview; estimate 1–2 h → 0; Auto Spell Check: `edit.autoSpellCheck` underlines the unknown words, #4936; previously minor: PDF editable import preserves authored ActualText once, including empty/nested spans and authored ordering (#6165); cross-line/style layout remains approximate; scores and estimates unchanged; PDF marked-text export (#6309): compatible glyphs stay on one layout line with per-glyph offsets; scores and estimates unchanged; G5: built-in UI Frames symbol library with default 9-slice; estimate 11–21 h; previously minor: G5: dynamic symbol part on-canvas takes opacity, blend, gradient and pattern; docs Overlap/auto-corners sync; estimate 12–22 h; previously minor: interim macOS cursor delivery, #2292; native validation pending; scores and estimates unchanged; previously minor: Control bar › Snapping includes the existing Snap to Glyph and Alignment Guides toggles (#6164); scores and estimates unchanged; previously minor: G5 docs: Art brush Overlap, Pattern brush auto corners and Global Edit Shift-click leave-out moved from Missing to Done (code already shipped); previously minor: custom dictionary and Ignore All: `text.spelling.addWord`, `removeWord`, `changeWord`, `dictionary` and `ignoreAll`, #4936; previously minor: EPS import: embedded fonts (composite, Type 42, CID-keyed, Type 1, CFF FontSet) draw their glyphs; spell check engine: `text.spelling.check` and `text.spelling.suggest` on craft-proof, #4936; previously minor: floating tab groups collapse into the side icon rail and opened rail panels fold back into it, #5925 in part; G9: EPS gradients drawn as abutting strips import as one gradient, without seams; Tools stays beside the canvas with left-side panels; new gradients follow document color mode; Selection QoL: marquee modes and visible feedback, #5313; #3380 deletion-only review follow-up: independent survivors keep gradient placement, owned subpaths avoid discarded copies, and contracts/status/evidence are clarified; endpoint highlighting remains open; scores and estimates unchanged; Indian-language hyphenation review and license allowlist, #4947; opening a slow file shows a progress window, part of #5930; Hindi catalog and contributor loanword preferences; agent wording pass complete; wider native proofreading welcome; an image zoomed in on is separated, colorized or proofed only where it shows (#4155); scores and estimates unchanged; a document's first frame renders on the render worker, so opening a heavy file no longer freezes the window; scores and estimates unchanged; large images in CMYK documents are shrunk before they are separated into ink planes (#4155); scores and estimates unchanged; `.ai` paths with a Calligraphic brush open brushed, with the 6D Art Pen's channels, and Windows reads the pen's tilt and barrel rotation, #372; scores and estimates unchanged; Compound Shapes add-on, beyond Illustrator; scores and estimates unchanged; Contour add-on, beyond Illustrator; scores and estimates unchanged; a slow first frame is waited for instead of restarting without the graphics adapter, and the menu bar no longer waits for the installed fonts' scan; scores and estimates unchanged) · **Target:** Adobe Illustrator 2026 (30.x) ## Feature submission evidence @@ -34,7 +34,6 @@ Artboard Options forwards the active Artboard tool's Scale Artwork with Artboard | Date | Change | Summary | |---|---|---| -| 2026-11-17 | minor | G5: Engraving adds four original procedural art brushes (Fine, Dense, Tapered and Broken Hatching); eleven built-in brush libraries. G5 remaining estimate 3–13 h (estimated); parity scores and headline totals unchanged. | | 2026-11-16 | minor | G1: Recolor Artwork - native Lab entry in Color Picker, swatch libraries access in Color Picker, and row right-click context menu ("Pick from Swatches", "Limit to Library") (#4028); scores and estimates unchanged. | | 2026-11-15 | minor | G4 type: modal Check Spelling dialog (Edit › Spelling › Check Spelling…, `ui.checkSpelling`, #4936) with Not in Dictionary sentence context, suggestions, Ignore, Ignore All, Change, Change All, Add to Dictionary, Done/Cancel, keyboard navigation, and one-step Undo/Redo; spell check complete; scores and estimates unchanged. | | 2026-11-15 | minor | G5: Neon & Glow joins Shadows and Glows, Outlines and Rules, Hand-Drawn, Textures, Painted and Sketched, Gradient Finishes, Shape Effects, Blends and Transparency, Game HUD and Status Effects as an eleventh built-in graphic style library (Cyan Neon, Magenta Laser, Amber Tube, Electric Lime, Pulse Violet, Cobalt Phosphor; original procedural styles generated in code); estimate unchanged (3–13 h). | diff --git a/docs/roadmap.md b/docs/roadmap.md index 19d1bcc755..258b86d04a 100644 --- a/docs/roadmap.md +++ b/docs/roadmap.md @@ -1,6 +1,6 @@ # Roadmap: milestones and what's next -> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-17 · **Change:** minor (M10/G5: Engraving adds four original hatching brushes; estimate and parity scores unchanged; previously: PDF import: a glyph filled only after a glyph filled and stroked comes in filled only, not stroked, #8300; PDF import: translucent type filled and stroked comes in as a filled type object and a stroked one, as the file composites them, and an upright glyph is never kept as the outline of its glyph alone, #8015; PDF import: type filled and stroked by one text-showing operator comes in as one type object, filled and stroked, not a stroked copy over a filled one, #8015; M1: Layers panel Alt-drag shows the copy cursor, #8217; scores and estimates unchanged; previously: Gradient panel: the add-stop strip shows the white arrow with a plus on Windows and X11, #8241; scores and estimates unchanged; previously: Recolor Artwork follow-up (#8031, remaining #4028): native Lab input, picker swatch libraries and Assign-row menus; UI interaction regression coverage; scores and estimates unchanged; previously: #8005: the Color spectrum fills a resized panel; scores and estimates unchanged; previously: M7: Check Spelling modal dialog (Edit › Spelling › Check Spelling…), #4936; spell check complete; previously: PDF import: stroked type keeps the line cap, line join and miter limit the file strokes it with, a glyph stroked otherwise than the run it joins coming in as a run of its own, #7741; M10/G5: Neon & Glow built-in graphic style library (Cyan Neon, Magenta Laser, Amber Tube, Electric Lime, Pulse Violet, Cobalt Phosphor); previously: Tech Circuit brush library, G5; previously: Graphic Styles list fills a taller panel, #2992; scores and estimates unchanged; previously: PDF import: glyphs in a span with an empty ActualText come in as outlines, #6971; scores and estimates unchanged; previously: library panels' lists fill a taller panel, #2992; scores and estimates unchanged; previously: Swatches list fills a taller panel, #1638; scores and estimates unchanged; previously: icon-strip flyouts also resize from the top edge and the canvas-side top corner, keeping the moved top in workspaces (storytold/craft-libs#1094); scores and estimates unchanged; previously: #6865: explicitly requested oversized editing artboard; Live Paint Bucket fills faces crossed in one drag (#6373); previously: #6404: transform-aware Eyedropper character copying; scores and estimates unchanged; previously: M10/G5: Energy Beams brush library; MCP docs list Energy Beams; previously minor: M10/G5: Skill Icons symbol library; MCP docs list Skill Icons; previously minor: M10/G5: Status Effects graphic style library; MCP docs catch-up for symbol libraries; previously minor: M10/G5: Inventory Icons built-in symbol library; previously minor: Edit › Edit Custom Dictionary…: its dialog adds, deletes and changes the custom dictionary's words, #4936; previously minor: M10/G5: Game HUD graphic style library; previously minor: resizable icon-strip flyouts and bottom-aligned panel footers, #5713; previously minor: M10/G5: Map Markers built-in symbol library; previously minor: right-click on type: Spelling › Auto Spell Check, with its check mark, #4936; previously minor: right-click on a word Auto Spell Check underlined: its suggestions, Ignore All and Add to Dictionary, #4936; previously minor: G2: Effect Gallery thumbnails and in-dialog preview are in; Auto Spell Check: `edit.autoSpellCheck` underlines the unknown words, #4936; previously minor: PDF editable import preserves authored ActualText once, including empty/nested spans and authored ordering (#6165); cross-line/style layout remains approximate; scores and estimates unchanged; PDF marked-text export (#6309): compatible glyphs stay on one layout line with per-glyph offsets; scores and estimates unchanged; interim macOS cursor delivery, #2292; native validation pending; scores and estimates unchanged; Control bar › Snapping includes the existing Snap to Glyph and Alignment Guides toggles (#6164); scores and estimates unchanged; custom dictionary and Ignore All: `text.spelling.addWord`, `removeWord`, `changeWord`, `dictionary` and `ignoreAll`, #4936; previously minor: EPS import: embedded fonts (composite, Type 42, CID-keyed, Type 1, CFF FontSet) draw their glyphs; spell check engine: `text.spelling.check` and `text.spelling.suggest` on craft-proof, #4936; previously minor: floating tab groups collapse into the side icon rail and opened rail panels fold back into it, #5925 in part; M4/M7: `.ai`/EPS type keeps its tab stops, and right-aligned lines with tabs lay out as the file's page, #6147; M4/M7: `.ai`/EPS type from the text document lays its lines out closer to the file's page, within limits, #6137; numeric fields step on wheel hover without taking keyboard focus, #5949; Character Styles panel: a double-click on a style's row opens its Character Style Options; the dialog keeps a fixed width and scrolls its sections, so its buttons stay on screen; Selection QoL: marquee modes and visible feedback, #5313; SVG CSS classes survive export and repeated import in all four styling modes (#2480); current-main integration retains event attributes and scripts; #3380 deletion-only review follow-up: independent survivors keep gradient placement, owned subpaths avoid discarded copies, and contracts/status/evidence are clarified; endpoint highlighting remains open; scores and estimates unchanged; Indian-language hyphenation review and license allowlist, #4947; Hindi catalog and contributor loanword preferences; full wording review in progress; Effect dialogs: a colour swatch beside a hex colour opens the Color Picker, #5365; shape tools move the selection from its centre point and turn it from the zone outside a box corner, #5477; scores and estimates unchanged) · **Target:** Adobe Illustrator 2026 (30.x) +> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-17 · **Change:** minor (PDF import: a glyph filled only after a glyph filled and stroked comes in filled only, not stroked, #8300; PDF import: translucent type filled and stroked comes in as a filled type object and a stroked one, as the file composites them, and an upright glyph is never kept as the outline of its glyph alone, #8015; PDF import: type filled and stroked by one text-showing operator comes in as one type object, filled and stroked, not a stroked copy over a filled one, #8015; M1: Layers panel Alt-drag shows the copy cursor, #8217; scores and estimates unchanged; previously: Gradient panel: the add-stop strip shows the white arrow with a plus on Windows and X11, #8241; scores and estimates unchanged; previously: Recolor Artwork follow-up (#8031, remaining #4028): native Lab input, picker swatch libraries and Assign-row menus; UI interaction regression coverage; scores and estimates unchanged; previously: #8005: the Color spectrum fills a resized panel; scores and estimates unchanged; previously: M7: Check Spelling modal dialog (Edit › Spelling › Check Spelling…), #4936; spell check complete; previously: PDF import: stroked type keeps the line cap, line join and miter limit the file strokes it with, a glyph stroked otherwise than the run it joins coming in as a run of its own, #7741; M10/G5: Neon & Glow built-in graphic style library (Cyan Neon, Magenta Laser, Amber Tube, Electric Lime, Pulse Violet, Cobalt Phosphor); previously: Tech Circuit brush library, G5; previously: Graphic Styles list fills a taller panel, #2992; scores and estimates unchanged; previously: PDF import: glyphs in a span with an empty ActualText come in as outlines, #6971; scores and estimates unchanged; previously: library panels' lists fill a taller panel, #2992; scores and estimates unchanged; previously: Swatches list fills a taller panel, #1638; scores and estimates unchanged; previously: icon-strip flyouts also resize from the top edge and the canvas-side top corner, keeping the moved top in workspaces (storytold/craft-libs#1094); scores and estimates unchanged; previously: #6865: explicitly requested oversized editing artboard; Live Paint Bucket fills faces crossed in one drag (#6373); previously: #6404: transform-aware Eyedropper character copying; scores and estimates unchanged; previously: M10/G5: Energy Beams brush library; MCP docs list Energy Beams; previously minor: M10/G5: Skill Icons symbol library; MCP docs list Skill Icons; previously minor: M10/G5: Status Effects graphic style library; MCP docs catch-up for symbol libraries; previously minor: M10/G5: Inventory Icons built-in symbol library; previously minor: Edit › Edit Custom Dictionary…: its dialog adds, deletes and changes the custom dictionary's words, #4936; previously minor: M10/G5: Game HUD graphic style library; previously minor: resizable icon-strip flyouts and bottom-aligned panel footers, #5713; previously minor: M10/G5: Map Markers built-in symbol library; previously minor: right-click on type: Spelling › Auto Spell Check, with its check mark, #4936; previously minor: right-click on a word Auto Spell Check underlined: its suggestions, Ignore All and Add to Dictionary, #4936; previously minor: G2: Effect Gallery thumbnails and in-dialog preview are in; Auto Spell Check: `edit.autoSpellCheck` underlines the unknown words, #4936; previously minor: PDF editable import preserves authored ActualText once, including empty/nested spans and authored ordering (#6165); cross-line/style layout remains approximate; scores and estimates unchanged; PDF marked-text export (#6309): compatible glyphs stay on one layout line with per-glyph offsets; scores and estimates unchanged; interim macOS cursor delivery, #2292; native validation pending; scores and estimates unchanged; Control bar › Snapping includes the existing Snap to Glyph and Alignment Guides toggles (#6164); scores and estimates unchanged; custom dictionary and Ignore All: `text.spelling.addWord`, `removeWord`, `changeWord`, `dictionary` and `ignoreAll`, #4936; previously minor: EPS import: embedded fonts (composite, Type 42, CID-keyed, Type 1, CFF FontSet) draw their glyphs; spell check engine: `text.spelling.check` and `text.spelling.suggest` on craft-proof, #4936; previously minor: floating tab groups collapse into the side icon rail and opened rail panels fold back into it, #5925 in part; M4/M7: `.ai`/EPS type keeps its tab stops, and right-aligned lines with tabs lay out as the file's page, #6147; M4/M7: `.ai`/EPS type from the text document lays its lines out closer to the file's page, within limits, #6137; numeric fields step on wheel hover without taking keyboard focus, #5949; Character Styles panel: a double-click on a style's row opens its Character Style Options; the dialog keeps a fixed width and scrolls its sections, so its buttons stay on screen; Selection QoL: marquee modes and visible feedback, #5313; SVG CSS classes survive export and repeated import in all four styling modes (#2480); current-main integration retains event attributes and scripts; #3380 deletion-only review follow-up: independent survivors keep gradient placement, owned subpaths avoid discarded copies, and contracts/status/evidence are clarified; endpoint highlighting remains open; scores and estimates unchanged; Indian-language hyphenation review and license allowlist, #4947; Hindi catalog and contributor loanword preferences; full wording review in progress; Effect dialogs: a colour swatch beside a hex colour opens the Color Picker, #5365; shape tools move the selection from its centre point and turn it from the zone outside a box corner, #5477; scores and estimates unchanged) · **Target:** Adobe Illustrator 2026 (30.x) > > Oversized artboard import update (2026-11-12): Explicit editing-data import retains a single artboard beyond a capped 14,400 pt PDF page (#6865). > @@ -212,7 +212,6 @@ not take the artwork yet. Overflow-menu drag remains separate. Scores and hours | Date | Change | Summary | |---|---|---| -| 2026-11-17 | minor | M10/G5: Engraving adds Fine, Dense, Tapered and Broken Hatching as four original procedural art brushes; eleven built-in brush libraries. G5 estimate and parity scores unchanged. | | 2026-11-17 | minor | PDF import (#8300): a glyph filled only (text rendering mode 0) right after one filled and stroked (mode 2) joined the stroked run and came in stroked too: `2 Tr (B) Tj 0 Tr (C) Tj` came in as `BC` stroked throughout. A glyph filled only now joins only a run drawn alike, so it starts a run of its own, filled only, in the same type object, and takes a stroke only when the file draws one over it (the #8015 matching); a word filled whole then stroked whole, and fill and stroke rendering glyph by glyph, still come in as one run filled and stroked. Tests: `a_glyph_filled_only_after_one_filled_and_stroked_is_not_stroked`, `glyphs_filled_and_stroked_one_by_one_stay_one_run`; scores and estimates unchanged. | | 2026-11-17 | minor | PDF import (#8015 follow-up): type filled and stroked at less than full opacity is no longer joined into one type object, since the file composites the fill and the stroke apiece, darker where they overlap, while one object's opacity applies to both together; it stays a filled object and a stroked one, as a fill and stroke at different opacities already did. An upright glyph (vertical type) filled and stroked is no longer kept as an outline for a line that comes in as its outlines, as glyphs filled only weren't, so such a line can't lose them. The #8015 entries now say what is left: translucent type filled and stroked, and a `TJ` whose kerning starts a new line part way through, still come in as two objects. Tests: `translucent_fill_and_stroke_text_stays_two_objects`, `a_vertical_line_with_one_glyph_filled_and_stroked_keeps_every_glyph_filled`; scores and estimates unchanged. | | 2026-11-16 | minor | PDF import: fill and stroke rendering (text rendering modes 2 and 6) draws all the glyphs of a text-showing operator (`Tj`, `TJ`, `'`, `"`) filled, then the same glyphs stroked, so a word shown at once came in as two type objects: a stroke-only copy over a fill-only one. Each stroke is now matched, in order, to the glyph filled with the same placement (where, how large, how wide, slanted and turned) in the same font with the same text on the line, and only that glyph takes the stroke, so the word comes in as one type object, filled and stroked; glyphs stroked with another join part way through still split into runs of their own, and stroked type over no filled glyph (modes 1 and 5) stays stroke only (#8015; `a_word_filled_then_stroked_imports_as_one_filled_and_stroked_type` in `crates/pdf/src/tests/textstroke.rs`, `a_vertical_column_filled_then_stroked_is_one_filled_and_stroked_type` in `crates/pdf/src/tests/text_placement.rs`). Scores and estimates unchanged. | diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index 1def6a247b..99c955f21a 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -575,7 +575,7 @@ since 2026-10-01. | **Interaction fidelity:** modifiers, cursors, small behaviours | ~30–40% | The dedicated pass hasn't started, and there has been no side-by-side session with Illustrator yet. A power user notices this first | | **Look & feel** | ~75–80% | Measured against Illustrator 2026 screenshots (2026-10-02); the panels added since haven't been re-measured | | **File interop** | ~85% | SVG/SVGZ, PDF and PDF-compatible `.ai` (and legacy version 7 `.ai` out, keeping layers, groups and type as text), EPS, DXF, EMF/WMF, raster formats, PSD export and PSD/PSB placement (merged image), Place and Links, Package, Print, clipboard flavours. Affinity documents (Affinity 1–3) open natively as editable art, checked against 51 pinned public files (33 current `.af`), with selected saved-thumbnail comparisons and every-board native/SVG/PDF/PSD checks for current files; Affinity export is missing and effects, adjustments and brushes don't import. Affinity isn't an Illustrator feature, so this doesn't raise the parity score. The editing copy inside an Illustrator EPS or `.ai` is read for its structure: layers, groups, names, hidden objects and type, colours, gradients, transparency, images and every artboard (see Out of scope for what it doesn't read yet); DWG has no open spec | -| **Bundled content:** brush, symbol, style and swatch libraries | ~46% | Ours are original and generated in code, and far fewer than Illustrator ships; symbol libraries have six (Basic Shapes, UI Frames with default 9-slice, Map Markers, Inventory Icons, Skill Icons, Weather Icons), graphic style libraries eleven (including Game HUD, Status Effects and Neon & Glow) and brush libraries eleven (Art Ribbons, Ink and Wash, Calligraphic Nibs, Bristle Brushes, Pattern Borders, Scatter Shapes, Game Trails, Energy Beams, Dry Media, Tech Circuit, Engraving) beside User Defined and Other Library… | +| **Bundled content:** brush, symbol, style and swatch libraries | ~46% | Ours are original and generated in code, and far fewer than Illustrator ships; symbol libraries have six (Basic Shapes, UI Frames with default 9-slice, Map Markers, Inventory Icons, Skill Icons, Weather Icons), graphic style libraries eleven (including Game HUD, Status Effects and Neon & Glow) and brush libraries ten (Art Ribbons, Ink and Wash, Calligraphic Nibs, Bristle Brushes, Pattern Borders, Scatter Shapes, Game Trails, Energy Beams, Dry Media, Tech Circuit) beside User Defined and Other Library… | | **Performance** | unverified | Multithreaded, off-thread rendering and caches are in place. The last budget run (2026-10-01, loaded machine) measured 290 ms for a 50k-path fit against a 16 ms budget. Re-run `vectorcraft-cli perf` on an idle machine | | **Robustness** | good, new | ~2,840 tests, property tests, no panics in shipped code (lints, the `guard` safety net, import fuzzing), Data Recovery. Missing: a corpus of real-world files, Windows/Linux/browser QA | | **Platforms and 1.0 polish** | ~60% | The macOS app and the web build work, and Finder opens every readable format with the macOS app (#295, #354); on macOS the menus are in the system menu bar, laid out as a Mac app's, with the in-window menus as a fallback (`--in-window-menus`; verified on Windows and by cross-compilation, not yet by hand on a Mac); hybrid-graphics laptops render on the power-saving GPU by default on Windows and macOS (#306), and Windows starts on Direct3D 12, falling back to OpenGL, and loads no Vulkan driver unless `WGPU_BACKEND` asks for it (#545: Vulkan flickered black on an Intel GPU, DX12 and OpenGL didn't; #806: a faulty Vulkan driver crashed the app before its window appeared; verified by unit tests and the reporter's runs with `WGPU_BACKEND`), and Linux on the GPU the desktop runs on, since a Wayland compositor may refuse frames from the other one; a window that fails on its GPU while starting up starts again on the next one instead of crashing (#502; the dual-GPU Wayland case is verified by unit tests and cross-compilation, not on such hardware); web drops land in the document they were dropped on (#359); desktop drops carry no pointer position (winit 0.30), so a dropped document opens as a tab of its own and a picture or text is placed in the middle of the view, while the web places anything dropped on the canvas and opens what is dropped off it, as Illustrator does (#472); a web page that loses its WebGPU device or WebGL context restarts its graphics with the same documents (#369); on Linux/Wayland the clipboard reads the compositor's own (data-control) and copied image files paste, but files can't be dropped on the window under native Wayland until eframe moves to winit 0.31 (#398; the Wayland side is verified by compilation only), so Preferences › Performance › Linux Display Server › X11 (XWayland) opens the window through XWayland, where drops work (#1151; verified by unit tests and cross-compilation, not on a Wayland desktop); on Linux the Paste menu checks the system clipboard on a background thread, so a clipboard owner that never answers no longer freezes the window, while Windows and macOS keep their quick in-line check (#510; the X11 hang verified by the contributor, here by headless tests); on KDE Plasma 6.3+ under Wayland, pens and pen displays reach the app only under XWayland (`WAYLAND_DISPLAY=`) or with KWin's `KWIN_WAYLAND_EMULATE_TABLET=1`, since winit 0.30 has no Wayland tablet input (#491, not verified on hardware); Windows/Linux packaging and accessibility are pending | From 2d156c1bbe96ed59ec1d593d95aeeaf567c6120e Mon Sep 17 00:00:00 2001 From: Sven Lafebre Date: Tue, 17 Nov 2026 20:15:20 +0100 Subject: [PATCH 27/78] #8188: a head that stays put no longer settles a moving head's placement When both placements give the drawn art's bounds, the tie is decided by the head that moves most between them, not the one that moves least: a start head that runs its line to its tip (a stop of 0) left an end head that moves 4 pt placed on the end. --- crates/eps/src/import/ai/read/ops.rs | 14 ++++++++------ crates/eps/src/import/ai/tests.rs | 23 +++++++++++++++++++++++ docs/file-format-parity.md | 2 +- 3 files changed, 32 insertions(+), 7 deletions(-) diff --git a/crates/eps/src/import/ai/read/ops.rs b/crates/eps/src/import/ai/read/ops.rs index 4f063bbeec..4562c06507 100644 --- a/crates/eps/src/import/ai/read/ops.rs +++ b/crates/eps/src/import/ai/read/ops.rs @@ -1407,17 +1407,19 @@ fn painted_bounds(object: &Node, appearance: &Appearance) -> Option { /// object the look's bounds within a quarter of the least distance a head moves between the two /// (at least 0.05 pt, at most 0.5 pt). `None` /// when neither does (the file draws the heads elsewhere: on other subpaths, say), or when both do -/// and the heads move 0.2 pt or more between them (the bounds can't tell which the file draws). +/// and any head moves 0.2 pt or more between them (the bounds can't tell which the file draws). fn heads_placed(object: &Node, look: &Node, mut appearance: Appearance, space: Affine) -> Option { let k = space.determinant().abs().sqrt(); let k = if k.is_finite() && k > 0.0 { k } else { 1.0 }; - // How far each head moves between the placements: its line's length under it. - let mut shift = f64::INFINITY; + // How far each head moves between the placements (its line's length under it): the least and + // the most. + let (mut shift, mut most) = (f64::INFINITY, 0.0f64); for item in &appearance.items { let AppearanceItem::Stroke(s) = item else { continue }; for (head, end) in [(&s.start_arrow, false), (&s.end_arrow, true)] { if let Some(Arrowhead::Custom(c)) = head { - shift = shift.min(c.stop() * s.arrow_weight(end) * k); + let moves = c.stop() * s.arrow_weight(end) * k; + (shift, most) = (shift.min(moves), most.max(moves)); } } } @@ -1444,10 +1446,10 @@ fn heads_placed(object: &Node, look: &Node, mut appearance: Appearance, space: A } } // Both fit when the bounds can't tell the placements apart (the end inside the bounds of the - // line's other segments), unless the heads move so little that either draws alike. + // line's other segments), unless every head moves so little that either draws alike. let align = match fits.as_slice() { [one] => *one, - [first, _] if shift < 0.2 => *first, + [first, _] if most < 0.2 => *first, _ => return None, }; for item in &mut appearance.items { diff --git a/crates/eps/src/import/ai/tests.rs b/crates/eps/src/import/ai/tests.rs index 7d8a213f80..dc3064a2d3 100644 --- a/crates/eps/src/import/ai/tests.rs +++ b/crates/eps/src/import/ai/tests.rs @@ -6446,6 +6446,29 @@ fn heads_whose_placement_the_drawn_bounds_leave_open_keep_the_drawn_look() { assert!(!matches!(a[0].kind, NodeKind::Path { .. }), "the look, not the object"); } +#[test] +fn a_head_that_stays_put_leaves_a_moving_heads_placement_open() { + // The bent line of the test above, its end head moving 4 between the placements, and a start + // head whose line runs to its tip (a stop of 0), which stays put: the bounds still can't tell + // where the end head goes. + let flat = WEDGE_ART.replace("-9 0 m\n4 0 l", "-9 0 m\n8 0 l"); + let entries = format!("50 /Real (BSArrowBeginScale) ,\n/GObjRef : (Flat) /SymbolArt ; (BSArrowBeginSymbol) ,\n{END_WEDGE}"); + let path = "%_0 50 m\n%_0 0 L\n%_200 0 L\n%_200 100 L\n%_100 100 L\n%_100 50 L\n%_N\n"; + let look = + "0 G\n2 w\n0 50 m\n0 0 l\n200 0 l\n200 100 l\n100 100 l\n100 54 l\nS\n0 g\n-3 44 m\n0 50 l\n3 44 l\nf\n97 56 m\n100 50 l\n103 56 l\nf\n"; + let line = format!("0 Ae\nu\n{look}U\n{path}1 (Arrowed) XW\n"); + let file = format!( + "{}{}{}", + symbols(&format!("{}{}", symbol("Wedge", WEDGE_ART, 5), symbol("Flat", &flat, 5))), + styles_and_list(&[arrow_style("Arrowed", &entries, 2.0)], &["Arrowed"]), + layer(&line) + ); + let r = read_ok(&file); + let a = art(&r.doc); + assert!(r.warnings.iter().any(|w| w.contains("drawn look")), "{:?} {a:#?}", r.warnings); + assert!(!matches!(a[0].kind, NodeKind::Path { .. }), "the look, not the object"); +} + #[test] fn an_arrowhead_entry_without_heads_leaves_the_stroke_read() { // Only beside heads does an arrowhead entry this doesn't read keep the drawn look. diff --git a/docs/file-format-parity.md b/docs/file-format-parity.md index 8bbd2d46be..6bfa4b26e1 100644 --- a/docs/file-format-parity.md +++ b/docs/file-format-parity.md @@ -344,7 +344,7 @@ Stop opacity on translated artboards remains outside this regression coverage. | Date | Change | Summary | |---|---|---| -| 2026-11-16 | minor | `.ai` import: a stroke's arrowheads were left out, so lines came in without their heads (#8188). A Stroke Style filter's stroke dictionary names each end's head as a symbol of the file (`/GObjRef : (name) /SymbolArt ; (BSArrowBeginSymbol)` or `(BSArrowEndSymbol)`), with its scale in percent (`BSArrowEndScale`, and `BSArrowBeginScale` read the same way; 100 without one). As the files have it, such a symbol's art (y down, as symbols are read) points right along a straight, level sample of the line: an open stroked path with no fill, which ends where the line stops under the head. The rest of the art that paints is the head, its tip its rightmost point, at one symbol unit a head weight (the stroke's weight at the scale). The head comes in as a custom arrowhead with that outline and that stop (a custom head now carries an optional stop, else its line ends halfway along it, as before). Its placement is the one of the two (tip on the end of the path, or Extend, the tip past it by the line's length under the head) that gives the object its drawn art's bounds; the user's file has every tip on its path's end. A stroke keeps its drawn look when neither placement gives those bounds (heads on other subpaths, say) or both do while the heads move 0.2 pt or more between them (a line whose end lies inside the bounds of its other segments), when its symbol isn't read whole or isn't read as a head (no sample or more than one, a sample that isn't 1 pt wide, as in art stored at a Large Canvas scale, art other than paths, compound paths and groups such as a clip group, a group with fills or strokes of its own, effects, brushes, partial opacity or an opacity mask), when its dictionary holds another `BSArrow` entry beside heads, when a scale is outside 1–1000 %, or when the head's weight would be under the 0.25 pt least one VectorCraft draws; a graphic style with such a stroke isn't read rather than read without its heads, and one with heads takes them on the end of the path, so an object whose heads are read past its ends isn't linked to its listed style. Measured on a user's file of ten arrows (used locally, never committed): every line gets its heads, and drawn at 4× its pixels match the file's own page but for 3 of 9,825 inked ones (0.24.1: 1,232 differ). Tests `a_strokes_arrowhead_symbols_are_its_arrowheads`, `a_strokes_start_arrowhead_points_back_and_keeps_its_side`, `a_stroke_takes_both_heads_at_their_own_scales`, `heads_drawn_past_the_path_extend_it`, `arrowheads_this_does_not_read_keep_the_drawn_look`, `an_arrowhead_entry_without_heads_leaves_the_stroke_read` in `crates/eps/src/import/ai/tests.rs`, `heads_whose_placement_the_drawn_bounds_leave_open_keep_the_drawn_look` in it, `a_symbol_entry_cut_short_leaves_the_next_style_read` and `a_comment_inside_a_symbol_entry_is_skipped` in `crates/eps/src/import/ai/style/tests.rs`, `partly_transparent_or_masked_art_makes_no_head` in `crates/eps/src/import/ai/arrowhead.rs`, fuzzed by `ai_arrowhead_strokes_never_panic`; scores unchanged | +| 2026-11-16 | minor | `.ai` import: a stroke's arrowheads were left out, so lines came in without their heads (#8188). A Stroke Style filter's stroke dictionary names each end's head as a symbol of the file (`/GObjRef : (name) /SymbolArt ; (BSArrowBeginSymbol)` or `(BSArrowEndSymbol)`), with its scale in percent (`BSArrowEndScale`, and `BSArrowBeginScale` read the same way; 100 without one). As the files have it, such a symbol's art (y down, as symbols are read) points right along a straight, level sample of the line: an open stroked path with no fill, which ends where the line stops under the head. The rest of the art that paints is the head, its tip its rightmost point, at one symbol unit a head weight (the stroke's weight at the scale). The head comes in as a custom arrowhead with that outline and that stop (a custom head now carries an optional stop, else its line ends halfway along it, as before). Its placement is the one of the two (tip on the end of the path, or Extend, the tip past it by the line's length under the head) that gives the object its drawn art's bounds; the user's file has every tip on its path's end. A stroke keeps its drawn look when neither placement gives those bounds (heads on other subpaths, say) or both do while a head moves 0.2 pt or more between them (a line whose end lies inside the bounds of its other segments), when its symbol isn't read whole or isn't read as a head (no sample or more than one, a sample that isn't 1 pt wide, as in art stored at a Large Canvas scale, art other than paths, compound paths and groups such as a clip group, a group with fills or strokes of its own, effects, brushes, partial opacity or an opacity mask), when its dictionary holds another `BSArrow` entry beside heads, when a scale is outside 1–1000 %, or when the head's weight would be under the 0.25 pt least one VectorCraft draws; a graphic style with such a stroke isn't read rather than read without its heads, and one with heads takes them on the end of the path, so an object whose heads are read past its ends isn't linked to its listed style. Measured on a user's file of ten arrows (used locally, never committed): every line gets its heads, and drawn at 4× its pixels match the file's own page but for 3 of 9,825 inked ones (0.24.1: 1,232 differ). Tests `a_strokes_arrowhead_symbols_are_its_arrowheads`, `a_strokes_start_arrowhead_points_back_and_keeps_its_side`, `a_stroke_takes_both_heads_at_their_own_scales`, `heads_drawn_past_the_path_extend_it`, `arrowheads_this_does_not_read_keep_the_drawn_look`, `an_arrowhead_entry_without_heads_leaves_the_stroke_read` in `crates/eps/src/import/ai/tests.rs`, `heads_whose_placement_the_drawn_bounds_leave_open_keep_the_drawn_look`, `a_head_that_stays_put_leaves_a_moving_heads_placement_open` in it, `a_symbol_entry_cut_short_leaves_the_next_style_read` and `a_comment_inside_a_symbol_entry_is_skipped` in `crates/eps/src/import/ai/style/tests.rs`, `partly_transparent_or_masked_art_makes_no_head` in `crates/eps/src/import/ai/arrowhead.rs`, fuzzed by `ai_arrowhead_strokes_never_panic`; scores unchanged | | 2026-11-15 | minor | PDF import: stroked type (text rendering modes 1, 2, 5 and 6, and glyphs under `ActualText`) came in with butt caps, miter joins and a miter limit of 10 whatever the file stroked it with, while paths kept the graphics state's. The characters' stroke now takes the line cap (`J`), line join (`j`) and miter limit (`M`) of the graphics state, as a path's stroke does, and glyphs stroked with other ones start a run of their own, also a glyph filled and then stroked otherwise than the run its fill joined, so the glyphs before it keep their stroke (#7741). Test `imported_stroked_type_keeps_the_files_cap_join_and_miter_limit` in `crates/pdf/src/tests/textstroke.rs`. Scores and estimates unchanged. | | 2026-11-13 | minor | `.ai` and EPS import: layers that don't draw as the page, even with the drawn art of every live envelope put back, no longer put back the drawn art of every envelope of type. Each live envelope of type is weighed in the page check's own drawing of the pages it lies on, on the pixels that it and its drawn art ink there (the two drawn together on a layer of their own, without the rest of the layers; a pixel inks with an alpha above 8 of 255): it keeps its drawn art and its type, hidden, with the note, where the layers with it differ from the page in more of those pixels than its own check allows against its drawn art (10% of them, or 3% differing with all their neighbours, away from type), or where the envelopes of type that stay live, in the order they were read, would together differ there in more of a page than half of what the page check allows (a budget of the same size as the one their own checks share, kept apart from it). Art that differs elsewhere on the page no longer costs them their editable type; art that differs on their pixels still does. An envelope of type that a clip group or a clipping sublayer clips, an opacity mask masks, or a group with an appearance of its own, another envelope, a repeat or a blend holds keeps its drawn art as before, wherever it lies: drawn on its own it would be weighed elsewhere than it draws, and what holds it can draw it onto the page from off it. An envelope on no page stays live, as the page check doesn't see it, unless the page holds all the art that prints (an EPS's page that is its art's box, where art past the page is compared too): there one reaching past the page keeps its drawn art. Past 12 of them on the pages, all keep it. This holds where the editing data is trusted, where the objects that differ come in as the page's art (the placed files' other placement weighed on its own, as it draws them elsewhere under or over the envelopes; layers that draw as the page with only the envelopes the page holds put back are used as they are; where none of the objects that differ can then come in as the page's art, because an object holds type, the drawn art of every envelope of type is put back and that is tried again, as before), and for a `.ai` whose layers would open alone, which still opens alone: its envelopes of type are all settled again as they were with the page, in the same order and with the same checks, so each that opens live draws as it was weighed, and those the page held get their drawn art back. Where putting the drawn art of every live envelope back makes the layers draw as the page, it is still put back (#5065). In 224 users' files (used locally, never committed): envelopes of type that open live go from 174 to 186, in 8 files, none fewer in any file; no file changes between its layers and its PDF part; 7 renders change, by at most 0.7% of their pixels at 40 ppi (1 closer to the page, 1 alike, 5 further, by at most 0.7 of a percentage point, where VectorCraft's own envelope draws a little apart from the drawn art, within its check); the note for type in an envelope goes from 6 files. Of the 14 envelopes of type that had opened live and lost it to the page check, 2 keep their drawn art: one where the page draws something else where it is, and one in a file that comes in as its PDF part (#7141). Tests `build::candidate_tests::the_page_holds_back_only_envelopes_of_type_where_it_differs_from_them`, `envelopes_of_type_stay_live_within_half_of_what_the_page_check_allows`, `an_envelope_of_type_differing_in_more_of_its_pixels_than_its_check_allows_is_held_back`, `envelopes_of_type_the_layers_dont_draw_in_place_are_held_back`, `on_a_page_that_holds_all_the_art_an_envelope_of_type_past_it_is_held_back`, `objects_come_in_as_the_page_art_with_every_envelope_of_type_put_back_where_a_live_one_holds_a_difference`, `tests_native::layers_that_would_open_alone_keep_an_envelope_of_type_live_where_other_art_differs_from_the_page`, `layers_that_would_open_alone_keep_live_only_the_envelopes_of_type_the_page_doesnt_hold`, `trusted_layers_that_would_open_alone_open_alone_with_an_envelope_of_type_the_page_doesnt_hold_live`, `layers_with_objects_that_come_in_as_the_page_art_keep_an_envelope_of_type_that_draws_as_the_page_live`, `trusted_layers_keep_an_envelope_of_type_live_where_other_art_differs_from_the_page`, `trusted_layers_leave_an_envelope_of_type_the_page_draws_otherwise_its_drawn_art`, `build::candidate_tests::the_other_placement_of_placed_files_is_weighed_on_its_own`, `layers_that_draw_as_the_page_with_the_held_envelopes_of_type_put_back_are_used_so` | | 2026-11-13 | minor | PDF import: glyphs inside a marked-content span with an empty `ActualText` come in as outlines in their fill and stroke instead of being left out, adding no text (#6971; `empty_actual_text_keeps_the_glyphs_art` in `crates/pdf/src/tests/actual_text.rs`). Scores and estimates unchanged. | From 2abc008931c774cfd127102885bec3900bb28d83 Mon Sep 17 00:00:00 2001 From: Sven Lafebre Date: Tue, 17 Nov 2026 21:12:56 +0100 Subject: [PATCH 28/78] #8188: a graphic style library reads the heads of symbols defined after its styles A library has no layers, so nothing checked the symbols after the styles and a style whose arrowhead symbol came later was dropped. Read the heads once the reader is done, as the symbols library already does. --- crates/eps/src/import/ai/read/document.rs | 2 ++ crates/eps/src/import/ai/tests.rs | 14 ++++++++++++++ docs/file-format-parity.md | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/crates/eps/src/import/ai/read/document.rs b/crates/eps/src/import/ai/read/document.rs index d022a5168c..2f685a0a22 100644 --- a/crates/eps/src/import/ai/read/document.rs +++ b/crates/eps/src/import/ai/read/document.rs @@ -452,6 +452,8 @@ pub fn graphic_styles(data: &[u8], large_canvas: bool, names: &mut obj::Names) - r.large_canvas = large_canvas.then_some(1.0); // The styles come before the art, so an error in the art leaves them read. let _ = r.run(); + // No layer checks the symbols here: the heads of those defined after the styles. + r.read_arrowheads(); let styles = r.graphic_styles().0; let used: Vec<&str> = styles.iter().map(|s| s.name.as_str()).collect(); names.absorb_among(std::mem::take(&mut r.names), &used); diff --git a/crates/eps/src/import/ai/tests.rs b/crates/eps/src/import/ai/tests.rs index e84054a110..b2f2000014 100644 --- a/crates/eps/src/import/ai/tests.rs +++ b/crates/eps/src/import/ai/tests.rs @@ -6525,6 +6525,20 @@ fn a_head_that_stays_put_leaves_a_moving_heads_placement_open() { assert!(!matches!(a[0].kind, NodeKind::Path { .. }), "the look, not the object"); } +#[test] +fn a_style_library_reads_the_heads_of_symbols_defined_after_its_styles() { + // A graphic style library has no layers, so nothing past its styles reads the heads again. + use vectorcraft_doc::Arrowhead; + let data = stream(&format!( + "%AI9_BeginArtStyles\n{}%AI9_EndArtStyles\n{}%AI9_BeginArtStyleList\n(Arrowed)\n%AI9_EndArtStyleList\n", + arrow_style("Arrowed", END_WEDGE, 2.0), + symbols(&symbol("Wedge", WEDGE_ART, 5)) + )); + let (styles, _) = graphic_styles(data.as_bytes(), false, &mut obj::Names::default()); + let stroke = styles.iter().find(|g| g.name == "Arrowed").and_then(|g| g.appearance.stroke()); + assert!(matches!(stroke.and_then(|s| s.end_arrow.as_ref()), Some(Arrowhead::Custom(h)) if h.name == "Wedge"), "{styles:?}"); +} + #[test] fn an_arrowhead_entry_without_heads_leaves_the_stroke_read() { // Only beside heads does an arrowhead entry this doesn't read keep the drawn look. diff --git a/docs/file-format-parity.md b/docs/file-format-parity.md index ee1d700b19..3ee2f5491f 100644 --- a/docs/file-format-parity.md +++ b/docs/file-format-parity.md @@ -374,7 +374,7 @@ Stop opacity on translated artboards remains outside this regression coverage. | Date | Change | Summary | |---|---|---| -| 2026-11-17 | minor | `.ai` import: a stroke's arrowheads were left out, so lines came in without their heads (#8188). A Stroke Style filter's stroke dictionary names each end's head as a symbol of the file (`/GObjRef : (name) /SymbolArt ; (BSArrowBeginSymbol)` or `(BSArrowEndSymbol)`), with its scale in percent (`BSArrowEndScale`, and `BSArrowBeginScale` read the same way; 100 without one). As the files have it, such a symbol's art (y down, as symbols are read) points right along a straight, level sample of the line: an open stroked path with no fill, which ends where the line stops under the head. The rest of the art that paints is the head, its tip its rightmost point, at one symbol unit a head weight (the stroke's weight at the scale). The head comes in as a custom arrowhead with that outline and that stop (a custom head now carries an optional stop, else its line ends halfway along it, as before). Its placement is the one of the two (tip on the end of the path, or Extend, the tip past it by the line's length under the head) that gives the object its drawn art's bounds; the user's file has every tip on its path's end. A stroke keeps its drawn look when neither placement gives those bounds (heads on other subpaths, say) or both do while a head moves 0.2 pt or more between them (a line whose end lies inside the bounds of its other segments), when its symbol isn't read whole or isn't read as a head (no sample or more than one, a sample that isn't 1 pt wide, as in art stored at a Large Canvas scale, art other than paths, compound paths and groups such as a clip group, a group with fills or strokes of its own, effects, brushes, partial opacity or an opacity mask), when its dictionary holds another `BSArrow` entry beside heads, when a scale is outside 1–1000 %, or when the head's weight would be under the 0.25 pt least one VectorCraft draws; a graphic style with such a stroke isn't read rather than read without its heads, and one with heads takes them on the end of the path, so an object whose heads are read past its ends isn't linked to its listed style. Measured on a user's file of ten arrows (used locally, never committed): every line gets its heads, and drawn at 4× its pixels match the file's own page but for 3 of 9,825 inked ones (0.24.1: 1,232 differ). Tests `a_strokes_arrowhead_symbols_are_its_arrowheads`, `a_strokes_start_arrowhead_points_back_and_keeps_its_side`, `a_stroke_takes_both_heads_at_their_own_scales`, `heads_drawn_past_the_path_extend_it`, `arrowheads_this_does_not_read_keep_the_drawn_look`, `an_arrowhead_entry_without_heads_leaves_the_stroke_read` in `crates/eps/src/import/ai/tests.rs`, `heads_whose_placement_the_drawn_bounds_leave_open_keep_the_drawn_look`, `a_head_that_stays_put_leaves_a_moving_heads_placement_open` in it, `a_symbol_entry_cut_short_leaves_the_next_style_read` and `a_comment_inside_a_symbol_entry_is_skipped` in `crates/eps/src/import/ai/style/tests.rs`, `partly_transparent_or_masked_art_makes_no_head` in `crates/eps/src/import/ai/arrowhead.rs`, fuzzed by `ai_arrowhead_strokes_never_panic`; scores unchanged | +| 2026-11-17 | minor | `.ai` import: a stroke's arrowheads were left out, so lines came in without their heads (#8188). A Stroke Style filter's stroke dictionary names each end's head as a symbol of the file (`/GObjRef : (name) /SymbolArt ; (BSArrowBeginSymbol)` or `(BSArrowEndSymbol)`), with its scale in percent (`BSArrowEndScale`, and `BSArrowBeginScale` read the same way; 100 without one). As the files have it, such a symbol's art (y down, as symbols are read) points right along a straight, level sample of the line: an open stroked path with no fill, which ends where the line stops under the head. The rest of the art that paints is the head, its tip its rightmost point, at one symbol unit a head weight (the stroke's weight at the scale). The head comes in as a custom arrowhead with that outline and that stop (a custom head now carries an optional stop, else its line ends halfway along it, as before). Its placement is the one of the two (tip on the end of the path, or Extend, the tip past it by the line's length under the head) that gives the object its drawn art's bounds; the user's file has every tip on its path's end. A stroke keeps its drawn look when neither placement gives those bounds (heads on other subpaths, say) or both do while a head moves 0.2 pt or more between them (a line whose end lies inside the bounds of its other segments), when its symbol isn't read whole or isn't read as a head (no sample or more than one, a sample that isn't 1 pt wide, as in art stored at a Large Canvas scale, art other than paths, compound paths and groups such as a clip group, a group with fills or strokes of its own, effects, brushes, partial opacity or an opacity mask), when its dictionary holds another `BSArrow` entry beside heads, when a scale is outside 1–1000 %, or when the head's weight would be under the 0.25 pt least one VectorCraft draws; a graphic style with such a stroke isn't read rather than read without its heads, and one with heads takes them on the end of the path, so an object whose heads are read past its ends isn't linked to its listed style. Measured on a user's file of ten arrows (used locally, never committed): every line gets its heads, and drawn at 4× its pixels match the file's own page but for 3 of 9,825 inked ones (0.24.1: 1,232 differ). Tests `a_strokes_arrowhead_symbols_are_its_arrowheads`, `a_strokes_start_arrowhead_points_back_and_keeps_its_side`, `a_stroke_takes_both_heads_at_their_own_scales`, `heads_drawn_past_the_path_extend_it`, `arrowheads_this_does_not_read_keep_the_drawn_look`, `an_arrowhead_entry_without_heads_leaves_the_stroke_read` in `crates/eps/src/import/ai/tests.rs`, `heads_whose_placement_the_drawn_bounds_leave_open_keep_the_drawn_look`, `a_head_that_stays_put_leaves_a_moving_heads_placement_open`, `a_style_library_reads_the_heads_of_symbols_defined_after_its_styles` in it, `a_symbol_entry_cut_short_leaves_the_next_style_read` and `a_comment_inside_a_symbol_entry_is_skipped` in `crates/eps/src/import/ai/style/tests.rs`, `partly_transparent_or_masked_art_makes_no_head` in `crates/eps/src/import/ai/arrowhead.rs`, fuzzed by `ai_arrowhead_strokes_never_panic`; scores unchanged | | 2026-11-17 | minor | PDF import (#8300): a glyph filled only (text rendering mode 0) right after one filled and stroked (mode 2) joined the stroked run and came in stroked too: `2 Tr (B) Tj 0 Tr (C) Tj` came in as `BC` stroked throughout. A glyph filled only now joins only a run drawn alike, so it starts a run of its own, filled only, in the same type object, and takes a stroke only when the file draws one over it (the #8015 matching); a word filled whole then stroked whole, and fill and stroke rendering glyph by glyph, still come in as one run filled and stroked. Tests: `a_glyph_filled_only_after_one_filled_and_stroked_is_not_stroked`, `glyphs_filled_and_stroked_one_by_one_stay_one_run`; scores and estimates unchanged. | | 2026-11-17 | minor | PDF import (#8015 follow-up): type filled and stroked at less than full opacity is no longer joined into one type object, since the file composites the fill and the stroke apiece, darker where they overlap, while one object's opacity applies to both together; it stays a filled object and a stroked one, as a fill and stroke at different opacities already did. An upright glyph (vertical type) filled and stroked is no longer kept as an outline for a line that comes in as its outlines, as glyphs filled only weren't, so such a line can't lose them. The #8015 entries now say what is left: translucent type filled and stroked, and a `TJ` whose kerning starts a new line part way through, still come in as two objects. Tests: `translucent_fill_and_stroke_text_stays_two_objects`, `a_vertical_line_with_one_glyph_filled_and_stroked_keeps_every_glyph_filled`; scores and estimates unchanged. | | 2026-11-16 | minor | PDF import: fill and stroke rendering (text rendering modes 2 and 6) draws all the glyphs of a text-showing operator (`Tj`, `TJ`, `'`, `"`) filled, then the same glyphs stroked, so a word shown at once came in as two type objects: a stroke-only copy over a fill-only one. Each stroke is now matched, in order, to the glyph filled with the same placement (where, how large, how wide, slanted and turned) in the same font with the same text on the line, and only that glyph takes the stroke, so the word comes in as one type object, filled and stroked; glyphs stroked with another join part way through still split into runs of their own, and stroked type over no filled glyph (modes 1 and 5) stays stroke only (#8015; `a_word_filled_then_stroked_imports_as_one_filled_and_stroked_type` in `crates/pdf/src/tests/textstroke.rs`, `a_vertical_column_filled_then_stroked_is_one_filled_and_stroked_type` in `crates/pdf/src/tests/text_placement.rs`). Scores and estimates unchanged. | From 8a70231260840800fe1d7e1fa07e69214c67a00f Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Tue, 17 Nov 2026 14:05:53 -0800 Subject: [PATCH 29/78] Transform: Rectangle and Ellipse Properties show the shape's angle Rectangle Properties and Ellipse Properties in the Transform panel, the Properties panel and the task bar's Shape Properties popup get an Angle field, as Polygon Properties has. object.setLiveShape takes rectangleAngle and ellipseAngle: each turns the selected shapes of that kind about their own centers, keeping size, corners and pie. The field shows the angle the selected shapes of its kind share and is blank when they differ; the Polygon Properties angle reads the same way. An angle a shape already has, within rounding, records no undo step, for polygonAngle too. A value that is not a number is an error. --- crates/doc/src/node/live_shape.rs | 34 +++++++-- crates/engine/src/cmd/object/commands.rs | 2 +- crates/engine/src/cmd/object/shape.rs | 30 +++++++- crates/engine/src/tests/livecorners.rs | 78 ++++++++++++++++++++ crates/engine/tests/command_sweep.rs | 33 +++++++++ crates/ui-egui/src/panels/transform.rs | 55 +++++++++++++- crates/ui-egui/src/panels/transform/tests.rs | 32 ++++++++ docs/mcp.md | 16 ++++ docs/target-app-parity.md | 1 + 9 files changed, 268 insertions(+), 13 deletions(-) diff --git a/crates/doc/src/node/live_shape.rs b/crates/doc/src/node/live_shape.rs index 9ddc4e1bb6..88a3e09d2d 100644 --- a/crates/doc/src/node/live_shape.rs +++ b/crates/doc/src/node/live_shape.rs @@ -144,10 +144,34 @@ impl LiveShape { /// from straight up (the Rotate field's sense). None for other shapes. pub fn polygon_angle(&self) -> Option { let LiveShape::Polygon { .. } = self else { return None }; - // No −0° or 360° from rounding: a polygon drawn upright reads 0°. + self.shape_angle() + } + /// A rectangle's, ellipse's or polygon's angle (Rectangle, Ellipse and Polygon Angle): the + /// counterclockwise degrees in [0, 360) it is turned by (the Rotate field's sense). A rectangle or + /// ellipse drawn level reads 0°, as does a polygon drawn with its first vertex straight up. None for + /// other shapes. + pub fn shape_angle(&self) -> Option { + let (LiveShape::Rectangle { .. } | LiveShape::Ellipse { .. } | LiveShape::Polygon { .. }) = self else { return None }; + // No −0° or 360° from rounding: a shape drawn level reads 0°. let a = (-self.angle_deg()).rem_euclid(360.0); Some(if a > 360.0 - 1e-9 { 0.0 } else { a + 0.0 }) } + /// Turn a rectangle, ellipse or polygon about its center to `angle` (degrees, as + /// [`LiveShape::shape_angle`]), keeping its size, corners and pie. Nothing changes for other + /// shapes or an angle that isn't finite. + pub fn set_shape_angle(&mut self, angle: f64) { + let Some(now) = self.shape_angle() else { return }; + if !angle.is_finite() { + return; + } + let (xf, local) = match self { + LiveShape::Rectangle { w, h, xf, .. } | LiveShape::Ellipse { w, h, xf, .. } => (xf, Point::new(*w / 2.0, *h / 2.0)), + LiveShape::Polygon { xf, .. } => (xf, Point::ZERO), + LiveShape::Line { .. } | LiveShape::Path { .. } => return, + }; + let center = *xf * local; + *xf = Affine::rotate_about((now - angle).to_radians(), center) * *xf; + } /// Whether a polygon's sides are all as long: `xf` scales it evenly and doesn't shear it. True /// for other shapes. pub fn polygon_sides_equal(&self) -> bool { @@ -171,12 +195,8 @@ impl LiveShape { } /// Turn a polygon about its centre to `angle` (degrees, as [`LiveShape::polygon_angle`]). pub fn set_polygon_angle(&mut self, angle: f64) { - let Some(now) = self.polygon_angle() else { return }; - if let LiveShape::Polygon { xf, .. } = self - && angle.is_finite() - { - let centre = *xf * Point::ZERO; - *xf = Affine::rotate_about((now - angle).to_radians(), centre) * *xf; + if let LiveShape::Polygon { .. } = self { + self.set_shape_angle(angle); } } /// Make a polygon's sides equal (Make Sides Equal): drop the uneven scale and the shear from diff --git a/crates/engine/src/cmd/object/commands.rs b/crates/engine/src/cmd/object/commands.rs index 0c638ceb5e..e85373323e 100644 --- a/crates/engine/src/cmd/object/commands.rs +++ b/crates/engine/src/cmd/object/commands.rs @@ -305,7 +305,7 @@ pub fn specs() -> Vec { "Live Shape Properties", [], None, - "{id?, ids?, radius?: pt (or % of each corner's maximum when `relativeRadii` is true), kind?: \"round\"|\"invertedRound\"|\"chamfer\", relativeRadii?: bool (Relative rounding, as in the reference app: store radii as fractions of each corner's maximum so they scale with the shape), corners?: [i…], items?: [{id, corners?: [i…]}] (several objects, each with its own corners, in place of ids and corners: the canvas's corner widgets across a selection), sides?: n, polygonAngle?: degrees (counter-clockwise from its first vertex straight up), polygonRadius?: pt (centre to vertex), sideLength?: pt (sets the radius), makeSidesEqual?: true (a polygon scaled unevenly: drops the uneven scale and shear, keeping its centre, angle and mean radius), pieStart?, pieEnd?: degrees (an ellipse's pie, counter-clockwise from 3 o'clock; 0 to 360 is the whole ellipse), invertPie?: true (swaps them: the other part of the ellipse)} (Live Corners on any path: radius and kind set its corners (anchors that aren't smooth, where two sides, straight or curved (#1144), meet at an angle): `corners` (anchor indices of the path with its corners uncut, counting every subpath's anchors in order: a rectangle's 0 top-left, 1 top-right, 2 bottom-right, 3 bottom-left; a polygon's from the first vertex clockwise), else the corners with a Direct-Selected anchor, else every corner; each radius is drawn no larger than half the corner's shorter side allows; a path that isn't a live shape keeps its uncut outline so its corners stay editable, and is plain again once none is cut; sides: a polygon's, which keep the radius they shared; the polygon params apply in that order: sides, makeSidesEqual, polygonAngle, then sideLength or else polygonRadius)", + "{id?, ids?, radius?: pt (or % of each corner's maximum when `relativeRadii` is true), kind?: \"round\"|\"invertedRound\"|\"chamfer\", relativeRadii?: bool (Relative rounding, as in the reference app: store radii as fractions of each corner's maximum so they scale with the shape), corners?: [i…], items?: [{id, corners?: [i…]}] (several objects, each with its own corners, in place of ids and corners: the canvas's corner widgets across a selection), sides?: n, polygonAngle?: degrees (counter-clockwise from its first vertex straight up), polygonRadius?: pt (centre to vertex), sideLength?: pt (sets the radius), makeSidesEqual?: true (a polygon scaled unevenly: drops the uneven scale and shear, keeping its centre, angle and mean radius), pieStart?, pieEnd?: degrees (an ellipse's pie, counter-clockwise from 3 o'clock; 0 to 360 is the whole ellipse), invertPie?: true (swaps them: the other part of the ellipse), rectangleAngle?: degrees (a live rectangle's, counterclockwise from level), ellipseAngle?: degrees (a live ellipse's, counterclockwise from level; its pie turns with it)} (rectangleAngle, ellipseAngle and polygonAngle turn each shape of that kind about its own center and leave other objects as they are; an angle that is not a number is an error; Live Corners on any path: radius and kind set its corners (anchors that aren't smooth, where two sides, straight or curved (#1144), meet at an angle): `corners` (anchor indices of the path with its corners uncut, counting every subpath's anchors in order: a rectangle's 0 top-left, 1 top-right, 2 bottom-right, 3 bottom-left; a polygon's from the first vertex clockwise), else the corners with a Direct-Selected anchor, else every corner; each radius is drawn no larger than half the corner's shorter side allows; a path that isn't a live shape keeps its uncut outline so its corners stay editable, and is plain again once none is cut; sides: a polygon's, which keep the radius they shared; the polygon params apply in that order: sides, makeSidesEqual, polygonAngle, then sideLength or else polygonRadius)", has_selection, set_live_shape ), diff --git a/crates/engine/src/cmd/object/shape.rs b/crates/engine/src/cmd/object/shape.rs index b30959de99..c56f1f0ae1 100644 --- a/crates/engine/src/cmd/object/shape.rs +++ b/crates/engine/src/cmd/object/shape.rs @@ -171,6 +171,16 @@ pub(super) fn set_live_shape(s: &mut Session, p: &Value) -> Result { // A polygon's Polygon Properties: its angle, radius or side length, Make Sides Equal. let (polygon_angle, polygon_radius, side) = (angle("polygonAngle")?, length("polygonRadius")?, length("sideLength")?); let equal = p.get("makeSidesEqual").and_then(Value::as_bool) == Some(true); + // A rectangle's Rectangle Angle and an ellipse's Ellipse Angle, as `polygonAngle` turns a polygon. + let (rectangle_angle, ellipse_angle) = (angle("rectangleAngle")?, angle("ellipseAngle")?); + // Whether a shape at `now` already stands at `a`: a turn the rounding of an earlier one left + // (89.999999999°, or 359.9999999999° against 0°) counts as no change. + let at_angle = |now: Option, a: f64| { + now.is_some_and(|n| { + let d = (n - a).rem_euclid(360.0); + d.min(360.0 - d) < 1e-9 + }) + }; // An ellipse's pie becomes `pie_of(pie)`. An end of 0 is a full turn (Illustrator shows a whole // ellipse as 0° to 360°). let end_of = |a: f64| if a == 0.0 { 360.0 } else { a }; @@ -187,12 +197,15 @@ pub(super) fn set_live_shape(s: &mut Session, p: &Value) -> Result { Some(l @ LiveShape::Polygon { sides: now, .. }) if !(sides.is_none_or(|n| n.clamp(3, 1000) == u64::from(*now)) && (!equal || l.polygon_sides_equal()) - && polygon_angle.is_none_or(|a| l.polygon_angle() == Some(a)) + && polygon_angle.is_none_or(|a| at_angle(l.polygon_angle(), a)) && side.and_then(|len| l.polygon_radius_for_side(len)).or(polygon_radius).is_none_or(|r| l.polygon_radius() == Some(r))) => { return false; } - Some(LiveShape::Ellipse { pie, .. }) if pie_of(*pie) != *pie => return false, + Some(l @ LiveShape::Ellipse { pie, .. }) if pie_of(*pie) != *pie || ellipse_angle.is_some_and(|a| !at_angle(l.shape_angle(), a)) => { + return false; + } + Some(l @ LiveShape::Rectangle { .. }) if rectangle_angle.is_some_and(|a| !at_angle(l.shape_angle(), a)) => return false, _ => {} } if relative_radii.is_some_and(|on| live.as_deref().map(|l| l.radii_relative()) != Some(on)) { @@ -236,9 +249,18 @@ pub(super) fn set_live_shape(s: &mut Session, p: &Value) -> Result { } *path = l.to_path(); } - if let Some(l @ LiveShape::Ellipse { .. }) = live.as_deref_mut() - && (pie_start.is_some() || pie_end.is_some() || invert) + if let Some(a) = rectangle_angle + && let Some(l @ LiveShape::Rectangle { .. }) = live.as_deref_mut() { + l.set_shape_angle(a); + *path = l.to_path(); + } + if let Some(l @ LiveShape::Ellipse { .. }) = live.as_deref_mut() + && (pie_start.is_some() || pie_end.is_some() || invert || ellipse_angle.is_some()) + { + if let Some(a) = ellipse_angle { + l.set_shape_angle(a); + } if let LiveShape::Ellipse { pie, .. } = l { *pie = pie_of(*pie); } diff --git a/crates/engine/src/tests/livecorners.rs b/crates/engine/src/tests/livecorners.rs index b9e3793913..0ea4bba76a 100644 --- a/crates/engine/src/tests/livecorners.rs +++ b/crates/engine/src/tests/livecorners.rs @@ -524,6 +524,84 @@ fn a_polygon_takes_its_angle_radius_side_length_and_equal_sides() { } } +/// Rectangle Angle and Ellipse Angle: `rectangleAngle` and `ellipseAngle` turn each selected live +/// rectangle or ellipse about its own center, keeping its size, corners and pie, as one undo step. +/// The angle it already has records no step, each key leaves the other kind as it is, and a value +/// that is not a number is an error. +#[test] +fn a_rectangle_and_an_ellipse_take_their_angle() { + let (mut s, rect) = session(); + run(&mut s, json!({"radius": 8})); + let ellipse = NodeId(s.execute("shape.ellipse", &json!({"x": 200, "y": 200, "width": 120, "height": 80})).unwrap()["id"].as_u64().unwrap()); + run(&mut s, json!({"pieStart": 30, "pieEnd": 120})); + let live = |s: &Session, id: NodeId| { + let n = s.doc().unwrap().doc.node(id).unwrap(); + (n.live_shape().unwrap().clone(), n.geometric_bounds().unwrap()) + }; + let steps = |s: &Session| s.doc().unwrap().history.undo.len(); + let close = |a: f64, b: f64| (a - b).abs() < 1e-6; + let angle = |s: &Session, id: NodeId| live(s, id).0.shape_angle().unwrap(); + // The ellipse's center: the middle of its untransformed box, wherever its pie leaves the path. + let ellipse_center = |s: &Session| match live(s, ellipse).0 { + LiveShape::Ellipse { w, h, xf, .. } => xf * vectorcraft_geom::Point::new(w / 2.0, h / 2.0), + l => panic!("{l:?}"), + }; + let center = ellipse_center(&s); + + s.execute("select.set", &json!({"ids": [rect.0]})).unwrap(); + let n = steps(&s); + run(&mut s, json!({"rectangleAngle": 90})); + let (l, b) = live(&s, rect); + assert!(close(angle(&s, rect), 90.0), "{l:?}"); + // 100 × 60 at (10, 10) turned about (60, 40): 60 wide, 100 tall, same center. + assert!(close(b.width(), 60.0) && close(b.height(), 100.0) && close(b.center().x, 60.0) && close(b.center().y, 40.0), "{b:?}"); + let LiveShape::Rectangle { w, h, radii, .. } = &l else { panic!("{l:?}") }; + assert!(close(*w, 100.0) && close(*h, 60.0) && *radii == [8.0; 4], "{w} {h} {radii:?}"); + assert_eq!(steps(&s), n + 1, "one undo step"); + for same in [json!({"rectangleAngle": 90}), json!({"rectangleAngle": 450}), json!({"rectangleAngle": -270}), json!({"ellipseAngle": 10})] { + run(&mut s, same.clone()); + assert_eq!(steps(&s), n + 1, "{same} records no undo step"); + } + // A turn the field gives back rounded is the angle the shape has: typing it again records no step. + run(&mut s, json!({"rectangleAngle": 33.3})); + let now = angle(&s, rect); + run(&mut s, json!({"rectangleAngle": now})); + run(&mut s, json!({"rectangleAngle": 33.3})); + assert_eq!(steps(&s), n + 2); + for bad in [json!({"rectangleAngle": "left"}), json!({"ellipseAngle": "up"}), json!({"rectangleAngle": true})] { + assert!(s.execute("object.setLiveShape", &bad).is_err(), "{bad}"); + assert_eq!(steps(&s), n + 2, "{bad} changes nothing"); + } + + // The ellipse turns about its center and keeps its pie. + s.execute("select.set", &json!({"ids": [ellipse.0]})).unwrap(); + run(&mut s, json!({"ellipseAngle": 90})); + let (l, b) = live(&s, ellipse); + assert!(close(angle(&s, ellipse), 90.0), "{l:?}"); + let LiveShape::Ellipse { pie, .. } = &l else { panic!("{l:?}") }; + assert_eq!(*pie, (30.0, 120.0)); + let now = ellipse_center(&s); + assert!(close(now.x, center.x) && close(now.y, center.y), "{center:?} → {now:?}"); + assert!(b.width() < b.height(), "120 × 80 turned a quarter turn: {b:?}"); + + // Both selected: each key turns its own kind only, each about its own center. + s.execute("select.set", &json!({"ids": [rect.0, ellipse.0]})).unwrap(); + run(&mut s, json!({"rectangleAngle": 45})); + assert!(close(angle(&s, rect), 45.0) && close(angle(&s, ellipse), 90.0)); + let b = live(&s, rect).1; + assert!(close(b.center().x, 60.0) && close(b.center().y, 40.0), "{b:?}"); + s.execute("edit.undo", &json!({})).unwrap(); + assert!(close(angle(&s, rect), 33.3)); + + // A reflected rectangle takes the angle too, about its center. + s.execute("select.set", &json!({"ids": [rect.0]})).unwrap(); + s.execute("object.reflect", &json!({"axis": "vertical"})).unwrap(); + let before = live(&s, rect).1.center(); + run(&mut s, json!({"rectangleAngle": 20})); + let after = live(&s, rect).1.center(); + assert!(close(angle(&s, rect), 20.0) && close(before.x, after.x) && close(before.y, after.y), "{before:?} → {after:?}"); +} + #[test] fn relative_corner_rounding_keeps_fraction_on_resize() { let (mut s, id) = session(); diff --git a/crates/engine/tests/command_sweep.rs b/crates/engine/tests/command_sweep.rs index fd1edc9b77..36386dc9d9 100644 --- a/crates/engine/tests/command_sweep.rs +++ b/crates/engine/tests/command_sweep.rs @@ -1256,6 +1256,39 @@ fn polygon_properties_junk() { assert!(failures.is_empty(), "{} failures:\n{}", failures.len(), failures.join("\n")); } +/// A live rectangle's and ellipse's Rectangle and Ellipse Angle with junk values, drawn plain, +/// scaled unevenly, flattened to nothing and sheared: never a panic, and the document stays sound. +#[test] +fn rectangle_and_ellipse_angle_junk() { + let mut failures = vec![]; + for (shape, key) in [("shape.rectangle", "rectangleAngle"), ("shape.ellipse", "ellipseAngle")] { + for xf in [ + None, + Some(("object.scale", json!({"sx": 300, "sy": 20}))), + Some(("object.scale", json!({"sx": 1e-300, "sy": 100}))), + Some(("object.shear", json!({"angle": 40}))), + ] { + for v in junk_values() { + let p = json!({ key: v }); + let mut s = Fixture::Multi.session(); + let Ok(_) = no_panic(s.execute(shape, &json!({"x": 60, "y": 60, "width": 80, "height": 50}))) else { continue }; + if let Some((cmd, q)) = &xf { + let _ = no_panic(s.execute(cmd, q)); + } + match catch_quiet(|| no_panic(s.execute("object.setLiveShape", &p))) { + Err(m) => failures.push(format!("PANIC object.setLiveShape {p} [{xf:?}]: {m}")), + Ok(_) => { + if let Err(e) = catch_quiet(|| check_all(&mut s)).unwrap_or_else(|m| Err(format!("panic in checks: {m}"))) { + failures.push(format!("object.setLiveShape {p} [{xf:?}]: {e}")); + } + } + } + } + } + } + assert!(failures.is_empty(), "{} failures:\n{}", failures.len(), failures.join("\n")); +} + /// The params `fuzzed_calls_keep_documents_serializable` sends `c`: each key with each of the /// first junk values, a string under a file or folder key replaced by a location inside `path`'s /// folder. diff --git a/crates/ui-egui/src/panels/transform.rs b/crates/ui-egui/src/panels/transform.rs index 1bce03c53d..a2e179829f 100644 --- a/crates/ui-egui/src/panels/transform.rs +++ b/crates/ui-egui/src/panels/transform.rs @@ -426,6 +426,8 @@ pub(crate) fn live_shape_rows(app: &mut VectorcraftApp, ui: &mut Ui, n: &Node, l if headed { widgets::subheader(ui, tl!("Rectangle Properties:")); } + let fw = super::field_width(ui); + shape_angle_row(app, ui, live, &format!("{id}-rectangle"), "rectangleAngle", fw); corner_radius_row(app, ui, n, &format!("{id}-radius")); } LiveShape::Polygon { .. } => { @@ -436,6 +438,7 @@ pub(crate) fn live_shape_rows(app: &mut VectorcraftApp, ui: &mut Ui, n: &Node, l } LiveShape::Ellipse { pie, .. } => { widgets::subheader(ui, tl!("Ellipse Properties:")); + shape_angle_row(app, ui, live, &format!("{id}-ellipse"), "ellipseAngle", 60.0); pie_rows(app, ui, *pie, &format!("{id}-pie")); } _ => return false, @@ -443,6 +446,55 @@ pub(crate) fn live_shape_rows(app: &mut VectorcraftApp, ui: &mut Ui, n: &Node, l true } +/// A live rectangle's or ellipse's Angle row (Rectangle and Ellipse Angle, counterclockwise): the +/// angle the selected shapes of its kind share, blank when they differ. `key` is the +/// `object.setLiveShape` param an edit sets, which turns each of them about its own center. +fn shape_angle_row(app: &mut VectorcraftApp, ui: &mut Ui, live: &LiveShape, id: &str, key: &str, width: f32) { + let angle = shared_shape_angle(app, ui.ctx(), live); + ui.horizontal(|ui| { + widgets::dim_label(ui, tl!("Angle:")); + if let Some(a) = widgets::mixed_field_named(ui, (id, "angle"), Some(tl!("Angle:")), angle, "°", 1, width) { + app.run("object.setLiveShape", json!({ key: a })).ok(); + } + }); +} + +/// The selected live shapes of `live`'s kind, the document uid and revision they were read at, and +/// the angle they share. +type SharedAngle = Option<((u64, u64, std::mem::Discriminant), Option)>; + +/// The angle ([`LiveShape::shape_angle`]) every selected live shape of `live`'s kind shares, `None` +/// when they differ or none is selected. Measured once per (document uid, revision) and kind: the +/// panels read it every frame, and Select All can select hundreds of thousands of shapes. +fn shared_shape_angle(app: &VectorcraftApp, ctx: &egui::Context, live: &LiveShape) -> Option { + let st = app.session.active()?; + let key = (st.uid, st.revision, std::mem::discriminant(live)); + if let Some((k, angle)) = pstate::(ctx, "shape-angle") + && k == key + { + return angle; + } + let mut angles = st + .selection + .objects + .iter() + .filter_map(|id| st.doc.node(*id)?.live_shape()) + .filter(|l| std::mem::discriminant(*l) == key.2) + .filter_map(LiveShape::shape_angle); + // With no shape of its kind selected, the panel shows `live`'s own angle. + let angle = match angles.next() { + None => live.shape_angle(), + Some(first) => angles + .all(|a| { + let d = (a - first).rem_euclid(360.0); + d.min(360.0 - d) < 1e-9 + }) + .then_some(first), + }; + set_pstate::(ctx, "shape-angle", Some((key, angle))); + angle +} + /// An ellipse's Pie Start and End Angle (degrees, counterclockwise from 3 o'clock; 0 to 360 is the /// whole ellipse) and Invert Pie, which shows the other part of it (Transform and Properties panels). pub(crate) fn pie_rows(app: &mut VectorcraftApp, ui: &mut Ui, pie: (f64, f64), id: &str) { @@ -469,6 +521,7 @@ pub(crate) fn polygon_rows(app: &mut VectorcraftApp, ui: &mut Ui, n: &Node, live let side = radius.map(|r| 2.0 * r * (std::f64::consts::PI / f64::from((*sides).max(3))).sin()); let kind = super::corner_style(app, n).1; let kinds: Vec<&str> = CornerKind::ALL.iter().map(|k| corner_kind(*k)).collect(); + let angle = shared_shape_angle(app, ui.ctx(), live); // The `object.setLiveShape` param an edited field sets. let mut set = None; egui::Grid::new((id, "grid")).num_columns(2).spacing([6.0, 6.0]).show(ui, |ui| { @@ -478,7 +531,7 @@ pub(crate) fn polygon_rows(app: &mut VectorcraftApp, ui: &mut Ui, n: &Node, live } ui.end_row(); widgets::dim_label(ui, tl!("Angle:")); - if let Some(a) = widgets::plain_field_named(ui, (id, "angle"), Some(tl!("Angle:")), live.polygon_angle().unwrap_or(0.0), "°", 1, fw) { + if let Some(a) = widgets::mixed_field_named(ui, (id, "angle"), Some(tl!("Angle:")), angle, "°", 1, fw) { set = Some(("polygonAngle", json!(a))); } ui.end_row(); diff --git a/crates/ui-egui/src/panels/transform/tests.rs b/crates/ui-egui/src/panels/transform/tests.rs index 3dff8e6a4b..83c78047e7 100644 --- a/crates/ui-egui/src/panels/transform/tests.rs +++ b/crates/ui-egui/src/panels/transform/tests.rs @@ -125,6 +125,38 @@ fn an_ellipse_shows_its_pie_properties() { assert!(shown.iter().any(|s| s == "30°") && shown.iter().any(|s| s == "120°"), "{shown:?}"); } +/// A live rectangle and a live ellipse show their own angle (Rectangle and Ellipse Angle) in the +/// Transform panel and the Properties panel's Transform section, apart from the Rotate field's box +/// angle, which Reset Bounding Box squares to the page. Selected shapes of one kind at different +/// angles show a blank angle. +#[test] +fn a_rectangle_and_an_ellipse_show_their_angle() { + let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), Default::default()); + app.run("file.new", json!({"width": 400, "height": 400})).unwrap(); + for (shape, heading) in [("shape.rectangle", "Rectangle Properties:"), ("shape.ellipse", "Ellipse Properties:")] { + let mut ids = vec![]; + for (y, angle) in [(20, 30), (200, 60)] { + let id = app.run(shape, json!({"x": 50, "y": y, "width": 100, "height": 50})).unwrap()["id"].as_u64().unwrap(); + app.run("object.rotate", json!({"angle": angle, "absolute": true})).unwrap(); + app.run("object.resetBoundingBox", json!({})).unwrap(); + ids.push(id); + } + app.run("select.set", json!({"ids": [ids[0]]})).unwrap(); + for draw in [show as fn(&mut VectorcraftApp, &mut Ui), crate::panels::properties::transform_section] { + let shown = texts(&mut app, draw); + for t in ["Angle:", "0°", "30°"] { + assert!(shown.iter().any(|s| s == t), "{t} in {shown:?}"); + } + } + assert!(texts(&mut app, show).iter().any(|s| s == heading), "{heading}"); + app.run("select.set", json!({"ids": ids})).unwrap(); + let shown = texts(&mut app, show); + assert!(shown.iter().any(|s| s == "Angle:") && !shown.iter().any(|s| s == "30°" || s == "60°"), "{shape}: {shown:?}"); + app.run("select.set", json!({"ids": [ids[1]]})).unwrap(); + assert!(texts(&mut app, show).iter().any(|s| s == "60°"), "{shape}"); + } +} + #[test] fn the_artboard_tool_shows_the_active_artboard() { let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), Default::default()); diff --git a/docs/mcp.md b/docs/mcp.md index 4c1b661f42..4dc28308c6 100644 --- a/docs/mcp.md +++ b/docs/mcp.md @@ -6490,6 +6490,22 @@ length that isn't a number above 0 is an error. An ellipse (Ellipse Properties): counterclockwise from 3 o'clock; 0 to 360 is the whole ellipse) and `invertPie: true`, which swaps them. Each call is one undo step. +A live rectangle's Rectangle Angle and a live ellipse's Ellipse Angle are `rectangleAngle` and `ellipseAngle` +(degrees counterclockwise, 0 for a shape drawn level; any number is read modulo 360). The help page +(https://helpx.adobe.com/illustrator/desktop/draw-shapes-and-paths/modify-live-shapes/live-shape-properties.html) lists +both as the shape's rotation on the canvas from 0° to 360°. The rest are VectorCraft's own rules: each selected shape +of that kind turns about its own center, keeping its size, corners and pie (an ellipse's pie turns with it), and other +objects stay as they are. The Transform and Properties panels show the angle in each shape's Properties section, blank +when the selected shapes of that kind differ. It is the shape's own angle: after Reset Bounding Box +(`object.resetBoundingBox`) the Rotate field reads 0° while the shape angle keeps the turn. An angle that is not a +number is an error and changes nothing, and the angle the shape already has records no undo step; the same holds for +`polygonAngle`, and the Polygon Properties angle is blank, too, when the selected polygons differ. + +```json +{"name":"run_command","arguments":{"command":"object.setLiveShape","params":{"rectangleAngle":30}}} +{"name":"run_command","arguments":{"command":"object.setLiveShape","params":{"ellipseAngle":45}}} +``` + `object.setLiveShape` returns a parameter error, and leaves the document and its undo history as they were, for a key it does not take, at the top level (`` unknown parameter `path` ``) or in one of `items` (`` unknown parameter `items[0].corner`; did you mean `items[0].corners`? ``), for a `sides` that is not a whole number diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index ef83de54ad..e910293daf 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -976,6 +976,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - While a Type tool (Type, Area Type, Type on a Path and their vertical versions) adds or edits type, the contextual task bar shows the font family menu, the font style menu, the Font Size combo and the Fill chip (); the Touch Type tool shows no bar, as the same page describes. Type selected with a selection tool shows the same three font controls beside its Create Outlines, conversion and Type on a Path items (). The controls act as the Character panel's do: on the characters a Type tool selects, else on every selected type object, with the size left blank where the sizes differ. VectorCraft's own rules: a Type tool's bar leaves out the object actions, the Stroke chip, Recolor Artwork and Lock; a Type tool shows no bar before it adds type or with other art selected; type selected with other art shows no font controls; the font controls go on a second row when one row would be wider than the canvas, and narrow to fit a canvas narrower than they are; while a Type tool edits type, the Fill chip shows the edited characters' fill ("?" where it differs). Evidence: `the_type_tools_show_font_and_fill_controls`, `the_type_tools_show_no_bar_without_type`, `selected_type_shows_font_controls_beside_its_actions`, `the_task_bars_font_size_sets_what_the_character_panel_would`, `the_type_tools_fill_chip_activates_the_fill`, `the_type_tools_bar_is_named_and_stays_on_the_canvas`, `selected_types_font_controls_take_a_second_row_on_a_narrow_canvas` and `the_type_tools_fill_chip_shows_the_edited_characters_fill` in `crates/ui-egui/src/tests/taskbar.rs`. - The help page describes the contextual task bar as one horizontal row () and gives no rule for a canvas narrower than that row. VectorCraft's own rule: the bar stays whole on the canvas. When its actions don't fit in one row, they wrap, in order, onto rows under the row with the handle, the chips and More Options; an action wider than any row, or one that would need a row past the canvas's height, is listed in More Options instead; when the chips don't fit beside the handle and More Options, they take rows after the actions; with no row to spare for the font controls, the bar leaves them out; a canvas too small for the handle and More Options shows no bar. Evidence: `a_task_bars_actions_wrap_on_a_narrow_canvas` and `a_task_bar_action_wider_than_the_canvas_goes_in_more_options` in `crates/ui-egui/src/tests/taskbar.rs`. - With a live rectangle, rounded rectangle, ellipse or polygon selected with the Selection tool, the contextual task bar shows a Shape Properties button in place of Lock. It opens a popup with the shape's rows from the Transform panel (corner radius, pie angles, or sides, angle, corner and radius), which edit it through `object.setLiveShape`. The overview describes this: when a shape drawn with a shape tool (Rectangle, Star) is selected, the bar offers to change its properties where Lock Object would be ([Contextual Task Bar overview](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/contextual-task-bar-overview.html)). Object › Lock and ⌘2 still lock the shape. Not done: stars, which the app draws as plain paths. Evidence: `a_basic_shape_shows_its_properties_in_place_of_lock`, `the_shape_properties_popup_edits_the_shape` and `other_selections_keep_lock` in `crates/ui-egui/src/tests/taskbar.rs`. + - Rectangle Properties and Ellipse Properties in the Transform panel, the Properties panel and the task bar's Shape Properties popup have an Angle field, as Polygon Properties does: the help page lists Rectangle Angle and Ellipse Angle as the shape's rotation on the canvas from 0° to 360° (). A typed angle turns the shape through `object.setLiveShape {rectangleAngle, ellipseAngle}`. VectorCraft's own rules: degrees counterclockwise, 0 for a shape drawn level; each selected shape of that kind turns about its own center and keeps its size, corners and pie; the field is blank when the selected shapes of that kind differ, as the Polygon Properties angle now is too; the shape keeps its angle after Reset Bounding Box squares the Rotate field's box to the page; the angle a shape already has records no undo step. Evidence: `a_rectangle_and_an_ellipse_take_their_angle` in `crates/engine/src/tests/livecorners.rs` and `a_rectangle_and_an_ellipse_show_their_angle` in `crates/ui-egui/src/panels/transform/tests.rs`. - While the Rectangle, Rounded Rectangle, Ellipse, Polygon or Star tool is in use, the contextual task bar offers Edit Path (the Direct Selection tool), the Fill and Stroke chips, and Shape Properties for the shape it draws, as the help page lists for those five tools (). VectorCraft's own rules: the bar shows while one of those tools has one closed path selected whole, as right after it draws one, and not with nothing selected, several objects, a group, an open path, type or picked-out anchors; it shows nothing during the drag that draws the shape; it leaves out the selection tools' Duplicate, Offset Path, Simplify, Recolor Artwork and Lock; the Line Segment tool shows no bar. Not done: Shape Properties for a star, which the app draws as a plain path, and Gen Shape Fill and Generate Vectors, which the app doesn't have. Evidence: `shape_tools_show_edit_path_paint_and_properties_after_drawing`, `shape_tools_have_no_shape_bar_without_a_single_shape` and `shape_tool_bar_retargets_after_another_shape_and_undo` in `crates/ui-egui/src/tests/taskbar.rs`. - While the Smooth tool is in use with a path it can smooth selected (a path with three or more anchors, or two joined by a curve, on its own or inside a selected group), the contextual task bar shows the tool's Fidelity field and Tool Options…, which opens the Smooth tool's options. The overview says the Smooth tool's bar has its tool options (), and the tool's help page names Fidelity as its option (). A value typed or stepped in the field sets the tool's Fidelity through `tool.setOption`, with the same range, unit (screen pixels) and steps as the field in its options. VectorCraft's own rules: with nothing selected, or only straight lines or type selected, the tool shows no bar; the bar leaves out the selection tools' actions, the Fill and Stroke chips, Recolor Artwork and Lock; on a canvas too narrow for the field, More Options lists Fidelity, which opens the tool's options. Evidence: `the_smooth_tool_shows_fidelity_and_tool_options_for_a_path` and `the_smooth_tool_shows_no_bar_without_a_path_to_smooth` in `crates/ui-egui/src/tests/taskbar.rs`. - The contextual task bar has a Stroke chip beside the Fill chip, drawn with the paint the Stroke proxy shows (a "?" when the selected objects' strokes differ, as on the Fill chip); a click brings the Stroke proxy forward and shows the Swatches panel wherever it is docked, floating or closed, as a click on the Fill chip does for the Fill proxy. The reference app's bar has Fill and Stroke controls for changing an object's colors ([Contextual Task Bar overview](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/contextual-task-bar-overview.html)). Evidence: `the_task_bar_shows_a_stroke_chip_beside_fill` and `the_task_bar_chips_follow_the_proxies_and_show_swatches_anywhere` in `crates/ui-egui/src/canvas/tests.rs`. From 0133157783ee17cf5c887867fa511b1dad4618d3 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Tue, 17 Nov 2026 14:09:49 -0800 Subject: [PATCH 30/78] PSD import: a layer with a knockout merges with the layers below it in its group Opening a PSD or PSB file with its layers as objects now applies a layer's Knockout setting instead of only counting it in a warning. The import options help page says that layers using a Knockout option are merged with the underlying layers: https://helpx.adobe.com/illustrator/desktop/add-and-import-files/import-from-other-apps/photoshop-import-options.html A layer or group inside a group whose `knko` value is 1 is read as a shallow knockout and merged with the visible layers below it in that group into one image, named after them with " + ". Where it has pixels (shaped by its layer mask), the layers below are cleared to transparency and it is drawn there at its fill opacity; its opacity then fades the result back toward the layers below. In a pass-through group the cut shows what is outside the group, and the knockout is applied only when it and the visible layers below it are in the Normal mode, so that no layer stops blending with what is outside the group. The knockouts of top-level layers, clipped layers, layers that others are clipped to, other `knko` values, and merges that would need more memory than allowed are not applied: those layers come in as before and the existing warning counts only them. A hidden knockout that would need the merge is left out, like other hidden layers that need a merge. A knockout that draws nothing, or has nothing visible below it, merges nothing and comes in as before. --- crates/engine/src/cmd/fileio/psdlayers.rs | 334 ++++++++++++++---- .../engine/src/cmd/fileio/tests_psdlayers.rs | 128 +++++++ docs/target-app-parity.md | 2 +- 3 files changed, 395 insertions(+), 69 deletions(-) diff --git a/crates/engine/src/cmd/fileio/psdlayers.rs b/crates/engine/src/cmd/fileio/psdlayers.rs index cbfaa434d5..ded5288c69 100644 --- a/crates/engine/src/cmd/fileio/psdlayers.rs +++ b/crates/engine/src/cmd/fileio/psdlayers.rs @@ -24,14 +24,20 @@ //! Light, Pin Light, Hard Mix, Subtract, Divide, Darker Color, Lighter Color) is merged with the //! layers below it in its group. A Dissolve layer's partly transparent pixels are merged as opaque //! or transparent, opaque at the share of its pixels their transparency gives, in a fixed pattern -//! that differs from layer to layer. When a merge's canvases would need more memory than allowed, -//! the layer comes in alone: in the Normal mode, or unclipped. -//! Hidden layers are left out unless `hidden` asks for them. A hidden layer that would need a merge -//! (one in a mode VectorCraft lacks, one that layers are clipped to, one clipped to another, or -//! one below a merged layer) is always left out, with the layers clipped to it. Adjustment layers, -//! fill layers that store no pixels and whose fill isn't read or whose shape is a vector mask, -//! layer effects that are switched on, knockouts and vector masks aren't applied; the warnings -//! count them and the hidden layers left out. +//! that differs from layer to layer. A layer or group in a group whose Knockout setting is 1 (read +//! as a shallow knockout) is merged with the layers below it in its group too, as the import option +//! describes: where it has pixels, they are cleared to transparency and it is drawn there at its fill +//! opacity, and its opacity fades that back toward them. In a pass-through group this is done only +//! when it and the visible layers below it are in the Normal mode. When a merge's canvases would need more +//! memory than allowed, the layer comes in alone: in the Normal mode, unclipped, or without its +//! knockout. Hidden layers are left out unless `hidden` asks for them. A hidden layer that would need +//! a merge (one in a mode VectorCraft lacks, one with a knockout in a group, one that layers are +//! clipped to, one clipped to another, or one below a merged layer) is always left out, with the +//! layers clipped to it. Adjustment layers, fill layers that store no pixels and whose fill isn't read +//! or whose shape is a vector mask, layer effects that are switched on, vector masks, and the +//! knockouts of top-level layers, of clipped layers, of layers that others are clipped to and of +//! layers in a pass-through group with a layer in another mode, and other Knockout values, aren't +//! applied; the warnings count them and the hidden layers left out. //! //! The file is untrusted: every count, length and size is checked before anything is allocated, //! groups nest at most [`MAX_DEPTH`] deep (layers deeper than a document may nest merge into the @@ -227,7 +233,9 @@ struct Record<'a> { content: Content, effects: bool, vector_mask: bool, - knockout: bool, + /// The Knockout setting's byte (`knko`): 0 none, 1 a shallow knockout. Any other value isn't + /// applied. + knockout: u8, } /// The layer records of `info` (the layer count, the records, then their channels' data). @@ -285,7 +293,7 @@ fn record<'a>(r: &mut Reader<'a>, psb: bool) -> Result<(Record<'a>, Vec<(i16, us content: Content::Pixels, effects: false, vector_mask: false, - knockout: false, + knockout: 0, }; rec.read_extra(extra, psb)?; Ok((rec, lengths)) @@ -345,8 +353,7 @@ impl Record<'_> { b"lfx2" | b"lmfx" => effects = Some(effects == Some(true) || effects_on(data)), b"lrFX" => old_effects = true, b"vmsk" | b"vsms" => self.vector_mask = true, - // Shallow or deep knockout. - b"knko" => self.knockout = data.first().is_some_and(|&k| k != 0), + b"knko" => self.knockout = data.first().copied().unwrap_or(0), k if ADJUSTMENTS.contains(&k) => self.content = Content::Adjustment, _ => {} } @@ -646,6 +653,27 @@ enum Body<'i> { Merged(Canvas), } +/// Where a layer list is. +#[derive(Clone, Copy, PartialEq)] +enum Level { + /// The file's top level. + Top, + /// An isolated group, or a group drawn on its own. + Group, + /// A pass-through group whose layers blend with what is below it. + Pass, +} + +/// What a knockout's merge with the layers below it gives. +enum Knocked { + /// The merged canvas. + Merged(Canvas), + /// Nothing below it draws, or it draws nothing: it comes in as a layer of its own. + Nothing, + /// The canvases would need more memory than allowed. + TooLarge, +} + /// A unit's body drawn alone. enum Drawn { /// It draws nothing. @@ -663,6 +691,7 @@ struct Notes { fills: usize, effects: usize, vector_masks: usize, + /// Layers whose knockout wasn't applied. knockouts: usize, /// Hidden layers left out, and layers clipped to them. hidden: usize, @@ -678,6 +707,8 @@ struct Notes { #[derive(Clone, Copy)] struct Counts { skipped: usize, + /// The knockouts counted as not applied. + unknocked: usize, merged: usize, unmerged: usize, unclipped: usize, @@ -745,8 +776,8 @@ impl Notes { out } - fn counts(&self, skipped: usize) -> Counts { - Counts { skipped, merged: self.merged.len(), unmerged: self.unmerged, unclipped: self.unclipped, clipped_out: self.clipped_out } + fn counts(&self, skipped: usize, unknocked: usize) -> Counts { + Counts { skipped, unknocked, merged: self.merged.len(), unmerged: self.unmerged, unclipped: self.unclipped, clipped_out: self.clipped_out } } } @@ -771,6 +802,10 @@ struct Builder<'a, F> { skipped: Vec, /// Those records, in the order they were counted. skip_log: Vec, + /// The records counted as knockouts not applied. + unknocked: Vec, + /// Those records, in the order they were counted. + unknock_log: Vec, /// Bytes of layer and mask pixels decoded, and of canvases the merges made, so far. spent: Cell, } @@ -920,6 +955,10 @@ impl [f32; 3]> Builder<'_, F> { Some(b) => { // Counted even when it draws nothing (an adjustment layer). self.note(i)?; + // A clipped layer's knockout isn't applied. + if self.record(i)?.knockout != 0 { + self.unknock(i); + } if !unclipped && self.clip(&mut out, b, &body, i, &name, blend, opacity)? { continue; } @@ -1048,9 +1087,9 @@ impl [f32; 3]> Builder<'_, F> { Some(n) => *n = true, None => {} } - let (content, empty, effects, vector_mask, knockout) = { + let (content, empty, effects, vector_mask) = { let rec = self.record(i)?; - (rec.content, rec.stores_nothing(), rec.effects, rec.vector_mask, rec.knockout) + (rec.content, rec.stores_nothing(), rec.effects, rec.vector_mask) }; match content { Content::Type => self.notes.types += 1, @@ -1062,10 +1101,39 @@ impl [f32; 3]> Builder<'_, F> { } self.notes.effects += usize::from(effects); self.notes.vector_masks += usize::from(vector_mask); - self.notes.knockouts += usize::from(knockout); Ok(()) } + /// Count record `i` as a layer whose knockout isn't applied (once). + fn unknock(&mut self, i: usize) { + if let Some(s) = self.unknocked.get_mut(i) + && !*s + { + *s = true; + self.notes.knockouts += 1; + self.unknock_log.push(i); + } + } + + /// Does unit `u`, at `level` above the units `below` it, take a shallow knockout this import + /// applies? Only a layer or group in a group, neither clipped nor a base of clipped layers, does; + /// in a pass-through group, only when it and the visible units below it are in the Normal mode, so + /// that none of them blends with what is below the group. Any other knockout is counted as not + /// applied. + fn knocks(&mut self, u: &Unit<'_>, below: &[Unit<'_>], level: Level) -> Result { + let rec = self.record(u.record)?; + if rec.knockout == 0 { + return Ok(false); + } + let normal = |u: &Unit<'_>| u.blend == Blend::Mode(BlendMode::Normal); + let blends_out = level == Level::Pass && !(normal(u) && below.iter().filter(|b| b.visible).all(normal)); + let applies = rec.knockout == 1 && level != Level::Top && !blends_out && !rec.clipped && !matches!(u.body, Body::Merged(_)); + if !applies { + self.unknock(u.record); + } + Ok(applies) + } + /// Count record `i` as a hidden layer left out (once). fn skip(&mut self, i: usize) { if let Some(s) = self.skipped.get_mut(i) @@ -1077,10 +1145,36 @@ impl [f32; 3]> Builder<'_, F> { } } - /// `items`' units with the layers in blend modes VectorCraft lacks merged with those below. - fn merged<'i>(&mut self, items: &'i [Item], keep_hidden: bool) -> Result>, String> { + /// `items`' units, at `level`, with the layers in blend modes VectorCraft lacks, and in a group + /// the layers with a shallow knockout, merged with those below. + fn merged<'i>(&mut self, items: &'i [Item], keep_hidden: bool, level: Level) -> Result>, String> { let mut out: Vec> = vec![]; for mut u in self.units(items, keep_hidden)? { + if self.knocks(&u, &out, level)? { + // A hidden layer that would need the merge is left out. + if !u.visible { + self.skip(u.record); + continue; + } + let saved = self.notes.counts(self.skip_log.len(), self.unknock_log.len()); + match self.knock(&out, &u)? { + Knocked::Merged(canvas) => { + self.take_merge(&mut out, &u, canvas); + if let Blend::Other(other) = u.blend + && !self.notes.merged.contains(&other.label()) + { + self.notes.merged.push(other.label()); + } + continue; + } + // Nothing below it, or nothing of its own, to knock out: it comes in as a layer. + Knocked::Nothing => {} + Knocked::TooLarge => { + self.restore(saved); + self.unknock(u.record); + } + } + } let Blend::Other(other) = u.blend else { out.push(u); continue; @@ -1091,7 +1185,7 @@ impl [f32; 3]> Builder<'_, F> { continue; } // A merge that can't be made counts nothing its groups would have counted. - let saved = self.notes.counts(self.skip_log.len()); + let saved = self.notes.counts(self.skip_log.len(), self.unknock_log.len()); let made = match out.as_mut_slice() { // Onto the previous merge alone: composited onto its canvas, in place. [prev] if prev.is_merge() => { @@ -1113,34 +1207,7 @@ impl [f32; 3]> Builder<'_, F> { } _ => match self.merge(&out, &u)? { Some(canvas) => { - let mut name = String::new(); - for (k, b) in out.iter_mut().filter(|b| b.visible).enumerate() { - if k == 0 { - name = std::mem::take(&mut b.name); - } else { - name.push_str(" + "); - name.push_str(&b.name); - } - } - if out.iter().any(|b| b.visible) { - name.push_str(" + "); - } - name.push_str(&u.name); - // Hidden layers below are left out with the rest. - for b in out.iter().filter(|b| !b.visible).map(|b| b.record).collect::>() { - self.skip(b); - } - out.clear(); - out.push(Unit { - name, - visible: true, - opacity: 1.0, - blend: Blend::Mode(BlendMode::Normal), - mask_of: None, - record: u.record, - body: Body::Merged(canvas), - clip: None, - }); + self.take_merge(&mut out, &u, canvas); true } None => false, @@ -1168,6 +1235,12 @@ impl [f32; 3]> Builder<'_, F> { self.notes.hidden = self.notes.hidden.saturating_sub(1); } } + for i in self.unknock_log.split_off(c.unknocked) { + if let Some(s) = self.unknocked.get_mut(i) { + *s = false; + self.notes.knockouts = self.notes.knockouts.saturating_sub(1); + } + } self.notes.merged.truncate(c.merged); self.notes.unmerged = c.unmerged; self.notes.unclipped = c.unclipped; @@ -1186,6 +1259,82 @@ impl [f32; 3]> Builder<'_, F> { Ok(Some(acc.unwrap_or_default())) } + /// `out` replaced by one layer: `canvas`, the merge of its visible units with `top`, named after + /// them, bottom first. Its hidden units are left out. + fn take_merge<'i>(&mut self, out: &mut Vec>, top: &Unit<'_>, canvas: Canvas) { + let mut name = String::new(); + for (k, b) in out.iter_mut().filter(|b| b.visible).enumerate() { + if k == 0 { + name = std::mem::take(&mut b.name); + } else { + name.push_str(" + "); + name.push_str(&b.name); + } + } + if out.iter().any(|b| b.visible) { + name.push_str(" + "); + } + name.push_str(&top.name); + // Hidden layers below are left out with the rest. + for b in out.iter().filter(|b| !b.visible).map(|b| b.record).collect::>() { + self.skip(b); + } + out.clear(); + out.push(Unit { + name, + visible: true, + opacity: 1.0, + blend: Blend::Mode(BlendMode::Normal), + mask_of: None, + record: top.record, + body: Body::Merged(canvas), + clip: None, + }); + } + + /// The visible units `below` with `top`, a layer with a shallow knockout, knocking them out: where + /// `top` has pixels, what is below it in its group is cleared to transparency (the group's own + /// backdrop) and `top` is drawn there at its fill opacity; its opacity then fades all of that + /// back toward the units below as they were. Its layer mask shapes the cut. + fn knock(&mut self, below: &[Unit<'_>], top: &Unit<'_>) -> Result { + if !below.iter().any(|u| u.visible) { + return Ok(Knocked::Nothing); + } + let (fill, opacity) = { + let rec = self.record(top.record)?; + (rec.fill, rec.opacity) + }; + let k = match self.draw_body(&top.body, top.mask_of)? { + Drawn::Nothing => return Ok(Knocked::Nothing), + Drawn::TooLarge => return Ok(Knocked::TooLarge), + Drawn::Canvas(c) if c.px.iter().all(|p| p[3] <= 0.0) => return Ok(Knocked::Nothing), + Drawn::Canvas(c) => c, + }; + // The layer's canvas is held while the units below are drawn. + let bytes = 16 * k.px.len() as u64; + self.held = self.held.saturating_add(bytes); + let mut acc: Option = None; + let mut drawn = Ok(true); + for u in below.iter().filter(|u| u.visible) { + drawn = self.composite(&mut acc, u); + if !matches!(drawn, Ok(true)) { + break; + } + } + self.held = self.held.saturating_sub(bytes); + if !drawn? { + return Ok(Knocked::TooLarge); + } + // Nothing below draws. + if acc.is_none() { + return Ok(Knocked::Nothing); + } + if !knock_onto(&mut acc, &k, top.blend, fill, opacity, top.record, self.room(), &|n| self.spend(n))? { + return Ok(Knocked::TooLarge); + } + Ok(acc.map_or(Knocked::Nothing, Knocked::Merged)) + } + /// The bytes a merge step may still take: the memory allowed, less the copies of what is below /// the pass-through groups being merged. fn room(&self) -> u64 { @@ -1203,7 +1352,7 @@ impl [f32; 3]> Builder<'_, F> { _ => None, }; if u.opacity >= 1.0 && mask.is_none() { - return self.lay(acc, items); + return self.lay(acc, items, Level::Pass); } let bytes = acc.as_ref().map_or(0, |c| 16 * c.px.len() as u64); if bytes > self.room() { @@ -1212,7 +1361,7 @@ impl [f32; 3]> Builder<'_, F> { self.spend(bytes)?; let below = acc.clone(); self.held = self.held.saturating_add(bytes); - let laid = self.lay(acc, items); + let laid = self.lay(acc, items, Level::Pass); self.held = self.held.saturating_sub(bytes); if !laid? { return Ok(false); @@ -1230,10 +1379,10 @@ impl [f32; 3]> Builder<'_, F> { blend_onto(acc, &c, u.blend, u.opacity, u.record, self.room(), &|n| self.spend(n)) } - /// `items`' layers composited onto `acc` one by one; `false` when a canvas would need more - /// memory than allowed. - fn lay(&mut self, acc: &mut Option, items: &[Item]) -> Result { - for c in self.merged(items, false)? { + /// `items`' layers, the layers of a group at `level`, composited onto `acc` one by one; `false` + /// when a canvas would need more memory than allowed. + fn lay(&mut self, acc: &mut Option, items: &[Item], level: Level) -> Result { + for c in self.merged(items, false, level)? { if !self.composite(acc, &c)? { return Ok(false); } @@ -1273,7 +1422,7 @@ impl [f32; 3]> Builder<'_, F> { }, Body::Group(items) => { let mut acc: Option = None; - if !self.lay(&mut acc, items)? { + if !self.lay(&mut acc, items, Level::Group)? { return Ok(Drawn::TooLarge); } let Some(acc) = acc else { return Ok(Drawn::Nothing) }; @@ -1306,10 +1455,10 @@ impl [f32; 3]> Builder<'_, F> { Ok(n) } - /// Layers of the document for `items`, bottom first. - fn list(&mut self, items: &[Item]) -> Result>, String> { + /// Layers of the document for `items`, the layers at `level`, bottom first. + fn list(&mut self, items: &[Item], level: Level) -> Result>, String> { let mut out = vec![]; - for u in self.merged(items, self.hidden)? { + for u in self.merged(items, self.hidden, level)? { if let Some(n) = self.node(u)? { out.push(Arc::new(n)); } @@ -1329,7 +1478,7 @@ impl [f32; 3]> Builder<'_, F> { Some((left, top, img)) => vec![Arc::new(self.image_node(&u.name, left, top, img)?)], None => return Ok(None), }, - Body::Group(items) => self.list(items)?, + Body::Group(items) => self.list(items, if u.blend == Blend::Pass { Level::Pass } else { Level::Group })?, }; let mut layer = self.layer(&u.name); layer.visible = u.visible; @@ -1443,6 +1592,61 @@ fn blend_onto( max_alloc: u64, spend: &dyn Fn(u64) -> Result<(), String>, ) -> Result { + if !cover(acc, src, max_alloc, spend)? { + return Ok(false); + } + let Some(out) = acc.as_mut() else { return Ok(false) }; + // Only the source's rows and columns change. + let (sw, x0, y0) = (src.width.max(1), (src.left - out.left) as usize, (src.top - out.top) as usize); + for (k, s) in src.px.iter().enumerate() { + let Some(p) = out.px.get_mut((y0 + k / sw) * out.width + x0 + k % sw) else { continue }; + let a = coverage(blend, s[3] * opacity, src.left + (k % sw) as i64, src.top + (k / sw) as i64, record); + *p = over(blend, *p, [s[0], s[1], s[2], a]); + } + Ok(true) +} + +/// `knock` (of record `record`, in `blend`, with its `fill` and `opacity`), a layer with a shallow +/// knockout, knocking out `acc`, on a canvas covering both, as [`blend_onto`] makes it. Where +/// `knock` has pixels, its transparency is the share of `acc` cleared and replaced by its color at +/// `fill`; `opacity` then fades that back toward `acc`. `false`, with `acc` as it was, when the +/// canvases would take more than `max_alloc` bytes. +#[allow(clippy::too_many_arguments)] +fn knock_onto( + acc: &mut Option, + knock: &Canvas, + blend: Blend, + fill: f32, + opacity: f32, + record: usize, + max_alloc: u64, + spend: &dyn Fn(u64) -> Result<(), String>, +) -> Result { + if !cover(acc, knock, max_alloc, spend)? { + return Ok(false); + } + let Some(out) = acc.as_mut() else { return Ok(false) }; + let (fill, opacity) = (fill.clamp(0.0, 1.0), opacity.clamp(0.0, 1.0)); + let (kw, x0, y0) = (knock.width.max(1), (knock.left - out.left) as usize, (knock.top - out.top) as usize); + for (k, s) in knock.px.iter().enumerate() { + let Some(p) = out.px.get_mut((y0 + k / kw) * out.width + x0 + k % kw) else { continue }; + let t = opacity * coverage(blend, s[3].clamp(0.0, 1.0), knock.left + (k % kw) as i64, knock.top + (k / kw) as i64, record); + let below = p[3].clamp(0.0, 1.0); + let alpha = (1.0 - t) * below + t * fill; + if alpha <= 0.0 { + *p = [0.0; 4]; + continue; + } + let mix = |i: usize| ((1.0 - t) * below * p[i] + t * fill * s[i]) / alpha; + *p = [mix(0), mix(1), mix(2), alpha]; + } + Ok(true) +} + +/// `acc` grown, when it doesn't already, to a canvas covering itself and `src` (a new one counted +/// with `spend`). `false`, with `acc` as it was, when the canvases held, `acc` and `src` and a +/// larger canvas when one is needed, would take more than `max_alloc` bytes. +fn cover(acc: &mut Option, src: &Canvas, max_alloc: u64, spend: &dyn Fn(u64) -> Result<(), String>) -> Result { let (mut left, mut top, mut right, mut bottom) = (src.left, src.top, src.left + src.width as i64, src.top + src.height as i64); if let Some(a) = acc.as_ref() { left = left.min(a.left); @@ -1475,14 +1679,6 @@ fn blend_onto( } *acc = Some(out); } - let Some(out) = acc.as_mut() else { return Ok(false) }; - // Only the source's rows and columns change. - let (sw, x0, y0) = (src.width.max(1), (src.left - left) as usize, (src.top - top) as usize); - for (k, s) in src.px.iter().enumerate() { - let Some(p) = out.px.get_mut((y0 + k / sw) * width + x0 + k % sw) else { continue }; - let a = coverage(blend, s[3] * opacity, src.left + (k % sw) as i64, src.top + (k / sw) as i64, record); - *p = over(blend, *p, [s[0], s[1], s[2], a]); - } Ok(true) } @@ -1523,9 +1719,11 @@ pub(super) fn import( noted: vec![false; records.len()], skipped: vec![false; records.len()], skip_log: vec![], + unknocked: vec![false; records.len()], + unknock_log: vec![], spent: Cell::new(0), }; - let layers = b.list(&items)?; + let layers = b.list(&items, Level::Top)?; let Builder { mut doc, notes, .. } = b; if !layers.is_empty() { doc.layers = layers; diff --git a/crates/engine/src/cmd/fileio/tests_psdlayers.rs b/crates/engine/src/cmd/fileio/tests_psdlayers.rs index 6c227c0e17..61db4b86fc 100644 --- a/crates/engine/src/cmd/fileio/tests_psdlayers.rs +++ b/crates/engine/src/cmd/fileio/tests_psdlayers.rs @@ -646,6 +646,134 @@ fn dissolve_layers_merge_as_opaque_or_transparent_pixels() { assert!((32..=96).contains(&red), "{red} of 256 pixels show the lower layer: {r}"); } +/// A layer with a Knockout value of `knko` and a fill opacity of `fill`. +fn knockout(l: L, knko: u8, fill: u8) -> L { + let mut l = l; + l.blocks.push((*b"knko", vec![knko, 0, 0, 0])); + l.blocks.push((*b"iOpa", vec![fill])); + l +} + +/// A green layer under a group of `group_blend` holding a red layer and `cut` above it. +fn knockout_stack(group_blend: &'static [u8; 4], cut: L) -> Vec { + vec![ + layer("Outside", [0, 0, 4, 4], [0, 255, 0, 255]), + group_end(), + layer("Lower", [0, 0, 4, 4], [255, 0, 0, 255]), + cut, + group("Group", group_blend), + ] +} + +/// The names of the document's layers, and of the layers in its second one. +fn knockout_names(s: &Session) -> (Vec, Vec) { + let d = &s.doc().unwrap().doc; + let names = |ls: &[std::sync::Arc]| ls.iter().map(|l| name(l).to_string()).collect::>(); + (names(&d.layers), d.layers.get(1).and_then(|g| g.children()).map_or(vec![], |c| names(c))) +} + +/// A layer with a shallow knockout in a group merges with the layers below it in the group: its +/// shape clears them to transparency, it draws there at its fill opacity, and its opacity fades +/// that. What is outside the group stays a layer of its own and shows through. +#[test] +fn knockout_layers_merge_with_the_layers_below_them_in_their_group() { + let cut = |fill: u8, opacity: u8| knockout(L { opacity, ..layer("Cut", [0, 0, 2, 2], [0, 0, 255, 255]) }, 1, fill); + for (fill, opacity, at_cut) in [(0, 255, [0, 0, 0, 0]), (128, 255, [0, 0, 255, 128]), (0, 128, [255, 0, 0, 127]), (255, 255, [0, 0, 255, 255])] { + for group_blend in [b"norm", b"pass"] { + let (s, r) = open(&file(4, 4, &knockout_stack(group_blend, cut(fill, opacity)), 8, false, false), json!({})); + assert_eq!(r["warnings"], json!([]), "{r}"); + let (top, inner) = knockout_names(&s); + assert_eq!((top, inner), (vec!["Outside".to_string(), "Group".into()], vec!["Lower + Cut".to_string()]), "{fill} {opacity}"); + let d = &s.doc().unwrap().doc; + assert_eq!(d.layers[1].isolate, group_blend == b"norm"); + let ((x, y), px) = image_of(&s, &d.layers[1].children().unwrap()[0]); + assert_eq!(((x, y), px.dimensions()), ((0.0, 0.0), (4, 4))); + assert_eq!((px.get_pixel(1, 1).0, px.get_pixel(3, 3).0), (at_cut, [255, 0, 0, 255]), "{fill} {opacity}"); + } + } + // A layer mask shapes the cut: where it hides the layer, nothing below is cleared. + let mut masked = cut(0, 255); + masked.mask = Some(([0, 0, 1, 1], 255, 0, vec![0])); + let (s, r) = open(&file(4, 4, &knockout_stack(b"norm", masked), 8, false, false), json!({})); + let px = image_of(&s, &s.doc().unwrap().doc.layers[1].children().unwrap()[0]).1; + assert_eq!((px.get_pixel(0, 0).0, px.get_pixel(1, 1).0), ([255, 0, 0, 255], [0, 0, 0, 0]), "{r}"); + // Without a knockout (0), the layers stay apart. + let (s, r) = + open(&file(4, 4, &knockout_stack(b"norm", knockout(layer("Cut", [0, 0, 2, 2], [0, 0, 255, 255]), 0, 0)), 8, false, false), json!({})); + assert_eq!((knockout_names(&s).1, &r["warnings"]), (vec!["Lower".to_string(), "Cut".into()], &json!([])), "{r}"); +} + +/// The knockouts this import doesn't apply come in as layers, counted in a warning: at the top level, +/// on a clipped layer, and with a Knockout value other than 1. Hidden ones that would need the merge +/// are left out; one that draws nothing, or nothing below it, merges nothing. +#[test] +fn knockouts_that_arent_applied_are_said() { + const UNAPPLIED: &str = "the knockout of 1 layer wasn't applied"; + let cut = |l: L, knko: u8| knockout(l, knko, 0); + let blue = || layer("Cut", [0, 0, 2, 2], [0, 0, 255, 255]); + // At the top level. + let layers = [layer("Lower", [0, 0, 4, 4], [255, 0, 0, 255]), cut(blue(), 1)]; + let (s, r) = open(&file(4, 4, &layers, 8, false, false), json!({})); + assert_eq!((knockout_names(&s).0, &r["warnings"]), (vec!["Lower".to_string(), "Cut".into()], &json!([UNAPPLIED])), "{r}"); + // Another Knockout value, and a clipped layer, in a group. + let (s, r) = open(&file(4, 4, &knockout_stack(b"norm", cut(blue(), 2)), 8, false, false), json!({})); + assert_eq!((knockout_names(&s).1, &r["warnings"]), (vec!["Lower".to_string(), "Cut".into()], &json!([UNAPPLIED])), "{r}"); + let (s, r) = open(&file(4, 4, &knockout_stack(b"norm", cut(L { clipped: true, ..blue() }, 1)), 8, false, false), json!({})); + assert_eq!((knockout_names(&s).1, &r["warnings"]), (vec!["Lower + Cut".to_string()], &json!([UNAPPLIED])), "{r}"); + // In a pass-through group, a layer below it, or the knockout itself, in another mode blends with + // what is outside the group: the layers stay apart, and the lower one still multiplies the green + // outside. In an isolated group they merge. + let mut multiply = knockout_stack(b"pass", cut(blue(), 1)); + multiply[2].blend = b"mul "; + let (s, r) = open(&file(4, 4, &multiply, 8, false, false), json!({})); + assert_eq!((knockout_names(&s).1, &r["warnings"]), (vec!["Lower".to_string(), "Cut".into()], &json!([UNAPPLIED])), "{r}"); + assert_eq!(s.doc().unwrap().doc.layers[1].children().unwrap()[0].blend, BlendMode::Multiply); + let (s, r) = open(&file(4, 4, &knockout_stack(b"pass", cut(L { blend: b"mul ", ..blue() }, 1)), 8, false, false), json!({})); + assert_eq!((knockout_names(&s).1, &r["warnings"]), (vec!["Lower".to_string(), "Cut".into()], &json!([UNAPPLIED])), "{r}"); + multiply[4] = group("Group", b"norm"); + let (s, r) = open(&file(4, 4, &multiply, 8, false, false), json!({})); + assert_eq!((knockout_names(&s).1, &r["warnings"]), (vec!["Lower + Cut".to_string()], &json!([])), "{r}"); + // A hidden knockout would need the merge: left out, hidden layers asked for or not. + for hidden in [false, true] { + let (s, r) = + open(&file(4, 4, &knockout_stack(b"norm", cut(L { hidden: true, ..blue() }, 1)), 8, false, false), json!({"hiddenLayers": hidden})); + assert_eq!((knockout_names(&s).1, &r["warnings"]), (vec!["Lower".to_string()], &json!([HIDDEN_1])), "{hidden}: {r}"); + } + // One that stores no pixels or only transparent ones cuts nothing, and merges nothing. + for (l, inner) in [(L { bare: true, ..blue() }, vec!["Lower"]), (layer("Cut", [0, 0, 2, 2], [0, 0, 255, 0]), vec!["Lower", "Cut"])] { + let (s, r) = open(&file(4, 4, &knockout_stack(b"norm", cut(l, 1)), 8, false, false), json!({})); + assert_eq!((knockout_names(&s).1, &r["warnings"]), (inner.iter().map(|n| n.to_string()).collect(), &json!([])), "{r}"); + } + // Nothing below it in its group: it comes in as a layer. + let layers = [group_end(), cut(blue(), 1), group("Group", b"norm"), layer("Over", [0, 0, 1, 1], [9, 9, 9, 255])]; + let (s, r) = open(&file(4, 4, &layers, 8, false, false), json!({})); + let d = &s.doc().unwrap().doc; + assert_eq!(d.layers[0].children().unwrap().iter().map(|c| name(c)).collect::>(), ["Cut"], "{r}"); + assert_eq!(r["warnings"], json!([]), "{r}"); +} + +/// A knockout's merge whose canvases would need more memory than allowed leaves the layers apart, +/// with a warning. +#[test] +fn a_knockout_merge_past_the_memory_allowed_leaves_the_layers_apart() { + let cms = |c: [f32; 4]| [c[0], c[1], c[2]]; + let layers = [ + group_end(), + layer("Lower", [0, 0, 2, 2], [255, 0, 0, 255]), + knockout(layer("Cut", [2, 2, 4, 4], [0, 0, 255, 255]), 1, 0), + group("Group", b"norm"), + ]; + let f = file(4, 4, &layers, 8, false, false); + // Each 2 × 2 layer fits 128 bytes (16 a pixel), but not the canvas of the layer below with the + // knockout's canvas held beside it. + let (doc, warnings) = psdlayers::import(&f, false, 128, cms).unwrap().unwrap(); + assert_eq!(doc.layers[0].children().unwrap().iter().map(|c| name(c)).collect::>(), ["Lower", "Cut"]); + assert_eq!(warnings, ["the knockout of 1 layer wasn't applied"]); + let (doc, warnings) = psdlayers::import(&f, false, 1 << 20, cms).unwrap().unwrap(); + assert_eq!(doc.layers[0].children().unwrap().iter().map(|c| name(c)).collect::>(), ["Lower + Cut"]); + assert!(warnings.is_empty(), "{warnings:?}"); +} + #[test] fn what_doesnt_come_in_is_said() { let mut text = layer("Words", [0, 0, 2, 2], [0, 0, 0, 255]); diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index 900dd99aab..e4bbf9dbbb 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -2040,7 +2040,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur EPS export and EPS Save make each file's PNG thumbnail from its TIFF preview, averaging the preview's pixels down to the thumbnail's size on white, instead of drawing the document a second time; a file without a preview still draws its thumbnail (`crates/engine/src/cmd/fileio/tests_eps.rs`). - Targa files (`.tga`, `.vda`, `.icb`, `.vst`) open, place linked or embedded, relink and update at their pixel size: color-mapped, true-color and black-and-white, raw or run-length encoded, in any of the four row orders. The image descriptor's attribute bits and the extension area's Attributes Type decide the transparency: a file with no attribute bits, or with attribute data the Attributes Type calls undefined, opens opaque; with one bit, a 16-bit true-color pixel takes that bit as its alpha, and a color-mapped pixel takes the bit of the 16-bit color map entry it indexes; premultiplied colors are divided by their alpha. Open and Place recognize a Targa file by its extension, and `clipboard.importImage` and Glass's Load Texture… by its header; a Targa file copied in a file manager pastes as a bitmap (`crates/engine/src/cmd/fileio/tests_tiffbmp.rs`, `crates/engine/src/tests/links.rs`). - BMP files named `.dib` or `.rle` (run-length encoded bitmaps included), Photoshop files named `.pdd` and PNG files named `.pns` open and place, linked or embedded, as BMP, PSD and PNG files, in any letter case: the Open and Place dialogs list them with their format, the Links panel names their format, and Edit Original opens them. Exports write only `.bmp`, `.psd` and `.png` (`crates/engine/src/cmd/fileio/tests_tiffbmp.rs`, `crates/engine/src/cmd/fileio/tests_psdread.rs`, `crates/engine/src/tests/links.rs`). - - File › Open converts a PSD or PSB file's layers to objects, keeping the layer structure, merging clipped layers into one layer and leaving out hidden layers that would need a merge, as [PSD import options](https://helpx.adobe.com/illustrator/desktop/add-and-import-files/import-from-other-apps/photoshop-import-options.html) describes for the option that converts layers to objects; hidden layers come in with `hiddenLayers`, as Import Hidden Layers brings them in, and `layers: false` opens the merged image. VectorCraft's own rules: each layer becomes a layer holding its pixels with its name, visibility, opacity and blend mode, groups become layers of sublayers, layers in Dissolve, Linear Burn, Linear Dodge, Vivid Light, Linear Light, Pin Light, Hard Mix, Subtract, Divide, Darker Color and Lighter Color are merged with the layers below, layer masks become opacity masks, fill opacity multiplies the opacity (in a layer that others are clipped to, it fades only that layer's own pixels), and adjustment layers, layer effects, knockouts and vector masks aren't applied and are counted in the warnings. 8-, 16- and 32-bit files, PSB, raw, PackBits and zipped channels (`crates/engine/src/cmd/fileio/tests_psdlayers.rs`). + - File › Open converts a PSD or PSB file's layers to objects, keeping the layer structure, merging clipped layers into one layer, merging a layer that uses a Knockout option with the layers below it, and leaving out hidden layers that would need a merge, as [PSD import options](https://helpx.adobe.com/illustrator/desktop/add-and-import-files/import-from-other-apps/photoshop-import-options.html) describes for the option that converts layers to objects; hidden layers come in with `hiddenLayers`, as Import Hidden Layers brings them in, and `layers: false` opens the merged image. VectorCraft's own rules: each layer becomes a layer holding its pixels with its name, visibility, opacity and blend mode, groups become layers of sublayers, layers in Dissolve, Linear Burn, Linear Dodge, Vivid Light, Linear Light, Pin Light, Hard Mix, Subtract, Divide, Darker Color and Lighter Color are merged with the layers below, layer masks become opacity masks, fill opacity multiplies the opacity (in a layer that others are clipped to, it fades only that layer's own pixels), a Knockout value of 1 is read as a shallow knockout and applied to a layer or group inside a group, which is merged with the layers below it in that group (its pixels clear them to transparency, it is drawn there at its fill opacity, and its opacity fades the result; in a pass-through group only when it and the layers below it are in the Normal mode), and adjustment layers, layer effects, vector masks and the other knockouts (top-level layers, clipped layers, layers that others are clipped to, pass-through groups with layers in other modes, other Knockout values) aren't applied and are counted in the warnings. 8-, 16- and 32-bit files, PSB, raw, PackBits and zipped channels (`crates/engine/src/cmd/fileio/tests_psdlayers.rs`). - File › Open of a PSD or PSB file with two or more layers, and File › Place of one without Link, show PSD Import Options: Convert Layers to Objects with Import Hidden Layers, or Flatten Layers to a Single Image, the options [PSD import options](https://helpx.adobe.com/illustrator/desktop/add-and-import-files/import-from-other-apps/photoshop-import-options.html) describes for a file that is opened or embedded. A file placed with Link shows its flat image and isn't asked about. `file.place` takes `layers` and `hiddenLayers`, and `document.psdInfo` counts a file's layers without opening it. VectorCraft's own rules: placed layers come in as one group named after the file, a layer as an image and a layer group as a group, at the place the merged image would take and clipped to the canvas when layers reach past it; the dialog asks from two layers up and starts from the choices made last. Layer comps aren't read (`crates/engine/src/cmd/fileio/tests_psdlayers.rs`, `crates/ui-egui/src/dialogs/psd_import.rs`). - A PSD or PSB file's clipping path, the saved path that image resource 2999 names in the [PSD file format specification](https://www.adobe.com/devnet-apps/photoshop/fileformatashtml/), clips its merged image on File › Place and on File › Open of the merged image, as [PSD import options](https://helpx.adobe.com/illustrator/desktop/add-and-import-files/import-from-other-apps/photoshop-import-options.html) describes for a file imported as one flattened image. The image comes in a clip group whose clipping path has no paint and uses the even-odd rule, and the path can be edited or released. `links.update` and `links.relink` give the clip group the clipping path the new file names, or leave a plain group when it names none, and files that name no clipping path come in as before (`crates/engine/src/cmd/fileio/tests_psdread.rs`). - Import Slices: File › Open of a PSD or PSB file with slices, and File › Place of one without Link, bring its slices in as user slices, as [PSD import options](https://helpx.adobe.com/illustrator/desktop/add-and-import-files/import-from-other-apps/photoshop-import-options.html) describes for a file that is opened or embedded; PSD Import Options offers Import Slices for such a file. `document.open` and `file.place` take `importSlices`, and `document.psdInfo` counts the slices. The slices are read from image resource 1050 in version 6 and in the descriptor of versions 7 and 8, as the [Photoshop File Formats Specification](https://www.adobe.com/devnet-apps/photoshop/fileformatashtml/) describes it. VectorCraft's own rules: Import Slices applies to Convert Layers to Objects and to Flatten Layers to a Single Image alike, and makes the dialog ask for a file with fewer than two layers; placed slices move and scale with the art in the same undo step; each slice keeps its name, type, link, target, message, alternative text, cell text and background color; slices the file generated automatically, and slices wholly outside the canvas, are left out; slices that can't be read are left out with a warning while the art comes in; with Show Import Options off, a PSD file is placed with the PSD Import Options chosen last, and on, each PSD file of the place cursor asks for them (`crates/engine/src/cmd/fileio/tests_psdslices.rs`, `crates/ui-egui/src/dialogs/psd_import.rs`). From 313d889a7f513ea0157ab0fd4bc736e2ab97851f Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Tue, 17 Nov 2026 16:54:12 -0800 Subject: [PATCH 31/78] PSD import: a group that draws nothing is drawn once, however deep it nests A group with a knockout was drawn for the knockout and, when it drew nothing, drawn again as a layer of its own. Nested inside each other, such groups were drawn twice over for every level, so opening a crafted PSD file could take exponential time; layers without pixels charge nothing against the import's memory allowance, so it did not stop it. The import now keeps what a group gave when drawn without reading any layer's pixels (nothing, or a canvas without pixels) and gives it again without walking the group's layers. A pass-through group that laid nothing onto an empty canvas without reading any pixels is not laid there again; its layers count the same warnings each time. A merge that can't be made forgets the groups found during it, with the notes it gives back. A knockout group that comes in as a layer is also listed after being drawn, and its layers clipped to a fill that isn't drawn, or left unclipped by a merge past the memory allowed, were counted twice in the warnings. Each is now counted once. The knockout of a layer that others are clipped to was applied when the clip merge needed more memory than allowed and the layers came in apart. It is now left unapplied and counted, as it is when the clip merge is made. A Dissolve knockout at part opacity cleared every pixel below it in part. It now clears each pixel fully or not at all, at the share its transparency times its opacity gives, as other Dissolve merges do. --- crates/engine/src/cmd/fileio/psdlayers.rs | 198 +++++++++++++++--- .../engine/src/cmd/fileio/tests_psdlayers.rs | 137 ++++++++++++ 2 files changed, 308 insertions(+), 27 deletions(-) diff --git a/crates/engine/src/cmd/fileio/psdlayers.rs b/crates/engine/src/cmd/fileio/psdlayers.rs index ded5288c69..c2f0dd5ff2 100644 --- a/crates/engine/src/cmd/fileio/psdlayers.rs +++ b/crates/engine/src/cmd/fileio/psdlayers.rs @@ -72,6 +72,13 @@ const MAX_CHANNELS: usize = 56; const MIN_RECORD: usize = 34; const DAMAGED: &str = "the PSD file's layer records are damaged"; +#[cfg(test)] +thread_local! { + /// The layer lists imports on this thread have walked, and the most a test lets them walk + /// before the import stops with an error. + pub(super) static WALKS: Cell<(usize, usize)> = const { Cell::new((0, usize::MAX)) }; +} + /// The keys of the tagged blocks that make a layer an adjustment layer. const ADJUSTMENTS: [&[u8; 4]; 18] = [ b"levl", b"curv", b"brit", b"blnc", b"hue ", b"hue2", b"selc", b"mixr", b"grdm", b"phfl", b"expA", b"vibA", b"thrs", b"nvrt", b"post", b"clrL", @@ -619,6 +626,8 @@ struct Unit<'i> { body: Body<'i>, /// While layers are clipped to it: how its merged canvas is shaped. clip: Option, + /// Layers are clipped to it, merged into it or not. + base: bool, } impl Unit<'_> { @@ -647,8 +656,8 @@ enum Clip { enum Body<'i> { /// A layer record's pixels. Layer(usize), - /// A group's layers. - Group(&'i [Item]), + /// A group's record and its layers. + Group(usize, &'i [Item]), /// Layers merged into one image. Merged(Canvas), } @@ -675,6 +684,7 @@ enum Knocked { } /// A unit's body drawn alone. +#[derive(Clone)] enum Drawn { /// It draws nothing. Nothing, @@ -713,6 +723,8 @@ struct Counts { unmerged: usize, unclipped: usize, clipped_out: usize, + /// The groups found to read no pixels. + blank: usize, } /// Adds the warning for `n` things to `out`: `one` when `n` is 1, `many` with the count in place @@ -776,8 +788,16 @@ impl Notes { out } - fn counts(&self, skipped: usize, unknocked: usize) -> Counts { - Counts { skipped, unknocked, merged: self.merged.len(), unmerged: self.unmerged, unclipped: self.unclipped, clipped_out: self.clipped_out } + fn counts(&self, skipped: usize, unknocked: usize, blank: usize) -> Counts { + Counts { + skipped, + unknocked, + merged: self.merged.len(), + unmerged: self.unmerged, + unclipped: self.unclipped, + clipped_out: self.clipped_out, + blank, + } } } @@ -806,8 +826,26 @@ struct Builder<'a, F> { unknocked: Vec, /// Those records, in the order they were counted. unknock_log: Vec, + /// The records counted as layers clipped to a fill that isn't drawn. + clipped_out: Vec, + /// Those records, in the order they were counted. + clipped_out_log: Vec, + /// The records counted as clipped layers left unclipped. + unclipped: Vec, + /// Those records, in the order they were counted. + unclip_log: Vec, /// Bytes of layer and mask pixels decoded, and of canvases the merges made, so far. spent: Cell, + /// The layers whose pixels were read so far (each time they were). + painted: Cell, + /// What each group gave when drawn alone without reading any layer's pixels (nothing, or a + /// canvas without pixels, whatever the memory left): drawing it again gives that without + /// walking its layers. + blank: Vec>, + /// The pass-through groups that laid nothing onto nothing (see [`Self::laid_nothing`]). + laid_blank: Vec, + /// The groups of both, in the order they were found. + blank_log: Vec, } impl [f32; 3]> Builder<'_, F> { @@ -849,6 +887,7 @@ impl [f32; 3]> Builder<'_, F> { Paint::Cmyk(ink) => (self.cmyk)(ink), }; let px = image::Rgba([byte(rgb[0]), byte(rgb[1]), byte(rgb[2]), 255]); + self.painted.set(self.painted.get() + 1); return Ok(Some((0, 0, RgbaImage::from_pixel(h.width, h.height, px)))); } Content::Pixels | Content::Type | Content::Solid(_) | Content::Fill => rec.bounds.size(), @@ -880,6 +919,7 @@ impl [f32; 3]> Builder<'_, F> { let rgb = to_rgb(h, |c| planes.get(c).map_or(0.0, |p| at(p, linear, 0.0)), &self.cmyk); image::Rgba([byte(rgb[0]), byte(rgb[1]), byte(rgb[2]), byte(at(&alpha, false, 1.0))]) }); + self.painted.set(self.painted.get() + 1); Ok(Some((i64::from(rec.bounds.left), i64::from(rec.bounds.top), img))) } @@ -932,7 +972,7 @@ impl [f32; 3]> Builder<'_, F> { for item in items { let (i, body) = match item { Item::Layer(i) => (*i, Body::Layer(*i)), - Item::Group(i, children) => (*i, Body::Group(children)), + Item::Group(i, children) => (*i, Body::Group(*i, children)), }; let rec = self.record(i)?; let (name, hidden, clipped, blend) = (rec.name.clone(), rec.hidden, rec.clipped, rec.blend); @@ -959,14 +999,17 @@ impl [f32; 3]> Builder<'_, F> { if self.record(i)?.knockout != 0 { self.unknock(i); } + if let Some(u) = out.get_mut(b) { + u.base = true; + } if !unclipped && self.clip(&mut out, b, &body, i, &name, blend, opacity)? { continue; } // The merge doesn't fit: this layer and the next ones clipped to the same // base come in as layers of their own. unclipped = true; - self.notes.unclipped += 1; - out.push(Unit { name, visible: true, opacity, blend, mask_of: Some(i), record: i, body, clip: None }); + self.unclip(i); + out.push(Unit { name, visible: true, opacity, blend, mask_of: Some(i), record: i, body, clip: None, base: false }); } } continue; @@ -978,7 +1021,7 @@ impl [f32; 3]> Builder<'_, F> { continue; } self.note(i)?; - out.push(Unit { name, visible: !hidden, opacity, blend, mask_of: Some(i), record: i, body, clip: None }); + out.push(Unit { name, visible: !hidden, opacity, blend, mask_of: Some(i), record: i, body, clip: None, base: false }); base = Some(Some(out.len() - 1)); } for u in &mut out { @@ -1001,7 +1044,7 @@ impl [f32; 3]> Builder<'_, F> { }; // A fill whose shape is a vector mask isn't drawn, and nothing clipped to it is either. if undrawn && u.clip.is_none() { - self.notes.clipped_out += 1; + self.clip_out(i); return Ok(true); } let layer = match self.draw_body(body, Some(i))? { @@ -1127,7 +1170,7 @@ impl [f32; 3]> Builder<'_, F> { } let normal = |u: &Unit<'_>| u.blend == Blend::Mode(BlendMode::Normal); let blends_out = level == Level::Pass && !(normal(u) && below.iter().filter(|b| b.visible).all(normal)); - let applies = rec.knockout == 1 && level != Level::Top && !blends_out && !rec.clipped && !matches!(u.body, Body::Merged(_)); + let applies = rec.knockout == 1 && level != Level::Top && !blends_out && !rec.clipped && !u.base && !matches!(u.body, Body::Merged(_)); if !applies { self.unknock(u.record); } @@ -1145,9 +1188,39 @@ impl [f32; 3]> Builder<'_, F> { } } + /// Count record `i` as a layer clipped to a fill that isn't drawn (once). + fn clip_out(&mut self, i: usize) { + if let Some(s) = self.clipped_out.get_mut(i) + && !*s + { + *s = true; + self.notes.clipped_out += 1; + self.clipped_out_log.push(i); + } + } + + /// Count record `i` as a clipped layer left unclipped (once). + fn unclip(&mut self, i: usize) { + if let Some(s) = self.unclipped.get_mut(i) + && !*s + { + *s = true; + self.notes.unclipped += 1; + self.unclip_log.push(i); + } + } + /// `items`' units, at `level`, with the layers in blend modes VectorCraft lacks, and in a group /// the layers with a shallow knockout, merged with those below. fn merged<'i>(&mut self, items: &'i [Item], keep_hidden: bool, level: Level) -> Result>, String> { + #[cfg(test)] + { + let (walked, most) = WALKS.get(); + if walked >= most { + return Err("the import walked more layer lists than the test allows".into()); + } + WALKS.set((walked + 1, most)); + } let mut out: Vec> = vec![]; for mut u in self.units(items, keep_hidden)? { if self.knocks(&u, &out, level)? { @@ -1156,7 +1229,7 @@ impl [f32; 3]> Builder<'_, F> { self.skip(u.record); continue; } - let saved = self.notes.counts(self.skip_log.len(), self.unknock_log.len()); + let saved = self.notes.counts(self.skip_log.len(), self.unknock_log.len(), self.blank_log.len()); match self.knock(&out, &u)? { Knocked::Merged(canvas) => { self.take_merge(&mut out, &u, canvas); @@ -1185,7 +1258,7 @@ impl [f32; 3]> Builder<'_, F> { continue; } // A merge that can't be made counts nothing its groups would have counted. - let saved = self.notes.counts(self.skip_log.len(), self.unknock_log.len()); + let saved = self.notes.counts(self.skip_log.len(), self.unknock_log.len(), self.blank_log.len()); let made = match out.as_mut_slice() { // Onto the previous merge alone: composited onto its canvas, in place. [prev] if prev.is_merge() => { @@ -1241,10 +1314,29 @@ impl [f32; 3]> Builder<'_, F> { self.notes.knockouts = self.notes.knockouts.saturating_sub(1); } } + // The groups found since: what their drawing counted is given back, so they are drawn again. + for g in self.blank_log.split_off(c.blank) { + if let Some(b) = self.blank.get_mut(g) { + *b = None; + } + if let Some(b) = self.laid_blank.get_mut(g) { + *b = false; + } + } + for i in self.unclip_log.split_off(c.unclipped) { + if let Some(s) = self.unclipped.get_mut(i) { + *s = false; + self.notes.unclipped = self.notes.unclipped.saturating_sub(1); + } + } + for i in self.clipped_out_log.split_off(c.clipped_out) { + if let Some(s) = self.clipped_out.get_mut(i) { + *s = false; + self.notes.clipped_out = self.notes.clipped_out.saturating_sub(1); + } + } self.notes.merged.truncate(c.merged); self.notes.unmerged = c.unmerged; - self.notes.unclipped = c.unclipped; - self.notes.clipped_out = c.clipped_out; } /// The visible units `below` with `top` composited over them; `None` when the canvas would need @@ -1289,6 +1381,7 @@ impl [f32; 3]> Builder<'_, F> { record: top.record, body: Body::Merged(canvas), clip: None, + base: false, }); } @@ -1341,18 +1434,41 @@ impl [f32; 3]> Builder<'_, F> { self.max_alloc.saturating_sub(self.held) } + /// Note pass-through group `g` as laying nothing onto nothing when `acc`, nothing before, still + /// is and no layer's pixels were read since `painted`: laying its layers onto nothing again + /// gives nothing, with the same notes. + fn laid_nothing(&mut self, g: usize, acc: &Option, painted: usize) { + if acc.is_none() + && self.painted.get() == painted + && let Some(b) = self.laid_blank.get_mut(g) + && !*b + { + *b = true; + self.blank_log.push(g); + } + } + /// Unit `u` composited onto `acc`. A pass-through group lays its layers onto `acc` one by one, /// so that they blend with what is below it; at less than full opacity or with a layer mask, the /// result is then faded back toward `acc` as it was by the opacity and the mask. Anything else /// is drawn alone first. `false` when the canvas would need more memory than allowed. fn composite(&mut self, acc: &mut Option, u: &Unit<'_>) -> Result { - if let (Body::Group(items), Blend::Pass) = (&u.body, u.blend) { + if let (Body::Group(g, items), Blend::Pass) = (&u.body, u.blend) { let mask = match u.mask_of { Some(i) if self.has_mask(Some(i))? => self.mask(i, false)?, _ => None, }; + // Onto nothing, a group that laid nothing onto nothing before lays nothing again. + let (fresh, painted) = (acc.is_none(), self.painted.get()); + if fresh && self.laid_blank.get(*g) == Some(&true) { + return Ok(true); + } if u.opacity >= 1.0 && mask.is_none() { - return self.lay(acc, items, Level::Pass); + let laid = self.lay(acc, items, Level::Pass)?; + if laid && fresh { + self.laid_nothing(*g, acc, painted); + } + return Ok(laid); } let bytes = acc.as_ref().map_or(0, |c| 16 * c.px.len() as u64); if bytes > self.room() { @@ -1366,6 +1482,9 @@ impl [f32; 3]> Builder<'_, F> { if !laid? { return Ok(false); } + if fresh { + self.laid_nothing(*g, acc, painted); + } if let Some(after) = acc.as_mut() { fade(after, below.as_ref(), u.opacity, mask.as_ref()); } @@ -1420,13 +1539,29 @@ impl [f32; 3]> Builder<'_, F> { } None => return Ok(Drawn::Nothing), }, - Body::Group(items) => { - let mut acc: Option = None; - if !self.lay(&mut acc, items, Level::Group)? { - return Ok(Drawn::TooLarge); + Body::Group(g, items) => { + let drawn = match self.blank.get(*g).cloned().flatten() { + Some(d) => d, + None => { + let painted = self.painted.get(); + let mut acc: Option = None; + if !self.lay(&mut acc, items, Level::Group)? { + return Ok(Drawn::TooLarge); + } + let d = acc.map_or(Drawn::Nothing, Drawn::Canvas); + if self.painted.get() == painted + && let Some(b) = self.blank.get_mut(*g) + { + *b = Some(d.clone()); + self.blank_log.push(*g); + } + d + } + }; + match drawn { + Drawn::Canvas(c) => c, + other => return Ok(other), } - let Some(acc) = acc else { return Ok(Drawn::Nothing) }; - acc } }; if let Some(i) = mask_of { @@ -1478,13 +1613,13 @@ impl [f32; 3]> Builder<'_, F> { Some((left, top, img)) => vec![Arc::new(self.image_node(&u.name, left, top, img)?)], None => return Ok(None), }, - Body::Group(items) => self.list(items, if u.blend == Blend::Pass { Level::Pass } else { Level::Group })?, + Body::Group(_, items) => self.list(items, if u.blend == Blend::Pass { Level::Pass } else { Level::Group })?, }; let mut layer = self.layer(&u.name); layer.visible = u.visible; layer.opacity = u.opacity.clamp(0.0, 1.0); (layer.blend, layer.isolate) = match u.blend { - Blend::Mode(m) => (m, matches!(u.body, Body::Group(_))), + Blend::Mode(m) => (m, matches!(u.body, Body::Group(..))), Blend::Pass | Blend::Other(_) => (BlendMode::Normal, false), }; if let Some(c) = layer.children_mut() { @@ -1609,8 +1744,9 @@ fn blend_onto( /// `knock` (of record `record`, in `blend`, with its `fill` and `opacity`), a layer with a shallow /// knockout, knocking out `acc`, on a canvas covering both, as [`blend_onto`] makes it. Where /// `knock` has pixels, its transparency is the share of `acc` cleared and replaced by its color at -/// `fill`; `opacity` then fades that back toward `acc`. `false`, with `acc` as it was, when the -/// canvases would take more than `max_alloc` bytes. +/// `fill`; `opacity` then fades that back toward `acc` (in Dissolve, each pixel is cleared fully +/// or not at all, at the share its transparency times `opacity` gives). `false`, with `acc` as it +/// was, when the canvases would take more than `max_alloc` bytes. #[allow(clippy::too_many_arguments)] fn knock_onto( acc: &mut Option, @@ -1630,7 +1766,7 @@ fn knock_onto( let (kw, x0, y0) = (knock.width.max(1), (knock.left - out.left) as usize, (knock.top - out.top) as usize); for (k, s) in knock.px.iter().enumerate() { let Some(p) = out.px.get_mut((y0 + k / kw) * out.width + x0 + k % kw) else { continue }; - let t = opacity * coverage(blend, s[3].clamp(0.0, 1.0), knock.left + (k % kw) as i64, knock.top + (k / kw) as i64, record); + let t = coverage(blend, s[3].clamp(0.0, 1.0) * opacity, knock.left + (k % kw) as i64, knock.top + (k / kw) as i64, record); let below = p[3].clamp(0.0, 1.0); let alpha = (1.0 - t) * below + t * fill; if alpha <= 0.0 { @@ -1721,7 +1857,15 @@ pub(super) fn import( skip_log: vec![], unknocked: vec![false; records.len()], unknock_log: vec![], + clipped_out: vec![false; records.len()], + clipped_out_log: vec![], + unclipped: vec![false; records.len()], + unclip_log: vec![], spent: Cell::new(0), + painted: Cell::new(0), + blank: vec![None; records.len()], + laid_blank: vec![false; records.len()], + blank_log: vec![], }; let layers = b.list(&items, Level::Top)?; let Builder { mut doc, notes, .. } = b; diff --git a/crates/engine/src/cmd/fileio/tests_psdlayers.rs b/crates/engine/src/cmd/fileio/tests_psdlayers.rs index 61db4b86fc..6c2f8b8ff2 100644 --- a/crates/engine/src/cmd/fileio/tests_psdlayers.rs +++ b/crates/engine/src/cmd/fileio/tests_psdlayers.rs @@ -774,6 +774,143 @@ fn a_knockout_merge_past_the_memory_allowed_leaves_the_layers_apart() { assert!(warnings.is_empty(), "{warnings:?}"); } +/// A Dissolve knockout at part opacity clears each pixel below it fully or not at all, at the share +/// its opacity gives, as a Dissolve layer merges. +#[test] +fn a_dissolve_knockout_at_part_opacity_clears_whole_pixels() { + let cut = knockout(L { blend: b"diss", opacity: 128, ..layer("Cut", [0, 0, 16, 16], [0, 0, 255, 255]) }, 1, 0); + let layers = [group_end(), layer("Lower", [0, 0, 16, 16], [255, 0, 0, 255]), cut, group("Group", b"norm")]; + let (s, r) = open(&file(16, 16, &layers, 8, false, false), json!({})); + let d = &s.doc().unwrap().doc; + let (_, px) = image_of(&s, &d.layers[0].children().unwrap()[0]); + assert!(px.pixels().all(|p| p.0 == [255, 0, 0, 255] || p.0[3] == 0), "{r}"); + let red = px.pixels().filter(|p| p.0 == [255, 0, 0, 255]).count(); + assert!((32..=224).contains(&red), "{red} of 256 pixels keep the lower layer: {r}"); +} + +/// The knockout of a layer that another is clipped to isn't applied, also when the clipped layer's +/// merge with it needs more memory than allowed and the two come in apart. +#[test] +fn a_clipping_base_knockout_isnt_applied_when_its_clip_doesnt_fit() { + let cms = |c: [f32; 4]| [c[0], c[1], c[2]]; + // The 4 × 4 clipped layer and its 2 × 2 base don't fit 320 bytes together for the clip; the + // base's knockout merge with the 2 × 2 layer below would. + let layers = [ + group_end(), + layer("Lower", [0, 0, 2, 2], [255, 0, 0, 255]), + knockout(layer("Base", [0, 0, 2, 2], [0, 0, 255, 255]), 1, 0), + L { clipped: true, ..layer("Clipped", [0, 0, 4, 4], [0, 255, 0, 255]) }, + group("Group", b"norm"), + ]; + let (doc, warnings) = psdlayers::import(&file(4, 4, &layers, 8, false, false), false, 320, cms).unwrap().unwrap(); + assert_eq!(doc.layers[0].children().unwrap().iter().map(|c| name(c)).collect::>(), ["Lower", "Base", "Clipped"], "{warnings:?}"); + assert_eq!( + warnings, + ["the knockout of 1 layer wasn't applied", "1 layer clipped to the layer below came in unclipped: the merge needs more memory than allowed"] + ); +} + +/// A knockout group that comes in as a layer counts each layer clipped in it once in the warnings, +/// though its layers are also drawn for the knockout: one clipped to a fill that isn't drawn, and +/// one that a merge past the memory allowed leaves unclipped. +#[test] +fn a_knockout_group_that_comes_in_as_a_layer_counts_its_clipped_layers_once() { + let cms = |c: [f32; 4]| [c[0], c[1], c[2]]; + let empty = L { bare: true, ..layer("Empty", [0, 0, 2, 2], [0, 0, 0, 0]) }; + // A fill whose shape is a vector mask, with a layer clipped to it: neither is drawn. + let mut soco = vec![0; 8]; + for (key, v) in [(b"Rd doub", 255.0f64), (b"Grn doub", 0.0), (b"Bl doub", 51.0)] { + soco.extend(key); + soco.extend(v.to_be_bytes()); + } + let mut outline = layer("Outline", [0, 0, 0, 0], [0; 4]); + outline.blocks.push((*b"SoCo", soco)); + outline.blocks.push((*b"vsms", vec![0; 8])); + let on_outline = L { clipped: true, ..layer("On outline", [0, 0, 2, 2], [1, 1, 1, 255]) }; + // Each 2 × 2 layer fits 128 bytes, and so do the two drawn together, but not the merge of the + // clipped one with the one below. + let base = layer("Base", [0, 0, 2, 2], [255, 0, 0, 255]); + let clipped = L { clipped: true, ..layer("Clipped", [0, 0, 2, 2], [0, 0, 255, 255]) }; + for (inner, said) in [ + (vec![outline, on_outline], "1 layer clipped to a fill layer that wasn't drawn was left out"), + (vec![base, clipped], "1 layer clipped to the layer below came in unclipped: the merge needs more memory than allowed"), + ] { + let mut layers = vec![layer("Outside", [0, 0, 4, 4], [0, 255, 0, 255]), group_end(), empty.clone(), group_end()]; + layers.extend(inner); + layers.extend([knockout(group("Cut", b"norm"), 1, 255), group("Group", b"norm")]); + let (doc, warnings) = psdlayers::import(&file(4, 4, &layers, 8, false, false), false, 128, cms).unwrap().unwrap(); + assert_eq!(doc.layers.iter().map(|l| name(l)).collect::>(), ["Outside", "Group"]); + assert!(warnings.iter().any(|w| w == said), "{said}: {warnings:?}"); + } +} + +/// A pass-through group that draws nothing still counts what its layers count in it, also when it +/// is drawn again inside a group that merges: a knockout above a Multiply layer isn't applied in a +/// pass-through group, though drawn alone it would be. +#[test] +fn a_pass_through_group_that_draws_nothing_still_counts_its_unapplied_knockouts() { + let cms = |c: [f32; 4]| [c[0], c[1], c[2]]; + let empty = |name: &'static str, blend: &'static [u8; 4]| L { bare: true, blend, ..layer(name, [0, 0, 2, 2], [0, 0, 0, 0]) }; + let layers = [ + layer("Lower", [0, 0, 4, 4], [255, 0, 0, 255]), + group_end(), + empty("Empty", b"norm"), + group_end(), + empty("Multiplied", b"mul "), + knockout(empty("Cut", b"norm"), 1, 255), + knockout(group("Through", b"pass"), 1, 255), + group("Dissolved", b"diss"), + ]; + let (doc, warnings) = psdlayers::import(&file(4, 4, &layers, 8, false, false), false, 1 << 20, cms).unwrap().unwrap(); + assert_eq!(doc.layers.iter().map(|l| name(l)).collect::>(), ["Lower + Dissolved"], "{warnings:?}"); + assert_eq!(warnings, ["the knockout of 1 layer wasn't applied".to_string(), psdlayers::MERGED_WARNING.replace("{modes}", "Dissolve")]); +} + +/// A group that draws nothing is drawn once, however deep the groups like it nest: here each holds +/// a layer that stores no pixels and, above it, the next group, with a knockout. The import walks +/// at most as many layer lists as the file has records, with isolated groups, with groups that +/// alternate with pass-through ones, with pass-through groups inside the outermost one (whose +/// knockouts aren't applied), and with a layer in a mode VectorCraft lacks in each (a merge of +/// nothing, a canvas without pixels). +#[test] +fn groups_that_draw_nothing_are_drawn_once_however_deep_they_nest() { + const LEVELS: usize = 48; + let cms = |c: [f32; 4]| [c[0], c[1], c[2]]; + let empty = |name: &'static str, blend: &'static [u8; 4]| L { bare: true, blend, ..layer(name, [0, 0, 2, 2], [0, 0, 0, 0]) }; + // Which levels are pass-through groups. + let none: fn(usize) -> bool = |_| false; + let odd: fn(usize) -> bool = |k| k % 2 == 1; + let all: fn(usize) -> bool = |k| k > 0; + for (case, pass, dissolve, warned) in [ + ("isolated", none, false, vec![]), + ("alternating", odd, false, vec![]), + ("pass-through", all, false, vec![format!("the knockout of {} layers wasn't applied", LEVELS - 1)]), + ("dissolved", none, true, vec![psdlayers::MERGED_WARNING.replace("{modes}", "Dissolve")]), + ] { + let mut layers = vec![layer("Outside", [0, 0, 4, 4], [0, 255, 0, 255])]; + for _ in 0..=LEVELS { + layers.push(group_end()); + if dissolve { + layers.push(empty("Dissolved", b"diss")); + } + layers.push(empty("Empty", b"norm")); + } + for k in (0..=LEVELS).rev() { + let g = group("Group", if pass(k) { b"pass" } else { b"norm" }); + layers.push(if k == 0 { g } else { knockout(g, 1, 255) }); + } + psdlayers::WALKS.set((0, layers.len())); + let imported = psdlayers::import(&file(4, 4, &layers, 8, false, false), false, 1 << 20, cms); + let (walked, _) = psdlayers::WALKS.replace((0, usize::MAX)); + let (doc, warnings) = imported.unwrap().unwrap(); + assert!(walked <= layers.len(), "{case}: {walked} walks for {} records", layers.len()); + assert_eq!(doc.layers.iter().map(|l| name(l)).collect::>(), ["Outside", "Group"], "{case}"); + let mut expected = warned; + expected.push(vectorcraft_doc::depth::merged_note()); + assert_eq!(warnings, expected, "{case}"); + } +} + #[test] fn what_doesnt_come_in_is_said() { let mut text = layer("Words", [0, 0, 2, 2], [0, 0, 0, 255]); From 5f134efb52db457902cd926617fcdff84ed22df3 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Tue, 17 Nov 2026 18:05:48 -0800 Subject: [PATCH 32/78] Brushes: the progress documents count the Engraving library The Strokes rows and the Bundled content row in docs/target-app-parity.md and the M10 row in docs/roadmap.md count eleven generated libraries and name Engraving, and the docs/ui-parity.md checklist row lists it. --- docs/roadmap.md | 2 +- docs/target-app-parity.md | 6 +++--- docs/ui-parity.md | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/roadmap.md b/docs/roadmap.md index 258b86d04a..4047c121c5 100644 --- a/docs/roadmap.md +++ b/docs/roadmap.md @@ -166,7 +166,7 @@ Gujarati interface follow-up (2026-11-14): the catalog and zero/one plural rule | M7 | Type (point/area/path, editing, styles, OpenType, threading, glyphs) | Spell check engine: `text.spelling.check` and `text.spelling.suggest` on craft-proof, the custom dictionary and Ignore All commands, Auto Spell Check with its right-click suggestions, Ignore All and Add to Dictionary, Spelling › Auto Spell Check in the context menu of type, the Edit Custom Dictionary dialog, and the modal Check Spelling dialog (Edit › Spelling › Check Spelling…, `Cmd+I`, `ui.checkSpelling`, #4936); Right-aligned area type sets the text after a line's last tab against the right edge, the text before it at its stops (#6147); A line a soft return ends is justified as a wrapped line is (#6137); Indian-language pattern hyphenation preserves syllables in both composers (#4947); 🟡 Hanging punctuation keeps its published amounts under Glyph Scaling, and Standard burasagari counts a hung line start as room; Fullwidth `!` / `?` keep an upright fallback in vertical type; Hyphenation… and Justification… per paragraph (#2310, #2755), Auto Leading also driving the Character panel's Leading, the Alt+↑/↓ leading nudge and Fill with Placeholder Text; Document-point character controls after object/group scaling (#1034; optional font-size preservation remains separate), Character/Paragraph Styles (explicit Auto-leading resets and local leading overrides), per-paragraph paragraph attributes, mixed paragraph alignment indication (headless regressions, full integration CI and visual review pass), Area Type Options (with Width/Height, Auto Size and Shrink Text to Fit; overflow reported to agents and vertical Align), type areas resized by their handles and reshaped with Direct Selection, threaded text, Fit Headline, Glyphs (feature-valued alternates and unencoded glyphs applied in one Undo step while keeping Arabic joining, #5514), OpenType panel (including font-defined Stylistic Sets), Find Font (Document, Recent and System replacement sources, #5217), installed system fonts in every font menu (fonts registered with Windows outside its font folders, the XDG and Flatpak host font folders on Linux, and fonts installed while the app runs, listed when it comes back to the front; searchable; the Character and Properties menus show each family's sample of the selected text, preview it live under the pointer or ↑/↓, show recently applied families first (#3515), filter by script and kind, list a family's styles, and star favourites; the Glyphs panel and Find Font's Replace With use the same menu without the live preview) and found by name on open/import (full-name aliases and Missing Fonts searches verified, #1258; Windows font-service QA pending), variable fonts' named instances as styles, CJK names in the UI, input methods (marked text in place, candidate window at the caret; Japanese IME), Text Wrap (offset, invert, both sides of an object; follows edits), Type on a Path effects and Options with draggable start/centre/end brackets (slide, flip), tab stops + Tabs panel (Above Text floats it over the selected text, its ruler at the canvas zoom so stops line up with the columns, #729), inline symbols in text (beyond parity), Hebrew/Arabic bidirectional text, Paragraph Direction, Every-line/Single-line Composer per object (ragged text too) done; paint-only Arabic harakat keep joining with GDEF-mark ownership and Insert Kashidas tatweels on the base letter's paint (`tests::harakat`); tab leaders, vertical type pending | 45–60 | | M8 | Transform & distort (Puppet Warp, Liquify tools, Envelopes, Blends, Perspective Grid) | ✅ done (M8.1–M8.20 on 2026-10-06, fidelity pass): Liquify Tool Options with one shared brush, pen pressure, hold-to-apply, a safe scope and incremental strokes; tool options that last; Puppet Warp rotation, multi-select, Control bar and a rest-shape session that follows Undo; Width tool on compound paths; Envelope dialogs with preview, Reset with Warp/Mesh, full Envelope Options, type/images/symbols/appearance/gradients/patterns distorted on canvas and in every export, warps that keep their frame, Edit Contents, mesh handles and Control bar; Blend Options, anchor-targeted Blend tool, editable spine, keys picked on the canvas, faithful interpolation and knockout; Anchor Point spine conversion/handle editing and selection priority (#2544), with #2425 Shift reshape preserved; Perspective Grid with Define Grid, presets, lock/snap/rulers, widgets, the 1–4 plane switch, movable planes, Perspective Selection scale/copy/perpendicular/Transform Again, and type and symbols truly projected with Edit Text. Left: Anti-Alias and Preserve Shape output, warp-envelope point editing, brush interpolation in blends, Free Transform/Scale/Reflect along a rotated box | 2–4 | | M9 | Live effects (+ 3D & Materials) | 🟡 2D effects done incl. Effect → Pathfinder, Color Adjustments and Document Raster Effects Settings; PDF export warns when the pixel cap lowers raster-effect resolution; Artistic › Colored Pencil, Cutout, Dry Brush, Film Grain, Fresco, Neon Glow, Paint Daubs, Palette Knife, Poster Edges, Rough Pastels, Smudge Stick, Sponge, Underpainting and Watercolor and Sketch › Halftone Pattern, Bas Relief, Charcoal, Conté Crayon, Photocopy, Stamp, Torn Edges and Water Paper done (57/57 Photoshop filters); Revolve with automatic smooth vector shading, default-on circular caps and continuous rims, Extrude & Bevel, Inflate and Rotate with one to ten colored directional lights and four original lighting presets; SVG Filters, remaining raster effects and 3D materials and shadows pending | 81–130 | -| M10 | Brushes, symbols, patterns, Repeat | 🟡 pattern swatches (5 tile types, Pattern Options, editing mode, SVG ``/PDF export) and live Repeat (radial/grid/mirror) done; interactive selected mirror axis implemented (focused and native checks passed; full CI blocked by an unrelated text test); symbol libraries done (Window › Symbol Libraries, six generated libraries (Basic Shapes, UI Frames, Map Markers, Inventory Icons, Skill Icons, Weather Icons), User Defined, Other Library…, Save Symbols); brush libraries done (Window › Brush Libraries, ten generated libraries including Tech Circuit, Ink and Wash, Bristle Brushes and Dry Media, User Defined, Other Library…, Save Brushes); symbol editing shows draggable 9-slice guides (#5280), with guides outside the artwork still unsupported; brushes/symbols in progress | 23–37 | +| M10 | Brushes, symbols, patterns, Repeat | 🟡 pattern swatches (5 tile types, Pattern Options, editing mode, SVG ``/PDF export) and live Repeat (radial/grid/mirror) done; interactive selected mirror axis implemented (focused and native checks passed; full CI blocked by an unrelated text test); symbol libraries done (Window › Symbol Libraries, six generated libraries (Basic Shapes, UI Frames, Map Markers, Inventory Icons, Skill Icons, Weather Icons), User Defined, Other Library…, Save Symbols); brush libraries done (Window › Brush Libraries, eleven generated libraries including Tech Circuit, Engraving, Ink and Wash, Bristle Brushes and Dry Media, User Defined, Other Library…, Save Brushes); symbol editing shows draggable 9-slice guides (#5280), with guides outside the artwork still unsupported; brushes/symbols in progress | 23–37 | | M11 | Artboards & views (selected-set deletion shared by Artboards menu, trash and Properties, retaining artboard 1 when all are selected; Artboard deletion keys keep the first of an all-selected set and protect artwork; history prunes invalid indices while preserving valid multiselection (history tests and full workspace CI pass); click-to-fit objects with the Artboard tool (#1227), artboard escape routing and document setup modal handoff done; artboard panel/tool with Move Artwork for X/Y fields and Artboard Options, Trim View, middle-button pan, print tiling and the status bar's artboard navigator with synchronized Artboard tool selection done; Window › Arrange › Tile and Consolidate All Windows done; multiple windows, presentation polish) (cached canvas reprojection preserves scale during resize, rotation and DPI changes; regression-tested and contributor-confirmed 2026-10-19; estimates unchanged) (cached canvas dimensions match the renderer limit before cache-key creation, view construction and worker submission; regression-tested; estimates unchanged); status-bar pointer coordinates follow the active ruler origin and General units | 🟡; Artboard Options shares existing presets and orientation controls and can fit artwork without moving it; artwork fitting includes all drawn document art across artboards and off-board; artwork bounds are cached by active document and revision, and selection uses the shared bounds cache across artboards | 15–25 | | M12 | Advanced color & art (CMYK/ICC, separations, Gradient Mesh, Live Paint, Image Trace, Graphs) | 🟡 Gradient Mesh, Live Paint, Image Trace (junction-returning pieces retain their positioned boundaries; a simpler contour walk with identical output; an edge's sub-pixel shift is the same from either side; notches read only their own piece; collapsed loops keep few segments; large images trace with a warning; Auto Color keeps rare distinct colours; quick presets trace at once and the Image Trace button opens the adjustment controls; Properties reopens them; tiny fitted contours retain islands and holes; Create Strokes: exact crop EDT, Guo–Hall thinning and maximal-disc graph simplification; 15 presets, the 14 documented ones each with an enhanced version; Ignore Color, Shapes, Auto Grouping and Gradients options; measured in `image-trace-quality.md`; closed outlines retain their interior after straightening; the Flat Logo mode places edges to a fraction of a pixel, restores sharp corners, snaps lines and circles, and refuses gradients; live trace result bounds and selection highlights exclude the retained bitmap except in source-image views), Recolor Artwork, colour management (ICC, soft proofing, separations preview), Graphs (all 9 tools, Graph Data/Type, group-selected series colours persist through regenerate/save/open) done; Graph Design and Marker designs, Transpose and Switch x/y, `\|` label line breaks, the pie options, drop shadows, the legend across the top, overlapping widths, First Row/Column in Front, filled lines, kept label formatting and the Graph Data worksheet done; graph Column designs pending; Vector Halftone Preview keeps the selection box without drawing dot selection marks (#6369); Live Paint Bucket fills faces crossed in one drag (#6373) | 6–10 | | M13 | Automation (Actions ✅ record/playback, persisted; variables, scripting, batch) | 🟡 MCP `add_text` exposes existing vertical point, area and path type; `script.run` and File › Scripts › Other Script… run JavaScript files, and Window › Script Console shows their output; the script document model and batch work remain | 18–27 | diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index 99c955f21a..a05c9ffb37 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -254,7 +254,7 @@ dominate; 3D, graphs and automation are specialist). They sum to 105. Feature de | Drawing tools (Pen, Curvature, Pencil, shapes, Shaper) | 7 | 85% | Shaper construction widget, Pencil/Pen nuances, Blob Brush options, Touch Type, Dimension tool; see [ui-parity.md](ui-parity.md) | 8–13 | estimated; Curvature point display regression-tested (#1236, in part); Polygon/Star exact-size count persistence regression-covered; Live Corners' Relative rounding done (#3091), score unchanged; Copy and Cut with the Pen or Curvature tool take the anchors a Cmd/Ctrl-lent Direct Selection picked (#6123), score and hours unchanged; the Pen, Smart Pen and Curvature tool show the measurement readout with the rubber band off (#7043), score, gaps and hours unchanged | | Path operations, Pathfinder, Shape Builder, Live Paint | 5 | 80% | Shape Builder on the reporter's file (#937: art past 4,096 segments is cut by lines again; unconfirmed on the file itself); gap detection shares Live Paint’s finder, with a 72 pt custom cap and the existing options; Live Paint Gap Options | 4–8 | estimated; Shape Builder Gap Detection shares Live Paint’s spatial gap finder and temporary merge bridges (#2526); Custom is capped at 72 pt in the existing options dialog (lowered from 86%: open issues); compound attributes regression-tested (#1197); single-result source names survive SVG export/import (#1293), with [SVG ID semantics](https://www.w3.org/TR/SVG2/struct.html#IDAttribute) and original-shape tests; Simplify component selection and preview regression-tested (#1272); Simplify of a Direct Selection part of a path regression-tested (`tests/simplify_part.rs`); Divide open-cutting-path geometry and appearance regression-tested (#1307); the Shape Builder's edge-source grid is bounded in memory and files a segment once per cell (`planar.rs` test `rect_index_holds_a_bounded_number_of_references`); live compound shapes (Make, Alt-click, member Shape Modes, Release, Expand, saved and exported) regression-tested (#4522); Live Paint Bucket face drags, including narrow faces and one Undo, regression-tested (#6373) | | Colour, swatches, gradients, patterns, mesh, recolor | 7 | 92% | Picker Lab entry, picker libraries and Assign-row menus complete the deferred #4028 UI paths (#8031); scores and estimates unchanged; Eyedropper copies effective character dimensions across text transforms (#6404); 30.0's gradient additions are done (dither, perceptual blending, presets); freeform gradients in SVG/PDF, mixed spot/process gradients in SVG, PDF gradients mixing a spot color with RGB or Lab stops, and dithered spot gradient fills and Perceptual spot gradients with RGB or Lab stops other than white or more than 4,096 stops on their curve, which PDF export writes as images in process colors| 4–7 | estimated; Recolor model selection is available through the engine and MCP (#2520), and the dialog's color sliders (HSB, RGB, CMYK, Lab, Tint for a spot color) edit the selected row's new color in its mode, and the Edit tab's Global Adjust sliders (Saturation, Brightness, Temperature, Luminosity, -100% to 100%) change every recolored color at once (lowered from 96%: target moved); unpainted zero-width stroke restoration fixed (#1253), score and hours unchanged; Eyedropper source reads regression-tested (#1251); screen-bounded Recolor Edit chip list (#3416), score and hours unchanged; a point on a gradient mesh's outline locates on its edge on every side (#7006: `mesh_locate_takes_a_point_on_any_side_of_the_outline`, `mesh_add_line_exactly_on_the_edge_needs_no_tolerance`), score and hours unchanged; Color panel spectrum grows with the resized panel (#8005) | -| Strokes, brushes, width profiles | 5 | 88% | Shift-double-click adjoining adjustment is implemented; brush libraries are done (ten generated libraries including Tech Circuit, Ink and Wash, Bristle Brushes, Game Trails, Energy Beams and Dry Media, User Defined, Other Library…, Save Brushes); Art brush Overlap and Pattern brush auto corners are done; remaining: pen pressure on macOS, Stylus Wheel, more built-in brush libraries, tilt, bearing and rotation for Art, Pattern and Bristle brushes and on native Wayland and the web | 8–15 | estimated; width-point creation and adjoining adjustment regression-tested; dialog layout reviewed; evidence below; finite-arithmetic follow-up regressions and full CI passed (evidence below) | +| Strokes, brushes, width profiles | 5 | 88% | Shift-double-click adjoining adjustment is implemented; brush libraries are done (eleven generated libraries including Tech Circuit, Engraving, Ink and Wash, Bristle Brushes, Game Trails, Energy Beams and Dry Media, User Defined, Other Library…, Save Brushes); Art brush Overlap and Pattern brush auto corners are done; remaining: pen pressure on macOS, Stylus Wheel, more built-in brush libraries, tilt, bearing and rotation for Art, Pattern and Bristle brushes and on native Wayland and the web | 8–15 | estimated; width-point creation and adjoining adjustment regression-tested; dialog layout reviewed; evidence below; finite-arithmetic follow-up regressions and full CI passed (evidence below) | | Appearance, transparency, graphic styles, masks | 5 | 97% | raster effect reach in preview bounds | 1–2 | estimated; Transform typing, sliders, preview, and undo are covered in `crates/ui-egui/src/panels/tests_appearance.rs` | | 3D and Materials (and Turntable) | 4 | ~25% | live Revolve with automatic smooth vector shading and default-on continuous circular caps, Extrude & Bevel (twist, taper, caps, five bevel shapes), Inflate and Rotate with Position presets (colored Inflate uses smooth membrane lighting; white-light Inflate retains its existing shading; Extrude & Bevel and Rotate retain planar shading; one to ten colored lights, shared neutral ambient, painter visibility); materials, light presets, shadows, ray tracing, the rest of 3D Classic (Map Art), Turntable views, textures, map art and shading in 3D export | 30–55 | estimated (Extrude & Bevel, Inflate and Rotate added 2026-10-12); every 3D seam has round joins (2026-11-12, [three-d.md](three-d.md#seams)), score, gaps and hours unchanged | | Type core | 9 | 80% | Auto-leading style resets are implemented; Hyphenation… and Justification… options are done (#2310, #2755), and a paragraph's Auto Leading also sets the Character panel's Leading, the Alt+↑/↓ leading nudge and Fill with Placeholder Text; remaining: Optical Margin Alignment, Middle Eastern features beyond bidi layout (the Middle Eastern & South Asian and Standard composers are done per paragraph, #4935; `.ai`/EPS/PDF files carry no composer), optional group font-size preservation; transformed character controls fixed (#1034), see [type-parity.md](type-parity.md) | 14–19 | estimated; eleven-language pattern hyphenation in both composers, with grapheme and shaping-cluster protection (#4947, `hyphen::tests` and `layout::wrapping_tests`); Sanskrit patterns pending an allowlisted source; recent-font groups in font pickers (#3515); full-name font matches regression-tested (#1258); mixed paragraph alignment indication implemented; headless regressions, full integration CI and visual review pass; localized legacy family-name fallback with loaded/catalog regressions (#2208); Fractional Widths per type object regression-tested; color emoji fonts with bitmap glyphs (`sbix`, `CBDT`) draw and export; threading ports: every selected area type and type on a path shows its in and out ports (empty, arrow, red "+"), and the Selection tool threads from either, the in port into a frame before it, and a double-click on a threaded port breaks the thread there (`threads::tests::break_splits_the_thread_and_the_story_flows_into_the_first_part`, `select::tests::a_double_click_on_a_threaded_port_breaks_the_thread`, `canvas::tests::a_double_click_on_a_threaded_out_port_breaks_the_thread`) (#2572; `select::tests::a_click_on_the_in_port_threads_into_a_frame_before_it`, `text::tests::selected_type_shows_its_ports_in_each_state`, `threads::tests::add_before_threads_the_story_from_the_new_frame_into_the_clicked_one`, live screenshot); the Glyphs panel highlights and scrolls to the character selected with the Type tool (#4908, `panels::glyphs` tests); the OpenType panel lists only `ss01`–`ss20` sets present in the selected font and uses its custom names when supplied; Type-range desktop Copy publishes styled art and keeps font family, size and color on canvas Paste after editing (#5636); paint-only Arabic harakat keep joining with conditional GDEF-mark ownership and Insert Kashidas base-letter paint (`tests::harakat`) | @@ -523,7 +523,7 @@ about 1–1.5 agent-hours each, so the other rows (estimated on the older scale) | Drawing tools | 7 | 86% | rough-square Shaper recognition and orientation steps corrected; editable Shaper Groups landed; Pencil: Alt key toggles to Smooth Tool (#2001); remaining: Shaper construction widget/gesture refinements, pencil and the remaining pen modifier nuances, Blob Brush Merge Only with Selection, Touch Type, Live Corners' Relative rounding | 7–12 | | Path operations, Pathfinder, Shape Builder, Live Paint | 5 | 86% | Live Paint gap options, Shape Builder gap detection, options (Tool Options dialog, clicking a stroke in merge mode) and Shift-drag marquee | 3–6 | | Colour, swatches, gradients, patterns, mesh, recolor | 7 | 96% | Picker Lab entry, picker libraries and Assign-row menus complete the deferred #4028 UI paths (#8031); scores and estimates unchanged; Library panels' lists (swatch, Color Book, brush, symbol and graphic style libraries) fill a taller panel above its footer (#2992; scores and estimates unchanged); Swatches list fills a taller panel above its footer (#1638; `the_list_fills_a_tall_panel_above_its_footer`; scores and estimates unchanged); freeform gradients in SVG/PDF and mixed spot/process gradients in SVG (exported as stops; PDF export keeps the spot inks in a DeviceN shading, except next to RGB or Lab stops; dithered fills and Perceptual gradients with RGB or Lab stops other than white or more than 4,096 stops on their curve are written as images in process colors), pattern fills in Expand | 2–4; Eyedropper source reads regression-tested (#1251) | -| Strokes, brushes, width profiles | 5 | 90% | more built-in brush libraries (ten generated in code including Tech Circuit, Ink and Wash, Bristle Brushes, Game Trails, Energy Beams and Dry Media are done; Art brush Overlap and Pattern brush auto corners are done), pen pressure on macOS (the windowing layer reports none there), Stylus Wheel, tilt, bearing and rotation for Art, Pattern and Bristle brushes and on native Wayland and the web | 8–15 | +| Strokes, brushes, width profiles | 5 | 90% | more built-in brush libraries (eleven generated in code including Tech Circuit, Engraving, Ink and Wash, Bristle Brushes, Game Trails, Energy Beams and Dry Media are done; Art brush Overlap and Pattern brush auto corners are done), pen pressure on macOS (the windowing layer reports none there), Stylus Wheel, tilt, bearing and rotation for Art, Pattern and Bristle brushes and on native Wayland and the web | 8–15 | | Appearance, transparency, graphic styles, masks | 5 | 98% | Graphic Styles list fills a taller panel above its footer (#2992; scores and estimates unchanged); raster effect reach in preview bounds (flattener presets apply in PDF, EPS and print) | 1–2 | | Live vector effects | 5 | 85% | Outline Object, Pathfinder Hard/Soft Mix and Trap (since done: #3061, #3063, #3785), SVG Filters, Transform Patterns and Scale Strokes & Effects on a fill's or stroke's own Transform effect | 6–10 | | 3D and Materials | 4 | ~25% | Initial Revolve, Extrude & Bevel, Inflate and Rotate, with simple lighting; materials, light presets, shadows, ray tracing, Rotate (Classic), Map Art and more complete visibility remain | 25–45 | @@ -575,7 +575,7 @@ since 2026-10-01. | **Interaction fidelity:** modifiers, cursors, small behaviours | ~30–40% | The dedicated pass hasn't started, and there has been no side-by-side session with Illustrator yet. A power user notices this first | | **Look & feel** | ~75–80% | Measured against Illustrator 2026 screenshots (2026-10-02); the panels added since haven't been re-measured | | **File interop** | ~85% | SVG/SVGZ, PDF and PDF-compatible `.ai` (and legacy version 7 `.ai` out, keeping layers, groups and type as text), EPS, DXF, EMF/WMF, raster formats, PSD export and PSD/PSB placement (merged image), Place and Links, Package, Print, clipboard flavours. Affinity documents (Affinity 1–3) open natively as editable art, checked against 51 pinned public files (33 current `.af`), with selected saved-thumbnail comparisons and every-board native/SVG/PDF/PSD checks for current files; Affinity export is missing and effects, adjustments and brushes don't import. Affinity isn't an Illustrator feature, so this doesn't raise the parity score. The editing copy inside an Illustrator EPS or `.ai` is read for its structure: layers, groups, names, hidden objects and type, colours, gradients, transparency, images and every artboard (see Out of scope for what it doesn't read yet); DWG has no open spec | -| **Bundled content:** brush, symbol, style and swatch libraries | ~46% | Ours are original and generated in code, and far fewer than Illustrator ships; symbol libraries have six (Basic Shapes, UI Frames with default 9-slice, Map Markers, Inventory Icons, Skill Icons, Weather Icons), graphic style libraries eleven (including Game HUD, Status Effects and Neon & Glow) and brush libraries ten (Art Ribbons, Ink and Wash, Calligraphic Nibs, Bristle Brushes, Pattern Borders, Scatter Shapes, Game Trails, Energy Beams, Dry Media, Tech Circuit) beside User Defined and Other Library… | +| **Bundled content:** brush, symbol, style and swatch libraries | ~46% | Ours are original and generated in code, and far fewer than Illustrator ships; symbol libraries have six (Basic Shapes, UI Frames with default 9-slice, Map Markers, Inventory Icons, Skill Icons, Weather Icons), graphic style libraries eleven (including Game HUD, Status Effects and Neon & Glow) and brush libraries eleven (Art Ribbons, Ink and Wash, Calligraphic Nibs, Bristle Brushes, Pattern Borders, Scatter Shapes, Game Trails, Energy Beams, Dry Media, Tech Circuit, Engraving) beside User Defined and Other Library… | | **Performance** | unverified | Multithreaded, off-thread rendering and caches are in place. The last budget run (2026-10-01, loaded machine) measured 290 ms for a 50k-path fit against a 16 ms budget. Re-run `vectorcraft-cli perf` on an idle machine | | **Robustness** | good, new | ~2,840 tests, property tests, no panics in shipped code (lints, the `guard` safety net, import fuzzing), Data Recovery. Missing: a corpus of real-world files, Windows/Linux/browser QA | | **Platforms and 1.0 polish** | ~60% | The macOS app and the web build work, and Finder opens every readable format with the macOS app (#295, #354); on macOS the menus are in the system menu bar, laid out as a Mac app's, with the in-window menus as a fallback (`--in-window-menus`; verified on Windows and by cross-compilation, not yet by hand on a Mac); hybrid-graphics laptops render on the power-saving GPU by default on Windows and macOS (#306), and Windows starts on Direct3D 12, falling back to OpenGL, and loads no Vulkan driver unless `WGPU_BACKEND` asks for it (#545: Vulkan flickered black on an Intel GPU, DX12 and OpenGL didn't; #806: a faulty Vulkan driver crashed the app before its window appeared; verified by unit tests and the reporter's runs with `WGPU_BACKEND`), and Linux on the GPU the desktop runs on, since a Wayland compositor may refuse frames from the other one; a window that fails on its GPU while starting up starts again on the next one instead of crashing (#502; the dual-GPU Wayland case is verified by unit tests and cross-compilation, not on such hardware); web drops land in the document they were dropped on (#359); desktop drops carry no pointer position (winit 0.30), so a dropped document opens as a tab of its own and a picture or text is placed in the middle of the view, while the web places anything dropped on the canvas and opens what is dropped off it, as Illustrator does (#472); a web page that loses its WebGPU device or WebGL context restarts its graphics with the same documents (#369); on Linux/Wayland the clipboard reads the compositor's own (data-control) and copied image files paste, but files can't be dropped on the window under native Wayland until eframe moves to winit 0.31 (#398; the Wayland side is verified by compilation only), so Preferences › Performance › Linux Display Server › X11 (XWayland) opens the window through XWayland, where drops work (#1151; verified by unit tests and cross-compilation, not on a Wayland desktop); on Linux the Paste menu checks the system clipboard on a background thread, so a clipboard owner that never answers no longer freezes the window, while Windows and macOS keep their quick in-line check (#510; the X11 hang verified by the contributor, here by headless tests); on KDE Plasma 6.3+ under Wayland, pens and pen displays reach the app only under XWayland (`WAYLAND_DISPLAY=`) or with KWin's `KWIN_WAYLAND_EMULATE_TABLET=1`, since winit 0.30 has no Wayland tablet input (#491, not verified on hardware); Windows/Linux packaging and accessibility are pending | diff --git a/docs/ui-parity.md b/docs/ui-parity.md index b312abae1b..926b2d8162 100644 --- a/docs/ui-parity.md +++ b/docs/ui-parity.md @@ -446,7 +446,7 @@ next unit in the order a right-click on a ruler lists them, from Feet back to Po | Info panel follows the tool in use: W and H show the change in x and y, with the distance and the angle, while the selection moves or the Gradient tool draws a vector; the Scale tool's percentages; the center and angles of a Rotate, Reflect or Shear tool drag; the Zoom tool's magnification; the Paintbrush's brush. W and H follow Use Preview Bounds, several selected objects show only the paint and type they share, and Show Options names a tint or a gradient swatch | done | `info.readout`; `Tool::readout`; behavior from the Info panel overview in the [archived user guide](https://web.archive.org/web/20220911143322/https://helpx.adobe.com/pdf/cs6/illustrator_reference.pdf#page=76); number formats, the rows shown between drags and the Direct Selection and Group Selection readouts are VectorCraft's own | | Make Compound Path on a group (such as outlined type) keeps its backmost path's paint; compound paths joined into one keep their holes | done | #1537 | | Symbol libraries: Window › Symbol Libraries (Basic Shapes, UI Frames, Map Markers, Inventory Icons, Skill Icons, User Defined, Other Library…, Save Symbols…) and the Symbols panel's Symbol Libraries Menu button and its menu's Open Symbol Library / Save Symbol Library…; a click on a library symbol adds it to the document's Symbols (one undo step, it becomes the current symbol), Shift/Cmd-clicks select for Add to Symbols, and a symbol dragged onto the canvas is added and placed where it is dropped | done | [public source](https://helpx.adobe.com/illustrator/desktop/manage-objects/traces-mockups-symbols/create-or-import-symbol-libraries.html), [Symbols panel options](https://helpx.adobe.com/illustrator/desktop/manage-objects/traces-mockups-symbols/symbols-panel-options.html), [placing from a library](https://helpx.adobe.com/illustrator/desktop/manage-objects/traces-mockups-symbols/create-and-place-symbols.html); `window.symbolLibrary`, `window.symbolLibrary.other`, `ui.saveSymbolLibrary` (dialog `saveSymbolLibrary`), `window.userSymbolLibrary1`…`10`; `panels::tests_symbol_libraries`; five built-in libraries (Basic Shapes, UI Frames with default 9-slice, Map Markers, Inventory Icons, Skill Icons; original, generated in code) | -| Brush libraries: Window › Brush Libraries (Art Ribbons, Ink and Wash, Calligraphic Nibs, Bristle Brushes, Pattern Borders, Scatter Shapes, Game Trails, Energy Beams, Dry Media, Tech Circuit, User Defined, Other Library…, Save Brushes…) and the Brushes panel's Brush Libraries Menu button and its menu's Open Brush Library / Save Brush Library…; a click on a library brush adds it to the document's Brushes (one undo step, it becomes the current brush, and selected paths take it in the same step), Shift/Cmd-clicks select for Add to Brushes, a brush dragged onto a path is added and applied to it and one dragged onto the Brushes panel is added; thumbnails render with the library's patterns and symbols | done | [public source](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/apply-and-edit-strokes/create-new-brush-libraries.html), [import brushes](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/apply-and-edit-strokes/import-brushes-from-brush-libraries-or-other-files.html), [Brushes panel overview](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/apply-and-edit-strokes/brushes-panel-overview.html); `window.brushLibrary`, `window.brushLibrary.other`, `ui.saveBrushLibrary` (dialog `saveBrushLibrary`), `window.userBrushLibrary1`…`10`; `panels::tests_brush_libraries`; ten built-in libraries (original, generated in code) | +| Brush libraries: Window › Brush Libraries (Art Ribbons, Ink and Wash, Calligraphic Nibs, Bristle Brushes, Pattern Borders, Scatter Shapes, Game Trails, Energy Beams, Dry Media, Tech Circuit, Engraving, User Defined, Other Library…, Save Brushes…) and the Brushes panel's Brush Libraries Menu button and its menu's Open Brush Library / Save Brush Library…; a click on a library brush adds it to the document's Brushes (one undo step, it becomes the current brush, and selected paths take it in the same step), Shift/Cmd-clicks select for Add to Brushes, a brush dragged onto a path is added and applied to it and one dragged onto the Brushes panel is added; thumbnails render with the library's patterns and symbols | done | [public source](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/apply-and-edit-strokes/create-new-brush-libraries.html), [import brushes](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/apply-and-edit-strokes/import-brushes-from-brush-libraries-or-other-files.html), [Brushes panel overview](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/apply-and-edit-strokes/brushes-panel-overview.html); `window.brushLibrary`, `window.brushLibrary.other`, `ui.saveBrushLibrary` (dialog `saveBrushLibrary`), `window.userBrushLibrary1`…`10`; `panels::tests_brush_libraries`; eleven built-in libraries (original, generated in code) | | Symbols panel: New Symbol opens Symbol Options (Name) before making the symbol; Alt-click skips it | partial | #1560 (#1566); Registration 9-point grid in Symbol Options (`symbol.new` / `symbol.place`); Export Type (Graphic / Movie Clip) and Enable Guides for 9-Slice Scaling (scaled instances keep their corners; in symbol editing mode the guides are drawn over the art and the Selection tool drags them); Symbol Type (Dynamic Symbol / Static Symbol, new symbols dynamic; #4938); Align to Pixel Grid (`alignToPixelGrid` on `symbol.new` / `symbol.options`: the art snaps at the symbol's natural size and instances at that size stay on whole points; [Aligning symbols to pixel grid](https://web.archive.org/web/20220911143322/https://helpx.adobe.com/pdf/cs6/illustrator_reference.pdf#page=28)) | | Dynamic symbols: an instance changes the fill, stroke, opacity and blend of objects in its symbol's art and stays linked; Reset in the Properties panel's Quick Actions and the Symbols panel menu (Reset Symbol Instance) | partial | #4938; `symbol.instance.setAppearance` (by child-index path) and `symbol.instance.reset`; redefining keeps the changes, Break Link bakes them; Direct Selection of a path, compound path or type object inside an instance, with the Fill/Stroke controls setting its solid fill or stroke, is on canvas; on-canvas editing beyond a solid fill and stroke, and `.ai` read and write, remain | | Pathfinder Trim, Merge and Crop remove strokes; Merge joins same-fill objects whatever their strokes | done | #1570 (#1572) | From 45e0345cac2033aa5e3dbd2629a6e34fa8b7cbfb Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Tue, 17 Nov 2026 18:46:47 -0800 Subject: [PATCH 33/78] Swatches: art Alt-dragged onto a pattern swatch replaces its tile art Art dragged off the canvas and released with Alt (Option on macOS) held over a pattern swatch now becomes that pattern's tile art, through the new object.pattern.replaceArt command, as one undo step. Every object painted with the pattern draws the new tile. Before, the drop made a new pattern swatch whatever the modifiers. The help page describes replacing a pattern this way, with the pattern updated in the file: https://web.archive.org/web/20220911143322/https://helpx.adobe.com/pdf/cs6/illustrator_reference.pdf#page=226 The pattern keeps its name, swatch, tile and options (Size Tile to Art refits the tile), and the dragged art stays on the canvas, selected. Art that matches the tile art records no undo step. The command is off while a pattern is edited, and refuses art painted with the pattern itself, directly or through symbols, other patterns, graph designs, brushes or a graph's stored paints. Alt over any other swatch, or a drop without Alt, still makes a new pattern swatch. Docs: docs/mcp.md, docs/target-app-parity.md. --- crates/engine/src/cmd/patterncmds.rs | 112 ++++++++++++++- crates/engine/src/tests/pattern.rs | 142 ++++++++++++++++++++ crates/ui-egui/src/i18n/bg.tsv | 1 + crates/ui-egui/src/i18n/bs.tsv | 1 + crates/ui-egui/src/i18n/ca.tsv | 2 + crates/ui-egui/src/i18n/cs.tsv | 2 + crates/ui-egui/src/i18n/da.tsv | 2 + crates/ui-egui/src/i18n/de.tsv | 2 + crates/ui-egui/src/i18n/el.tsv | 2 + crates/ui-egui/src/i18n/es.tsv | 2 + crates/ui-egui/src/i18n/fi.tsv | 2 + crates/ui-egui/src/i18n/fr.tsv | 2 + crates/ui-egui/src/i18n/gu.tsv | 1 + crates/ui-egui/src/i18n/hi.tsv | 2 + crates/ui-egui/src/i18n/hu.tsv | 2 + crates/ui-egui/src/i18n/id.tsv | 1 + crates/ui-egui/src/i18n/it.tsv | 2 + crates/ui-egui/src/i18n/ja.tsv | 2 + crates/ui-egui/src/i18n/ka.tsv | 2 + crates/ui-egui/src/i18n/ko.tsv | 2 + crates/ui-egui/src/i18n/nl.tsv | 2 + crates/ui-egui/src/i18n/pl.tsv | 2 + crates/ui-egui/src/i18n/pt-br.tsv | 2 + crates/ui-egui/src/i18n/ru.tsv | 2 + crates/ui-egui/src/i18n/sv.tsv | 2 + crates/ui-egui/src/i18n/tr.tsv | 2 + crates/ui-egui/src/i18n/uk.tsv | 2 + crates/ui-egui/src/i18n/vi.tsv | 2 + crates/ui-egui/src/i18n/zh-hans.tsv | 2 + crates/ui-egui/src/i18n/zh-hant.tsv | 2 + crates/ui-egui/src/panels/swatches/dnd.rs | 40 +++++- crates/ui-egui/src/panels/swatches/tests.rs | 39 ++++++ docs/mcp.md | 14 ++ docs/target-app-parity.md | 1 + 34 files changed, 393 insertions(+), 7 deletions(-) diff --git a/crates/engine/src/cmd/patterncmds.rs b/crates/engine/src/cmd/patterncmds.rs index 57f9094e48..ccc1bbfec9 100644 --- a/crates/engine/src/cmd/patterncmds.rs +++ b/crates/engine/src/cmd/patterncmds.rs @@ -9,12 +9,13 @@ //! **Repeat** objects are live nodes (`NodeKind::Repeat`) holding the source art and the //! arrangement; `vectorcraft_doc::pattern` evaluates the instances. +use std::collections::HashSet; use std::sync::Arc; use serde_json::{Value, json}; use vectorcraft_color::Paint; use vectorcraft_doc::pattern::{self, Overlap, PATTERN_EDIT_LAYER, PatternDef, PatternEdit, RepeatKind, RepeatSpec, TileType, pattern_paint}; -use vectorcraft_doc::swatches::PaintFn; +use vectorcraft_doc::swatches::{PaintFn, graph_paints, node_paints, override_paints, walk_with_masks}; use vectorcraft_doc::{Document, Node, NodeId, NodeKind, Selection}; use vectorcraft_geom::{Point, Rect}; @@ -37,6 +38,15 @@ pub fn specs() -> Vec { can_make_pattern, pattern_make ), + cmd!( + "object.pattern.replaceArt", + "Replace Pattern Art", + [], + None, + "{name, ids?} make copies of the selected art the tile art of pattern `name`, as Alt-dragging (Option-dragging on macOS) art onto its swatch in the Swatches panel does; the pattern keeps its name, swatch, tile and options (with Size Tile to Art on, the tile fits the new art), every fill and stroke painted with it draws the new tile, and the art stays on the canvas, selected; one undo step, none when the art matches the tile art already; refused while a pattern is edited, with nothing selected, and for art painted with the pattern itself → {name}", + can_replace_pattern_art, + pattern_replace_art + ), cmd!( "object.pattern.edit", "Edit Pattern", @@ -198,6 +208,12 @@ fn has_selection_or_ids(s: &Session) -> std::result::Result<(), String> { has_doc(s) } +/// Replace Pattern Art: a document, and no pattern is being edited. +fn can_replace_pattern_art(s: &Session) -> std::result::Result<(), String> { + has_doc(s)?; + if editing(s).is_some() { Err("finish editing the pattern first".into()) } else { Ok(()) } +} + /// The repeats of the selection: selected ones, and those around a selected object. None while /// an object of a dynamic symbol instance's art is selected. fn selected_repeats(s: &Session) -> Vec { @@ -412,6 +428,100 @@ pub(crate) fn finish_edit(d: &mut Document, sel: &mut Selection) -> Result Result { + const C: &str = "object.pattern.replaceArt"; + let name = text_param(p, "name", C)?.ok_or_else(|| bad(C, "missing name"))?.to_string(); + let roots = roots(s, p, C)?; + let d = &s.doc()?.doc; + let old = d.pattern(&name).map(|def| def.art.clone()).ok_or_else(|| bad(C, format!("no pattern `{name}`")))?; + if roots.is_empty() { + return Err(bad(C, "select the art for the pattern tile")); + } + let src: Vec> = roots.iter().filter_map(|id| d.node(*id).cloned()).map(Arc::new).collect(); + if paints_pattern(d, &src, &name) { + return Err(bad(C, format!("art painted with `{name}` can't be its tile"))); + } + // Copies made from the same next id are equal when the art matches the tile art. + let fresh = |art: &[Arc]| copies(&mut Document::clone(d), art); + if fresh(&old) == fresh(&src) { + return Ok(json!({ "name": name })); + } + s.edit("Replace Pattern Art", |d, _| { + let art: Vec> = copies(d, &src).into_iter().map(Arc::new).collect(); + if let Some(def) = d.pattern_mut(&name) { + def.art = art; + if def.size_tile_to_art { + def.fit_tile_to_art(); + } + } + Ok(()) + })?; + Ok(json!({ "name": name })) +} + +/// What a piece of art uses by name, for [`paints_pattern`]. +#[derive(Clone, Copy, PartialEq, Eq, Hash)] +enum Uses<'a> { + Symbol(&'a str), + Pattern(&'a str), + GraphDesign(&'a str), + Brush(&'a str), +} + +/// Does `art` paint pattern `name`, itself or through the symbols, patterns, graph designs and +/// brushes it uses? A graph's stored series and label paints count, since its marks and labels +/// take them each time it is drawn again. +fn paints_pattern(d: &Document, art: &[Arc], name: &str) -> bool { + let brushes = vectorcraft_brush::library(d); + // What was already looked into, and the art left to look at. + let mut seen: HashSet = HashSet::new(); + let mut left: Vec<&Node> = art.iter().map(|a| &**a).collect(); + while let Some(n) = left.pop() { + let mut used = vec![]; + walk_with_masks(n, &mut |c| { + if let NodeKind::SymbolInstance { symbol, .. } = &c.kind { + used.push(Uses::Symbol(symbol.as_str())); + } + for it in &c.appearance.items { + if let vectorcraft_doc::AppearanceItem::Stroke(sk) = it + && let Some(b) = &sk.brush + { + used.push(Uses::Brush(b.as_str())); + } + } + for p in node_paints(c).chain(override_paints(c)).chain(graph_paints(c)) { + if let Paint::Pattern { pattern, .. } = p { + used.push(Uses::Pattern(pattern.as_str())); + } + } + if let Some(g) = c.extras().graph.as_deref() { + used.extend(g.series_markers.iter().flatten().map(|m| Uses::GraphDesign(m.as_str()))); + used.extend(g.series_columns.iter().flatten().map(|c| Uses::GraphDesign(c.design.as_str()))); + } + }); + for u in used { + if u == Uses::Pattern(name) { + return true; + } + if !seen.insert(u) { + continue; + } + match u { + Uses::Symbol(symbol) => left.extend(d.symbols.iter().find(|x| x.name == symbol).map(|x| &*x.art)), + Uses::Pattern(pattern) => left.extend(d.pattern(pattern).into_iter().flat_map(|x| x.art.iter().map(|a| &**a))), + Uses::GraphDesign(design) => left.extend(d.graph_designs.iter().find(|x| x.name == design).map(|x| &*x.art)), + Uses::Brush(brush) => left.extend(brushes.iter().filter(|x| x.name == brush).flat_map(|x| x.art())), + } + } + } + false +} + /// Leave pattern editing mode, discarding the changes (`object.pattern.cancel`). An existing /// pattern gets its definition back, its name included when Pattern Options renamed it while it was /// edited and no other pattern, swatch or color group has taken that name since. A new pattern is diff --git a/crates/engine/src/tests/pattern.rs b/crates/engine/src/tests/pattern.rs index fafcc80ac6..11afc930c3 100644 --- a/crates/engine/src/tests/pattern.rs +++ b/crates/engine/src/tests/pattern.rs @@ -212,6 +212,148 @@ fn cancel_new_pattern_removes_it() { assert_eq!(doc(&s).layers.len(), 1); } +/// A 30×40 blue rectangle at (100, 100) with no stroke, selected. +fn blue_rect(s: &mut Session) -> NodeId { + let b = rect(s, 100.0, 100.0, 30.0, 40.0); + s.execute("paint.setFill", &json!({"ids": [b.0], "color": "#0000ff"})).unwrap(); + s.execute("paint.setStroke", &json!({"ids": [b.0], "none": true})).unwrap(); + sel(s, &[b]); + b +} + +/// Replace Pattern Art gives the pattern copies of the selected art as its tile art in one undo +/// step: the pattern keeps its name, swatch, place, tile and options, art painted with it keeps the +/// paint, and the selected art stays on the canvas, selected. Undo and Redo swap the two tiles. +#[test] +fn replace_art_gives_a_pattern_new_tile_art() { + let mut s = session(); + let red = make_dots(&mut s); + let filled = rect(&mut s, 200.0, 200.0, 100.0, 100.0); + s.execute("paint.setFill", &json!({"ids": [filled.0], "swatch": "Dots"})).unwrap(); + s.execute("pattern.options", &json!({"name": "Dots", "tileType": "hexByRow"})).unwrap(); + let blue = blue_rect(&mut s); + let old = doc(&s).pattern("Dots").unwrap().clone(); + let place = |s: &Session| doc(s).swatches_iter().position(|w| w.name == "Dots"); + let (at, swatches, steps) = (place(&s), doc(&s).swatches_iter().count(), s.doc().unwrap().history.undo.len()); + let v = s.execute("object.pattern.replaceArt", &json!({"name": "Dots"})).unwrap(); + assert_eq!(v["name"], "Dots"); + let d = doc(&s); + let def = d.pattern("Dots").unwrap(); + assert_eq!(def.art.len(), 1); + assert_eq!(def.art[0].kind, node(&s, blue).kind, "the tile art is the blue rectangle"); + assert_eq!(def.art[0].appearance, node(&s, blue).appearance); + assert_ne!(def.art[0].id, blue, "a copy with an id of its own"); + assert_eq!((def.tile, def.tile_type, &def.name), (old.tile, old.tile_type, &old.name), "the tile and options stay"); + assert_eq!((d.patterns.len(), place(&s), d.swatches_iter().count()), (1, at, swatches), "no new pattern or swatch"); + assert!(is_pattern(&node(&s, filled).appearance.fill_paint(), "Dots"), "the filled art keeps the pattern"); + assert!(d.node(blue).is_some() && d.node(red).is_some(), "the art stays"); + assert_eq!(s.doc().unwrap().selection.objects.to_vec(), vec![blue], "the art stays selected"); + let st = s.doc().unwrap(); + assert_eq!((st.history.undo.len(), st.history.undo.last().map(|e| e.label.as_str())), (steps + 1, Some("Replace Pattern Art"))); + let new = def.art.clone(); + s.execute("edit.undo", &json!({})).unwrap(); + assert_eq!(doc(&s).pattern("Dots").unwrap(), &old, "Undo gives the old tile art back"); + s.execute("edit.redo", &json!({})).unwrap(); + assert_eq!(doc(&s).pattern("Dots").unwrap().art, new, "Redo gives the new tile art"); +} + +/// With Size Tile to Art on, the tile fits the new art (and its spacing); `ids` names the art. +#[test] +fn replace_art_fits_the_tile_when_size_tile_to_art_is_on() { + let mut s = session(); + make_dots(&mut s); + s.execute("pattern.options", &json!({"name": "Dots", "sizeTileToArt": true, "hSpacing": 4, "vSpacing": 6})).unwrap(); + let blue = blue_rect(&mut s); + s.execute("select.set", &json!({"ids": []})).unwrap(); + s.execute("object.pattern.replaceArt", &json!({"name": "Dots", "ids": [blue.0]})).unwrap(); + assert_eq!(doc(&s).pattern("Dots").unwrap().tile, Rect::new(98.0, 97.0, 132.0, 143.0)); +} + +/// Art that matches the tile art already, its own ids aside, records no undo step. +#[test] +fn replace_art_that_matches_the_tile_art_records_nothing() { + let mut s = session(); + make_dots(&mut s); + blue_rect(&mut s); + s.execute("object.pattern.replaceArt", &json!({"name": "Dots"})).unwrap(); + let (before, steps) = (doc(&s).clone(), s.doc().unwrap().history.undo.len()); + s.execute("object.pattern.replaceArt", &json!({"name": "Dots"})).unwrap(); + assert_eq!(s.doc().unwrap().history.undo.len(), steps); + assert_eq!(doc(&s), &before); +} + +/// Replace Pattern Art is refused, changing nothing, for a missing name or pattern, with no art, +/// while a pattern is edited, and for art painted with the pattern itself, directly, through +/// another pattern, through a symbol, through the paints a graph stores, through a graph design a +/// graph draws its columns with and through the art of a brush on a stroke. +#[test] +fn replace_art_is_refused_without_changing_anything() { + let mut s = session(); + make_dots(&mut s); + // "Holds dots": a pattern whose tile is painted with Dots. + let other = rect(&mut s, 100.0, 100.0, 10.0, 10.0); + s.execute("paint.setFill", &json!({"ids": [other.0], "swatch": "Dots"})).unwrap(); + sel(&mut s, &[other]); + s.execute("object.pattern.make", &json!({"name": "Holds dots", "edit": false})).unwrap(); + let via = rect(&mut s, 150.0, 150.0, 10.0, 10.0); + s.execute("paint.setFill", &json!({"ids": [via.0], "swatch": "Holds dots"})).unwrap(); + let stroked = rect(&mut s, 200.0, 200.0, 10.0, 10.0); + s.execute("paint.setStroke", &json!({"ids": [stroked.0], "swatch": "Dots"})).unwrap(); + sel(&mut s, &[stroked]); + let instance = id_of(&s.execute("symbol.new", &json!({"name": "Dotted"})).unwrap()); + let graph = graph_painted_with(&mut s, "Dots"); + // A graph whose stored columns name design "Dotted columns", drawn with Dots, before it is drawn + // again. + let design = rect(&mut s, 300.0, 300.0, 10.0, 10.0); + s.execute("paint.setFill", &json!({"ids": [design.0], "swatch": "Dots"})).unwrap(); + s.execute("graph.design", &json!({"new": "Dotted columns", "ids": [design.0]})).unwrap(); + let v = s.execute("graph.create", &json!({"type": "column", "x": 300, "y": 200, "width": 60, "height": 40, "csv": ",2024\nQ1,3"})); + let designed = id_of(&v.unwrap()); + let mut extras = doc_mut(&mut s).node_mut(designed).unwrap().extras_mut(); + extras.graph.as_mut().unwrap().series_columns = + vec![Some(vectorcraft_doc::ColumnDesign { design: "Dotted columns".into(), ..Default::default() })]; + drop(extras); + // A path stroked with an art brush whose art is filled with Dots. + let brush_art = rect(&mut s, 300.0, 350.0, 20.0, 5.0); + s.execute("paint.setFill", &json!({"ids": [brush_art.0], "swatch": "Dots"})).unwrap(); + s.execute("brush.new", &json!({"type": "art", "name": "Dotted brush", "ids": [brush_art.0]})).unwrap(); + let brushed = rect(&mut s, 300.0, 380.0, 40.0, 10.0); + s.execute("paint.setFill", &json!({"ids": [brushed.0], "none": true})).unwrap(); + s.execute("paint.setStroke", &json!({"ids": [brushed.0], "color": "#000000"})).unwrap(); + s.execute("brush.apply", &json!({"name": "Dotted brush", "ids": [brushed.0]})).unwrap(); + let plain = blue_rect(&mut s); + let unchanged = |s: &Session, before: &vectorcraft_doc::Document, steps: usize, case: &str| { + assert_eq!(doc(s), before, "{case}: the document stays"); + assert_eq!(s.doc().unwrap().history.undo.len(), steps, "{case}: no undo step"); + }; + let (before, steps) = (doc(&s).clone(), s.doc().unwrap().history.undo.len()); + for (case, p, why) in [ + ("no name", json!({}), "missing name".to_string()), + ("no pattern", json!({"name": "Stripes"}), "no pattern `Stripes`".into()), + ("no art", json!({"name": "Dots", "ids": [9999]}), "select the art for the pattern tile".into()), + ("painted with it", json!({"name": "Dots", "ids": [other.0]}), "art painted with `Dots` can't be its tile".into()), + ("through a pattern", json!({"name": "Dots", "ids": [via.0]}), "art painted with `Dots` can't be its tile".into()), + ("through a symbol", json!({"name": "Dots", "ids": [instance.0]}), "art painted with `Dots` can't be its tile".into()), + ("through a graph's paints", json!({"name": "Dots", "ids": [graph.0]}), "art painted with `Dots` can't be its tile".into()), + ("through a graph design", json!({"name": "Dots", "ids": [designed.0]}), "art painted with `Dots` can't be its tile".into()), + ("through a brush", json!({"name": "Dots", "ids": [brushed.0]}), "art painted with `Dots` can't be its tile".into()), + ] { + let err = s.execute("object.pattern.replaceArt", &p).unwrap_err(); + assert!(err.to_string().contains(&why), "{case}: {err}"); + unchanged(&s, &before, steps, case); + } + s.execute("select.set", &json!({"ids": []})).unwrap(); + let (before, steps) = (doc(&s).clone(), s.doc().unwrap().history.undo.len()); + let err = s.execute("object.pattern.replaceArt", &json!({"name": "Dots"})).unwrap_err(); + assert!(err.to_string().contains("select the art for the pattern tile"), "nothing selected: {err}"); + unchanged(&s, &before, steps, "nothing selected"); + s.execute("object.pattern.edit", &json!({"name": "Holds dots"})).unwrap(); + let (before, steps) = (doc(&s).clone(), s.doc().unwrap().history.undo.len()); + let err = s.execute("object.pattern.replaceArt", &json!({"name": "Dots", "ids": [plain.0]})).unwrap_err(); + assert!(matches!(&err, EngineError::Disabled(_, w) if w == "finish editing the pattern first"), "while editing: {err}"); + unchanged(&s, &before, steps, "while editing"); +} + fn doc_mut(s: &mut Session) -> &mut vectorcraft_doc::Document { Arc::make_mut(&mut s.doc_mut().unwrap().doc) } diff --git a/crates/ui-egui/src/i18n/bg.tsv b/crates/ui-egui/src/i18n/bg.tsv index bb039bb08e..f5c2a9ff4a 100644 --- a/crates/ui-egui/src/i18n/bg.tsv +++ b/crates/ui-egui/src/i18n/bg.tsv @@ -6861,6 +6861,7 @@ breakText Glyphs Глифи Remove Strokes Премахване на щрихи Place Brush Art Поставяне на графика на четка Replace Brush Art Замяна на графика на четка + Replace Pattern Art Замяна на графика на мостра Strokes use this brush. Apply the new art to those strokes, or leave them as they are and add a copy of the brush with the new art? Щрихи използват тази четка. Да се приложи ли новата графика към тези щрихи, или те да останат както са и да се добави копие на четката с новата графика? Apply to Strokes Прилагане към щрихите Leave Strokes Оставяне на щрихите diff --git a/crates/ui-egui/src/i18n/bs.tsv b/crates/ui-egui/src/i18n/bs.tsv index 99f23d313c..19410bfbfe 100644 --- a/crates/ui-egui/src/i18n/bs.tsv +++ b/crates/ui-egui/src/i18n/bs.tsv @@ -6914,6 +6914,7 @@ shape Open Otvoren Remove Strokes Ukloni poteze Place Brush Art Postavi crtež četkice Replace Brush Art Zamijeni crtež četkice + Replace Pattern Art Zamijeni crtež uzorka Strokes use this brush. Apply the new art to those strokes, or leave them as they are and add a copy of the brush with the new art? Potezi koriste ovu četkicu. Primijeniti novi crtež na te poteze ili ih ostaviti kakvi jesu i dodati kopiju četkice s novim crtežom? Apply to Strokes Primijeni na poteze Leave Strokes Ostavi poteze diff --git a/crates/ui-egui/src/i18n/ca.tsv b/crates/ui-egui/src/i18n/ca.tsv index c54311799d..4ff78f7fd5 100644 --- a/crates/ui-egui/src/i18n/ca.tsv +++ b/crates/ui-egui/src/i18n/ca.tsv @@ -6209,6 +6209,7 @@ liquify-list-end {0}, {1} {0} i {1} @msg no native format no hi ha format natiu @msg no pages no hi ha pàgines @msg no pattern `{name}` no hi ha el motiu `{name}` +@msg art painted with `{name}` can't be its tile un art pintat amb `{name}` no pot ser el seu mosaic @msg no pattern swatch `{name}` no hi ha la mostra de motiu `{name}` @msg no perspective grid preset named `{name}` no hi ha cap preajust de quadrícula de perspectiva anomenat `{name}` @msg no plug-in {0} is installed no hi ha instal·lat el complement {0} @@ -7586,6 +7587,7 @@ breakText Glyphs Glifs Remove Strokes Elimina els traços Place Brush Art Col·loca l’art del pinzell Replace Brush Art Substitueix l’art del pinzell + Replace Pattern Art Substitueix l’art del motiu Strokes use this brush. Apply the new art to those strokes, or leave them as they are and add a copy of the brush with the new art? Hi ha traços que fan servir aquest pinzell. Voleu aplicar l’art nou a aquests traços, o deixar-los com estan i afegir una còpia del pinzell amb l’art nou? Apply to Strokes Aplica als traços Leave Strokes Deixa els traços diff --git a/crates/ui-egui/src/i18n/cs.tsv b/crates/ui-egui/src/i18n/cs.tsv index a5d7bb948a..f1f146a80b 100644 --- a/crates/ui-egui/src/i18n/cs.tsv +++ b/crates/ui-egui/src/i18n/cs.tsv @@ -5361,6 +5361,7 @@ liquify-list-end {0}, {1} {0} a {1} @msg no native format chybí nativní formát @msg no pages žádné stránky @msg no pattern `{name}` vzorek `{name}` neexistuje +@msg art painted with `{name}` can't be its tile kresba vybarvená vzorkem `{name}` nemůže být jeho dlaždicí @msg no perspective grid preset named `{name}` přednastavení perspektivní mřížky s názvem `{name}` neexistuje @msg no plug-in {0} is installed zásuvný modul {0} není nainstalován @msg no plug-in {id} is installed zásuvný modul {id} není nainstalován @@ -7576,6 +7577,7 @@ breakText Glyphs Glyfy Remove Strokes Odebrat tahy Place Brush Art Umístit kresbu štětce Replace Brush Art Nahradit kresbu štětce + Replace Pattern Art Nahradit kresbu vzorku Strokes use this brush. Apply the new art to those strokes, or leave them as they are and add a copy of the brush with the new art? Tahy používají tento štětec. Použít novou kresbu na tyto tahy, nebo je ponechat beze změny a přidat kopii štětce s novou kresbou? Apply to Strokes Použít na tahy Leave Strokes Ponechat tahy diff --git a/crates/ui-egui/src/i18n/da.tsv b/crates/ui-egui/src/i18n/da.tsv index 08100f593f..52069ed5f7 100644 --- a/crates/ui-egui/src/i18n/da.tsv +++ b/crates/ui-egui/src/i18n/da.tsv @@ -7548,6 +7548,7 @@ imageTrace Outline Kontur @msg no native format intet indbygget format @msg no pages ingen sider @msg no pattern `{name}` intet mønster `{name}` +@msg art painted with `{name}` can't be its tile grafik malet med `{name}` kan ikke være dens flise @msg no perspective grid preset named `{name}` ingen perspektivgitterforudindstilling med navnet `{name}` @msg no plug-in {0} is installed plug-in'et {0} er ikke installeret @msg no plug-in {id} is installed plug-in'et {id} er ikke installeret @@ -9636,6 +9637,7 @@ breakText Glyphs Glyffer Remove Strokes Fjern streger Place Brush Art Placér penselgrafik Replace Brush Art Erstat penselgrafik + Replace Pattern Art Erstat mønstergrafik Strokes use this brush. Apply the new art to those strokes, or leave them as they are and add a copy of the brush with the new art? Streger bruger denne pensel. Anvend den nye grafik på stregerne, eller lad dem være, som de er, og tilføj en kopi af penslen med den nye grafik? Apply to Strokes Anvend på streger Leave Strokes Bevar streger diff --git a/crates/ui-egui/src/i18n/de.tsv b/crates/ui-egui/src/i18n/de.tsv index 10147b2d45..c8799ce44a 100644 --- a/crates/ui-egui/src/i18n/de.tsv +++ b/crates/ui-egui/src/i18n/de.tsv @@ -4963,6 +4963,7 @@ liquify-list-end {0}, {1} {0} und {1} @msg no native format kein natives Format @msg no pages keine Seiten @msg no pattern `{name}` kein Muster `{name}` +@msg art painted with `{name}` can't be its tile mit `{name}` gefärbtes Bildmaterial kann nicht dessen Kachel sein @msg no perspective grid preset named `{name}` keine Vorgabe für Perspektivenraster namens `{name}` @msg no plug-in {0} is installed es ist kein Plug-in {0} installiert @msg no plug-in {id} is installed es ist kein Plug-in {id} installiert @@ -7169,6 +7170,7 @@ breakText Glyphs Glyphen Remove Strokes Konturen entfernen Place Brush Art Pinselgrafik platzieren Replace Brush Art Pinselgrafik ersetzen + Replace Pattern Art Mustergrafik ersetzen Strokes use this brush. Apply the new art to those strokes, or leave them as they are and add a copy of the brush with the new art? Konturen verwenden diesen Pinsel. Die neue Grafik auf diese Konturen anwenden oder sie unverändert lassen und eine Kopie des Pinsels mit der neuen Grafik hinzufügen? Apply to Strokes Auf Konturen anwenden Leave Strokes Konturen beibehalten diff --git a/crates/ui-egui/src/i18n/el.tsv b/crates/ui-egui/src/i18n/el.tsv index 1ebf6e5684..2a2577e5fe 100644 --- a/crates/ui-egui/src/i18n/el.tsv +++ b/crates/ui-egui/src/i18n/el.tsv @@ -5020,6 +5020,7 @@ digits Malayalam Μαλαγιάλαμ @msg no native format δεν υπάρχει εγγενής μορφή @msg no pages δεν υπάρχουν σελίδες @msg no pattern `{name}` δεν υπάρχει μοτίβο `{name}` +@msg art painted with `{name}` can't be its tile σχέδιο βαμμένο με `{name}` δεν μπορεί να είναι το πλακίδιό του @msg no perspective grid preset named `{name}` δεν υπάρχει προεπιλογή πλέγματος προοπτικής με όνομα `{name}` @msg no plug-in {0} is installed δεν είναι εγκατεστημένο το πρόσθετο {0} @msg no plug-in {id} is installed δεν είναι εγκατεστημένο το πρόσθετο {id} @@ -7559,6 +7560,7 @@ breakText Glyphs Γλύφοι Remove Strokes Αφαίρεση περιγραμμάτων Place Brush Art Τοποθέτηση σχεδίου πινέλου Replace Brush Art Αντικατάσταση σχεδίου πινέλου + Replace Pattern Art Αντικατάσταση σχεδίου μοτίβου Strokes use this brush. Apply the new art to those strokes, or leave them as they are and add a copy of the brush with the new art? Περιγράμματα χρησιμοποιούν αυτό το πινέλο. Να εφαρμοστεί το νέο σχέδιο σε αυτά τα περιγράμματα ή να μείνουν ως έχουν και να προστεθεί αντίγραφο του πινέλου με το νέο σχέδιο; Apply to Strokes Εφαρμογή στα περιγράμματα Leave Strokes Διατήρηση περιγραμμάτων diff --git a/crates/ui-egui/src/i18n/es.tsv b/crates/ui-egui/src/i18n/es.tsv index a456910a16..f1101309fe 100644 --- a/crates/ui-egui/src/i18n/es.tsv +++ b/crates/ui-egui/src/i18n/es.tsv @@ -5066,6 +5066,7 @@ liquify-list-end {0}, {1} {0}, {1} @msg no native format no hay formato nativo @msg no pages no hay páginas @msg no pattern `{name}` no existe el motivo `{name}` +@msg art painted with `{name}` can't be its tile una ilustración pintada con `{name}` no puede ser su azulejo @msg no perspective grid preset named `{name}` no hay ningún preajuste de cuadrícula de perspectiva llamado `{name}` @msg no plug-in {0} is installed no hay ningún plugin {0} instalado @msg no plug-in {id} is installed no hay ningún plugin {id} instalado @@ -7547,6 +7548,7 @@ breakText Glyphs Glifos Remove Strokes Quitar trazos Place Brush Art Colocar ilustración del pincel Replace Brush Art Reemplazar ilustración del pincel + Replace Pattern Art Reemplazar ilustración del motivo Strokes use this brush. Apply the new art to those strokes, or leave them as they are and add a copy of the brush with the new art? Algunos trazos usan este pincel. ¿Aplicar la nueva ilustración a esos trazos, o dejarlos como están y añadir una copia del pincel con la nueva ilustración? Apply to Strokes Aplicar a los trazos Leave Strokes Dejar los trazos diff --git a/crates/ui-egui/src/i18n/fi.tsv b/crates/ui-egui/src/i18n/fi.tsv index bff46fc0d7..049b86a2e1 100644 --- a/crates/ui-egui/src/i18n/fi.tsv +++ b/crates/ui-egui/src/i18n/fi.tsv @@ -5290,6 +5290,7 @@ liquify-list-end {0}, {1} {0} ja {1} @msg no native format ei omaa tiedostomuotoa @msg no pages ei sivuja @msg no pattern `{name}` ei kuviota `{name}` +@msg art painted with `{name}` can't be its tile kuviolla `{name}` maalattu kuvitus ei voi olla sen ruutu @msg no perspective grid preset named `{name}` ei perspektiiviruudukon esiasetusta nimeltä `{name}` @msg no plug-in {0} is installed laajennusta {0} ei ole asennettu @msg no plug-in {id} is installed laajennusta {id} ei ole asennettu @@ -7635,6 +7636,7 @@ breakText Glyphs Merkit Remove Strokes Poista viivat Place Brush Art Sijoita siveltimen kuvitus Replace Brush Art Korvaa siveltimen kuvitus + Replace Pattern Art Korvaa kuvion kuvitus Strokes use this brush. Apply the new art to those strokes, or leave them as they are and add a copy of the brush with the new art? Viivat käyttävät tätä sivellintä. Käytetäänkö uutta kuvitusta näissä viivoissa, vai jätetäänkö ne ennalleen ja lisätään siveltimestä kopio, jossa on uusi kuvitus? Apply to Strokes Käytä viivoihin Leave Strokes Jätä viivat ennalleen diff --git a/crates/ui-egui/src/i18n/fr.tsv b/crates/ui-egui/src/i18n/fr.tsv index 3be3497f97..9abb300b89 100644 --- a/crates/ui-egui/src/i18n/fr.tsv +++ b/crates/ui-egui/src/i18n/fr.tsv @@ -5028,6 +5028,7 @@ liquify-list-end {0}, {1} {0} et {1} @msg no native format aucun format natif @msg no pages aucune page @msg no pattern `{name}` aucun motif `{name}` +@msg art painted with `{name}` can't be its tile une illustration peinte avec `{name}` ne peut pas être son carreau @msg no perspective grid preset named `{name}` aucun paramètre prédéfini de grille de perspective nommé `{name}` @msg no plug-in {0} is installed aucun plug-in {0} n’est installé @msg no plug-in {id} is installed aucun plug-in {id} n’est installé @@ -7571,6 +7572,7 @@ breakText Glyphs Glyphes Remove Strokes Supprimer les contours Place Brush Art Placer l’illustration de la forme Replace Brush Art Remplacer l’illustration de la forme + Replace Pattern Art Remplacer l’illustration du motif Strokes use this brush. Apply the new art to those strokes, or leave them as they are and add a copy of the brush with the new art? Des contours utilisent cette forme. Appliquer la nouvelle illustration à ces contours, ou les laisser tels quels et ajouter une copie de la forme avec la nouvelle illustration ? Apply to Strokes Appliquer aux contours Leave Strokes Conserver les contours diff --git a/crates/ui-egui/src/i18n/gu.tsv b/crates/ui-egui/src/i18n/gu.tsv index c427fc527c..fc14adc689 100644 --- a/crates/ui-egui/src/i18n/gu.tsv +++ b/crates/ui-egui/src/i18n/gu.tsv @@ -4770,6 +4770,7 @@ antiAlias Sharp શાર્પ Composition કમ્પોઝિશન Place Brush Art બ્રશ આર્ટ પ્લેસ કરો Replace Brush Art બ્રશ આર્ટ બદલો + Replace Pattern Art પેટર્ન આર્ટ બદલો Strokes use this brush. Apply the new art to those strokes, or leave them as they are and add a copy of the brush with the new art? સ્ટ્રોક્સ આ બ્રશ વાપરે છે. તે સ્ટ્રોક્સ પર નવી આર્ટ લાગુ કરવી છે કે તેમને જેમ છે તેમ રાખીને નવી આર્ટવાળી બ્રશની નકલ ઉમેરવી છે? Apply to Strokes સ્ટ્રોક્સ પર લાગુ કરો Leave Strokes સ્ટ્રોક્સ જેમ છે તેમ રાખો diff --git a/crates/ui-egui/src/i18n/hi.tsv b/crates/ui-egui/src/i18n/hi.tsv index cbfb4f51d1..bf594e3fb5 100644 --- a/crates/ui-egui/src/i18n/hi.tsv +++ b/crates/ui-egui/src/i18n/hi.tsv @@ -4052,6 +4052,7 @@ antiAlias Sharp शार्प Remove Strokes स्ट्रोक हटाएँ Place Brush Art ब्रश आर्टवर्क रखें Replace Brush Art ब्रश आर्टवर्क बदलें + Replace Pattern Art पैटर्न आर्टवर्क बदलें Strokes use this brush. Apply the new art to those strokes, or leave them as they are and add a copy of the brush with the new art? स्ट्रोक्स इस ब्रश का उपयोग कर रहे हैं। नया आर्टवर्क उन स्ट्रोक्स पर लागू करें, या उन्हें जैसा है वैसा छोड़कर नए आर्टवर्क वाले ब्रश की एक कॉपी जोड़ें? Apply to Strokes स्ट्रोक्स पर लागू करें Leave Strokes स्ट्रोक्स जैसे हैं वैसे छोड़ें @@ -7741,6 +7742,7 @@ liquify-list-end {0}, {1} {0} और {1} @msg no parent layer कोई अभिभावक लेयर नहीं @msg no Pathfinder operation applied yet अभी तक कोई पाथफाइंडर ऑपरेशन लागू नहीं है @msg no pattern `{name}` कोई पैटर्न `{name}` नहीं +@msg art painted with `{name}` can't be its tile `{name}` से रंगी कला उसकी टाइल नहीं हो सकती @msg no pattern named `{choice}` `{choice}` नाम का कोई पैटर्न नहीं @msg no pattern swatch `{name}` कोई पैटर्न स्वॉच `{name}` नहीं @msg no PDF preset named `{n}` कोई PDF प्रीसेट नहीं है जिसका नाम `{n}` है diff --git a/crates/ui-egui/src/i18n/hu.tsv b/crates/ui-egui/src/i18n/hu.tsv index 0f81a72036..13d144d41a 100644 --- a/crates/ui-egui/src/i18n/hu.tsv +++ b/crates/ui-egui/src/i18n/hu.tsv @@ -5735,6 +5735,7 @@ liquify-list-end {0}, {1} {0} és {1} @msg no native format nincs natív formátum @msg no pages nincsenek oldalak @msg no pattern `{name}` nincs ilyen mintázat: `{name}` +@msg art painted with `{name}` can't be its tile a(z) `{name}` mintázattal festett grafika nem lehet annak csempéje @msg no perspective grid preset named `{name}` nincs ilyen nevű perspektivikusrács-előbeállítás: `{name}` @msg no plug-in {0} is installed nincs telepítve ilyen bővítmény: {0} @msg no plug-in {id} is installed nincs telepítve ilyen bővítmény: {id} @@ -7561,6 +7562,7 @@ breakText Glyphs Glifák Remove Strokes Körvonalak eltávolítása Place Brush Art Ecsetgrafika elhelyezése Replace Brush Art Ecsetgrafika cseréje + Replace Pattern Art Mintázatgrafika cseréje Strokes use this brush. Apply the new art to those strokes, or leave them as they are and add a copy of the brush with the new art? Körvonalak használják ezt az ecsetet. Alkalmazod az új grafikát ezekre a körvonalakra, vagy változatlanul hagyod őket, és hozzáadod az ecset egy másolatát az új grafikával? Apply to Strokes Alkalmazás a körvonalakra Leave Strokes Körvonalak megtartása diff --git a/crates/ui-egui/src/i18n/id.tsv b/crates/ui-egui/src/i18n/id.tsv index 28ea2b5ab3..312b66dfdd 100644 --- a/crates/ui-egui/src/i18n/id.tsv +++ b/crates/ui-egui/src/i18n/id.tsv @@ -6876,6 +6876,7 @@ breakText Glyphs Glif Remove Strokes Hapus Stroke Place Brush Art Tempatkan karya seni kuas Replace Brush Art Ganti karya seni kuas + Replace Pattern Art Ganti karya seni pola Strokes use this brush. Apply the new art to those strokes, or leave them as they are and add a copy of the brush with the new art? Stroke menggunakan kuas ini. Terapkan karya seni baru ke stroke tersebut, atau biarkan apa adanya dan tambahkan salinan kuas dengan karya seni baru? Apply to Strokes Terapkan ke Stroke Leave Strokes Biarkan Stroke diff --git a/crates/ui-egui/src/i18n/it.tsv b/crates/ui-egui/src/i18n/it.tsv index 8f2ed3216c..014ef06b3d 100644 --- a/crates/ui-egui/src/i18n/it.tsv +++ b/crates/ui-egui/src/i18n/it.tsv @@ -5096,6 +5096,7 @@ liquify-list-end {0}, {1} {0} e {1} @msg no native format nessun formato nativo @msg no pages nessuna pagina @msg no pattern `{name}` nessun motivo `{name}` +@msg art painted with `{name}` can't be its tile una grafica dipinta con `{name}` non può esserne la porzione @msg no perspective grid preset named `{name}` nessun preset di griglia prospettica denominato `{name}` @msg no plug-in {0} is installed nessun plug-in {0} installato @msg no plug-in {id} is installed nessun plug-in {id} installato @@ -7205,6 +7206,7 @@ breakText Glyphs Glifi Remove Strokes Rimuovi tracce Place Brush Art Inserisci grafica del pennello Replace Brush Art Sostituisci grafica del pennello + Replace Pattern Art Sostituisci grafica del motivo Strokes use this brush. Apply the new art to those strokes, or leave them as they are and add a copy of the brush with the new art? Alcune tracce usano questo pennello. Applicare la nuova grafica a queste tracce, o lasciarle come sono e aggiungere una copia del pennello con la nuova grafica? Apply to Strokes Applica alle tracce Leave Strokes Lascia le tracce diff --git a/crates/ui-egui/src/i18n/ja.tsv b/crates/ui-egui/src/i18n/ja.tsv index c429f204a1..78e22c2723 100644 --- a/crates/ui-egui/src/i18n/ja.tsv +++ b/crates/ui-egui/src/i18n/ja.tsv @@ -4888,6 +4888,7 @@ swatch Bright Violet ビビッドバイオレット @msg {label}: select paths, compound paths, groups or text {label}: パス、複合パス、グループ、テキストのいずれかを選択してください @msg already editing a pattern すでにパターンを編集中です @msg no pattern `{name}` パターン `{name}` が見つかりません +@msg art painted with `{name}` can't be its tile `{name}` でペイントされたアートはそのタイルにできません @msg not in pattern editing mode パターン編集モードではありません @msg finish editing the pattern first 先にパターンの編集を終了してください @msg pattern missing パターンが見つかりません @@ -9080,6 +9081,7 @@ breakText Glyphs 字形 Remove Strokes 線を削除 Place Brush Art ブラシのアートを配置 Replace Brush Art ブラシのアートを置き換え + Replace Pattern Art パターンのアートを置き換え Strokes use this brush. Apply the new art to those strokes, or leave them as they are and add a copy of the brush with the new art? このブラシは線で使われています。新しいアートをそれらの線に適用しますか?それとも線をそのままにして、新しいアートを持つブラシのコピーを追加しますか? Apply to Strokes 線に適用 Leave Strokes 線を保持 diff --git a/crates/ui-egui/src/i18n/ka.tsv b/crates/ui-egui/src/i18n/ka.tsv index 414f45171c..97ce0279f2 100644 --- a/crates/ui-egui/src/i18n/ka.tsv +++ b/crates/ui-egui/src/i18n/ka.tsv @@ -6875,6 +6875,7 @@ font-technology Variable ცვლადი @msg no native format საკუთარი ფორმატი არ არის @msg no pages გვერდები არ არის @msg no pattern `{name}` პატერნი `{name}` არ არის +@msg art painted with `{name}` can't be its tile `{name}`-ით შეღებილი ნახატი მისი ფილა ვერ იქნება @msg no perspective grid preset named `{name}` პერსპექტივის ბადის პრესეტი სახელით `{name}` არ არის @msg no plug-in {0} is installed პლაგინი {0} დაინსტალირებული არ არის @msg no plug-in {id} is installed პლაგინი {id} დაინსტალირებული არ არის @@ -9790,6 +9791,7 @@ breakText Glyphs გლიფები Remove Strokes კონტურების მოხსნა Place Brush Art ფუნჯის ნახატის განთავსება Replace Brush Art ფუნჯის ნახატის ჩანაცვლება + Replace Pattern Art პატერნის ნახატის ჩანაცვლება Strokes use this brush. Apply the new art to those strokes, or leave them as they are and add a copy of the brush with the new art? კონტურები იყენებს ამ ფუნჯს. გამოყენებულ იქნას ახალი ნახატი ამ კონტურებზე, თუ დარჩეს ისინი როგორც არის და დაემატოს ფუნჯის ასლი ახალი ნახატით? Apply to Strokes კონტურებზე გამოყენება Leave Strokes კონტურების დატოვება diff --git a/crates/ui-egui/src/i18n/ko.tsv b/crates/ui-egui/src/i18n/ko.tsv index dbda53243f..3719c93860 100644 --- a/crates/ui-egui/src/i18n/ko.tsv +++ b/crates/ui-egui/src/i18n/ko.tsv @@ -4815,6 +4815,7 @@ theme Appearance 외관 @msg {label}: select paths, compound paths, groups or text {label}: 패스, 컴파운드 패스, 그룹 또는 텍스트를 선택하세요 @msg already editing a pattern 이미 패턴을 편집 중입니다 @msg no pattern `{name}` `{name}` 패턴이 없습니다 +@msg art painted with `{name}` can't be its tile `{name}` 패턴으로 칠한 아트웍은 그 타일이 될 수 없습니다 @msg not in pattern editing mode 패턴 편집 모드가 아닙니다 @msg finish editing the pattern first 먼저 패턴 편집을 마치세요 @msg pattern missing 패턴이 없습니다 @@ -7169,6 +7170,7 @@ breakText Glyphs 글리프 Remove Strokes 선 제거 Place Brush Art 브러시 아트 배치 Replace Brush Art 브러시 아트 바꾸기 + Replace Pattern Art 패턴 아트 바꾸기 Strokes use this brush. Apply the new art to those strokes, or leave them as they are and add a copy of the brush with the new art? 선에서 이 브러시를 사용합니다. 새 아트를 해당 선에 적용하시겠습니까, 아니면 선을 그대로 두고 새 아트로 브러시 사본을 추가하시겠습니까? Apply to Strokes 선에 적용 Leave Strokes 선 유지 diff --git a/crates/ui-egui/src/i18n/nl.tsv b/crates/ui-egui/src/i18n/nl.tsv index 69aef91cfc..bc80c6de95 100644 --- a/crates/ui-egui/src/i18n/nl.tsv +++ b/crates/ui-egui/src/i18n/nl.tsv @@ -5421,6 +5421,7 @@ imageTrace Outline Contour @msg no native format geen eigen indeling @msg no pages geen pagina's @msg no pattern `{name}` geen patroon `{name}` +@msg art painted with `{name}` can't be its tile illustratie die met `{name}` is geverfd, kan niet de tegel ervan zijn @msg no perspective grid preset named `{name}` geen perspectiefrastervoorinstelling met de naam `{name}` @msg no plug-in {0} is installed er is geen plug-in {0} geïnstalleerd @msg no plug-in {id} is installed er is geen plug-in {id} geïnstalleerd @@ -9458,6 +9459,7 @@ breakText Glyphs Glyphs Remove Strokes Contouren verwijderen Place Brush Art Penseelillustratie plaatsen Replace Brush Art Penseelillustratie vervangen + Replace Pattern Art Patroonillustratie vervangen Strokes use this brush. Apply the new art to those strokes, or leave them as they are and add a copy of the brush with the new art? Contouren gebruiken dit penseel. De nieuwe illustratie op deze contouren toepassen, of ze laten zoals ze zijn en een kopie van het penseel met de nieuwe illustratie toevoegen? Apply to Strokes Op contouren toepassen Leave Strokes Contouren behouden diff --git a/crates/ui-egui/src/i18n/pl.tsv b/crates/ui-egui/src/i18n/pl.tsv index 0147515ffe..78cfd9b002 100644 --- a/crates/ui-egui/src/i18n/pl.tsv +++ b/crates/ui-egui/src/i18n/pl.tsv @@ -5184,6 +5184,7 @@ liquify-list-end {0}, {1} {0} i {1} @msg no native format brak formatu natywnego @msg no pages brak stron @msg no pattern `{name}` brak wzorka `{name}` +@msg art painted with `{name}` can't be its tile grafika malowana wzorkiem `{name}` nie może być jego kafelkiem @msg no perspective grid preset named `{name}` brak ustawienia siatki perspektywy o nazwie `{name}` @msg no plug-in {0} is installed wtyczka {0} nie jest zainstalowana @msg no plug-in {id} is installed wtyczka {id} nie jest zainstalowana @@ -7432,6 +7433,7 @@ breakText Glyphs Glify Remove Strokes Usuń obrysy Place Brush Art Umieść kompozycję pędzla Replace Brush Art Zastąp kompozycję pędzla + Replace Pattern Art Zastąp kompozycję wzorka Strokes use this brush. Apply the new art to those strokes, or leave them as they are and add a copy of the brush with the new art? Obrysy używają tego pędzla. Zastosować nową kompozycję do tych obrysów, czy pozostawić je bez zmian i dodać kopię pędzla z nową kompozycją? Apply to Strokes Zastosuj do obrysów Leave Strokes Pozostaw obrysy diff --git a/crates/ui-egui/src/i18n/pt-br.tsv b/crates/ui-egui/src/i18n/pt-br.tsv index 8201db7ab6..21e937b26c 100644 --- a/crates/ui-egui/src/i18n/pt-br.tsv +++ b/crates/ui-egui/src/i18n/pt-br.tsv @@ -4370,6 +4370,7 @@ axis Both Ambos @msg no native format sem formato nativo @msg no pages sem páginas @msg no pattern `{name}` nenhum padrão `{name}` +@msg art painted with `{name}` can't be its tile uma arte pintada com `{name}` não pode ser o ladrilho dele @msg no perspective grid preset named `{name}` nenhuma predefinição de grade de perspectiva chamada `{name}` @msg no plug-in {0} is installed o plug-in {0} não está instalado @msg no plug-in {id} is installed o plug-in {id} não está instalado @@ -7608,6 +7609,7 @@ breakText Glyphs Glifos Remove Strokes Remover Traçados Place Brush Art Colocar Arte do Pincel Replace Brush Art Substituir Arte do Pincel + Replace Pattern Art Substituir Arte do Padrão Strokes use this brush. Apply the new art to those strokes, or leave them as they are and add a copy of the brush with the new art? Traçados usam este pincel. Aplicar a nova arte a esses traçados, ou deixá-los como estão e adicionar uma cópia do pincel com a nova arte? Apply to Strokes Aplicar aos Traçados Leave Strokes Manter Traçados diff --git a/crates/ui-egui/src/i18n/ru.tsv b/crates/ui-egui/src/i18n/ru.tsv index d1593508d3..24aeb28909 100644 --- a/crates/ui-egui/src/i18n/ru.tsv +++ b/crates/ui-egui/src/i18n/ru.tsv @@ -5090,6 +5090,7 @@ liquify-list-end {0}, {1} {0} и {1} @msg no native format нет собственного формата @msg no pages нет страниц @msg no pattern `{name}` нет узора `{name}` +@msg art painted with `{name}` can't be its tile графика, окрашенная узором `{name}`, не может быть его плиткой @msg no perspective grid preset named `{name}` нет набора сетки перспективы с именем `{name}` @msg no plug-in {0} is installed модуль {0} не установлен @msg no plug-in {id} is installed модуль {id} не установлен @@ -7566,6 +7567,7 @@ breakText Glyphs Глифы Remove Strokes Убрать обводки Place Brush Art Поместить рисунок кисти Replace Brush Art Заменить рисунок кисти + Replace Pattern Art Заменить рисунок узора Strokes use this brush. Apply the new art to those strokes, or leave them as they are and add a copy of the brush with the new art? Обводки используют эту кисть. Применить новый рисунок к этим обводкам или оставить их как есть и добавить копию кисти с новым рисунком? Apply to Strokes Применить к обводкам Leave Strokes Оставить обводки diff --git a/crates/ui-egui/src/i18n/sv.tsv b/crates/ui-egui/src/i18n/sv.tsv index 5c0420fcd3..910c9e4b2e 100644 --- a/crates/ui-egui/src/i18n/sv.tsv +++ b/crates/ui-egui/src/i18n/sv.tsv @@ -4963,6 +4963,7 @@ liquify-list-end {0}, {1} {0} och {1} @msg no native format inget eget format @msg no pages inga sidor @msg no pattern `{name}` inget mönster `{name}` +@msg art painted with `{name}` can't be its tile grafik målad med `{name}` kan inte vara dess ruta @msg no perspective grid preset named `{name}` ingen förinställning för perspektivrutnät med namnet `{name}` @msg no plug-in {0} is installed inget plugin {0} är installerat @msg no plug-in {id} is installed inget plugin {id} är installerat @@ -7604,6 +7605,7 @@ breakText Glyphs Glyfer Remove Strokes Ta bort konturer Place Brush Art Placera penselgrafik Replace Brush Art Ersätt penselgrafik + Replace Pattern Art Ersätt mönstergrafik Strokes use this brush. Apply the new art to those strokes, or leave them as they are and add a copy of the brush with the new art? Konturer använder den här penseln. Använd den nya grafiken på konturerna, eller låt dem vara som de är och lägg till en kopia av penseln med den nya grafiken? Apply to Strokes Använd på konturer Leave Strokes Behåll konturer diff --git a/crates/ui-egui/src/i18n/tr.tsv b/crates/ui-egui/src/i18n/tr.tsv index 910a7fc5b1..bdcce47116 100644 --- a/crates/ui-egui/src/i18n/tr.tsv +++ b/crates/ui-egui/src/i18n/tr.tsv @@ -4781,6 +4781,7 @@ liquify-list-end {0}, {1} {0} ve {1} @msg no native format yerel format yok @msg no pages sayfa yok @msg no pattern `{name}` `{name}` deseni yok +@msg art painted with `{name}` can't be its tile `{name}` ile boyanmış resim onun döşemesi olamaz @msg no perspective grid preset named `{name}` `{name}` adında perspektif ızgarası ön ayarı yok @msg no plug-in {0} is installed {0} eklentisi kurulu değil @msg no plug-in {id} is installed {id} eklentisi kurulu değil @@ -9457,6 +9458,7 @@ breakText Glyphs Glifler Remove Strokes Konturları Kaldır Place Brush Art Fırça Çizimini Yerleştir Replace Brush Art Fırça Çizimini Değiştir + Replace Pattern Art Desen Çizimini Değiştir Strokes use this brush. Apply the new art to those strokes, or leave them as they are and add a copy of the brush with the new art? Konturlar bu fırçayı kullanıyor. Yeni çizim bu konturlara uygulansın mı, yoksa konturlar olduğu gibi bırakılıp fırçanın yeni çizimli bir kopyası mı eklensin? Apply to Strokes Konturlara Uygula Leave Strokes Konturları Bırak diff --git a/crates/ui-egui/src/i18n/uk.tsv b/crates/ui-egui/src/i18n/uk.tsv index dbd6d2609e..dcc50ec891 100644 --- a/crates/ui-egui/src/i18n/uk.tsv +++ b/crates/ui-egui/src/i18n/uk.tsv @@ -5080,6 +5080,7 @@ liquify-list-end {0}, {1} {0} і {1} @msg no native format немає власного формату @msg no pages немає сторінок @msg no pattern `{name}` немає візерунка `{name}` +@msg art painted with `{name}` can't be its tile графіка, зафарбована візерунком `{name}`, не може бути його плиткою @msg no perspective grid preset named `{name}` немає набору сітки перспективи з ім’ям `{name}` @msg no plug-in {0} is installed модуль {0} не встановлений @msg no plug-in {id} is installed модуль {id} не встановлений @@ -7187,6 +7188,7 @@ breakText Glyphs Гліфи Remove Strokes Забрати обведення Place Brush Art Розмістити малюнок пензля Replace Brush Art Замінити малюнок пензля + Replace Pattern Art Замінити малюнок візерунка Strokes use this brush. Apply the new art to those strokes, or leave them as they are and add a copy of the brush with the new art? Обведення використовують цей пензель. Застосувати новий малюнок до цих обведень чи залишити їх як є і додати копію пензля з новим малюнком? Apply to Strokes Застосувати до обведень Leave Strokes Залишити обведення diff --git a/crates/ui-egui/src/i18n/vi.tsv b/crates/ui-egui/src/i18n/vi.tsv index 519c5d8f0d..2771754f33 100644 --- a/crates/ui-egui/src/i18n/vi.tsv +++ b/crates/ui-egui/src/i18n/vi.tsv @@ -5421,6 +5421,7 @@ liquify-list-end {0}, {1} {0} và {1} @msg no native format không có định dạng gốc @msg no pages không có trang @msg no pattern `{name}` không có họa tiết `{name}` +@msg art painted with `{name}` can't be its tile đối tượng được tô bằng `{name}` không thể làm ô của nó @msg no perspective grid preset named `{name}` không có thiết lập sẵn lưới phối cảnh tên `{name}` @msg no plug-in {0} is installed plug-in {0} chưa được cài đặt @msg no plug-in {id} is installed plug-in {id} chưa được cài đặt @@ -7218,6 +7219,7 @@ breakText Glyphs Glyph Remove Strokes Gỡ nét Place Brush Art Đặt đối tượng của cọ Replace Brush Art Thay đối tượng của cọ + Replace Pattern Art Thay đối tượng của họa tiết Strokes use this brush. Apply the new art to those strokes, or leave them as they are and add a copy of the brush with the new art? Có nét đang dùng cọ này. Áp dụng đối tượng mới cho các nét đó, hay giữ nguyên chúng và thêm một bản sao của cọ với đối tượng mới? Apply to Strokes Áp dụng cho nét Leave Strokes Giữ nguyên nét diff --git a/crates/ui-egui/src/i18n/zh-hans.tsv b/crates/ui-egui/src/i18n/zh-hans.tsv index c6696a9ec6..26c69eb647 100644 --- a/crates/ui-egui/src/i18n/zh-hans.tsv +++ b/crates/ui-egui/src/i18n/zh-hans.tsv @@ -4586,6 +4586,7 @@ imageTrace Outline 轮廓 @msg {label}: select paths, compound paths, groups or text {label}:请选择路径、复合路径、编组或文字 @msg already editing a pattern 已在编辑图案 @msg no pattern `{name}` 没有图案 `{name}` +@msg art painted with `{name}` can't be its tile 使用 `{name}` 上色的图稿不能作为它的拼贴 @msg not in pattern editing mode 不在图案编辑模式中 @msg finish editing the pattern first 请先完成图案编辑 @msg pattern missing 缺少图案 @@ -7419,6 +7420,7 @@ breakText Glyphs 字形 Remove Strokes 移除描边 Place Brush Art 置入画笔图稿 Replace Brush Art 替换画笔图稿 + Replace Pattern Art 替换图案图稿 Strokes use this brush. Apply the new art to those strokes, or leave them as they are and add a copy of the brush with the new art? 有描边使用了此画笔。要将新图稿应用到这些描边,还是保留描边不变并添加一个使用新图稿的画笔副本? Apply to Strokes 应用于描边 Leave Strokes 保留描边 diff --git a/crates/ui-egui/src/i18n/zh-hant.tsv b/crates/ui-egui/src/i18n/zh-hant.tsv index 1480422931..f249e9059d 100644 --- a/crates/ui-egui/src/i18n/zh-hant.tsv +++ b/crates/ui-egui/src/i18n/zh-hant.tsv @@ -2119,6 +2119,7 @@ file-filter Templates 範本 @msg {label}: select paths, compound paths, groups or text {label}:請選取路徑、複合路徑、群組或文字 @msg already editing a pattern 已在編輯圖樣 @msg no pattern `{name}` 沒有圖樣 `{name}` +@msg art painted with `{name}` can't be its tile 以 `{name}` 上色的圖稿不能作為它的拼貼 @msg not in pattern editing mode 不在圖樣編輯模式中 @msg finish editing the pattern first 請先完成圖樣編輯 @msg pattern missing 找不到圖樣 @@ -7228,6 +7229,7 @@ breakText Glyphs 字符 Remove Strokes 移除筆畫 Place Brush Art 置入筆刷圖稿 Replace Brush Art 取代筆刷圖稿 + Replace Pattern Art 取代圖樣圖稿 Strokes use this brush. Apply the new art to those strokes, or leave them as they are and add a copy of the brush with the new art? 有筆畫使用了此筆刷。要將新圖稿套用到這些筆畫,還是保留筆畫不變並加入一個使用新圖稿的筆刷複本? Apply to Strokes 套用至筆畫 Leave Strokes 保留筆畫 diff --git a/crates/ui-egui/src/panels/swatches/dnd.rs b/crates/ui-egui/src/panels/swatches/dnd.rs index ea3282db68..dae955709e 100644 --- a/crates/ui-egui/src/panels/swatches/dnd.rs +++ b/crates/ui-egui/src/panels/swatches/dnd.rs @@ -64,8 +64,10 @@ pub(super) enum Drop { /// (`replace`) it replaces swatch `target` when that is of its kind and neither Registration /// nor a tint swatch. New { paint: Paint, target: Option, replace: bool }, - /// Art dragged off the canvas becomes a pattern swatch made of a copy of it (the art stays). - Pattern { ids: Vec }, + /// Art dragged off the canvas becomes a pattern swatch made of a copy of it (the art stays); + /// with Alt held (`replace`) over pattern swatch `target`, a copy of it becomes that pattern's + /// tile art instead. + Pattern { ids: Vec, target: Option, replace: bool }, } impl Drop { @@ -80,7 +82,7 @@ impl Drop { Some(Drop::Move { names: r.names.clone(), target, after, with }) } PanelDrag::Paint { paint, .. } => Some(Drop::New { paint: paint.clone(), target, replace }), - PanelDrag::Art(ids) => Some(Drop::Pattern { ids: ids.iter().map(|id| id.0).collect() }), + PanelDrag::Art(ids) => Some(Drop::Pattern { ids: ids.iter().map(|id| id.0).collect(), target, replace }), _ => None, } } @@ -159,6 +161,19 @@ pub(super) fn tile_input(ui: &Ui, resp: Response, e: &Entry, items: &[Entry], se /// it by the pointer's half, or into a folder); a release there sets the drop. fn tile_drop(ui: &Ui, resp: &Response, e: &Entry, list: bool, ev: &mut TileEvents) { let Some(d) = held(resp) else { return }; + // Art held with Alt over a pattern swatch would replace its tile art, and the swatch is + // outlined; other art goes to the list (see [`zone_input`]). + if let PanelDrag::Art(_) = &*d { + if crate::panels::alt_held(ui) && matches!(e, Entry::Swatch { paint: Paint::Pattern { .. }, .. }) { + ev.over = true; + let t = Tokens::get(ui.ctx()); + ui.painter().rect_stroke(resp.rect.expand(1.0), 0.0, Stroke::new(1.5, t.accent), StrokeKind::Outside); + if resp.dnd_release_payload::().is_some() { + ev.drop = Drop::of(&d, Some(e.name().to_string()), false, true); + } + } + return; + } let PanelDrag::Paint { rows, .. } = &*d else { return }; let name = e.name(); ev.over = true; @@ -253,9 +268,18 @@ fn replaces(d: &Document, with: &str, target: &str) -> bool { } } +/// The pattern swatch `name` paints with. +fn swatch_pattern(d: &Document, name: &str) -> Option { + match &d.swatch(name)?.paint { + Paint::Pattern { pattern, .. } => Some(pattern.clone()), + _ => None, + } +} + /// Run a drop on the panel: move the swatches, give the paint of a swatch Alt-dropped on another of -/// its kind to that one, or make a swatch of the proxy's paint (a color dropped on a folder or a -/// grouped swatch joins that group). +/// its kind to that one, make a swatch of the proxy's paint (a color dropped on a folder or a +/// grouped swatch joins that group), or make a pattern swatch of art (Alt-dropped on a pattern +/// swatch: the art becomes that pattern's tile art). pub(super) fn apply_drop(app: &mut VectorcraftApp, drop: Drop) { let Some(d) = app.session.active().map(|st| &st.doc) else { return }; let (cmd, params) = match drop { @@ -281,7 +305,11 @@ pub(super) fn apply_drop(app: &mut VectorcraftApp, drop: Drop) { } ("swatch.new", p) } - Drop::Pattern { ids } => ("object.pattern.make", json!({"ids": ids, "edit": false})), + // Alt: over a pattern swatch, the art becomes that pattern's tile art. + Drop::Pattern { ids, target, replace } => match target.filter(|_| replace).and_then(|t| swatch_pattern(d, &t)) { + Some(name) => ("object.pattern.replaceArt", json!({"name": name, "ids": ids})), + None => ("object.pattern.make", json!({"ids": ids, "edit": false})), + }, }; if let Err(e) = app.run(cmd, params) { app.status(e); diff --git a/crates/ui-egui/src/panels/swatches/tests.rs b/crates/ui-egui/src/panels/swatches/tests.rs index a67e604f2b..84b126eb07 100644 --- a/crates/ui-egui/src/panels/swatches/tests.rs +++ b/crates/ui-egui/src/panels/swatches/tests.rs @@ -830,6 +830,45 @@ fn art_dropped_on_the_panel_becomes_a_pattern_swatch() { assert!(egui::DragAndDrop::payload::(&ctx).is_none()); } +/// Art released with Alt held over a pattern swatch becomes that pattern's tile art in one undo +/// step: no pattern or swatch is added and the art stays. With Alt over a color swatch, or without +/// Alt over the pattern swatch, the art becomes a new pattern swatch as before. +#[test] +fn art_alt_dropped_on_a_pattern_swatch_replaces_its_tile_art() { + let mut app = app(); + let square = app.run("shape.rectangle", json!({"x": 0, "y": 0, "width": 10, "height": 10})).unwrap()["id"].as_u64().unwrap(); + app.run("object.pattern.make", json!({"ids": [square], "name": "Dots", "edit": false})).unwrap(); + let id = app.run("shape.star", json!({"cx": 50, "cy": 50, "radius1": 20, "radius2": 9, "points": 5})).unwrap()["id"].as_u64().unwrap(); + let star = vectorcraft_doc::NodeId(id); + let count = |app: &mut VectorcraftApp| app.run("pattern.list", json!({})).unwrap()["patterns"].as_array().map(Vec::len); + let tile_art = |app: &VectorcraftApp| app.session.doc().unwrap().doc.pattern("Dots").map(|p| p.art.clone()); + let ctx = context(); + let drop = |app: &mut VectorcraftApp, on: &str, modifiers: Modifiers, time: f64| { + frame(app, &ctx, vec![], time, show); + let at = tile_center(&ctx, on); + egui::DragAndDrop::set_payload(&ctx, PanelDrag::Art(vec![star])); + let release = Event::PointerButton { pos: at, button: PointerButton::Primary, pressed: false, modifiers }; + frame_with(app, &ctx, vec![Event::PointerMoved(at), release], modifiers, time + 0.5, show); + assert!(egui::DragAndDrop::payload::(&ctx).is_none(), "{on}: the drop is taken"); + }; + let (before, undo, star_before) = (tile_art(&app), undo_steps(&app), app.session.doc().unwrap().doc.node(star).cloned()); + drop(&mut app, "Dots", Modifiers::ALT, 0.0); + let art = tile_art(&app).expect("Dots stays"); + assert_ne!(Some(&art), before.as_ref(), "{}", app.ui.status); + assert_eq!(art.len(), 1); + assert_eq!(Some(&art[0].kind), star_before.as_ref().map(|n| &n.kind), "the star is the tile art"); + assert_eq!(count(&mut app), Some(1), "no new pattern"); + assert_eq!(undo_steps(&app), undo + 1, "one undo step"); + assert_eq!(app.session.doc().unwrap().doc.node(star).cloned(), star_before, "the star stays as it was"); + // Alt over a color swatch: a new pattern. + drop(&mut app, "Bright Red", Modifiers::ALT, 1.0); + assert_eq!(count(&mut app), Some(2), "Alt over a color swatch makes a pattern"); + // No Alt over the pattern swatch: a new pattern, and Dots keeps its art. + drop(&mut app, "Dots", Modifiers::NONE, 2.0); + assert_eq!(count(&mut app), Some(3), "a plain drop on a pattern swatch makes a pattern"); + assert_eq!(tile_art(&app), Some(art), "Dots keeps its tile art"); +} + #[test] fn a_proxy_dropped_on_the_panel_becomes_a_swatch() { let mut app = app(); diff --git a/docs/mcp.md b/docs/mcp.md index 4c1b661f42..2fa3cc3723 100644 --- a/docs/mcp.md +++ b/docs/mcp.md @@ -5318,6 +5318,20 @@ details are VectorCraft's own rules; the help page says only that the option mov (). `pattern.list` reports it as `moveTileWithArt`. A `pattern.options` call that changes nothing records no undo step. +`object.pattern.replaceArt {name, ids?}` (Replace Pattern Art) makes copies of the selected art, or of `ids`, the tile +art of pattern `name`, as one undo step, and returns `{name}`. The pattern keeps its name, its swatch and the swatch's +place, its tile and its options; with `sizeTileToArt` on, the tile is sized to the new art plus `hSpacing` and +`vSpacing`. Fills and strokes name the pattern, so every object painted with it draws the new tile. The art stays on the +canvas, selected as it was. Art that matches the tile art already records no undo step. The command is off while a +pattern is edited ("finish editing the pattern first"), and returns an error, changing nothing, for a missing `name`, a +pattern that does not exist, no art, and art painted with the pattern itself, directly or through the symbols, other +patterns, graph designs and brushes it uses, or the series and label paints a graph stores. In the Swatches panel, art dragged off the canvas and released with Alt (Option on macOS) held over a +pattern swatch runs it with that swatch's pattern; the swatch is outlined while the art is held there. Released anywhere +else in the list, or without Alt, the art becomes a new pattern swatch as before. The help page describes replacing a +pattern by dragging its edited tile onto the old swatch with Alt or Option held, with the pattern updated in the file +(, +archived copy). Keeping the tile, the options and the source art are VectorCraft's own rules. + ```json {"name":"run_command","arguments":{"command":"pattern.options","params":{"showSwatchBounds":true}}} {"name":"run_command","arguments":{"command":"prefs.set","params":{"key":"patternTileEdgeColor","value":"#ff4f4f"}}} diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index ef83de54ad..62af2f4b75 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -826,6 +826,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - **Pattern names and swatch names:** `pattern.options` refuses a new name that another pattern, a swatch or a color group has. It takes a name that only the pattern's own swatches have. The reference page does not say what happens when the new name is taken; the refusal follows VectorCraft's rule that swatches and color groups share one namespace (`Document::swatch_name_taken`), which `swatch.new` and `swatch.edit` also follow. A rename gives the new name only to the pattern's swatches that had the old one; any other swatch with the old name keeps it, and art linked to that swatch stays linked. `object.pattern.make` and `object.pattern.saveCopy` number a color group's name as they number a swatch's. Tests in `tests/pattern.rs` cover each command. Public reference: [Create and edit patterns](https://web.archive.org/web/20211031180358/https://helpx.adobe.com/illustrator/using/create-edit-patterns.html) (archived copy). - **Cancel, Delete and rename leave no paint of a missing pattern:** the help page lists Save a Copy, Done and Cancel for leaving pattern editing (https://helpx.adobe.com/illustrator/using/create-edit-patterns.html). Canceling a pattern made for the edit removes it with every swatch of it, a color group's included. Canceling a new pattern, `pattern.delete` and a `pattern.options` rename reach every paint of the pattern: art outside the editing layer, opacity mask art, type runs, symbol definitions, graph designs, the series and label paints a graph keeps for its next redraw, other patterns' tiles (a copy Save a Copy made included), graphic and character styles, brush art, and the fill, stroke and appearance new art takes. Canceling a new pattern and Delete make those paints no paint, a VectorCraft rule; a rename renames them. Canceling the edit of an existing pattern puts its definition back as it was when editing started; after a rename in Pattern Options, it also gives the pattern its old name back with its swatches and paints, unless another pattern, swatch or color group has taken that name. Undo and Redo restore new art's paints with the document. Tests in `tests/pattern.rs` cover each command. - **Move Tile with Art:** Pattern Options has the Move Tile with Art checkbox under Size Tile to Art, and with it on, moving the tile art in pattern editing mode moves the tile with it (). VectorCraft's own rules for what the page leaves open: the tile moves only when a move takes all of the tile art, by the same offset; rotations, scales, copies and anchor moves leave it in place; the option is off for a new pattern. `pattern.options {moveTileWithArt}` sets it and `pattern.list` reports it. Tests in `tests/pattern.rs` and `panels::pattern_options::tests` cover it. +- **Art Alt-dragged onto a pattern swatch replaces its tile art:** the help page describes dragging the edited tile onto the old pattern swatch with Alt (Option on macOS) held to replace the pattern and update it in the file (, archived copy). In the Swatches panel, art released this way over a pattern swatch becomes that pattern's tile art in one undo step (`object.pattern.replaceArt`), and every object painted with the pattern draws the new tile. VectorCraft's own rules: the pattern keeps its name, swatch, tile and options (Size Tile to Art refits the tile), the dragged art stays on the canvas, art that matches the tile records nothing, art painted with the pattern itself is refused, and Alt over any other swatch still makes a new pattern. Tests in `tests/pattern.rs` and `panels::swatches::tests` cover it. - **A clip group in Properties:** with one clip group selected, the panel has Edit Clipping Path and Edit Contents at its top, under the Clip Group heading, which select the clipping path or the clipped art for the selection tools to transform alone, as Object › Clipping Mask does (: with a clip group selected, the tutorial uses Edit Clipping Path at the top of the Properties panel to select the mask for editing, and uses Edit Contents to select the masked art). Edit Contents shows only when the group clips something. Not checked against the reference app: whether Properties keeps the buttons while the clipping path or the contents is selected; the Control bar has no clip-group buttons here. Evidence: `panels::properties::tests::one_clip_group_has_edit_clipping_path_and_edit_contents_at_the_top`. - **Contextual controls in Properties:** the [Properties panel overview](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/properties-panel-overview.html) lists controls that appear for particular selections and tools; Properties has them, each running the existing command. Quick Actions has Blend Options for one selected blend, with the Blend tool or any other, as the [blending page](https://helpx.adobe.com/illustrator/using/blending-objects.html) describes (#4817) (the Blend Options dialog, OK one undo step) and Merge Live Paint when a Live Paint group is selected with more paths and nothing Live Paint refuses (`livePaint.merge`). Appearance has the stroke's Variable Width Profile list, the Control bar's, with the Width tool or when the stroke has a variable width (`stroke.set {profile}`), and beside fx the Delete icon: with one effect on the one selected object (its own or a fill's or stroke's) its name and an icon that removes it (`effect.remove`), with several an icon that opens the Appearance panel, as the overview describes. With Direct Selection and corners of one path selected, Corner and Corner Radius set the kind and radius of those corners (`object.setLiveShape`); a live rectangle's and polygon's own rows already do. Each edit is one undo step. The overview's Variable Font icon was already in Character. Not checked against the reference app: whether Merge needs two Live Paint groups (the overview speaks of several selected groups; `livePaint.merge` takes a group and paths), and where exactly each control sits in its section. Evidence: `panels::properties::tests::{blend_options_is_a_quick_action_for_one_blend_with_the_blend_tool, merge_live_paint_is_a_quick_action_for_a_live_paint_group_and_more, the_width_profile_shows_for_a_variable_width_or_the_width_tool, direct_selected_corners_show_their_kind_and_radius, one_effect_has_a_delete_icon_in_appearance}`. - **Edit Artboards in Properties:** a Transform section comes first (#5219): the reference point the Transform panel and Control bar share, the active artboard's X and Y (of that point) and W and H with the Constrain Width and Height Proportions link, its preset and orientation, and Move and Scale Artwork with Artboard. The Artboards section follows, with the name field, Artboard Options and Fill. The active artboard's name is a field. Typing a new name and pressing Enter or clicking elsewhere renames that artboard in one undo step, as the Artboards panel's rename does (`artboard.setProps {index, name}`); pressing Escape or leaving the field empty keeps the old name. A click on the Artboard Options icon beside the field opens Artboard Options for the active artboard, as double-clicking the Artboard tool's button does (`tool.options {tool: "artboard"}`). Pointer and key tests in `panels/properties.rs` cover both. Public references: [Resize artboards](https://helpx.adobe.com/illustrator/desktop/create-manage-artboards/add-edit-artboards/resize-artboards.html) and [Create and add new artboards](https://helpx.adobe.com/illustrator/desktop/create-manage-artboards/add-edit-artboards/add-new-artboards.html). From 612f965679fafae87a7a89b87a750ff57bbe36a5 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Tue, 17 Nov 2026 18:53:36 -0800 Subject: [PATCH 34/78] Control bar: the Linked File or Embedded label opens the Links panel With one image selected, the Control bar's object label, Linked File or Embedded, is an underlined link. A click on it shows the Links panel wherever it is docked or floats, scrolls the list to the image's row and shows the image's details in Link Info. The help page (https://helpx.adobe.com/illustrator/using/links-info.html) describes clicking this label for a selected linked object as a way to open the Links panel. VectorCraft's own rules: the Embedded label opens the panel too; the click opens Link Info when it was closed; and a Show filter that leaves out the image's row goes back to Show All. The panel's sort, thumbnail size and DCS option keep their settings, and a panel that is already shown stays where it is. The label of any other object stays plain text. --- crates/ui-egui/src/chrome/control_bar.rs | 39 ++++++----- crates/ui-egui/src/chrome/tests.rs | 42 ++++++++++++ crates/ui-egui/src/panels/links.rs | 33 ++++++++++ crates/ui-egui/src/panels/tests_links.rs | 83 ++++++++++++++++++++++++ docs/target-app-parity.md | 1 + 5 files changed, 181 insertions(+), 17 deletions(-) diff --git a/crates/ui-egui/src/chrome/control_bar.rs b/crates/ui-egui/src/chrome/control_bar.rs index 71b737dbfc..534c4ed516 100644 --- a/crates/ui-egui/src/chrome/control_bar.rs +++ b/crates/ui-egui/src/chrome/control_bar.rs @@ -922,6 +922,19 @@ pub fn control_bar(app: &mut VectorcraftApp, ui: &mut Ui) { } } +/// The Control bar's object label, `label`, while the bar has room for it. For one selected image +/// (`image`: Linked File or Embedded) it is an underlined link, and a click opens the Links panel on +/// the image with its Link Info. +fn object_label(app: &mut VectorcraftApp, ui: &mut Ui, label: egui::RichText, image: bool) { + if ui.available_width() < widgets::text_width(ui, label.clone()) { + left_out(ui); + } else if !image { + ui.label(label); + } else if ui.link(label.underline()).clicked() { + crate::panels::links::show_selected_image(app, ui.ctx()); + } +} + /// The Control bar's gripper, controls and panel menu, in the bar `bar`. A `floating` bar clips its /// controls to the room left of the panel menu button, and always shows the button. fn contents(app: &mut VectorcraftApp, ui: &mut Ui, t: &Tokens, bar: egui::Rect, dock_room: egui::Rect, floating: bool) { @@ -954,30 +967,22 @@ fn contents(app: &mut VectorcraftApp, ui: &mut Ui, t: &Tokens, bar: egui::Rect, let units = app.session.general_unit(); let first = sel.first().and_then(|id| st.doc.node(*id)); let anchors = anchor_controls(app); - let label = match first { - _ if app.session.tool_id() == "artboard" => tl!("Artboard"), - Some(_) if sel.len() == 1 && anchors != AnchorControls::None => { - tl!("Anchor Point") - } + // The label, and whether it names one selected image. + let (label, image) = match first { + _ if app.session.tool_id() == "artboard" => (tl!("Artboard"), false), + Some(_) if sel.len() == 1 && anchors != AnchorControls::None => (tl!("Anchor Point"), false), Some(vectorcraft_doc::Node { kind: NodeKind::Image(im), .. }) if sel.len() == 1 => { if im.link.is_some() { - tl!("Linked File") + (tl!("Linked File"), true) } else { - tl!("Embedded") + (tl!("Embedded"), true) } } - Some(n) if sel.len() == 1 && crate::panels::image_trace::is_trace(n) => { - tl!("Image Tracing") - } - _ => tl!(crate::panels::appearance::object_label(app)), + Some(n) if sel.len() == 1 && crate::panels::image_trace::is_trace(n) => (tl!("Image Tracing"), false), + _ => (tl!(crate::panels::appearance::object_label(app)), false), }; let has_first = first.is_some(); - let label = egui::RichText::new(label).font(theme::semibold(12.0)).color(t.text); - if ui.available_width() >= widgets::text_width(ui, label.clone()) { - ui.label(label); - } else { - left_out(ui); - } + object_label(app, ui, egui::RichText::new(label).font(theme::semibold(12.0)).color(t.text), image); // With the Artboard tool in use, the bar shows the active artboard's controls in place // of the object controls. let (artboard_options, transform) = (group_on(app, "artboardOptions"), group_on(app, "transform")); diff --git a/crates/ui-egui/src/chrome/tests.rs b/crates/ui-egui/src/chrome/tests.rs index 61c67e6a70..64798ece36 100644 --- a/crates/ui-egui/src/chrome/tests.rs +++ b/crates/ui-egui/src/chrome/tests.rs @@ -4049,6 +4049,48 @@ fn select_similar_stays_out_while_an_image_control_is_left_out() { assert!(seen, "a wide bar shows the button after the image's controls"); } +/// A click on the Control bar's Linked File or Embedded label shows the Links panel, in an expanded +/// dock and in one collapsed to icons; the label of any other object stays plain text. +#[test] +fn the_linked_file_and_embedded_labels_open_the_links_panel() { + crate::i18n::set_current(crate::i18n::Lang::EN); + let mut app = crate::VectorcraftApp::new(Session::new(), Default::default()); + app.run("file.new", json!({"width": 400, "height": 200})).unwrap(); + let img = image::RgbaImage::from_pixel(20, 20, image::Rgba([0, 0, 0, 255])); + let mut png = vec![]; + img.write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png).unwrap(); + let dir = vectorcraft_testkit::temp_dir("control-bar-image-label"); + std::fs::create_dir_all(&dir).unwrap(); + let path = dir.join("square.png"); + std::fs::write(&path, &png).unwrap(); + use crate::tests_removeanchors::{at, click_control, control_frame}; + let ctx = egui::Context::default(); + crate::theme::install_fonts(&ctx); + let links = crate::panels::links::ID; + // Closes the Links panel, clicks `name` on the bar and answers whether the panel shows. + let click = |app: &mut crate::VectorcraftApp, name: &str| { + app.run("window.panel.close", json!({"panel": links})).ok(); + app.ui.open_panel = None; + assert!(!crate::panel_docking::visible(&app.ui, links), "{name}: the panel is closed first"); + let pos = at(&control_frame(app, &ctx, vec![]), name); + click_control(app, &ctx, pos); + crate::panel_docking::visible(&app.ui, links) + }; + let id = app.run("shape.rectangle", json!({"x": 10, "y": 10, "width": 30, "height": 20})).unwrap()["id"].clone(); + let linked = app.run("file.place", json!({"path": path, "link": true})).unwrap()["ids"].clone(); + let embedded = app.run("file.place", json!({"path": path, "link": false})).unwrap()["ids"].clone(); + for collapsed in [false, true] { + app.run("window.collapseDock", json!({ "collapsed": collapsed })).unwrap(); + app.run("select.set", json!({ "ids": linked })).unwrap(); + assert!(click(&mut app, "Linked File"), "collapsed {collapsed}, status: {}", app.ui.status); + app.run("select.set", json!({ "ids": embedded })).unwrap(); + assert!(click(&mut app, "Embedded"), "collapsed {collapsed}, status: {}", app.ui.status); + app.run("select.set", json!({ "ids": [id] })).unwrap(); + let name = crate::panels::appearance::object_label(&app); + assert!(!click(&mut app, name), "collapsed {collapsed}: a rectangle's label opens nothing"); + } +} + /// The Anchor Points group holds Convert and Anchors for direct-selected anchors; off, the bar keeps /// its Anchor Point label. #[test] diff --git a/crates/ui-egui/src/panels/links.rs b/crates/ui-egui/src/panels/links.rs index 611c9e472a..7eaf6da8c2 100644 --- a/crates/ui-egui/src/panels/links.rs +++ b/crates/ui-egui/src/panels/links.rs @@ -82,6 +82,31 @@ fn set_options(ctx: &egui::Context, f: impl FnOnce(&mut Options)) { set_pstate(ctx, "links-options", o); } +/// Show the Links panel on the selected image (the Control bar's Linked File or Embedded label), +/// wherever the panel is docked or floats; a panel that is already shown stays where it is. The +/// Link Info section opens, a Show filter that leaves out the image's row goes back to Show All, +/// and the list scrolls to the row when the panel next draws it. The sort, thumbnail size and DCS +/// option keep their settings. +pub(crate) fn show_selected_image(app: &mut VectorcraftApp, ctx: &egui::Context) { + let o = options(ctx); + let listed = |list: Value, id: u64| list["links"].as_array().is_some_and(|rows| rows.iter().any(|r| r["id"].as_u64() == Some(id))); + let first = selected_images(app).first().copied(); + let hidden = match first { + Some(id) if o.show != "all" => app.session.execute("links.list", &json!({ "show": o.show, "sort": o.sort })).is_ok_and(|l| !listed(l, id)), + _ => false, + }; + set_pstate(ctx, "links-scroll-to", first); + set_options(ctx, |o| { + o.info = true; + if hidden { + o.show = "all"; + } + }); + if let Err(e) = crate::panel_docking::reveal_panel(app, ID) { + app.status(e); + } +} + /// The rows to show (cached per document revision, the files looked at again every [`RECHECK`] /// seconds) and the Link Info of the first selected image when the section is open. fn cached(app: &mut VectorcraftApp, ctx: &egui::Context, o: &Options) -> Option { @@ -566,11 +591,19 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) { super::empty_state(ui, "link", tl!("No images"), detail); return; } + // The row that `show_selected_image` asks the list to scroll to, once. + let scroll_to: Option = pstate(ui.ctx(), "links-scroll-to"); + if scroll_to.is_some() { + set_pstate::>(ui.ctx(), "links-scroll-to", None); + } egui::ScrollArea::vertical().max_height(260.0).auto_shrink([false, true]).show(ui, |ui| { let h = o.thumb.max(16.0) + 6.0; for r in rows { let Some(id) = r["id"].as_u64() else { continue }; let (rect, resp) = ui.allocate_exact_size(vec2(ui.available_width(), h), Sense::click()); + if scroll_to == Some(id) { + ui.scroll_to_rect(rect, Some(egui::Align::Center)); + } if !ui.is_rect_visible(rect) { continue; } diff --git a/crates/ui-egui/src/panels/tests_links.rs b/crates/ui-egui/src/panels/tests_links.rs index 781c4f5840..fbee40fbc7 100644 --- a/crates/ui-egui/src/panels/tests_links.rs +++ b/crates/ui-egui/src/panels/tests_links.rs @@ -136,6 +136,89 @@ fn the_panel_lists_the_images_with_link_info_for_the_selected_one() { } } +/// Click the flyout item `name`, checked or not (frames at `time` and just after). +fn click_menu_item(app: &mut VectorcraftApp, ctx: &egui::Context, name: &str, time: f64) { + let frame = |app: &mut VectorcraftApp, events: Vec, time: f64| { + super::tests_appearance::frame_raw(ctx, app, egui::RawInput { events, time: Some(time), ..Default::default() }, super::links::menu) + }; + let texts = frame(app, vec![], time); + let item = texts.iter().find(|(t, _)| t.trim_start_matches('✓').trim() == name); + let at = item.unwrap_or_else(|| panic!("`{name}` not drawn: {texts:?}")).1.center(); + let button = |pressed| egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() }; + for (i, e) in [egui::Event::PointerMoved(at), button(true), button(false)].into_iter().enumerate() { + frame(app, vec![e], time + 0.01 * (i + 1) as f64); + } +} + +/// Opening the panel on the selected image (the Control bar's Linked File or Embedded label) opens +/// Link Info when it was closed, and sets a Show filter that leaves out the image's row back to +/// Show All; a filter that lists the row stays. +#[test] +fn opening_the_panel_on_the_selected_image_shows_its_row_and_link_info() { + let dir = Folder::new("show-selected"); + let (mut app, linked, embedded) = app(&dir); + let ctx = egui::Context::default(); + crate::theme::install_fonts(&ctx); + let text = |app: &mut VectorcraftApp, time: f64| { + let raw = egui::RawInput { time: Some(time), ..Default::default() }; + let texts = super::tests_appearance::frame_raw(&ctx, app, raw, super::links::show); + texts.into_iter().map(|(t, _)| t).collect::>().join("\n") + }; + app.run("select.set", json!({"ids": [linked]})).unwrap(); + click_menu_item(&mut app, &ctx, "Show Link Info", 1.0); + click_menu_item(&mut app, &ctx, "Show Embedded", 2.0); + let before = text(&mut app, 3.0); + assert!(!before.contains("linked.png") && !before.contains("Location"), "the filter hides the row, Link Info is closed: {before}"); + app.run("window.panel.close", json!({"panel": super::links::ID})).ok(); + super::links::show_selected_image(&mut app, &ctx); + assert!(crate::panel_docking::visible(&app.ui, super::links::ID), "status: {}", app.ui.status); + let after = text(&mut app, 4.0); + assert!(after.contains("linked.png") && after.contains("embedded.png"), "Show All lists every row: {after}"); + assert!(after.contains("Location") && after.contains("300 × 200 px"), "Link Info shows the linked image: {after}"); + // An embedded image under Show Embedded keeps the filter. + app.run("select.set", json!({"ids": [embedded]})).unwrap(); + click_menu_item(&mut app, &ctx, "Show Link Info", 5.0); + click_menu_item(&mut app, &ctx, "Show Embedded", 6.0); + super::links::show_selected_image(&mut app, &ctx); + assert!(crate::panel_docking::visible(&app.ui, super::links::ID), "an open panel stays open"); + let embedded_only = text(&mut app, 7.0); + assert!(embedded_only.contains("embedded.png") && !embedded_only.contains("linked.png"), "Show Embedded stays: {embedded_only}"); + assert!(embedded_only.contains("Effective PPI"), "Link Info shows the embedded image: {embedded_only}"); +} + +/// Opening the panel on the selected image scrolls the list to the image's row when it is out of +/// view. +#[test] +fn opening_the_panel_on_the_selected_image_scrolls_to_its_row() { + let dir = Folder::new("show-selected-scroll"); + let mut app = VectorcraftApp::new(Session::new(), Default::default()); + app.run("file.new", json!({"width": 400, "height": 300})).unwrap(); + // The panel lists the image placed first last, below the list's view. + let mut first = None; + for i in 0..20 { + let path = dir.file(&format!("img{i:02}.png"), &png(10, 10)); + let id = app.run("file.place", json!({"path": path, "at": [10 + 15 * i, 100]})).unwrap()["ids"][0].as_u64().unwrap(); + first.get_or_insert(id); + } + app.run("select.set", json!({"ids": [first]})).unwrap(); + let ctx = egui::Context::default(); + crate::theme::install_fonts(&ctx); + // How many times the first image's name is drawn: its row while in view, and Link Info. + let drawn = |app: &mut VectorcraftApp, time: f64| { + let raw = egui::RawInput { time: Some(time), ..Default::default() }; + let texts = super::tests_appearance::frame_raw(&ctx, app, raw, super::links::show); + texts.iter().filter(|(t, _)| t == "img00.png").count() + }; + let before = drawn(&mut app, 1.0); + assert_eq!(drawn(&mut app, 2.0), before, "the list stays at the top"); + super::links::show_selected_image(&mut app, &ctx); + // The list scrolls over the frames after the one that asks. + for time in [3.0, 4.0, 5.0] { + drawn(&mut app, time); + } + assert_eq!(drawn(&mut app, 6.0), before + 1, "the row scrolled into view"); +} + /// Copy Info copies the file names of the selected links, or of `ids` in the order given, one per /// line; it is off with nothing selected, and a bad `ids` leaves the clipboard as it was. #[test] diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index ef83de54ad..6fdd63b890 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -2133,6 +2133,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - Missing linked files can be looked for in a folder and its subfolders: Find in Folder… in the Linked File Not Found dialog and in the Links panel menu lists the files with each one's name, those with the size and contents saved with the link first, and relinks the files chosen, copying an image's file into the document's folder when asked, without replacing a file there (`links.findFiles`, `links.relink {copy}`). In the Links panel it looks for the selected linked files when any are selected. - The Links panel's Relink… opens a Relink dialog whose Replace menu picks which links take the new file: Selected Instances (the selected images, as before), All Instances (every image linked to the same file), Missing Links from This Folder (then every other missing link whose file name is in the new file's folder) and Each Link Separately (a file for each selected link in turn). Each relinks as one undo step (`links.relink {scope}`, `ui.relinkDialog`). Relink to Folder… stays as it is. - The Links panel menu's Copy Info ([Links panel](https://helpx.adobe.com/illustrator/desktop/add-and-import-files/import-from-other-apps/links-panel-in-illustrator.html)) copies the selected link's file name to the clipboard (`links.copyInfo`). VectorCraft's own rules: with several rows selected it copies one name per line in the order the panel shows them, an embedded image gives the name its row shows, and the item is off with no row selected. + - With one image selected, the Control bar's object label, Linked File or Embedded, is an underlined link, and a click on it opens the Links panel wherever it is docked, scrolls the list to the image's row, which shows selected, and shows the image's details in Link Info. The help page () describes clicking this label for a selected linked object as a way to open the Links panel. VectorCraft's own rules: the Embedded label opens the panel too, the click opens Link Info when it was closed and scrolls the list to the row, and a Show filter that leaves out the image's row goes back to Show All; the panel's sort, thumbnail size and other options stay as they were (`the_linked_file_and_embedded_labels_open_the_links_panel`, `opening_the_panel_on_the_selected_image_shows_its_row_and_link_info`, `opening_the_panel_on_the_selected_image_scrolls_to_its_row`). - Linked files inside symbols, graph designs, patterns and opacity masks are saved with their paths relative to the document, as linked files in the layers are, so they are found after the document and its files move to another folder together; on open each of those links takes the path where its file was found. Update Links, and opening with Update Links: Automatically, read a modified file again for that art too, and saving a document refreshes its placed copies inside symbols and patterns of the other open documents. Evidence: `links_outside_the_layers_find_their_files_after_the_folder_moves`, `update_links_reads_files_again_inside_symbols_patterns_and_masks`, `saving_a_document_refreshes_its_placed_copies_inside_symbols_and_patterns`. - A linked file that is missing when a moved document is saved keeps the folder its relative path names, instead of a relative path worked out from the out-of-date absolute path, also for a `.ai` file another app wrote (such as `src/`), so the file is found once it is back in that folder. Evidence: `a_missing_link_keeps_its_relative_path_when_the_moved_document_is_saved`, `links_of_an_imported_file_are_found_by_their_relative_folder`, `a_missing_link_of_a_moved_document_keeps_its_relative_place`. - On Windows, a document opened from a mapped network drive finds its links stored with the share's own path (`\\server\share\…`), as the same document opened from the share does; links on other computers stay missing. From 9c364510e9249082a3cf1335e1ccc18cb8fd835a Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Tue, 17 Nov 2026 19:32:03 -0800 Subject: [PATCH 35/78] PSD import: knockouts that change nothing below them leave the layers apart A shallow knockout at 0 opacity, or at 0 fill over layers that are all transparent, is no longer merged with the layers below it, so hidden layers below it come in with hiddenLayers. A hidden knockout at 0 opacity, or with nothing visible below it, comes in with hiddenLayers instead of being left out. The count of hidden layers left out no longer includes hidden layers that came in after a group was drawn for a knockout or a clip that wasn't made. docs/mcp.md describes the knockouts document.open applies. --- crates/engine/src/cmd/fileio/psdlayers.rs | 35 ++++++++-- .../engine/src/cmd/fileio/tests_psdlayers.rs | 68 +++++++++++++++++++ docs/mcp.md | 14 +++- docs/target-app-parity.md | 2 +- 4 files changed, 108 insertions(+), 11 deletions(-) diff --git a/crates/engine/src/cmd/fileio/psdlayers.rs b/crates/engine/src/cmd/fileio/psdlayers.rs index c2f0dd5ff2..4c3e05cb48 100644 --- a/crates/engine/src/cmd/fileio/psdlayers.rs +++ b/crates/engine/src/cmd/fileio/psdlayers.rs @@ -677,7 +677,8 @@ enum Level { enum Knocked { /// The merged canvas. Merged(Canvas), - /// Nothing below it draws, or it draws nothing: it comes in as a layer of its own. + /// Nothing below it draws, it draws nothing, or what is below it and the merge are both + /// transparent: it comes in as a layer of its own. Nothing, /// The canvases would need more memory than allowed. TooLarge, @@ -834,6 +835,9 @@ struct Builder<'a, F> { unclipped: Vec, /// Those records, in the order they were counted. unclip_log: Vec, + /// The records that came in as layers of the document (hidden ones too, with `hidden`): not left + /// out, though a drawing for a merge that wasn't made counted them. + kept: Vec, /// Bytes of layer and mask pixels decoded, and of canvases the merges made, so far. spent: Cell, /// The layers whose pixels were read so far (each time they were). @@ -1162,7 +1166,8 @@ impl [f32; 3]> Builder<'_, F> { /// applies? Only a layer or group in a group, neither clipped nor a base of clipped layers, does; /// in a pass-through group, only when it and the visible units below it are in the Normal mode, so /// that none of them blends with what is below the group. Any other knockout is counted as not - /// applied. + /// applied. One at 0 opacity, or with no visible unit below it, changes nothing below it: it needs + /// no merge, and a hidden one isn't left out for it. fn knocks(&mut self, u: &Unit<'_>, below: &[Unit<'_>], level: Level) -> Result { let rec = self.record(u.record)?; if rec.knockout == 0 { @@ -1171,10 +1176,12 @@ impl [f32; 3]> Builder<'_, F> { let normal = |u: &Unit<'_>| u.blend == Blend::Mode(BlendMode::Normal); let blends_out = level == Level::Pass && !(normal(u) && below.iter().filter(|b| b.visible).all(normal)); let applies = rec.knockout == 1 && level != Level::Top && !blends_out && !rec.clipped && !u.base && !matches!(u.body, Body::Merged(_)); + // Its fill opacity isn't checked: at 0 fill it still clears what is below it. + let changes = rec.opacity > 0.0 && below.iter().any(|b| b.visible); if !applies { self.unknock(u.record); } - Ok(applies) + Ok(applies && changes) } /// Count record `i` as a hidden layer left out (once). @@ -1240,7 +1247,8 @@ impl [f32; 3]> Builder<'_, F> { } continue; } - // Nothing below it, or nothing of its own, to knock out: it comes in as a layer. + // Nothing below it, or nothing of its own, to knock out: it comes in as a layer, + // with the hidden layers its drawing left out (see `kept`). Knocked::Nothing => {} Knocked::TooLarge => { self.restore(saved); @@ -1390,9 +1398,6 @@ impl [f32; 3]> Builder<'_, F> { /// backdrop) and `top` is drawn there at its fill opacity; its opacity then fades all of that /// back toward the units below as they were. Its layer mask shapes the cut. fn knock(&mut self, below: &[Unit<'_>], top: &Unit<'_>) -> Result { - if !below.iter().any(|u| u.visible) { - return Ok(Knocked::Nothing); - } let (fill, opacity) = { let rec = self.record(top.record)?; (rec.fill, rec.opacity) @@ -1422,9 +1427,19 @@ impl [f32; 3]> Builder<'_, F> { if acc.is_none() { return Ok(Knocked::Nothing); } + let clear = |c: &Canvas| c.px.iter().all(|p| p[3] <= 0.0); + let below_clear = acc.as_ref().is_some_and(clear); + // Nothing below to cut, and nothing of its own drawn at 0 fill: no canvas for the merge is needed. + if below_clear && fill <= 0.0 { + return Ok(Knocked::Nothing); + } if !knock_onto(&mut acc, &k, top.blend, fill, opacity, top.record, self.room(), &|n| self.spend(n))? { return Ok(Knocked::TooLarge); } + // Nothing below to cut, and nothing of its own drawn at its fill opacity. + if below_clear && acc.as_ref().is_none_or(clear) { + return Ok(Knocked::Nothing); + } Ok(acc.map_or(Knocked::Nothing, Knocked::Merged)) } @@ -1604,6 +1619,9 @@ impl [f32; 3]> Builder<'_, F> { /// The layer of the document unit `u` becomes; `None` for a layer that draws nothing (an /// adjustment layer, or one without pixels). fn node(&mut self, u: Unit<'_>) -> Result, String> { + if let Some(k) = self.kept.get_mut(u.record) { + *k = true; + } let children = match &u.body { Body::Layer(i) => match self.image(*i)? { Some((left, top, img)) => vec![Arc::new(self.image_node(&u.name, left, top, img)?)], @@ -1861,6 +1879,7 @@ pub(super) fn import( clipped_out_log: vec![], unclipped: vec![false; records.len()], unclip_log: vec![], + kept: vec![false; records.len()], spent: Cell::new(0), painted: Cell::new(0), blank: vec![None; records.len()], @@ -1868,6 +1887,8 @@ pub(super) fn import( blank_log: vec![], }; let layers = b.list(&items, Level::Top)?; + // A drawing for a knockout or a clip leaves hidden layers out; those that came in anyway aren't. + b.notes.hidden = b.skipped.iter().zip(&b.kept).filter(|&(s, k)| *s && !*k).count(); let Builder { mut doc, notes, .. } = b; if !layers.is_empty() { doc.layers = layers; diff --git a/crates/engine/src/cmd/fileio/tests_psdlayers.rs b/crates/engine/src/cmd/fileio/tests_psdlayers.rs index 6c2f8b8ff2..6324ffcce5 100644 --- a/crates/engine/src/cmd/fileio/tests_psdlayers.rs +++ b/crates/engine/src/cmd/fileio/tests_psdlayers.rs @@ -752,6 +752,74 @@ fn knockouts_that_arent_applied_are_said() { assert_eq!(r["warnings"], json!([]), "{r}"); } +/// A knockout that changes nothing below it leaves the layers apart, hidden ones included: one at 0 +/// opacity, and one at 0 fill over layers that are transparent. At 0 fill over painted layers, and +/// at a fill over transparent ones, it still merges. A knockout at 0 fill over a transparent layer +/// stays apart without a warning when their merge would need more memory than allowed. +#[test] +fn knockouts_that_change_nothing_keep_the_layers_apart() { + let cms = |c: [f32; 4]| [c[0], c[1], c[2]]; + let layers = [ + group_end(), + layer("Lower", [0, 0, 2, 2], [255, 0, 0, 0]), + knockout(layer("Cut", [2, 2, 4, 4], [0, 0, 255, 255]), 1, 0), + group("Group", b"norm"), + ]; + // The two 2 × 2 layers drawn together fit 256 bytes, but not the 4 × 4 canvas covering both. + let (doc, warnings) = psdlayers::import(&file(4, 4, &layers, 8, false, false), false, 256, cms).unwrap().unwrap(); + assert_eq!(doc.layers[0].children().unwrap().iter().map(|c| name(c)).collect::>(), ["Lower", "Cut"]); + assert!(warnings.is_empty(), "{warnings:?}"); + let lower = |alpha: u8| layer("Lower", [0, 0, 4, 4], [255, 0, 0, alpha]); + let hidden = L { hidden: true, ..layer("Hidden", [0, 0, 4, 4], [0, 255, 0, 255]) }; + let cut = |fill: u8, opacity: u8| knockout(L { opacity, ..layer("Cut", [0, 0, 2, 2], [0, 0, 255, 255]) }, 1, fill); + let inner = |s: &Session| s.doc().unwrap().doc.layers[0].children().map_or(vec![], |c| c.iter().map(|l| name(l).to_string()).collect::>()); + for (alpha, fill, opacity, apart) in [(255, 0, 0, true), (0, 0, 255, true), (255, 0, 255, false), (0, 128, 255, false)] { + let layers = [group_end(), lower(alpha), hidden.clone(), cut(fill, opacity), group("Group", b"norm")]; + let (s, r) = open(&file(4, 4, &layers, 8, false, false), json!({"hiddenLayers": true})); + let (names, warnings) = if apart { (vec!["Lower", "Hidden", "Cut"], json!([])) } else { (vec!["Lower + Cut"], json!([HIDDEN_1])) }; + assert_eq!((inner(&s), &r["warnings"]), (names.iter().map(|n| n.to_string()).collect(), &warnings), "{alpha} {fill} {opacity}: {r}"); + } + // A hidden knockout that needs no merge comes in with hidden layers: at 0 opacity, and with + // nothing below it in its group. + let hidden_cut = |opacity: u8| L { hidden: true, ..cut(0, opacity) }; + for (layers, names) in [ + (vec![group_end(), lower(255), hidden_cut(0), group("Group", b"norm")], vec!["Lower", "Cut"]), + (vec![group_end(), hidden_cut(255), group("Group", b"norm")], vec!["Cut"]), + ] { + let (s, r) = open(&file(4, 4, &layers, 8, false, false), json!({"hiddenLayers": true})); + assert_eq!((inner(&s), &r["warnings"]), (names.iter().map(|n| n.to_string()).collect(), &json!([])), "{r}"); + } +} + +/// With hidden layers asked for, the hidden layers of a group drawn for a knockout or a clip that +/// isn't made come in, and aren't counted as left out: a knockout group over a layer that stores no +/// pixels, and a clipped group whose merge needs more memory than allowed. +#[test] +fn hidden_layers_of_a_group_drawn_for_a_merge_not_made_come_in() { + let cms = |c: [f32; 4]| [c[0], c[1], c[2]]; + let children = |l: &Node| l.children().map_or(vec![], |c| c.iter().map(|l| (name(l).to_string(), l.visible)).collect::>()); + let shown_and_hidden = + || [group_end(), layer("Shown", [0, 0, 2, 2], [0, 0, 255, 255]), L { hidden: true, ..layer("Hidden", [2, 2, 4, 4], [0, 255, 0, 255]) }]; + let both = vec![("Shown".to_string(), true), ("Hidden".to_string(), false)]; + // A knockout group over a layer that stores no pixels. + let mut layers = vec![group_end(), L { bare: true, ..layer("Lower", [0, 0, 2, 2], [0; 4]) }]; + layers.extend(shown_and_hidden()); + layers.extend([knockout(group("Cut", b"norm"), 1, 255), group("Group", b"norm")]); + let (s, r) = open(&file(4, 4, &layers, 8, false, false), json!({"hiddenLayers": true})); + let d = &s.doc().unwrap().doc; + let cut = &d.layers[0].children().unwrap()[0]; + assert_eq!((name(cut), children(cut), &r["warnings"]), ("Cut", both.clone(), &json!([])), "{r}"); + // A clipped group whose merge with its base doesn't fit 320 bytes. + let mut layers = vec![layer("Base", [0, 0, 2, 2], [255, 0, 0, 255])]; + layers.extend(shown_and_hidden()); + layers[2].rect = [0, 0, 4, 4]; + layers.push(L { clipped: true, ..group("Clipped", b"norm") }); + let (doc, warnings) = psdlayers::import(&file(4, 4, &layers, 8, false, false), true, 320, cms).unwrap().unwrap(); + let clipped = &doc.layers[1]; + assert_eq!((name(clipped), children(clipped)), ("Clipped", both), "{warnings:?}"); + assert_eq!(warnings, ["1 layer clipped to the layer below came in unclipped: the merge needs more memory than allowed"]); +} + /// A knockout's merge whose canvases would need more memory than allowed leaves the layers apart, /// with a warning. #[test] diff --git a/docs/mcp.md b/docs/mcp.md index 4c1b661f42..06fc2fe242 100644 --- a/docs/mcp.md +++ b/docs/mcp.md @@ -9312,8 +9312,8 @@ clipping mask into one layer and discards hidden layers that require merging; th imports one image, and Import Hidden Layers brings hidden layers in. `document.open` does the same, with `layers: false` for the single image and `hiddenLayers: true` for the hidden layers. The page also merges adjustment layers, layers with a knockout option, and layers that hold transparent pixels in some blend modes with -the layers below them. `document.open` applies neither adjustments nor knockouts, and it merges a layer by its blend -mode alone, as the rules below say. +the layers below them. `document.open` does not apply adjustments, applies only shallow knockouts inside groups, and +otherwise merges a layer by its blend mode alone, as the rules below say. The rest are VectorCraft's own rules: @@ -9333,6 +9333,12 @@ The rest are VectorCraft's own rules: mask. - A Dissolve layer's partly transparent pixels are merged as opaque or transparent, opaque at the share of its pixels their transparency gives, in a fixed pattern that differs from layer to layer. +- A layer or group inside a group with a Knockout value of 1 (shallow) is merged with the visible layers below it + in that group: where it has pixels, shaped by its layer mask, they are cleared to transparency, it is drawn there + at its fill opacity, and its opacity fades the result back toward them. In a Pass Through group this applies only + when it and the visible layers below it are in Normal mode. A knockout at 0 opacity, one that draws nothing, one + with nothing visible below it, and one at 0 fill over layers that are all transparent are not merged for the + knockout; one in a mode VectorCraft lacks is still merged by its mode. - A merged layer is named after the layers it holds, joined with ` + `. - A layer name the file stores only as a one-byte Pascal string, without its Unicode name, is read as Mac Roman. - A layer's opacity is multiplied by its fill opacity, in every blend mode. A layer that others are clipped to keeps @@ -9344,7 +9350,9 @@ The rest are VectorCraft's own rules: (RGB, CMYK, Grayscale, Lab or HSB) over the canvas. One whose shape is a vector mask isn't drawn, and the layers clipped to it are left out. - Adjustment layers, fill layers that store no pixels and whose fill isn't read, layer effects that are switched on, - knockouts and vector masks are not applied; the `warnings` count them. + the other knockouts (top-level layers, clipped layers, layers that others are clipped to, Pass Through groups with + layers in other modes, other Knockout values, and merges that need more memory than allowed) and vector masks are + not applied; the `warnings` count them. - Layer channels may be raw, PackBits or zipped (with or without prediction) at 8, 16 and 32 bits. - A file without layers opens as its merged image. A file whose layers can't be read opens as its merged image with a warning, and when the merged image can't be read either, the file is refused with an error. diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index e4bbf9dbbb..36b53e6f6f 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -2040,7 +2040,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur EPS export and EPS Save make each file's PNG thumbnail from its TIFF preview, averaging the preview's pixels down to the thumbnail's size on white, instead of drawing the document a second time; a file without a preview still draws its thumbnail (`crates/engine/src/cmd/fileio/tests_eps.rs`). - Targa files (`.tga`, `.vda`, `.icb`, `.vst`) open, place linked or embedded, relink and update at their pixel size: color-mapped, true-color and black-and-white, raw or run-length encoded, in any of the four row orders. The image descriptor's attribute bits and the extension area's Attributes Type decide the transparency: a file with no attribute bits, or with attribute data the Attributes Type calls undefined, opens opaque; with one bit, a 16-bit true-color pixel takes that bit as its alpha, and a color-mapped pixel takes the bit of the 16-bit color map entry it indexes; premultiplied colors are divided by their alpha. Open and Place recognize a Targa file by its extension, and `clipboard.importImage` and Glass's Load Texture… by its header; a Targa file copied in a file manager pastes as a bitmap (`crates/engine/src/cmd/fileio/tests_tiffbmp.rs`, `crates/engine/src/tests/links.rs`). - BMP files named `.dib` or `.rle` (run-length encoded bitmaps included), Photoshop files named `.pdd` and PNG files named `.pns` open and place, linked or embedded, as BMP, PSD and PNG files, in any letter case: the Open and Place dialogs list them with their format, the Links panel names their format, and Edit Original opens them. Exports write only `.bmp`, `.psd` and `.png` (`crates/engine/src/cmd/fileio/tests_tiffbmp.rs`, `crates/engine/src/cmd/fileio/tests_psdread.rs`, `crates/engine/src/tests/links.rs`). - - File › Open converts a PSD or PSB file's layers to objects, keeping the layer structure, merging clipped layers into one layer, merging a layer that uses a Knockout option with the layers below it, and leaving out hidden layers that would need a merge, as [PSD import options](https://helpx.adobe.com/illustrator/desktop/add-and-import-files/import-from-other-apps/photoshop-import-options.html) describes for the option that converts layers to objects; hidden layers come in with `hiddenLayers`, as Import Hidden Layers brings them in, and `layers: false` opens the merged image. VectorCraft's own rules: each layer becomes a layer holding its pixels with its name, visibility, opacity and blend mode, groups become layers of sublayers, layers in Dissolve, Linear Burn, Linear Dodge, Vivid Light, Linear Light, Pin Light, Hard Mix, Subtract, Divide, Darker Color and Lighter Color are merged with the layers below, layer masks become opacity masks, fill opacity multiplies the opacity (in a layer that others are clipped to, it fades only that layer's own pixels), a Knockout value of 1 is read as a shallow knockout and applied to a layer or group inside a group, which is merged with the layers below it in that group (its pixels clear them to transparency, it is drawn there at its fill opacity, and its opacity fades the result; in a pass-through group only when it and the layers below it are in the Normal mode), and adjustment layers, layer effects, vector masks and the other knockouts (top-level layers, clipped layers, layers that others are clipped to, pass-through groups with layers in other modes, other Knockout values) aren't applied and are counted in the warnings. 8-, 16- and 32-bit files, PSB, raw, PackBits and zipped channels (`crates/engine/src/cmd/fileio/tests_psdlayers.rs`). + - File › Open converts a PSD or PSB file's layers to objects, keeping the layer structure, merging clipped layers into one layer, merging a layer that uses a Knockout option with the layers below it, and leaving out hidden layers that would need a merge, as [PSD import options](https://helpx.adobe.com/illustrator/desktop/add-and-import-files/import-from-other-apps/photoshop-import-options.html) describes for the option that converts layers to objects; hidden layers come in with `hiddenLayers`, as Import Hidden Layers brings them in, and `layers: false` opens the merged image. VectorCraft's own rules: each layer becomes a layer holding its pixels with its name, visibility, opacity and blend mode, groups become layers of sublayers, layers in Dissolve, Linear Burn, Linear Dodge, Vivid Light, Linear Light, Pin Light, Hard Mix, Subtract, Divide, Darker Color and Lighter Color are merged with the layers below, layer masks become opacity masks, fill opacity multiplies the opacity (in a layer that others are clipped to, it fades only that layer's own pixels), a Knockout value of 1 is read as a shallow knockout and applied to a layer or group inside a group, which is merged with the layers below it in that group (its pixels clear them to transparency, it is drawn there at its fill opacity, and its opacity fades the result; in a pass-through group only when it and the layers below it are in the Normal mode; a knockout at 0 opacity, or at 0 fill over layers that are all transparent, isn't merged for the knockout), and adjustment layers, layer effects, vector masks and the other knockouts (top-level layers, clipped layers, layers that others are clipped to, pass-through groups with layers in other modes, other Knockout values) aren't applied and are counted in the warnings. 8-, 16- and 32-bit files, PSB, raw, PackBits and zipped channels (`crates/engine/src/cmd/fileio/tests_psdlayers.rs`). - File › Open of a PSD or PSB file with two or more layers, and File › Place of one without Link, show PSD Import Options: Convert Layers to Objects with Import Hidden Layers, or Flatten Layers to a Single Image, the options [PSD import options](https://helpx.adobe.com/illustrator/desktop/add-and-import-files/import-from-other-apps/photoshop-import-options.html) describes for a file that is opened or embedded. A file placed with Link shows its flat image and isn't asked about. `file.place` takes `layers` and `hiddenLayers`, and `document.psdInfo` counts a file's layers without opening it. VectorCraft's own rules: placed layers come in as one group named after the file, a layer as an image and a layer group as a group, at the place the merged image would take and clipped to the canvas when layers reach past it; the dialog asks from two layers up and starts from the choices made last. Layer comps aren't read (`crates/engine/src/cmd/fileio/tests_psdlayers.rs`, `crates/ui-egui/src/dialogs/psd_import.rs`). - A PSD or PSB file's clipping path, the saved path that image resource 2999 names in the [PSD file format specification](https://www.adobe.com/devnet-apps/photoshop/fileformatashtml/), clips its merged image on File › Place and on File › Open of the merged image, as [PSD import options](https://helpx.adobe.com/illustrator/desktop/add-and-import-files/import-from-other-apps/photoshop-import-options.html) describes for a file imported as one flattened image. The image comes in a clip group whose clipping path has no paint and uses the even-odd rule, and the path can be edited or released. `links.update` and `links.relink` give the clip group the clipping path the new file names, or leave a plain group when it names none, and files that name no clipping path come in as before (`crates/engine/src/cmd/fileio/tests_psdread.rs`). - Import Slices: File › Open of a PSD or PSB file with slices, and File › Place of one without Link, bring its slices in as user slices, as [PSD import options](https://helpx.adobe.com/illustrator/desktop/add-and-import-files/import-from-other-apps/photoshop-import-options.html) describes for a file that is opened or embedded; PSD Import Options offers Import Slices for such a file. `document.open` and `file.place` take `importSlices`, and `document.psdInfo` counts the slices. The slices are read from image resource 1050 in version 6 and in the descriptor of versions 7 and 8, as the [Photoshop File Formats Specification](https://www.adobe.com/devnet-apps/photoshop/fileformatashtml/) describes it. VectorCraft's own rules: Import Slices applies to Convert Layers to Objects and to Flatten Layers to a Single Image alike, and makes the dialog ask for a file with fewer than two layers; placed slices move and scale with the art in the same undo step; each slice keeps its name, type, link, target, message, alternative text, cell text and background color; slices the file generated automatically, and slices wholly outside the canvas, are left out; slices that can't be read are left out with a warning while the art comes in; with Show Import Options off, a PSD file is placed with the PSD Import Options chosen last, and on, each PSD file of the place cursor asks for them (`crates/engine/src/cmd/fileio/tests_psdslices.rs`, `crates/ui-egui/src/dialogs/psd_import.rs`). From 4b04d3e905e77e42e300c01a2cb050a26f2b5538 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Tue, 17 Nov 2026 19:42:04 -0800 Subject: [PATCH 36/78] Links: the panel opened from the Control bar label reads its list again The panel keeps its list for two seconds before it looks at the files again. When an image's file changed in that time, for example a deleted file under Show Missing, the label opened the panel on the old list, which lacked the image's row, and the list did not scroll to it. Opening the panel from the label now reads the list again. --- crates/ui-egui/src/panels/links.rs | 5 +++++ crates/ui-egui/src/panels/tests_links.rs | 23 +++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/crates/ui-egui/src/panels/links.rs b/crates/ui-egui/src/panels/links.rs index 7eaf6da8c2..7951595ba0 100644 --- a/crates/ui-egui/src/panels/links.rs +++ b/crates/ui-egui/src/panels/links.rs @@ -96,6 +96,11 @@ pub(crate) fn show_selected_image(app: &mut VectorcraftApp, ctx: &egui::Context) _ => false, }; set_pstate(ctx, "links-scroll-to", first); + // The list drawn next is read after this request, so a row a file change has just brought + // into the Show filter is there to scroll to. + let mut c: Cache = pstate(ctx, "links-cache"); + c.at = f64::NEG_INFINITY; + set_pstate(ctx, "links-cache", c); set_options(ctx, |o| { o.info = true; if hidden { diff --git a/crates/ui-egui/src/panels/tests_links.rs b/crates/ui-egui/src/panels/tests_links.rs index fbee40fbc7..f7e067aeed 100644 --- a/crates/ui-egui/src/panels/tests_links.rs +++ b/crates/ui-egui/src/panels/tests_links.rs @@ -219,6 +219,29 @@ fn opening_the_panel_on_the_selected_image_scrolls_to_its_row() { assert_eq!(drawn(&mut app, 6.0), before + 1, "the row scrolled into view"); } +/// Opening the panel on the selected image draws a list read after the request, so a row that a +/// file change brought into the Show filter since the list was last read is there to scroll to. +#[test] +fn opening_the_panel_on_the_selected_image_reads_the_list_again() { + let dir = Folder::new("show-selected-fresh"); + let (mut app, linked, _) = app(&dir); + let ctx = egui::Context::default(); + crate::theme::install_fonts(&ctx); + // How many times the linked image's name is drawn: its row, and Link Info. + let drawn = |app: &mut VectorcraftApp, time: f64| { + let raw = egui::RawInput { time: Some(time), ..Default::default() }; + let texts = super::tests_appearance::frame_raw(&ctx, app, raw, super::links::show); + texts.iter().filter(|(t, _)| t == "linked.png").count() + }; + app.run("select.set", json!({"ids": [linked]})).unwrap(); + click_menu_item(&mut app, &ctx, "Show Missing", 1.0); + assert_eq!(drawn(&mut app, 2.0), 1, "Link Info only: nothing is missing yet"); + std::fs::remove_file(dir.0.join("linked.png")).unwrap(); + // Within the time the panel keeps its list before it looks at the files again. + super::links::show_selected_image(&mut app, &ctx); + assert_eq!(drawn(&mut app, 2.1), 2, "the missing image's row and its Link Info are drawn"); +} + /// Copy Info copies the file names of the selected links, or of `ids` in the order given, one per /// line; it is off with nothing selected, and a bad `ids` leaves the clipboard as it was. #[test] From 157469f6af49137de4e0f06afce9ad0ec02e1dfc Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Tue, 17 Nov 2026 19:56:29 -0800 Subject: [PATCH 37/78] i18n: the Greek PSD knockout warnings use the catalog's knockout term MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit main now checks that every Greek row naming a knockout says διάτρηση. --- crates/ui-egui/src/i18n/el.tsv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/ui-egui/src/i18n/el.tsv b/crates/ui-egui/src/i18n/el.tsv index acd85f7742..43abb58be7 100644 --- a/crates/ui-egui/src/i18n/el.tsv +++ b/crates/ui-egui/src/i18n/el.tsv @@ -5717,8 +5717,8 @@ variable-list-end {0}, {1} {0} και {1} @msg the layer effects of {n} layers weren't drawn τα εφέ επιπέδου {n} επιπέδων δεν σχεδιάστηκαν @msg the vector masks of 1 layer weren't applied οι διανυσματικές μάσκες 1 επιπέδου δεν εφαρμόστηκαν @msg the vector masks of {n} layers weren't applied οι διανυσματικές μάσκες {n} επιπέδων δεν εφαρμόστηκαν -@msg the knockout of 1 layer wasn't applied η εκκένωση 1 επιπέδου δεν εφαρμόστηκε -@msg the knockout of {n} layers wasn't applied η εκκένωση {n} επιπέδων δεν εφαρμόστηκε +@msg the knockout of 1 layer wasn't applied η διάτρηση 1 επιπέδου δεν εφαρμόστηκε +@msg the knockout of {n} layers wasn't applied η διάτρηση {n} επιπέδων δεν εφαρμόστηκε @msg 1 layer was left out (hidden layers and the layers clipped to them) 1 επίπεδο παραλείφθηκε (κρυφά επίπεδα και τα επίπεδα που αποκόπτονται σε αυτά) @msg {n} layers were left out (hidden layers and the layers clipped to them) {n} επίπεδα παραλείφθηκαν (κρυφά επίπεδα και τα επίπεδα που αποκόπτονται σε αυτά) @msg 1 layer clipped to a fill layer that wasn't drawn was left out 1 επίπεδο που αποκόπτεται σε επίπεδο γεμίσματος που δεν σχεδιάστηκε παραλείφθηκε From 0d5bbd4e1321fbefd3bf51f77640e8bc589a7ab0 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Tue, 17 Nov 2026 22:54:31 -0800 Subject: [PATCH 38/78] Docs: place typo matches above description-only matches Results matched through a typo rank below every other result matched in a name, menu path or id and above results found only by a description. The sentence on order now says only that typo matching leaves the order of results matched without a typo unchanged, since recent picks can still reorder equally matching results. --- docs/target-app-parity.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index 75d325da3c..42759ce468 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -1447,7 +1447,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur A modal window that opens without a press in the window (a dialog opened from the macOS menu bar or by an automation command, the About window, a file dialog, the update prompt, or the progress window of a plug-in, trace or open run) closes the Command Palette, a tool group's flyout, the All Tools drawer and any open menu or popup in the pass it opens. While such a window is open, the palette stays closed, so opening it from the macOS menu bar or by an automation command does not take the keyboard from the window; it opens again once the window closes (`palette` tests `a_dialog_opened_from_the_system_menu_closes_the_palette`, `the_about_window_closes_the_palette`, `a_progress_window_closes_the_palette`, `the_palette_opened_over_a_dialog_closes`, `a_click_on_the_menu_bar_closes_the_palette_before_a_dialog_opens`, `a_dialog_opened_without_a_press_closes_a_flyout`, `a_dialog_opened_without_a_press_closes_the_tools_drawer`, `a_dialog_opened_without_a_press_closes_a_menu`, `the_palette_opened_as_a_dialog_closes_stays_open_until_the_next_dialog`). The Command Palette ranks its results by how well they match. A query that is a result's id lists that result first (`view.goto1` lists Saved View 1 above Saved View 10); then come results whose name is the query, results whose name without its menu path starts with it, and results whose initials it is ("ea" finds Export As…). Within each of those, a result where every word of the query is a whole word of its name ranks above one where a word only starts a word of the name, then one where it is a word of the menu that holds it, then of its id, then text inside a word, so a query that is a menu's title ("object") lists results named with that word above the items of that menu. A tool ranks above a menu command, panel, effect or filter plug-in that matches as well, so "rect" lists the Rectangle Tool above Effect › Convert to Shape › Rectangle…, and of two results of the same kind the shorter name comes first. Words of the menu bar item that runs a result also find it, the item's own label included ("exit" finds Quit VectorCraft, which File › Exit runs); with the native macOS menu bar, the items that bar moves into its application menu are found under it (Preferences… under Settings). Every result the earlier search found is still found, and the highlight stays on its result when a plug-in is installed, a shortcut changes or the language changes while the palette is open (`palette::search` tests `a_better_word_grade_ranks_first`, `a_better_whole_query_tier_ranks_first`, `kind_and_length_never_lift_a_worse_grade`, `a_menu_title_does_not_lift_its_items`, `common_queries_list_the_command_near_the_top`, `every_result_is_found_first_by_its_name_and_its_id`, `every_result_found_before_is_still_found_and_shown`, `results_know_their_place_in_the_menu_bar`, `native_homes_follow_the_native_application_menu`; `palette` test `the_highlight_stays_on_its_result_when_the_results_change`). A Command Palette query word in an English plural or verb form finds a result whose English name or menu path holds the base word: "rounded corners" lists Effect › Stylize › Round Corners… first, and "scaling" finds Object › Transform › Scale…. The search drops `'s`; `es` after `s`, `x`, `z`, `ch` or `sh` (also trying the word with only its `s` dropped, so "rasterizes" finds Rasterize…); a final `s` in words of more than 3 letters, except after `ss`, `us` or `is`; `ing` in words of more than 5 letters and `ed` in words of more than 4. After `ing` or `ed`, a doubled `b`, `d`, `g`, `m`, `n`, `p`, `r` or `t` is tried both single and doubled, the single letter only when at least 3 letters are left ("cutting" meets Cut, "added" meets Add); otherwise the word is also tried with an `e` ("scaling" meets Scale…). It turns `ies` into `y` or `ie` in words of more than 5 letters and `sses` into `ss`, and leaves `series` and `species` as they are. Among results that the whole query matches the same way (as an id, as a label, at the start of a label, as initials, or none of these), a result whose name holds the base word of a query word ranks below one that holds the query word whole and above one where the query word only starts a word of the name, so "scale zz" lists a name with "Zz Scaling" above one with "Zz Scalers". "scale" alone still lists "Scalers" above "Scaling", because "Scalers" starts with the query. A partly typed word that is not itself a word of any result ("scal") does not meet a base word. Names shown in other languages and ids are not changed this way, and every result found before is still found (`palette::search` tests `plurals_and_verb_forms_meet_their_base_word`, `a_plural_or_verb_form_finds_the_result`, `a_better_word_grade_ranks_first`, `a_partly_typed_word_does_not_lift_a_verb_form`, `a_whole_query_tier_comes_before_a_stem_form`, `results_matched_without_a_stem_keep_their_order`). - A Command Palette query word with a typo still finds the result: "gruop" lists Object › Group first, and "eyedroper", "rectange" and "elipse" list the same first results as the words spelled right, the Eyedropper, Rectangle and Ellipse tools among them. When a query word of 4 or more letters is not a word, a base word or the start of a word of any result's name, menu path or id, the search compares it with the words of result names and menu paths, and a word 1 edit away (2 for a query word of 8 or more letters) matches; a letter added, left out or changed, or two letters next to each other swapped, is one edit. A query word meets at most the 32 nearest such words. Results matched through a typo come after every result the query matches without one, and among them the query is read with the misspelled word replaced by the word it meets, so they come in the order the word spelled right gives; then a result whose label holds the word comes before one whose menu path holds it. Ids, and query words and result words with Chinese, Japanese or Korean letters, are not compared this way, and results without typos keep their order (`palette::search` tests `edits_are_counted_up_to_a_bound`, `a_word_with_a_typo_finds_the_result`, `a_typo_meets_at_most_32_words`, `misspelled_words_find_the_command`). + A Command Palette query word with a typo still finds the result: "gruop" lists Object › Group first, and "eyedroper", "rectange" and "elipse" list the same first results as the words spelled right, the Eyedropper, Rectangle and Ellipse tools among them. When a query word of 4 or more letters is not a word, a base word or the start of a word of any result's name, menu path or id, the search compares it with the words of result names and menu paths, and a word 1 edit away (2 for a query word of 8 or more letters) matches; a letter added, left out or changed, or two letters next to each other swapped, is one edit. A query word meets at most the 32 nearest such words. Results matched through a typo come after every other result the query matches in a name, menu path or id, and before results found only by a description (below); among them the query is read with the misspelled word replaced by the word it meets, so they come in the order the word spelled right gives; then a result whose label holds the word comes before one whose menu path holds it. Ids, and query words and result words with Chinese, Japanese or Korean letters, are not compared this way, and matching through a typo does not change the order of the results matched without one (`palette::search` tests `edits_are_counted_up_to_a_bound`, `a_word_with_a_typo_finds_the_result`, `a_typo_meets_at_most_32_words`, `misspelled_words_find_the_command`). A Command Palette query word also finds a result whose name or menu path holds a word with the same meaning: "remove bg" lists Remove Background… first, "outline text" lists Type › Create Outlines first, and "flip", "combine", "vectorize" and "colour" list Reflect…, Unite, an Image Trace command and the Color panel among the first 3 results. The words come from VectorCraft's own table of 21 groups of English words (`palette/words.rs`, at most 60 groups of at most 6 words); a word that is the whole label of another command, such as Merge or Mirror, is in no group, and neither is Insert. A word or its English base word that is in a group meets the other words of its group in labels and menu paths, and their base words, but not ids or word starts. A result whose label holds the word itself ranks above one whose label holds a word with the same meaning, which ranks above one whose menu path holds the word, so "type" now lists Scale Text Attributes above Type › Orientation › Vertical. A catalog may add a group's words in its language with a row in the `search` context (the group's English words joined by ", ", then that language's words), used while that language is the UI language; no catalog has to have these rows (`palette::search` tests `a_word_with_the_same_meaning_finds_the_result`, `a_catalog_row_adds_words_to_a_group`, `words_with_the_same_meaning_find_the_command`; `palette::words` tests; `i18n` test `search_rows_name_a_group_and_add_single_words`). The Command Palette ranks the commands listed in Recent Commands first among the results that match a query as well as they do, the most recent first, and below every result that matches it better: after a pick of Effect › Convert to Shape › Rectangle…, "rect" lists it above the Rectangle Tool, so Enter runs it again. A recent pick ranks after the whole-query match, the word grades and the matches through a typo, a description or a word with the same meaning, and before the kind of result and the name's length. The ranking uses the list Recent Commands shows. This is VectorCraft's own behavior (`palette::search` test `a_recent_pick_ranks_first_within_its_grades`; `palette` tests `a_recent_pick_ranks_first_among_results_that_match_as_well`, `the_kept_ranking_follows_the_recent_picks`). A Command Palette query word also finds a command by what the command's description says: "transparent background" lists Remove Background… among the first 3 results, and "png" lists it after every result with "png" in its name or menu path. The description is the command's params text (an engine or plug-in command's, a UI command's, or an effect's) without each `{…}` group that is not inside a `{`, `[` or `(` group, without each such `[…]` or `(…)` group just after a `→`, and without the `→` before a removed group, cut to its first 300 characters at the end of a word. The words of a schema ("corners" for Remove Background…) and of a result written as a group do not find the command; a result written as words after a `→` stays in the description. Words of 2 characters or fewer, words with no letter, and "the", "and", "ids", "true", "false" and "null" are left out. A query word that is a word of a description, shares an English base word with one, starts one or has the same meaning as one finds the result, and such a result ranks below every result that the query matches in its name, menu path or id, as text inside a word or through a typo. Descriptions are English only, and a typo does not match them. Tools, panels and filter plug-ins have no description (`palette::search` tests `a_description_leaves_out_the_schema_and_the_result`, `a_word_of_the_description_finds_the_result`, `a_description_match_ranks_below_a_typo`, `words_of_a_description_find_the_command`). From eea9c10bc3d7259212797c1370ad23c54b464129 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Wed, 18 Nov 2026 06:08:53 -0800 Subject: [PATCH 39/78] Plug-ins: object.pattern.replaceArt joins the reviewed commands Plug-ins may call object.pattern.replaceArt like the other pattern commands, and every_command_is_reviewed passes again. --- crates/engine/src/cmd/plugin_call/reviewed.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/crates/engine/src/cmd/plugin_call/reviewed.rs b/crates/engine/src/cmd/plugin_call/reviewed.rs index 6a0caf4cd6..edbfc84518 100644 --- a/crates/engine/src/cmd/plugin_call/reviewed.rs +++ b/crates/engine/src/cmd/plugin_call/reviewed.rs @@ -354,6 +354,7 @@ pub(super) const ALLOWED: &[&str] = &[ "object.pattern.done", "object.pattern.edit", "object.pattern.make", + "object.pattern.replaceArt", "object.puppetWarp", "object.puppetWarp.pins", "object.rasterize", From a6d4729bf246c0645a1a809abb249ed45d395a3f Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Wed, 18 Nov 2026 06:49:40 -0800 Subject: [PATCH 40/78] PSD import: knockouts that cut no paint stay apart, and failed merges keep room to read the layers - A knockout at 0 fill whose pixels cover none of the painted pixels below it is no longer merged with them. - A hidden knockout is left out only when its merge would be made or is too large, so one whose layer mask hides all of it comes in with hiddenLayers. What drawing it counted is forgotten when it is left out. - The pixels and canvases of a merge that isn't made are counted against a separate limit of the same size, so the layers can still be read apart afterward. - docs: the memory-limit fallback for knockouts is listed with the knockouts that aren't applied. --- crates/engine/src/cmd/fileio/psdlayers.rs | 125 ++++++++++++++---- .../engine/src/cmd/fileio/tests_psdlayers.rs | 74 +++++++++-- docs/mcp.md | 9 +- docs/target-app-parity.md | 2 +- 4 files changed, 163 insertions(+), 47 deletions(-) diff --git a/crates/engine/src/cmd/fileio/psdlayers.rs b/crates/engine/src/cmd/fileio/psdlayers.rs index 4c3e05cb48..598f75ff04 100644 --- a/crates/engine/src/cmd/fileio/psdlayers.rs +++ b/crates/engine/src/cmd/fileio/psdlayers.rs @@ -31,19 +31,20 @@ //! when it and the visible layers below it are in the Normal mode. When a merge's canvases would need more //! memory than allowed, the layer comes in alone: in the Normal mode, unclipped, or without its //! knockout. Hidden layers are left out unless `hidden` asks for them. A hidden layer that would need -//! a merge (one in a mode VectorCraft lacks, one with a knockout in a group, one that layers are -//! clipped to, one clipped to another, or one below a merged layer) is always left out, with the -//! layers clipped to it. Adjustment layers, fill layers that store no pixels and whose fill isn't read -//! or whose shape is a vector mask, layer effects that are switched on, vector masks, and the -//! knockouts of top-level layers, of clipped layers, of layers that others are clipped to and of -//! layers in a pass-through group with a layer in another mode, and other Knockout values, aren't -//! applied; the warnings count them and the hidden layers left out. +//! a merge (one in a mode VectorCraft lacks, one with a knockout in a group that changes the layers +//! below it, one that layers are clipped to, one clipped to another, or one below a merged layer) is +//! always left out, with the layers clipped to it. Adjustment layers, fill layers that store no +//! pixels and whose fill isn't read or whose shape is a vector mask, layer effects that are switched +//! on, vector masks, and the knockouts of top-level layers, of clipped layers, of layers that others +//! are clipped to and of layers in a pass-through group with a layer in another mode, and other +//! Knockout values, aren't applied; the warnings count them and the hidden layers left out. //! //! The file is untrusted: every count, length and size is checked before anything is allocated, //! groups nest at most [`MAX_DEPTH`] deep (layers deeper than a document may nest merge into the //! group around them, with a warning), each layer's pixels, like the canvases one step of a //! merge holds together, must fit the memory allowed, and all the pixels decoded and the canvases -//! the merges make must fit [`TOTAL_DECODED`] times that. +//! the merges make must fit [`TOTAL_DECODED`] times that. What the merges that can't be made, or +//! that a hidden layer would need, decoded and made is counted apart, against the same limit. use std::cell::Cell; use std::sync::Arc; @@ -677,8 +678,8 @@ enum Level { enum Knocked { /// The merged canvas. Merged(Canvas), - /// Nothing below it draws, it draws nothing, or what is below it and the merge are both - /// transparent: it comes in as a layer of its own. + /// Nothing below it draws, it draws nothing, it is at 0 fill and cuts no painted pixel below + /// it, or what is below it and the merge are both transparent: it comes in as a layer of its own. Nothing, /// The canvases would need more memory than allowed. TooLarge, @@ -717,6 +718,8 @@ struct Notes { /// The counts a merge that can't be made gives back. #[derive(Clone, Copy)] struct Counts { + /// The bytes spent so far (see [`Builder::spent`]). + spent: u64, skipped: usize, /// The knockouts counted as not applied. unknocked: usize, @@ -789,8 +792,9 @@ impl Notes { out } - fn counts(&self, skipped: usize, unknocked: usize, blank: usize) -> Counts { + fn counts(&self, spent: u64, skipped: usize, unknocked: usize, blank: usize) -> Counts { Counts { + spent, skipped, unknocked, merged: self.merged.len(), @@ -819,6 +823,8 @@ struct Builder<'a, F> { notes: Notes, /// The records [`Notes`] counted. noted: Vec, + /// Those records, in the order they were counted. + noted_log: Vec, /// The records counted as hidden layers left out. skipped: Vec, /// Those records, in the order they were counted. @@ -840,6 +846,9 @@ struct Builder<'a, F> { kept: Vec, /// Bytes of layer and mask pixels decoded, and of canvases the merges made, so far. spent: Cell, + /// Those bytes that merges not made, and merges a hidden layer would need, took: given back to + /// `spent` and counted here instead, against the same limit. + wasted: Cell, /// The layers whose pixels were read so far (each time they were). painted: Cell, /// What each group gave when drawn alone without reading any layer's pixels (nothing, or a @@ -873,6 +882,20 @@ impl [f32; 3]> Builder<'_, F> { Ok(()) } + /// Move the bytes spent since `spent` was the count to [`Self::wasted`], which has an allowance + /// of its own as large: what a merge that isn't made decoded doesn't take the room for reading + /// the layers apart. + fn refund(&self, spent: u64) -> Result<(), String> { + let since = self.spent.get().saturating_sub(spent); + self.spent.set(self.spent.get().min(spent)); + let total = self.wasted.get().saturating_add(since); + self.wasted.set(total); + if total > self.max_alloc.saturating_mul(TOTAL_DECODED) { + return Err("the PSD file's layers take more memory to read than allowed".into()); + } + Ok(()) + } + /// Record `i`'s pixels as straight RGBA, at their place on the canvas; `None` when it has none. fn image(&self, i: usize) -> Result, String> { let rec = self.record(i)?; @@ -1006,9 +1029,11 @@ impl [f32; 3]> Builder<'_, F> { if let Some(u) = out.get_mut(b) { u.base = true; } + let spent = self.spent.get(); if !unclipped && self.clip(&mut out, b, &body, i, &name, blend, opacity)? { continue; } + self.refund(spent)?; // The merge doesn't fit: this layer and the next ones clipped to the same // base come in as layers of their own. unclipped = true; @@ -1131,7 +1156,10 @@ impl [f32; 3]> Builder<'_, F> { // Once, though a merge may draw it again. match self.noted.get_mut(i) { Some(true) => return Ok(()), - Some(n) => *n = true, + Some(n) => { + *n = true; + self.noted_log.push(i); + } None => {} } let (content, empty, effects, vector_mask) = { @@ -1151,6 +1179,23 @@ impl [f32; 3]> Builder<'_, F> { Ok(()) } + /// What [`Self::note`] has counted so far: the length of its log, and the counts. + fn noted_so_far(&self) -> (usize, [usize; 5]) { + let n = &self.notes; + (self.noted_log.len(), [n.types, n.adjustments, n.fills, n.effects, n.vector_masks]) + } + + /// Forget what [`Self::note`] counted since `so_far`, for layers that are left out. + fn unnote(&mut self, (logged, counts): (usize, [usize; 5])) { + for i in self.noted_log.split_off(logged) { + if let Some(n) = self.noted.get_mut(i) { + *n = false; + } + } + let n = &mut self.notes; + [n.types, n.adjustments, n.fills, n.effects, n.vector_masks] = counts; + } + /// Count record `i` as a layer whose knockout isn't applied (once). fn unknock(&mut self, i: usize) { if let Some(s) = self.unknocked.get_mut(i) @@ -1231,13 +1276,17 @@ impl [f32; 3]> Builder<'_, F> { let mut out: Vec> = vec![]; for mut u in self.units(items, keep_hidden)? { if self.knocks(&u, &out, level)? { - // A hidden layer that would need the merge is left out. - if !u.visible { - self.skip(u.record); - continue; - } - let saved = self.notes.counts(self.skip_log.len(), self.unknock_log.len(), self.blank_log.len()); + let saved = self.saved(); + let noted = self.noted_so_far(); match self.knock(&out, &u)? { + // A hidden layer that would need the merge is left out, and nothing its drawing + // counted is counted. + Knocked::Merged(_) | Knocked::TooLarge if !u.visible => { + self.restore(saved)?; + self.unnote(noted); + self.skip(u.record); + continue; + } Knocked::Merged(canvas) => { self.take_merge(&mut out, &u, canvas); if let Blend::Other(other) = u.blend @@ -1251,7 +1300,7 @@ impl [f32; 3]> Builder<'_, F> { // with the hidden layers its drawing left out (see `kept`). Knocked::Nothing => {} Knocked::TooLarge => { - self.restore(saved); + self.restore(saved)?; self.unknock(u.record); } } @@ -1266,7 +1315,7 @@ impl [f32; 3]> Builder<'_, F> { continue; } // A merge that can't be made counts nothing its groups would have counted. - let saved = self.notes.counts(self.skip_log.len(), self.unknock_log.len(), self.blank_log.len()); + let saved = self.saved(); let made = match out.as_mut_slice() { // Onto the previous merge alone: composited onto its canvas, in place. [prev] if prev.is_merge() => { @@ -1299,7 +1348,7 @@ impl [f32; 3]> Builder<'_, F> { self.notes.merged.push(other.label()); } } else { - self.restore(saved); + self.restore(saved)?; self.notes.unmerged += 1; u.blend = Blend::Mode(BlendMode::Normal); out.push(u); @@ -1308,8 +1357,15 @@ impl [f32; 3]> Builder<'_, F> { Ok(out) } - /// The counts as they were before a merge that couldn't be made. - fn restore(&mut self, c: Counts) { + /// The counts as they are, for [`Self::restore`]. + fn saved(&self) -> Counts { + self.notes.counts(self.spent.get(), self.skip_log.len(), self.unknock_log.len(), self.blank_log.len()) + } + + /// The counts as they were before a merge that couldn't be made, the bytes it spent counted as + /// wasted (see [`Self::refund`]). + fn restore(&mut self, c: Counts) -> Result<(), String> { + self.refund(c.spent)?; for i in self.skip_log.split_off(c.skipped) { if let Some(s) = self.skipped.get_mut(i) { *s = false; @@ -1345,6 +1401,7 @@ impl [f32; 3]> Builder<'_, F> { } self.notes.merged.truncate(c.merged); self.notes.unmerged = c.unmerged; + Ok(()) } /// The visible units `below` with `top` composited over them; `None` when the canvas would need @@ -1424,15 +1481,14 @@ impl [f32; 3]> Builder<'_, F> { return Ok(Knocked::TooLarge); } // Nothing below draws. - if acc.is_none() { + let Some(below) = acc.as_ref() else { return Ok(Knocked::Nothing) }; + // At 0 fill it draws nothing of its own: where it cuts no painted pixel below, no canvas for + // the merge is needed. + if fill <= 0.0 && !cuts_paint(below, &k, top.blend, opacity, top.record) { return Ok(Knocked::Nothing); } let clear = |c: &Canvas| c.px.iter().all(|p| p[3] <= 0.0); - let below_clear = acc.as_ref().is_some_and(clear); - // Nothing below to cut, and nothing of its own drawn at 0 fill: no canvas for the merge is needed. - if below_clear && fill <= 0.0 { - return Ok(Knocked::Nothing); - } + let below_clear = clear(below); if !knock_onto(&mut acc, &k, top.blend, fill, opacity, top.record, self.room(), &|n| self.spend(n))? { return Ok(Knocked::TooLarge); } @@ -1797,6 +1853,15 @@ fn knock_onto( Ok(true) } +/// Does `knock`, as [`knock_onto`] takes it, clear any of a pixel of `below` that has paint? +fn cuts_paint(below: &Canvas, knock: &Canvas, blend: Blend, opacity: f32, record: usize) -> bool { + let (kw, opacity) = (knock.width.max(1), opacity.clamp(0.0, 1.0)); + knock.px.iter().enumerate().any(|(k, s)| { + let (x, y) = (knock.left + (k % kw) as i64, knock.top + (k / kw) as i64); + below.get(x, y).is_some_and(|b| b[3] > 0.0) && coverage(blend, s[3].clamp(0.0, 1.0) * opacity, x, y, record) > 0.0 + }) +} + /// `acc` grown, when it doesn't already, to a canvas covering itself and `src` (a new one counted /// with `spend`). `false`, with `acc` as it was, when the canvases held, `acc` and `src` and a /// larger canvas when one is needed, would take more than `max_alloc` bytes. @@ -1871,6 +1936,7 @@ pub(super) fn import( layers: 0, notes: Notes::default(), noted: vec![false; records.len()], + noted_log: vec![], skipped: vec![false; records.len()], skip_log: vec![], unknocked: vec![false; records.len()], @@ -1881,6 +1947,7 @@ pub(super) fn import( unclip_log: vec![], kept: vec![false; records.len()], spent: Cell::new(0), + wasted: Cell::new(0), painted: Cell::new(0), blank: vec![None; records.len()], laid_blank: vec![false; records.len()], diff --git a/crates/engine/src/cmd/fileio/tests_psdlayers.rs b/crates/engine/src/cmd/fileio/tests_psdlayers.rs index 6324ffcce5..c5be312153 100644 --- a/crates/engine/src/cmd/fileio/tests_psdlayers.rs +++ b/crates/engine/src/cmd/fileio/tests_psdlayers.rs @@ -753,7 +753,8 @@ fn knockouts_that_arent_applied_are_said() { } /// A knockout that changes nothing below it leaves the layers apart, hidden ones included: one at 0 -/// opacity, and one at 0 fill over layers that are transparent. At 0 fill over painted layers, and +/// opacity, one at 0 fill over layers that are transparent or beside their painted pixels, and one +/// whose layer mask hides all of it. At 0 fill over painted layers, and /// at a fill over transparent ones, it still merges. A knockout at 0 fill over a transparent layer /// stays apart without a warning when their merge would need more memory than allowed. #[test] @@ -779,16 +780,40 @@ fn knockouts_that_change_nothing_keep_the_layers_apart() { let (names, warnings) = if apart { (vec!["Lower", "Hidden", "Cut"], json!([])) } else { (vec!["Lower + Cut"], json!([HIDDEN_1])) }; assert_eq!((inner(&s), &r["warnings"]), (names.iter().map(|n| n.to_string()).collect(), &warnings), "{alpha} {fill} {opacity}: {r}"); } - // A hidden knockout that needs no merge comes in with hidden layers: at 0 opacity, and with - // nothing below it in its group. + // A hidden knockout that needs no merge comes in with hidden layers: at 0 opacity, with nothing + // below it in its group, at 0 fill beside the painted pixels below it, and with a layer mask that + // hides all of it. let hidden_cut = |opacity: u8| L { hidden: true, ..cut(0, opacity) }; + let beside = L { hidden: true, ..knockout(layer("Cut", [0, 0, 2, 2], [0, 0, 255, 255]), 1, 0) }; + let masked = L { hidden: true, mask: Some(([0, 0, 2, 2], 0, 0, vec![0; 4])), ..cut(255, 255) }; for (layers, names) in [ (vec![group_end(), lower(255), hidden_cut(0), group("Group", b"norm")], vec!["Lower", "Cut"]), (vec![group_end(), hidden_cut(255), group("Group", b"norm")], vec!["Cut"]), + (vec![group_end(), layer("Lower", [2, 2, 4, 4], [255, 0, 0, 255]), beside, group("Group", b"norm")], vec!["Lower", "Cut"]), + (vec![group_end(), lower(255), masked.clone(), group("Group", b"norm")], vec!["Lower", "Cut"]), ] { let (s, r) = open(&file(4, 4, &layers, 8, false, false), json!({"hiddenLayers": true})); assert_eq!((inner(&s), &r["warnings"]), (names.iter().map(|n| n.to_string()).collect(), &json!([])), "{r}"); } + // With the mask switched off it would need the merge, and is left out. + let unmasked = L { mask: Some(([0, 0, 2, 2], 0, 2, vec![0; 4])), ..masked }; + let (s, r) = open(&file(4, 4, &[group_end(), lower(255), unmasked, group("Group", b"norm")], 8, false, false), json!({"hiddenLayers": true})); + assert_eq!((inner(&s), &r["warnings"]), (vec!["Lower".to_string()], &json!([HIDDEN_1])), "{r}"); + // A hidden knockout group that would need the merge is counted once, as a hidden layer left out: + // its type layer and its own hidden layer aren't counted. + let mut words = layer("Words", [0, 0, 2, 2], [0, 0, 0, 255]); + words.blocks.push((*b"TySh", vec![0; 4])); + let layers = [ + group_end(), + lower(255), + group_end(), + words, + L { hidden: true, ..layer("Inner", [0, 0, 2, 2], [0, 0, 255, 255]) }, + L { hidden: true, ..knockout(group("Cut", b"norm"), 1, 255) }, + group("Group", b"norm"), + ]; + let (s, r) = open(&file(4, 4, &layers, 8, false, false), json!({"hiddenLayers": true})); + assert_eq!((inner(&s), &r["warnings"]), (vec!["Lower".to_string()], &json!([HIDDEN_1])), "{r}"); } /// With hidden layers asked for, the hidden layers of a group drawn for a knockout or a clip that @@ -821,25 +846,48 @@ fn hidden_layers_of_a_group_drawn_for_a_merge_not_made_come_in() { } /// A knockout's merge whose canvases would need more memory than allowed leaves the layers apart, -/// with a warning. +/// with a warning. One at 0 fill beside the painted pixels below it cuts nothing, and stays apart +/// whatever the memory. #[test] fn a_knockout_merge_past_the_memory_allowed_leaves_the_layers_apart() { let cms = |c: [f32; 4]| [c[0], c[1], c[2]]; - let layers = [ - group_end(), - layer("Lower", [0, 0, 2, 2], [255, 0, 0, 255]), - knockout(layer("Cut", [2, 2, 4, 4], [0, 0, 255, 255]), 1, 0), - group("Group", b"norm"), - ]; - let f = file(4, 4, &layers, 8, false, false); + let stack = |cut: [i32; 4]| { + let layers = [ + group_end(), + layer("Lower", [0, 0, 2, 2], [255, 0, 0, 255]), + knockout(layer("Cut", cut, [0, 0, 255, 255]), 1, 0), + group("Group", b"norm"), + ]; + file(4, 4, &layers, 8, false, false) + }; + let names = |doc: &vectorcraft_doc::Document| doc.layers[0].children().unwrap().iter().map(|c| name(c).to_string()).collect::>(); + let f = stack([1, 1, 3, 3]); // Each 2 × 2 layer fits 128 bytes (16 a pixel), but not the canvas of the layer below with the // knockout's canvas held beside it. let (doc, warnings) = psdlayers::import(&f, false, 128, cms).unwrap().unwrap(); - assert_eq!(doc.layers[0].children().unwrap().iter().map(|c| name(c)).collect::>(), ["Lower", "Cut"]); + assert_eq!(names(&doc), ["Lower", "Cut"]); assert_eq!(warnings, ["the knockout of 1 layer wasn't applied"]); let (doc, warnings) = psdlayers::import(&f, false, 1 << 20, cms).unwrap().unwrap(); - assert_eq!(doc.layers[0].children().unwrap().iter().map(|c| name(c)).collect::>(), ["Lower + Cut"]); + assert_eq!(names(&doc), ["Lower + Cut"]); assert!(warnings.is_empty(), "{warnings:?}"); + let (doc, warnings) = psdlayers::import(&stack([2, 2, 4, 4]), false, 1 << 20, cms).unwrap().unwrap(); + assert_eq!(names(&doc), ["Lower", "Cut"]); + assert!(warnings.is_empty(), "{warnings:?}"); +} + +/// A knockout merge that can't be made leaves the import the whole allowance for reading the layers +/// apart: here the merge decodes 22 layers over one another before the layer beside them makes its +/// canvas too large, which used up nearly all of eight times 64 KiB. +#[test] +fn a_knockout_merge_not_made_leaves_room_to_read_the_layers() { + let cms = |c: [f32; 4]| [c[0], c[1], c[2]]; + let mut layers = vec![group_end()]; + layers.extend((0..22).map(|_| layer("Lower", [0, 0, 32, 32], [255, 0, 0, 255]))); + layers.push(layer("Beside", [0, 64, 32, 96], [0, 255, 0, 255])); + layers.extend([knockout(layer("Cut", [0, 0, 32, 32], [0, 0, 255, 255]), 1, 0), group("Group", b"norm")]); + let (doc, warnings) = psdlayers::import(&file(96, 32, &layers, 8, false, false), false, 64 << 10, cms).unwrap().unwrap(); + assert_eq!(doc.layers[0].children().unwrap().len(), 24, "{warnings:?}"); + assert_eq!(warnings, ["the knockout of 1 layer wasn't applied"]); } /// A Dissolve knockout at part opacity clears each pixel below it fully or not at all, at the share diff --git a/docs/mcp.md b/docs/mcp.md index 048fc5f557..e641490062 100644 --- a/docs/mcp.md +++ b/docs/mcp.md @@ -9906,7 +9906,7 @@ The rest are VectorCraft's own rules: in that group: where it has pixels, shaped by its layer mask, they are cleared to transparency, it is drawn there at its fill opacity, and its opacity fades the result back toward them. In a Pass Through group this applies only when it and the visible layers below it are in Normal mode. A knockout at 0 opacity, one that draws nothing, one - with nothing visible below it, and one at 0 fill over layers that are all transparent are not merged for the + with nothing visible below it, and one at 0 fill that covers none of their painted pixels are not merged for the knockout; one in a mode VectorCraft lacks is still merged by its mode. - A merged layer is named after the layers it holds, joined with ` + `. - A layer name the file stores only as a one-byte Pascal string, without its Unicode name, is read as Mac Roman. @@ -9928,9 +9928,10 @@ The rest are VectorCraft's own rules: Each layer's pixels must fit the memory allowed for one image, and the pixels of all the layers and masks, with the canvases the merges make, must together fit eight times that; a file past either limit opens as its merged image, -with a warning. The canvases one step of a merge holds at once must also fit the memory allowed for one image; when -they don't, the layer that needed the merge comes in alone, with a warning: in the Normal mode, or as a layer of its -own instead of clipped. +with a warning. The pixels and canvases of merges that aren't made count against a second limit of the same size. The +canvases one step of a merge holds at once must also fit the memory allowed for one image; when they don't, the +layer that needed the merge comes in alone, with a warning: in the Normal mode, as a layer of its own instead of +clipped, or without its knockout. ```json {"name":"run_command","arguments":{"command":"document.open","params":{"path":"/tmp/poster.psd","hiddenLayers":true}}} diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index c7e1723f05..14bf39612f 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -2141,7 +2141,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur EPS export and EPS Save make each file's PNG thumbnail from its TIFF preview, averaging the preview's pixels down to the thumbnail's size on white, instead of drawing the document a second time; a file without a preview still draws its thumbnail (`crates/engine/src/cmd/fileio/tests_eps.rs`). - Targa files (`.tga`, `.vda`, `.icb`, `.vst`) open, place linked or embedded, relink and update at their pixel size: color-mapped, true-color and black-and-white, raw or run-length encoded, in any of the four row orders. The image descriptor's attribute bits and the extension area's Attributes Type decide the transparency: a file with no attribute bits, or with attribute data the Attributes Type calls undefined, opens opaque; with one bit, a 16-bit true-color pixel takes that bit as its alpha, and a color-mapped pixel takes the bit of the 16-bit color map entry it indexes; premultiplied colors are divided by their alpha. Open and Place recognize a Targa file by its extension, and `clipboard.importImage` and Glass's Load Texture… by its header; a Targa file copied in a file manager pastes as a bitmap (`crates/engine/src/cmd/fileio/tests_tiffbmp.rs`, `crates/engine/src/tests/links.rs`). - BMP files named `.dib` or `.rle` (run-length encoded bitmaps included), Photoshop files named `.pdd` and PNG files named `.pns` open and place, linked or embedded, as BMP, PSD and PNG files, in any letter case: the Open and Place dialogs list them with their format, the Links panel names their format, and Edit Original opens them. Exports write only `.bmp`, `.psd` and `.png` (`crates/engine/src/cmd/fileio/tests_tiffbmp.rs`, `crates/engine/src/cmd/fileio/tests_psdread.rs`, `crates/engine/src/tests/links.rs`). - - File › Open converts a PSD or PSB file's layers to objects, keeping the layer structure, merging clipped layers into one layer, merging a layer that uses a Knockout option with the layers below it, and leaving out hidden layers that would need a merge, as [PSD import options](https://helpx.adobe.com/illustrator/desktop/add-and-import-files/import-from-other-apps/photoshop-import-options.html) describes for the option that converts layers to objects; hidden layers come in with `hiddenLayers`, as Import Hidden Layers brings them in, and `layers: false` opens the merged image. VectorCraft's own rules: each layer becomes a layer holding its pixels with its name, visibility, opacity and blend mode, groups become layers of sublayers, layers in Dissolve, Linear Burn, Linear Dodge, Vivid Light, Linear Light, Pin Light, Hard Mix, Subtract, Divide, Darker Color and Lighter Color are merged with the layers below, layer masks become opacity masks, fill opacity multiplies the opacity (in a layer that others are clipped to, it fades only that layer's own pixels), a Knockout value of 1 is read as a shallow knockout and applied to a layer or group inside a group, which is merged with the layers below it in that group (its pixels clear them to transparency, it is drawn there at its fill opacity, and its opacity fades the result; in a pass-through group only when it and the layers below it are in the Normal mode; a knockout at 0 opacity, or at 0 fill over layers that are all transparent, isn't merged for the knockout), and adjustment layers, layer effects, vector masks and the other knockouts (top-level layers, clipped layers, layers that others are clipped to, pass-through groups with layers in other modes, other Knockout values) aren't applied and are counted in the warnings. 8-, 16- and 32-bit files, PSB, raw, PackBits and zipped channels (`crates/engine/src/cmd/fileio/tests_psdlayers.rs`). + - File › Open converts a PSD or PSB file's layers to objects, keeping the layer structure, merging clipped layers into one layer, merging a layer that uses a Knockout option with the layers below it, and leaving out hidden layers that would need a merge, as [PSD import options](https://helpx.adobe.com/illustrator/desktop/add-and-import-files/import-from-other-apps/photoshop-import-options.html) describes for the option that converts layers to objects; hidden layers come in with `hiddenLayers`, as Import Hidden Layers brings them in, and `layers: false` opens the merged image. VectorCraft's own rules: each layer becomes a layer holding its pixels with its name, visibility, opacity and blend mode, groups become layers of sublayers, layers in Dissolve, Linear Burn, Linear Dodge, Vivid Light, Linear Light, Pin Light, Hard Mix, Subtract, Divide, Darker Color and Lighter Color are merged with the layers below, layer masks become opacity masks, fill opacity multiplies the opacity (in a layer that others are clipped to, it fades only that layer's own pixels), a Knockout value of 1 is read as a shallow knockout and applied to a layer or group inside a group, which is merged with the layers below it in that group (its pixels clear them to transparency, it is drawn there at its fill opacity, and its opacity fades the result; in a pass-through group only when it and the layers below it are in the Normal mode; a knockout at 0 opacity, or at 0 fill where it covers none of their painted pixels, isn't merged for the knockout), and adjustment layers, layer effects, vector masks and the other knockouts (top-level layers, clipped layers, layers that others are clipped to, pass-through groups with layers in other modes, other Knockout values, and merges that need more memory than allowed) aren't applied and are counted in the warnings. 8-, 16- and 32-bit files, PSB, raw, PackBits and zipped channels (`crates/engine/src/cmd/fileio/tests_psdlayers.rs`). - File › Open of a PSD or PSB file with two or more layers, and File › Place of one without Link, show PSD Import Options: Convert Layers to Objects with Import Hidden Layers, or Flatten Layers to a Single Image, the options [PSD import options](https://helpx.adobe.com/illustrator/desktop/add-and-import-files/import-from-other-apps/photoshop-import-options.html) describes for a file that is opened or embedded. A file placed with Link shows its flat image and isn't asked about. `file.place` takes `layers` and `hiddenLayers`, and `document.psdInfo` counts a file's layers without opening it. VectorCraft's own rules: placed layers come in as one group named after the file, a layer as an image and a layer group as a group, at the place the merged image would take and clipped to the canvas when layers reach past it; the dialog asks from two layers up and starts from the choices made last. Layer comps aren't read (`crates/engine/src/cmd/fileio/tests_psdlayers.rs`, `crates/ui-egui/src/dialogs/psd_import.rs`). - A PSD or PSB file's clipping path, the saved path that image resource 2999 names in the [PSD file format specification](https://www.adobe.com/devnet-apps/photoshop/fileformatashtml/), clips its merged image on File › Place and on File › Open of the merged image, as [PSD import options](https://helpx.adobe.com/illustrator/desktop/add-and-import-files/import-from-other-apps/photoshop-import-options.html) describes for a file imported as one flattened image. The image comes in a clip group whose clipping path has no paint and uses the even-odd rule, and the path can be edited or released. `links.update` and `links.relink` give the clip group the clipping path the new file names, or leave a plain group when it names none, and files that name no clipping path come in as before (`crates/engine/src/cmd/fileio/tests_psdread.rs`). - Import Slices: File › Open of a PSD or PSB file with slices, and File › Place of one without Link, bring its slices in as user slices, as [PSD import options](https://helpx.adobe.com/illustrator/desktop/add-and-import-files/import-from-other-apps/photoshop-import-options.html) describes for a file that is opened or embedded; PSD Import Options offers Import Slices for such a file. `document.open` and `file.place` take `importSlices`, and `document.psdInfo` counts the slices. The slices are read from image resource 1050 in version 6 and in the descriptor of versions 7 and 8, as the [Photoshop File Formats Specification](https://www.adobe.com/devnet-apps/photoshop/fileformatashtml/) describes it. VectorCraft's own rules: Import Slices applies to Convert Layers to Objects and to Flatten Layers to a Single Image alike, and makes the dialog ask for a file with fewer than two layers; placed slices move and scale with the art in the same undo step; each slice keeps its name, type, link, target, message, alternative text, cell text and background color; slices the file generated automatically, and slices wholly outside the canvas, are left out; slices that can't be read are left out with a warning while the art comes in; with Show Import Options off, a PSD file is placed with the PSD Import Options chosen last, and on, each PSD file of the place cursor asks for them (`crates/engine/src/cmd/fileio/tests_psdslices.rs`, `crates/ui-egui/src/dialogs/psd_import.rs`). From 4b2412eaf9833b0b13046b5967a39b10d553e53e Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Wed, 18 Nov 2026 06:57:06 -0800 Subject: [PATCH 41/78] Docs: G5 Missing line counts eleven built-in brush libraries docs/gaps.md's G5 Missing line said "beyond the ten shipped", while BUILTIN in crates/engine/src/cmd/brushlib.rs lists eleven libraries and the G5 Done text above already names all eleven. --- docs/gaps.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/gaps.md b/docs/gaps.md index ea34b655ca..1c57f3dbfc 100644 --- a/docs/gaps.md +++ b/docs/gaps.md @@ -708,7 +708,7 @@ macOS cursor delivery (#2292) is narrowed to a native host adapter using the exi Fine Grain, Canvas Weave, Burlap Sack, Cracked Glaze, Mosaic Floor, Quilted Squares, Leaded Glass and Damp Paper, painted with the texture effects; User Defined; Other Library…; `graphicStyle.libraries`, `graphicStyle.addFromLibrary`). -- **Missing:** more built-in brush libraries beyond the ten shipped (and further graphic-style libraries beyond the eleven shipped, and further symbol libraries beyond Basic +- **Missing:** more built-in brush libraries beyond the eleven shipped (and further graphic-style libraries beyond the eleven shipped, and further symbol libraries beyond Basic Shapes, UI Frames, Map Markers, Inventory Icons, Skill Icons and Weather Icons; original, generated in code, never Adobe's); dynamic symbols' `.ai` read and write. - **Estimate:** 3–13 h (estimated). From bc1c1131c0ea43cf22da20d05697532d1db2c5ef Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Wed, 18 Nov 2026 08:01:32 -0800 Subject: [PATCH 42/78] PSD import: merges being tried get their own allowance, and knockouts that cut nothing give it back - A knockout, clip or blend-mode merge being tried may use the whole import allowance beyond what was read before it. A merge that is made must still fit the allowance with everything read before it. - A knockout that turns out to cut nothing moves what its drawing read out of the allowance, as a merge that isn't made does. A hidden one also forgets what its drawing counted, so a later merge that leaves it out reports only the hidden layer. - A hidden layer in a mode VectorCraft lacks is left out before any knockout drawing, as before the knockout merge. - A knockout at 0 fill whose painted pixels lie outside the bounds of every layer below it is kept apart before their canvas is made. --- crates/engine/src/cmd/fileio/psdlayers.rs | 99 ++++++++++++++++--- .../engine/src/cmd/fileio/tests_psdlayers.rs | 54 +++++++++- docs/mcp.md | 4 +- docs/target-app-parity.md | 2 +- 4 files changed, 139 insertions(+), 20 deletions(-) diff --git a/crates/engine/src/cmd/fileio/psdlayers.rs b/crates/engine/src/cmd/fileio/psdlayers.rs index 598f75ff04..3779b72745 100644 --- a/crates/engine/src/cmd/fileio/psdlayers.rs +++ b/crates/engine/src/cmd/fileio/psdlayers.rs @@ -43,8 +43,9 @@ //! groups nest at most [`MAX_DEPTH`] deep (layers deeper than a document may nest merge into the //! group around them, with a warning), each layer's pixels, like the canvases one step of a //! merge holds together, must fit the memory allowed, and all the pixels decoded and the canvases -//! the merges make must fit [`TOTAL_DECODED`] times that. What the merges that can't be made, or -//! that a hidden layer would need, decoded and made is counted apart, against the same limit. +//! the merges make must fit [`TOTAL_DECODED`] times that. A merge being tried may take that much +//! past what was read before it. What the merges that aren't made, or that a hidden layer would +//! need, decoded and made is counted apart, against the same limit. use std::cell::Cell; use std::sync::Arc; @@ -849,6 +850,9 @@ struct Builder<'a, F> { /// Those bytes that merges not made, and merges a hidden layer would need, took: given back to /// `spent` and counted here instead, against the same limit. wasted: Cell, + /// `spent` when the innermost merge being tried began: until it is made or given up, it may + /// spend the whole allowance past that (see [`Self::spend`]). + trial: Cell, /// The layers whose pixels were read so far (each time they were). painted: Cell, /// What each group gave when drawn alone without reading any layer's pixels (nothing, or a @@ -872,16 +876,30 @@ impl [f32; 3]> Builder<'_, F> { } /// Count `bytes` of decoded pixels, or of a canvas a merge makes, against the whole import's - /// allowance, [`TOTAL_DECODED`] times the memory allowed for one image. + /// allowance, [`TOTAL_DECODED`] times the memory allowed for one image. While a merge is tried + /// (see [`Self::try_from_here`]), only what it spent counts against the allowance. fn spend(&self, bytes: u64) -> Result<(), String> { let total = self.spent.get().saturating_add(bytes); self.spent.set(total); - if total > self.max_alloc.saturating_mul(TOTAL_DECODED) { + if total.saturating_sub(self.trial.get()) > self.max_alloc.saturating_mul(TOTAL_DECODED) { return Err("the PSD file's layers take more memory to read than allowed".into()); } Ok(()) } + /// Start trying a merge that may not be made: what it spends counts against the whole + /// allowance, however much was spent before it. Gives what [`Self::tried`] takes back. + fn try_from_here(&self) -> u64 { + self.trial.replace(self.spent.get()) + } + + /// End the merge tried since [`Self::try_from_here`] gave `outer`. A merge that is `made` keeps + /// what it spent, which must then fit the allowance with what was spent before it. + fn tried(&self, outer: u64, made: bool) -> Result<(), String> { + self.trial.set(outer); + if made { self.spend(0) } else { Ok(()) } + } + /// Move the bytes spent since `spent` was the count to [`Self::wasted`], which has an allowance /// of its own as large: what a merge that isn't made decoded doesn't take the room for reading /// the layers apart. @@ -1030,7 +1048,10 @@ impl [f32; 3]> Builder<'_, F> { u.base = true; } let spent = self.spent.get(); - if !unclipped && self.clip(&mut out, b, &body, i, &name, blend, opacity)? { + let outer = self.try_from_here(); + let made = !unclipped && self.clip(&mut out, b, &body, i, &name, blend, opacity)?; + self.tried(outer, made)?; + if made { continue; } self.refund(spent)?; @@ -1275,10 +1296,19 @@ impl [f32; 3]> Builder<'_, F> { } let mut out: Vec> = vec![]; for mut u in self.units(items, keep_hidden)? { + // A hidden layer in a mode VectorCraft lacks would need the merge for its mode: it is left + // out without being drawn. + if !u.visible && matches!(u.blend, Blend::Other(_)) { + self.skip(u.record); + continue; + } if self.knocks(&u, &out, level)? { let saved = self.saved(); let noted = self.noted_so_far(); - match self.knock(&out, &u)? { + let outer = self.try_from_here(); + let knocked = self.knock(&out, &u)?; + self.tried(outer, u.visible && matches!(knocked, Knocked::Merged(_)))?; + match knocked { // A hidden layer that would need the merge is left out, and nothing its drawing // counted is counted. Knocked::Merged(_) | Knocked::TooLarge if !u.visible => { @@ -1297,8 +1327,14 @@ impl [f32; 3]> Builder<'_, F> { continue; } // Nothing below it, or nothing of its own, to knock out: it comes in as a layer, - // with the hidden layers its drawing left out (see `kept`). - Knocked::Nothing => {} + // with the hidden layers its drawing left out (see `kept`). What its drawing + // read is read again when it comes in. A hidden one may still be left out by a + // later merge: what its drawing counted is counted when it comes in instead. + Knocked::Nothing if !u.visible => { + self.restore(saved)?; + self.unnote(noted); + } + Knocked::Nothing => self.refund(saved.spent)?, Knocked::TooLarge => { self.restore(saved)?; self.unknock(u.record); @@ -1309,13 +1345,9 @@ impl [f32; 3]> Builder<'_, F> { out.push(u); continue; }; - // A hidden layer that would need the merge is left out. - if !u.visible { - self.skip(u.record); - continue; - } // A merge that can't be made counts nothing its groups would have counted. let saved = self.saved(); + let outer = self.try_from_here(); let made = match out.as_mut_slice() { // Onto the previous merge alone: composited onto its canvas, in place. [prev] if prev.is_merge() => { @@ -1343,6 +1375,7 @@ impl [f32; 3]> Builder<'_, F> { None => false, }, }; + self.tried(outer, made)?; if made { if !self.notes.merged.contains(&other.label()) { self.notes.merged.push(other.label()); @@ -1465,6 +1498,10 @@ impl [f32; 3]> Builder<'_, F> { Drawn::Canvas(c) if c.px.iter().all(|p| p[3] <= 0.0) => return Ok(Knocked::Nothing), Drawn::Canvas(c) => c, }; + // At 0 fill, beside every layer below it, it cuts nothing: no canvas for them is needed. + if fill <= 0.0 && self.beside(below, &k)? { + return Ok(Knocked::Nothing); + } // The layer's canvas is held while the units below are drawn. let bytes = 16 * k.px.len() as u64; self.held = self.held.saturating_add(bytes); @@ -1499,6 +1536,41 @@ impl [f32; 3]> Builder<'_, F> { Ok(acc.map_or(Knocked::Nothing, Knocked::Merged)) } + /// Do the pixels `knock` paints lie outside the bounds of every visible unit `below`? Only the + /// bounds of layers and of merged canvases are known without drawing them: with a group below, + /// `false`. + fn beside(&self, below: &[Unit<'_>], knock: &Canvas) -> Result { + let width = knock.width.max(1); + let mut painted: Option<[i64; 4]> = None; + for (k, _) in knock.px.iter().enumerate().filter(|(_, p)| p[3] > 0.0) { + let (x, y) = (knock.left + (k % width) as i64, knock.top + (k / width) as i64); + painted = Some(painted.map_or([x, y, x + 1, y + 1], |[l, t, r, b]| [l.min(x), t.min(y), r.max(x + 1), b.max(y + 1)])); + } + let Some([left, top, right, bottom]) = painted else { return Ok(true) }; + for u in below.iter().filter(|u| u.visible) { + let [l, t, r, b] = match &u.body { + Body::Merged(c) => [c.left, c.top, c.left + c.width as i64, c.top + c.height as i64], + Body::Layer(i) => { + let rec = self.record(*i)?; + match rec.content { + Content::Adjustment => continue, + Content::Solid(Some(_)) if rec.color_over_canvas() => [0, 0, i64::from(self.h.width), i64::from(self.h.height)], + _ => { + let (w, h) = rec.bounds.size(); + let (l, t) = (i64::from(rec.bounds.left), i64::from(rec.bounds.top)); + [l, t, l + w as i64, t + h as i64] + } + } + } + Body::Group(..) => return Ok(false), + }; + if l < right && left < r && t < bottom && top < b { + return Ok(false); + } + } + Ok(true) + } + /// The bytes a merge step may still take: the memory allowed, less the copies of what is below /// the pass-through groups being merged. fn room(&self) -> u64 { @@ -1948,6 +2020,7 @@ pub(super) fn import( kept: vec![false; records.len()], spent: Cell::new(0), wasted: Cell::new(0), + trial: Cell::new(0), painted: Cell::new(0), blank: vec![None; records.len()], laid_blank: vec![false; records.len()], diff --git a/crates/engine/src/cmd/fileio/tests_psdlayers.rs b/crates/engine/src/cmd/fileio/tests_psdlayers.rs index c5be312153..d197658c20 100644 --- a/crates/engine/src/cmd/fileio/tests_psdlayers.rs +++ b/crates/engine/src/cmd/fileio/tests_psdlayers.rs @@ -807,13 +807,26 @@ fn knockouts_that_change_nothing_keep_the_layers_apart() { group_end(), lower(255), group_end(), - words, + words.clone(), L { hidden: true, ..layer("Inner", [0, 0, 2, 2], [0, 0, 255, 255]) }, L { hidden: true, ..knockout(group("Cut", b"norm"), 1, 255) }, group("Group", b"norm"), ]; let (s, r) = open(&file(4, 4, &layers, 8, false, false), json!({"hiddenLayers": true})); assert_eq!((inner(&s), &r["warnings"]), (vec!["Lower".to_string()], &json!([HIDDEN_1])), "{r}"); + // One whose layer mask hides all of it needs no merge, but a knockout above it merges the layers + // and leaves it out: it is counted once, without its type layer. + let layers = [ + group_end(), + lower(255), + group_end(), + words, + L { hidden: true, mask: Some(([0, 0, 2, 2], 0, 0, vec![0; 4])), ..knockout(group("Masked", b"norm"), 1, 255) }, + cut(0, 255), + group("Group", b"norm"), + ]; + let (s, r) = open(&file(4, 4, &layers, 8, false, false), json!({"hiddenLayers": true})); + assert_eq!((inner(&s), &r["warnings"]), (vec!["Lower + Cut".to_string()], &json!([HIDDEN_1])), "{r}"); } /// With hidden layers asked for, the hidden layers of a group drawn for a knockout or a clip that @@ -870,14 +883,18 @@ fn a_knockout_merge_past_the_memory_allowed_leaves_the_layers_apart() { let (doc, warnings) = psdlayers::import(&f, false, 1 << 20, cms).unwrap().unwrap(); assert_eq!(names(&doc), ["Lower + Cut"]); assert!(warnings.is_empty(), "{warnings:?}"); - let (doc, warnings) = psdlayers::import(&stack([2, 2, 4, 4]), false, 1 << 20, cms).unwrap().unwrap(); - assert_eq!(names(&doc), ["Lower", "Cut"]); - assert!(warnings.is_empty(), "{warnings:?}"); + for max_alloc in [128, 1 << 20] { + let (doc, warnings) = psdlayers::import(&stack([2, 2, 4, 4]), false, max_alloc, cms).unwrap().unwrap(); + assert_eq!(names(&doc), ["Lower", "Cut"], "{max_alloc}"); + assert!(warnings.is_empty(), "{max_alloc}: {warnings:?}"); + } } /// A knockout merge that can't be made leaves the import the whole allowance for reading the layers /// apart: here the merge decodes 22 layers over one another before the layer beside them makes its -/// canvas too large, which used up nearly all of eight times 64 KiB. +/// canvas too large, which used up nearly all of eight times 64 KiB. The merge has that allowance +/// also after five layers below the group were read, and a knockout at 0 fill over 22 transparent +/// layers, which cuts no paint after they are drawn, leaves the same room. #[test] fn a_knockout_merge_not_made_leaves_room_to_read_the_layers() { let cms = |c: [f32; 4]| [c[0], c[1], c[2]]; @@ -888,6 +905,33 @@ fn a_knockout_merge_not_made_leaves_room_to_read_the_layers() { let (doc, warnings) = psdlayers::import(&file(96, 32, &layers, 8, false, false), false, 64 << 10, cms).unwrap().unwrap(); assert_eq!(doc.layers[0].children().unwrap().len(), 24, "{warnings:?}"); assert_eq!(warnings, ["the knockout of 1 layer wasn't applied"]); + let mut after_five = vec![layer("Outside", [0, 0, 32, 32], [0, 0, 0, 255]); 5]; + after_five.extend(layers); + let (doc, warnings) = psdlayers::import(&file(96, 32, &after_five, 8, false, false), false, 64 << 10, cms).unwrap().unwrap(); + assert_eq!((doc.layers.len(), doc.layers[5].children().unwrap().len()), (6, 24), "{warnings:?}"); + assert_eq!(warnings, ["the knockout of 1 layer wasn't applied"]); + let mut layers = vec![group_end()]; + layers.extend((0..22).map(|_| layer("Lower", [0, 0, 32, 32], [255, 0, 0, 0]))); + layers.extend([knockout(layer("Cut", [0, 0, 32, 32], [0, 0, 255, 255]), 1, 0), group("Group", b"norm")]); + let (doc, warnings) = psdlayers::import(&file(32, 32, &layers, 8, false, false), false, 64 << 10, cms).unwrap().unwrap(); + assert_eq!(doc.layers[0].children().unwrap().len(), 23, "{warnings:?}"); + assert!(warnings.is_empty(), "{warnings:?}"); +} + +/// A hidden knockout in a mode VectorCraft lacks is left out without being drawn, hidden layers +/// asked for: here its pixels are larger than the memory allowed for one image. +#[test] +fn a_hidden_knockout_in_a_mode_vectorcraft_lacks_is_left_out_unread() { + let cms = |c: [f32; 4]| [c[0], c[1], c[2]]; + let layers = [ + group_end(), + layer("Lower", [0, 0, 2, 2], [255, 0, 0, 255]), + L { hidden: true, blend: b"diss", ..knockout(layer("Cut", [0, 0, 8, 8], [0, 0, 255, 255]), 1, 255) }, + group("Group", b"norm"), + ]; + let (doc, warnings) = psdlayers::import(&file(8, 8, &layers, 8, false, false), true, 128, cms).unwrap().unwrap(); + assert_eq!(doc.layers[0].children().unwrap().iter().map(|c| name(c)).collect::>(), ["Lower"]); + assert_eq!(warnings, [HIDDEN_1]); } /// A Dissolve knockout at part opacity clears each pixel below it fully or not at all, at the share diff --git a/docs/mcp.md b/docs/mcp.md index e641490062..a71a4d6943 100644 --- a/docs/mcp.md +++ b/docs/mcp.md @@ -9928,7 +9928,9 @@ The rest are VectorCraft's own rules: Each layer's pixels must fit the memory allowed for one image, and the pixels of all the layers and masks, with the canvases the merges make, must together fit eight times that; a file past either limit opens as its merged image, -with a warning. The pixels and canvases of merges that aren't made count against a second limit of the same size. The +with a warning. A merge being tried may use the whole of that limit beyond what was read before it. The pixels and +canvases of merges that aren't made, including knockouts that turn out to cut nothing, then count against a second +limit of the same size instead. The canvases one step of a merge holds at once must also fit the memory allowed for one image; when they don't, the layer that needed the merge comes in alone, with a warning: in the Normal mode, as a layer of its own instead of clipped, or without its knockout. diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index 14bf39612f..ca57638462 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -2141,7 +2141,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur EPS export and EPS Save make each file's PNG thumbnail from its TIFF preview, averaging the preview's pixels down to the thumbnail's size on white, instead of drawing the document a second time; a file without a preview still draws its thumbnail (`crates/engine/src/cmd/fileio/tests_eps.rs`). - Targa files (`.tga`, `.vda`, `.icb`, `.vst`) open, place linked or embedded, relink and update at their pixel size: color-mapped, true-color and black-and-white, raw or run-length encoded, in any of the four row orders. The image descriptor's attribute bits and the extension area's Attributes Type decide the transparency: a file with no attribute bits, or with attribute data the Attributes Type calls undefined, opens opaque; with one bit, a 16-bit true-color pixel takes that bit as its alpha, and a color-mapped pixel takes the bit of the 16-bit color map entry it indexes; premultiplied colors are divided by their alpha. Open and Place recognize a Targa file by its extension, and `clipboard.importImage` and Glass's Load Texture… by its header; a Targa file copied in a file manager pastes as a bitmap (`crates/engine/src/cmd/fileio/tests_tiffbmp.rs`, `crates/engine/src/tests/links.rs`). - BMP files named `.dib` or `.rle` (run-length encoded bitmaps included), Photoshop files named `.pdd` and PNG files named `.pns` open and place, linked or embedded, as BMP, PSD and PNG files, in any letter case: the Open and Place dialogs list them with their format, the Links panel names their format, and Edit Original opens them. Exports write only `.bmp`, `.psd` and `.png` (`crates/engine/src/cmd/fileio/tests_tiffbmp.rs`, `crates/engine/src/cmd/fileio/tests_psdread.rs`, `crates/engine/src/tests/links.rs`). - - File › Open converts a PSD or PSB file's layers to objects, keeping the layer structure, merging clipped layers into one layer, merging a layer that uses a Knockout option with the layers below it, and leaving out hidden layers that would need a merge, as [PSD import options](https://helpx.adobe.com/illustrator/desktop/add-and-import-files/import-from-other-apps/photoshop-import-options.html) describes for the option that converts layers to objects; hidden layers come in with `hiddenLayers`, as Import Hidden Layers brings them in, and `layers: false` opens the merged image. VectorCraft's own rules: each layer becomes a layer holding its pixels with its name, visibility, opacity and blend mode, groups become layers of sublayers, layers in Dissolve, Linear Burn, Linear Dodge, Vivid Light, Linear Light, Pin Light, Hard Mix, Subtract, Divide, Darker Color and Lighter Color are merged with the layers below, layer masks become opacity masks, fill opacity multiplies the opacity (in a layer that others are clipped to, it fades only that layer's own pixels), a Knockout value of 1 is read as a shallow knockout and applied to a layer or group inside a group, which is merged with the layers below it in that group (its pixels clear them to transparency, it is drawn there at its fill opacity, and its opacity fades the result; in a pass-through group only when it and the layers below it are in the Normal mode; a knockout at 0 opacity, or at 0 fill where it covers none of their painted pixels, isn't merged for the knockout), and adjustment layers, layer effects, vector masks and the other knockouts (top-level layers, clipped layers, layers that others are clipped to, pass-through groups with layers in other modes, other Knockout values, and merges that need more memory than allowed) aren't applied and are counted in the warnings. 8-, 16- and 32-bit files, PSB, raw, PackBits and zipped channels (`crates/engine/src/cmd/fileio/tests_psdlayers.rs`). + - File › Open converts a PSD or PSB file's layers to objects, keeping the layer structure, merging clipped layers into one layer, merging a layer that uses a Knockout option with the layers below it, and leaving out hidden layers that would need a merge, as [PSD import options](https://helpx.adobe.com/illustrator/desktop/add-and-import-files/import-from-other-apps/photoshop-import-options.html) describes for the option that converts layers to objects; hidden layers come in with `hiddenLayers`, as Import Hidden Layers brings them in, and `layers: false` opens the merged image. VectorCraft's own rules: each layer becomes a layer holding its pixels with its name, visibility, opacity and blend mode, groups become layers of sublayers, layers in Dissolve, Linear Burn, Linear Dodge, Vivid Light, Linear Light, Pin Light, Hard Mix, Subtract, Divide, Darker Color and Lighter Color are merged with the layers below, layer masks become opacity masks, fill opacity multiplies the opacity (in a layer that others are clipped to, it fades only that layer's own pixels), a Knockout value of 1 is read as a shallow knockout and applied to a layer or group inside a group, which is merged with the visible layers below it in that group (its pixels clear them to transparency, it is drawn there at its fill opacity, and its opacity fades the result; in a pass-through group only when it and the visible layers below it are in the Normal mode; a knockout at 0 opacity, or at 0 fill where it covers none of their painted pixels, isn't merged for the knockout), and adjustment layers, layer effects, vector masks and the other knockouts (top-level layers, clipped layers, layers that others are clipped to, pass-through groups with layers in other modes, other Knockout values, and merges that need more memory than allowed) aren't applied and are counted in the warnings. 8-, 16- and 32-bit files, PSB, raw, PackBits and zipped channels (`crates/engine/src/cmd/fileio/tests_psdlayers.rs`). - File › Open of a PSD or PSB file with two or more layers, and File › Place of one without Link, show PSD Import Options: Convert Layers to Objects with Import Hidden Layers, or Flatten Layers to a Single Image, the options [PSD import options](https://helpx.adobe.com/illustrator/desktop/add-and-import-files/import-from-other-apps/photoshop-import-options.html) describes for a file that is opened or embedded. A file placed with Link shows its flat image and isn't asked about. `file.place` takes `layers` and `hiddenLayers`, and `document.psdInfo` counts a file's layers without opening it. VectorCraft's own rules: placed layers come in as one group named after the file, a layer as an image and a layer group as a group, at the place the merged image would take and clipped to the canvas when layers reach past it; the dialog asks from two layers up and starts from the choices made last. Layer comps aren't read (`crates/engine/src/cmd/fileio/tests_psdlayers.rs`, `crates/ui-egui/src/dialogs/psd_import.rs`). - A PSD or PSB file's clipping path, the saved path that image resource 2999 names in the [PSD file format specification](https://www.adobe.com/devnet-apps/photoshop/fileformatashtml/), clips its merged image on File › Place and on File › Open of the merged image, as [PSD import options](https://helpx.adobe.com/illustrator/desktop/add-and-import-files/import-from-other-apps/photoshop-import-options.html) describes for a file imported as one flattened image. The image comes in a clip group whose clipping path has no paint and uses the even-odd rule, and the path can be edited or released. `links.update` and `links.relink` give the clip group the clipping path the new file names, or leave a plain group when it names none, and files that name no clipping path come in as before (`crates/engine/src/cmd/fileio/tests_psdread.rs`). - Import Slices: File › Open of a PSD or PSB file with slices, and File › Place of one without Link, bring its slices in as user slices, as [PSD import options](https://helpx.adobe.com/illustrator/desktop/add-and-import-files/import-from-other-apps/photoshop-import-options.html) describes for a file that is opened or embedded; PSD Import Options offers Import Slices for such a file. `document.open` and `file.place` take `importSlices`, and `document.psdInfo` counts the slices. The slices are read from image resource 1050 in version 6 and in the descriptor of versions 7 and 8, as the [Photoshop File Formats Specification](https://www.adobe.com/devnet-apps/photoshop/fileformatashtml/) describes it. VectorCraft's own rules: Import Slices applies to Convert Layers to Objects and to Flatten Layers to a Single Image alike, and makes the dialog ask for a file with fewer than two layers; placed slices move and scale with the art in the same undo step; each slice keeps its name, type, link, target, message, alternative text, cell text and background color; slices the file generated automatically, and slices wholly outside the canvas, are left out; slices that can't be read are left out with a warning while the art comes in; with Show Import Options off, a PSD file is placed with the PSD Import Options chosen last, and on, each PSD file of the place cursor asks for them (`crates/engine/src/cmd/fileio/tests_psdslices.rs`, `crates/ui-egui/src/dialogs/psd_import.rs`). From 55114ca1abaff143745c1debe42a80183856a464 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Wed, 18 Nov 2026 08:09:22 -0800 Subject: [PATCH 43/78] Docs: gap entry counts twelve built-in brush libraries --- docs/gaps.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/gaps.md b/docs/gaps.md index caecdb99fb..d6067d0f98 100644 --- a/docs/gaps.md +++ b/docs/gaps.md @@ -708,7 +708,7 @@ macOS cursor delivery (#2292) is narrowed to a native host adapter using the exi Fine Grain, Canvas Weave, Burlap Sack, Cracked Glaze, Mosaic Floor, Quilted Squares, Leaded Glass and Damp Paper, painted with the texture effects; User Defined; Other Library…; `graphicStyle.libraries`, `graphicStyle.addFromLibrary`). -- **Missing:** more built-in brush libraries beyond the eleven shipped (and further graphic-style libraries beyond the eleven shipped, and further symbol libraries beyond Basic +- **Missing:** more built-in brush libraries beyond the twelve shipped (and further graphic-style libraries beyond the eleven shipped, and further symbol libraries beyond Basic Shapes, UI Frames, Map Markers, Inventory Icons, Skill Icons and Weather Icons; original, generated in code, never Adobe's); dynamic symbols' `.ai` read and write. - **Estimate:** 3–13 h (estimated). From 768edc48fee566afddc24327affee5c7e5e7a6ab Mon Sep 17 00:00:00 2001 From: yoriswind Date: Wed, 18 Nov 2026 11:36:39 -0800 Subject: [PATCH 44/78] Test stale sampler double-click release ownership --- .../tests/image_trace_ignore_sampler.rs | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/crates/ui-egui/tests/image_trace_ignore_sampler.rs b/crates/ui-egui/tests/image_trace_ignore_sampler.rs index edd197195d..bc9fd97eb1 100644 --- a/crates/ui-egui/tests/image_trace_ignore_sampler.rs +++ b/crates/ui-egui/tests/image_trace_ignore_sampler.rs @@ -405,6 +405,92 @@ fn a_stale_sampler_and_canvas_press_in_one_frame_do_not_reselect_the_source() { assert_eq!(app.session.active().unwrap().selection.objects, vec![target]); } +/// A stale sampler consumes its second press, including the release's double-click action. +#[test] +fn a_consumed_stale_sampler_press_does_not_complete_a_double_click() { + fn frame_at(app: &mut VectorcraftApp, ctx: &egui::Context, time: f64, events: Vec) { + let mut raw = RawInput { + time: Some(time), + events, + focused: true, + screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(1600.0, 1400.0))), + ..Default::default() + }; + app.raw_input_hook(ctx, &mut raw); + let mut out = ctx.run_ui(raw, |ui| { + app.tick(ui.ctx()); + app.ui(ui); + }); + out.textures_delta.clear(); + assert_eq!(ctx.time(), time, "the real UI frame uses the supplied gesture time"); + } + + // Run the legitimate control first: this geometry and these real UI frames must isolate. + for sampler in [false, true] { + let (mut app, ctx) = fixture(true, [37, 83, 149], false); + let source = selected(&app).id; + app.session.prefs.double_click_to_isolate = true; + let first = app.run("shape.rectangle", json!({"x": 100, "y": 140, "width": 20, "height": 20})).unwrap()["id"].clone(); + let second = app.run("shape.rectangle", json!({"x": 120, "y": 140, "width": 20, "height": 20})).unwrap()["id"].clone(); + app.run("paint.setFill", json!({"ids": [first.clone(), second.clone()], "color": "#cc3322"})).unwrap(); + app.run("select.set", json!({"ids": [first, second]})).unwrap(); + let group = NodeId(app.run("object.group", json!({})).unwrap()["id"].as_u64().unwrap()); + app.run("select.set", json!({"ids": [source.0]})).unwrap(); + settle(&mut app, &ctx); + let point = Point::new(110.0, 150.0); + assert!(point.x < source_point(&app, 0.0).x - 40.0, "the group is outside the source image"); + if sampler { + click_control(&mut app, &ctx, SAMPLE_TIP); + assert_eq!(app.session.tool_id(), "eyedropper"); + assert!(app.ui.trace_ignore_sampler.is_some()); + } + let at = canvas::Xf::at(app.canvas_rect.unwrap(), app.view().unwrap(), ctx.zoom_factor()).to_screen(point); + assert!(app.canvas_rect.unwrap().contains(at)); + let (delay, hold) = ctx.options(|o| (o.input_options.max_double_click_delay, o.input_options.max_click_duration)); + assert!(delay.is_finite() && delay > 0.0 && hold.is_finite() && hold > 0.0); + let step = delay.min(hold) / 8.0; + // Leave the panel-button click outside the interval; only these two canvas clicks count. + let start = ctx.time() + delay + 1.0; + let press = |pressed| Event::PointerButton { pos: at, button: PointerButton::Primary, pressed, modifiers: Default::default() }; + frame_at(&mut app, &ctx, start, vec![Event::PointerMoved(at), press(true)]); + frame_at(&mut app, &ctx, start + step, vec![press(false)]); + assert!(!ctx.input(|i| i.pointer.button_double_clicked(PointerButton::Primary)), "the first canvas click is single"); + assert_eq!(app.session.active().unwrap().isolation, None); + + if sampler { + assert_eq!(app.session.tool_id(), "eyedropper", "the first click is a source-image miss"); + assert!(app.ui.trace_ignore_sampler.is_some(), "the miss keeps sampling armed"); + assert_eq!(app.session.active().unwrap().selection.objects, vec![source], "the miss does not select the group"); + // No intervening UI frame: canvas refresh must consume the stale second press. + app.run("select.none", json!({})).unwrap(); + let state = app.session.active().unwrap(); + let (document, selection, revision) = (state.doc.clone(), state.selection.clone(), state.revision); + let history = (state.history.undo.len(), state.history.redo.len()); + let paint = app.session.paint.clone(); + frame_at(&mut app, &ctx, start + 3.0 * step, vec![press(true)]); + assert_eq!(app.session.tool_id(), "selection"); + assert!(app.ui.trace_ignore_sampler.is_none()); + assert_eq!(app.session.active().unwrap().selection, selection, "the second press was consumed"); + frame_at(&mut app, &ctx, start + 4.0 * step, vec![press(false)]); + assert!(ctx.input(|i| i.pointer.button_double_clicked(PointerButton::Primary)), "egui recognizes the timed release as a double-click"); + let state = app.session.active().unwrap(); + assert_eq!(state.isolation, None, "the release of the consumed press must not isolate the group"); + assert_eq!(state.doc, document); + assert_eq!(state.selection, selection); + assert_eq!(state.revision, revision); + assert_eq!((state.history.undo.len(), state.history.redo.len()), history); + assert_eq!(app.session.paint, paint); + assert_eq!(app.session.tool_id(), "selection"); + } else { + assert_eq!(app.session.active().unwrap().selection.objects, vec![group], "the ordinary first click really selects the group"); + frame_at(&mut app, &ctx, start + 3.0 * step, vec![press(true)]); + frame_at(&mut app, &ctx, start + 4.0 * step, vec![press(false)]); + assert!(ctx.input(|i| i.pointer.button_double_clicked(PointerButton::Primary))); + assert_eq!(app.session.active().unwrap().isolation, Some(group), "the legitimate unarmed double-click isolates the same group"); + } + } +} + fn capture_canvas(app: &mut VectorcraftApp, ctx: &egui::Context) -> (vectorcraft_render::Rendered, CacheKey) { app.canvas.key = None; // force a complete upload, not a partial delta requiring reconstruction let mut out = frame(app, ctx, vec![]); From 42f69621a23998e2ebbb0ac76992feab52395bb3 Mon Sep 17 00:00:00 2001 From: yoriswind Date: Wed, 18 Nov 2026 12:12:05 -0800 Subject: [PATCH 45/78] Keep a cancelled trace sampler press owned through release --- crates/ui-egui/src/canvas.rs | 19 +++++++++++++++++-- .../tests/image_trace_ignore_sampler.rs | 11 +++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/crates/ui-egui/src/canvas.rs b/crates/ui-egui/src/canvas.rs index e401b0a70b..c10ca61fb4 100644 --- a/crates/ui-egui/src/canvas.rs +++ b/crates/ui-egui/src/canvas.rs @@ -466,9 +466,24 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) { } } -/// A press arriving with an invalidated sampler is consumed, not given to its restored tool. +/// A press arriving with an invalidated sampler and its release belong to that cancelled pick. fn input_after_sampler_refresh(app: &mut VectorcraftApp, ui: &Ui, resp: &egui::Response, rect: egui::Rect, cancelled: bool) { - if !cancelled || !ui.input(|i| i.pointer.any_pressed()) { + let (pressed, released, down, any_pressed) = ui.input(|i| { + (i.pointer.primary_pressed(), i.pointer.primary_released(), i.pointer.primary_down(), i.pointer.any_pressed()) + }); + let consumed_primary = ui.data_mut(|data| { + let id = resp.id.with("image-trace-consumed-primary"); + // A fresh press replaces any ownership whose release this canvas did not observe. + let consumed = if pressed { cancelled } else { data.get_temp::(id).unwrap_or(false) }; + if consumed && down { + data.insert_temp(id, true); + } else { + data.remove::(id); + } + // egui classifies double/triple clicks on release, independently of the tool's Down. + consumed && (pressed || released || down) + }); + if !consumed_primary && (!cancelled || !any_pressed) { canvas_input(app, ui, resp, rect); } } diff --git a/crates/ui-egui/tests/image_trace_ignore_sampler.rs b/crates/ui-egui/tests/image_trace_ignore_sampler.rs index bc9fd97eb1..5a61946659 100644 --- a/crates/ui-egui/tests/image_trace_ignore_sampler.rs +++ b/crates/ui-egui/tests/image_trace_ignore_sampler.rs @@ -481,6 +481,17 @@ fn a_consumed_stale_sampler_press_does_not_complete_a_double_click() { assert_eq!((state.history.undo.len(), state.history.redo.len()), history); assert_eq!(app.session.paint, paint); assert_eq!(app.session.tool_id(), "selection"); + // The consumed release must not take the next independent ordinary gesture with it. + let next = start + 4.0 * step + delay + 1.0; + frame_at(&mut app, &ctx, next, vec![Event::PointerMoved(at), press(true)]); + frame_at(&mut app, &ctx, next + step, vec![press(false)]); + assert!(!ctx.input(|i| i.pointer.button_double_clicked(PointerButton::Primary))); + assert_eq!(app.session.active().unwrap().selection.objects, vec![group], "the next ordinary first click selects the group"); + assert_eq!(app.session.active().unwrap().isolation, None); + frame_at(&mut app, &ctx, next + 3.0 * step, vec![press(true)]); + frame_at(&mut app, &ctx, next + 4.0 * step, vec![press(false)]); + assert!(ctx.input(|i| i.pointer.button_double_clicked(PointerButton::Primary))); + assert_eq!(app.session.active().unwrap().isolation, Some(group), "the next ordinary double-click still isolates the group"); } else { assert_eq!(app.session.active().unwrap().selection.objects, vec![group], "the ordinary first click really selects the group"); frame_at(&mut app, &ctx, start + 3.0 * step, vec![press(true)]); From 149cc169694a82fb82390b9979e7478874b9c2ac Mon Sep 17 00:00:00 2001 From: yoriswind Date: Wed, 18 Nov 2026 12:16:00 -0800 Subject: [PATCH 46/78] Format the cancelled sampler pointer-state binding --- crates/ui-egui/src/canvas.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/crates/ui-egui/src/canvas.rs b/crates/ui-egui/src/canvas.rs index c10ca61fb4..7392ad73b8 100644 --- a/crates/ui-egui/src/canvas.rs +++ b/crates/ui-egui/src/canvas.rs @@ -468,9 +468,8 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) { /// A press arriving with an invalidated sampler and its release belong to that cancelled pick. fn input_after_sampler_refresh(app: &mut VectorcraftApp, ui: &Ui, resp: &egui::Response, rect: egui::Rect, cancelled: bool) { - let (pressed, released, down, any_pressed) = ui.input(|i| { - (i.pointer.primary_pressed(), i.pointer.primary_released(), i.pointer.primary_down(), i.pointer.any_pressed()) - }); + let (pressed, released, down, any_pressed) = + ui.input(|i| (i.pointer.primary_pressed(), i.pointer.primary_released(), i.pointer.primary_down(), i.pointer.any_pressed())); let consumed_primary = ui.data_mut(|data| { let id = resp.id.with("image-trace-consumed-primary"); // A fresh press replaces any ownership whose release this canvas did not observe. From 47acc318720a163c11b980927769cc28eb4b3deb Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Wed, 18 Nov 2026 12:38:58 -0800 Subject: [PATCH 47/78] Dimension: Arrow Style offers every built-in stroke arrowhead Arrow Style in Dimension Tool Options and in the Properties panel lists Filled, Open, Tick and None, then the other 38 built-in Stroke panel arrowheads, each with its drawn preview. The dimension line draws the chosen head at both ends. A dimension's options take a new arrowHead value: null, or a built-in stroke arrowhead name as stroke.set takes it. The menu writes arrowStyle filled with it, so versions that do not read arrowHead open such a dimension with Filled arrows. Documents and tool settings saved before open unchanged. Custom arrowheads and unknown names are refused. Fixes #8049 Fixes #3222 --- crates/doc/src/dimension.rs | 33 +++++++++ crates/engine/src/cmd/dimension.rs | 4 +- crates/engine/tests/it/dimensions.rs | 56 ++++++++++++++ crates/ui-egui/src/dialogs/dimension.rs | 98 +++++++++++++++++++------ docs/dimensions.md | 5 ++ docs/mcp.md | 6 ++ docs/target-app-parity.md | 1 + 7 files changed, 179 insertions(+), 24 deletions(-) diff --git a/crates/doc/src/dimension.rs b/crates/doc/src/dimension.rs index 9e78d17d4d..35c8431661 100644 --- a/crates/doc/src/dimension.rs +++ b/crates/doc/src/dimension.rs @@ -124,6 +124,26 @@ impl ArrowStyle { } } +/// `arrowHead`: null, or a built-in stroke arrowhead by its name (`Barbed`, as `stroke.set` takes +/// it). A custom arrowhead and an unknown name are refused. +mod arrow_head { + use crate::Arrowhead; + use serde::de::{Error, IntoDeserializer}; + use serde::{Deserialize, Deserializer}; + + pub fn deserialize<'de, D: Deserializer<'de>>(deserializer: D) -> Result, D::Error> { + let Some(name) = Option::::deserialize(deserializer)? else { return Ok(None) }; + let parsed: Result = Arrowhead::deserialize(name.as_str().into_deserializer()); + match parsed { + Ok(head) if !matches!(head, Arrowhead::Custom(_)) => Ok(Some(head)), + _ => { + let shown: String = name.chars().take(64).collect(); + Err(D::Error::custom(format!("Unknown arrowhead {shown}: a built-in stroke arrowhead name or null"))) + } + } + } +} + /// Where the label sits across the dimension line. #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)] #[serde(rename_all = "lowercase")] @@ -157,6 +177,10 @@ pub struct DimensionOptions { pub line_type: LineType, pub line_color: [u8; 3], pub arrow_style: ArrowStyle, + /// A built-in stroke arrowhead drawn at both ends in place of `arrow_style`'s head. Versions + /// that do not read it draw `arrow_style`. + #[serde(deserialize_with = "arrow_head::deserialize")] + pub arrow_head: Option, pub arrow_scale: f64, pub extension_weight: f64, pub extension_type: LineType, @@ -186,6 +210,7 @@ impl Default for DimensionOptions { line_type: LineType::Solid, line_color: [0, 0, 0], arrow_style: ArrowStyle::Filled, + arrow_head: None, arrow_scale: 100.0, extension_weight: 0.5, extension_type: LineType::Solid, @@ -228,8 +253,16 @@ impl DimensionOptions { } Ok(f) } + /// The stroke arrowhead drawn at each end of the dimension line: `arrow_head`, or else the + /// arrow style's head. + pub fn arrowhead(&self) -> Option { + self.arrow_head.clone().or_else(|| self.arrow_style.arrowhead()) + } pub fn validate(&self) -> Result<(), String> { self.factor()?; + if matches!(self.arrow_head, Some(crate::Arrowhead::Custom(_))) { + return Err("A dimension's arrowhead is a built-in stroke arrowhead".into()); + } if self.precision > 6 { return Err("Choose a precision from 0 to 6".into()); } diff --git a/crates/engine/src/cmd/dimension.rs b/crates/engine/src/cmd/dimension.rs index 955401b923..768384f578 100644 --- a/crates/engine/src/cmd/dimension.rs +++ b/crates/engine/src/cmd/dimension.rs @@ -14,7 +14,7 @@ pub fn specs() -> Vec { "Create Dimension", [], None, - "{mode?: linear|angular|radius|diameter, a?: [x,y], b?: [x,y], vertex?: [x,y], source?: {kind: segment, edge: {node,subpath,segment}}|{kind: angle, first: edge, second: edge}|{kind: circle, node}|{kind: arc, edge}|{kind: points, a?, b?, vertex?: {node,subpath,anchor}, freeA?, freeB?: a point that is not an anchor, {kind: onSegment, edge: {node,subpath,segment}, t: 0..1 (curve parameter)}|{kind: anchors, node, anchors: [{subpath,anchor,part?: point|in|out (the anchor, default, or its in or out handle),weight}] (2 or 3 points of one path whose weights add up to 1), across?: (2 anchors only: times the first-to-second anchor vector (x,y) turned to (-y,x), which points down when the vector points right)} (an end is an anchor or a free point, not both)}, orientation?: aligned|horizontal|vertical (linear only: the distance between the points, or only its horizontal or vertical part; default aligned), offset?: pt (the line's distance from the first point: along the left normal of a → b when aligned, downward when horizontal, leftward when vertical; negative goes the other way), options?: {units: in|mm|pt|pc|px|cm|m|ft|yd, precision: 0-6, scale: drawing:real, hideUnits, lineWeight, lineType: solid|dashed|dotted, lineColor: [r,g,b], arrowStyle: filled|open|tick|none, arrowScale: %, extensionWeight, extensionType, extensionColor, extensionOffset, extensionLength, hideExtensions, fontFamily, fontStyle, fontSize, textColor, textPosition: away|between, textAlignment: left|center|right, textOffset}} → {id,label}; linked measurements follow source edits", + "{mode?: linear|angular|radius|diameter, a?: [x,y], b?: [x,y], vertex?: [x,y], source?: {kind: segment, edge: {node,subpath,segment}}|{kind: angle, first: edge, second: edge}|{kind: circle, node}|{kind: arc, edge}|{kind: points, a?, b?, vertex?: {node,subpath,anchor}, freeA?, freeB?: a point that is not an anchor, {kind: onSegment, edge: {node,subpath,segment}, t: 0..1 (curve parameter)}|{kind: anchors, node, anchors: [{subpath,anchor,part?: point|in|out (the anchor, default, or its in or out handle),weight}] (2 or 3 points of one path whose weights add up to 1), across?: (2 anchors only: times the first-to-second anchor vector (x,y) turned to (-y,x), which points down when the vector points right)} (an end is an anchor or a free point, not both)}, orientation?: aligned|horizontal|vertical (linear only: the distance between the points, or only its horizontal or vertical part; default aligned), offset?: pt (the line's distance from the first point: along the left normal of a → b when aligned, downward when horizontal, leftward when vertical; negative goes the other way), options?: {units: in|mm|pt|pc|px|cm|m|ft|yd, precision: 0-6, scale: drawing:real, hideUnits, lineWeight, lineType: solid|dashed|dotted, lineColor: [r,g,b], arrowStyle: filled|open|tick|none, arrowHead: null|a built-in stroke.set arrowhead name (Barbed, LineArrow…; drawn at both ends in place of arrowStyle's head, which versions that do not read arrowHead draw; custom arrowheads are refused), arrowScale: %, extensionWeight, extensionType, extensionColor, extensionOffset, extensionLength, hideExtensions, fontFamily, fontStyle, fontSize, textColor, textPosition: away|between, textAlignment: left|center|right, textOffset}} → {id,label}; linked measurements follow source edits", has_doc, create ), @@ -565,7 +565,7 @@ fn appearance(o: &DimensionOptions, mode: ColorMode, ext: bool, arrows: bool) -> LineType::Solid => None, }; if arrows { - let head = o.arrow_style.arrowhead(); + let head = o.arrowhead(); st.start_arrow = head.clone(); st.end_arrow = head; st.arrow_scale = (o.arrow_scale, o.arrow_scale); diff --git a/crates/engine/tests/it/dimensions.rs b/crates/engine/tests/it/dimensions.rs index 17391ae98a..d2c6148f7d 100644 --- a/crates/engine/tests/it/dimensions.rs +++ b/crates/engine/tests/it/dimensions.rs @@ -118,6 +118,62 @@ fn each_arrow_style_draws_its_stroke_arrowhead_at_both_ends() { } } +/// `arrowHead` draws any built-in stroke arrowhead at both ends of the dimension line, and the +/// native file keeps it. The saved `arrowStyle` stays one of the four values versions without +/// `arrowHead` read, and a dimension saved without `arrowHead` draws its arrow style. A custom +/// arrowhead and an unknown name are refused. +#[test] +fn every_stroke_arrowhead_draws_as_a_dimension_arrowhead() { + use vectorcraft_doc::{Arrowhead, dimension::ArrowStyle}; + let ends = |s: &Session, id: u64| -> Vec<_> { + let n = s.doc().unwrap().doc.node(NodeId(id)).unwrap(); + let children = n.children().unwrap(); + let strokes = children.iter().filter_map(|n| n.appearance.stroke().map(|s| (s.start_arrow.clone(), s.end_arrow.clone()))); + strokes.filter(|(a, b)| a.is_some() || b.is_some()).collect() + }; + let mut s = session(); + let mut made = vec![]; + for head in Arrowhead::ALL { + let name = serde_json::to_value(&head).unwrap(); + let id = run(&mut s, "dimension.create", json!({"a":[0,0],"b":[72,0],"options":{"arrowHead":name}}))["id"].as_u64().unwrap(); + let drawn = ends(&s, id); + assert!(!drawn.is_empty() && drawn.iter().all(|h| *h == (Some(head.clone()), Some(head.clone()))), "{name}: {drawn:?}"); + let saved = serde_json::to_value(&recipe(&s, id).options).unwrap(); + assert_eq!((&saved["arrowStyle"], &saved["arrowHead"]), (&json!("filled"), &name)); + made.push((id, head)); + } + let bytes = vectorcraft_format::save(&s.doc().unwrap().doc, false); + let mut reopened = Session::new(); + reopened.add_document(vectorcraft_format::load(&bytes).unwrap(), None); + for (id, head) in made { + assert_eq!(recipe(&reopened, id).options.arrowhead(), Some(head)); + } + // A dimension saved before `arrowHead` existed. + let id = run(&mut s, "dimension.create", json!({"a":[0,0],"b":[72,0],"options":{"arrowStyle":"open"}}))["id"].as_u64().unwrap(); + let mut file: Value = serde_json::from_slice(&vectorcraft_format::save(&s.doc().unwrap().doc, false)).unwrap(); + fn drop_head(v: &mut Value) { + match v { + Value::Object(m) => { + m.remove("arrowHead"); + m.values_mut().for_each(drop_head); + } + Value::Array(a) => a.iter_mut().for_each(drop_head), + _ => {} + } + } + drop_head(&mut file); + let mut older = Session::new(); + older.add_document(vectorcraft_format::load(&serde_json::to_vec(&file).unwrap()).unwrap(), None); + let o = recipe(&older, id).options; + assert_eq!((o.arrow_style, o.arrow_head.clone(), o.arrowhead()), (ArrowStyle::Open, None, Some(Arrowhead::TriangleOpen))); + let custom = json!({"Custom":{"name":"Dot","path":{"subpaths":[]}}}); + for bad in [json!("Custom"), json!("Arrowhead"), json!("barbed"), json!(3), custom] { + let p = json!({"a":[0,0],"b":[72,0],"options":{"arrowHead":bad}}); + assert!(s.execute("dimension.create", &p).is_err(), "{bad}"); + } + assert!(s.execute("dimension.create", &json!({"a":[0,0],"b":[72,0],"options":{"arrowStyle":"Barbed"}})).is_err()); +} + #[test] fn dimension_angles_circles_arcs_and_curves() { let mut s = session(); diff --git a/crates/ui-egui/src/dialogs/dimension.rs b/crates/ui-egui/src/dialogs/dimension.rs index 3a977e76c6..c3c929b50d 100644 --- a/crates/ui-egui/src/dialogs/dimension.rs +++ b/crates/ui-egui/src/dialogs/dimension.rs @@ -4,6 +4,7 @@ use super::DialogSpec; use crate::{VectorcraftApp, state::Dialog, theme::Tokens, widgets}; use egui::{RichText, Ui}; use serde_json::{Value, json}; +use vectorcraft_doc::Arrowhead; use vectorcraft_doc::dimension::{ArrowStyle, DimensionOptions}; pub const KIND: &str = "dimensionOptions"; @@ -31,11 +32,33 @@ const UNITS: Choices = &[ ("yd", "Yards"), ]; const LINE_TYPES: Choices = &[("solid", "Solid"), ("dashed", "Dashed"), ("dotted", "Dotted")]; -const ARROWS: Choices = &[("filled", "Filled"), ("open", "Open"), ("tick", "Tick"), ("none", "None")]; -/// The style of each `ARROWS` entry, in the same order. -const ARROW_STYLES: [ArrowStyle; 4] = [ArrowStyle::Filled, ArrowStyle::Open, ArrowStyle::Tick, ArrowStyle::None]; -/// The size of an Arrow Style preview: a line with the head at its right end. -const ARROW_PREVIEW: egui::Vec2 = egui::vec2(40.0, 16.0); +/// The size of an Arrow Style preview: a line with the head at its right end. Line Arrow, the widest +/// head, spreads 20 pt across at the preview's head weight. +const ARROW_PREVIEW: egui::Vec2 = egui::vec2(40.0, 22.0); +/// One Arrow Style entry: the `arrowStyle` and `arrowHead` values it sets, and its name. +struct ArrowChoice { + style: ArrowStyle, + head: Option, + name: &'static str, +} +impl ArrowChoice { + /// The arrowhead the dimension line draws with this entry. + fn drawn(&self) -> Option { + self.head.clone().or_else(|| self.style.arrowhead()) + } +} +/// The Arrow Style entries: Filled, Open, Tick and None, then the other built-in stroke arrowheads +/// in the Stroke panel's order. A stroke arrowhead keeps `filled` as its `arrowStyle`, the head that +/// versions which do not read `arrowHead` draw. +fn arrow_choices() -> Vec { + let named = [(ArrowStyle::Filled, "Filled"), (ArrowStyle::Open, "Open"), (ArrowStyle::Tick, "Tick"), (ArrowStyle::None, "None")]; + let heads = Arrowhead::ALL.into_iter().filter(|h| !named.iter().any(|(s, _)| s.arrowhead().as_ref() == Some(h))); + named + .into_iter() + .map(|(style, name)| ArrowChoice { style, head: None, name }) + .chain(heads.map(|h| ArrowChoice { style: ArrowStyle::Filled, name: h.label(), head: Some(h) })) + .collect() +} const POSITIONS: Choices = &[("away", "Away from the Line"), ("between", "Between Line and Object")]; const ALIGNMENTS: Choices = &[("left", "Left"), ("center", "Center"), ("right", "Right")]; @@ -73,24 +96,34 @@ fn choose(ui: &mut Ui, fields: &mut serde_json::Map, key: &str, l }); changed } -/// The Arrow Style dropdown: each style shows a drawn preview of its arrowhead before its name, in -/// the open list and in the closed field. +/// The Arrow Style dropdown: Filled, Open, Tick and None, then the other built-in stroke +/// arrowheads. Each style shows a drawn preview of its arrowhead before its name, in the open list +/// and in the closed field. fn arrow_style(ui: &mut Ui, fields: &mut serde_json::Map, id: &str) -> bool { - const KEY: &str = "arrowStyle"; + const STYLE: &str = "arrowStyle"; + const HEAD: &str = "arrowHead"; let mut changed = false; widgets::label_row(ui, tl!("Arrow Style:"), 96.0, |ui| { - let current = fields.get(KEY).and_then(Value::as_str).unwrap_or_default(); - let shown = ARROWS.iter().position(|(v, _)| *v == current); - let names: Vec<&str> = ARROWS.iter().map(|(_, s)| tl!(*s)).collect(); + let choices = arrow_choices(); + let style = fields.get(STYLE).cloned().and_then(|v| serde_json::from_value::(v).ok()); + let head = fields.get(HEAD).cloned().and_then(|v| serde_json::from_value::>(v).ok()).flatten(); + let current = style.map(|s| head.or_else(|| s.arrowhead())); + let shown = current.and_then(|c| choices.iter().position(|ch| ch.drawn() == c)); + let names: Vec<&str> = choices.iter().map(|ch| tl!(ch.name)).collect(); let icon = |ui: &Ui, rect: egui::Rect, i: usize, ink: egui::Color32, _: bool| { - if let Some(style) = ARROW_STYLES.get(i) { - crate::panels::stroke::paint_arrow(ui, rect, style.arrowhead().as_ref(), false, ink); + // Only the rows in view render their previews. + if ui.is_rect_visible(rect) + && let Some(ch) = choices.get(i) + { + crate::panels::stroke::paint_arrow(ui, rect, ch.drawn().as_ref(), false, ink); } }; - if let Some((value, _)) = - widgets::dropdown_icon_names_sized(ui, ("dimension", id), shown, &names, 150.0, ARROW_PREVIEW, icon).and_then(|i| ARROWS.get(i)) + if let Some(ch) = + widgets::dropdown_icon_names_sized(ui, ("dimension", id), shown, &names, 150.0, ARROW_PREVIEW, icon).and_then(|i| choices.get(i)) + && let (Ok(style), Ok(head)) = (serde_json::to_value(ch.style), serde_json::to_value(&ch.head)) { - fields.insert(KEY.into(), json!(value)); + fields.insert(STYLE.into(), style); + fields.insert(HEAD.into(), head); changed = true; } }); @@ -430,7 +463,10 @@ mod tests { let ctx = egui::Context::default(); crate::theme::install_fonts(&ctx); ctx.run_ui(egui::RawInput::default(), |ui| f(app, ui)).textures_delta.clear(); - ctx.run_ui(egui::RawInput::default(), |ui| f(app, ui)) + let mut out = ctx.run_ui(egui::RawInput::default(), |ui| f(app, ui)); + // Previews of rows that come into view in this frame load now. + out.textures_delta.clear(); + out } /// The Arrow Style field of the Tool Options and of Properties shows the style's arrowhead, @@ -448,12 +484,30 @@ mod tests { assert!(picture_before(&out, "Tick"), "Properties"); } - /// Each Arrow Style entry previews the style its value names. + /// A dimension drawn with a stroke arrowhead shows that head's name and preview in its Arrow + /// Style field (#3222). #[test] - fn arrow_previews_follow_the_listed_styles() { - assert_eq!(ARROWS.len(), ARROW_STYLES.len()); - for ((value, _), style) in ARROWS.iter().zip(ARROW_STYLES) { - assert_eq!(serde_json::to_value(style).unwrap(), json!(value)); + fn arrow_style_shows_a_stroke_arrowhead() { + let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), Default::default()); + app.run("file.new", json!({"width": 400, "height": 300})).unwrap(); + app.run("dimension.create", json!({"a":[10,10],"b":[110,10],"options":{"arrowHead":"HalfArrowLeft"}})).unwrap(); + let out = frame(&mut app, properties_section); + assert!(picture_before(&out, "Half Arrow (left)"), "Properties"); + } + + /// The Arrow Style list names each arrowhead once, with the four older styles first, and each + /// stroke arrowhead keeps Filled for versions that do not read `arrowHead`. + #[test] + fn arrow_style_list_names_each_style_once() { + let choices = arrow_choices(); + let names: Vec<&str> = choices.iter().map(|c| c.name).collect(); + assert_eq!(names[..4], ["Filled", "Open", "Tick", "None"]); + for name in ["Triangle", "Triangle (open)", "Slash"] { + assert!(!names.contains(&name), "{name} is listed as Filled, Open or Tick"); } + assert_eq!(names.len(), Arrowhead::ALL.len() + 1, "None and each built-in head: {names:?}"); + let drawn: Vec<_> = choices.iter().map(|c| format!("{:?}", c.drawn())).collect(); + assert_eq!(drawn.iter().collect::>().len(), drawn.len(), "{drawn:?}"); + assert!(choices[4..].iter().all(|c| c.style == ArrowStyle::Filled && c.head.is_some())); } } diff --git a/docs/dimensions.md b/docs/dimensions.md index b5a15d1f11..ef7323f07b 100644 --- a/docs/dimensions.md +++ b/docs/dimensions.md @@ -88,6 +88,11 @@ alignment). **Position** is **Away from the Line** (the label on the far side of from the object) or **Between Line and Object**; **Alignment** is **Left**, **Center** or **Right** along the line. **Save** keeps them for new dimensions; existing ones don't change. +**Arrow Style** lists **Filled**, **Open**, **Tick** and **None**, then every other built-in +arrowhead of the Stroke panel, each with a drawn preview before its name. Custom arrowheads are not +listed. A dimension with one of the other arrowheads opens in versions without them with +**Filled** arrows. + Scale means **drawing : real size**, independent of zoom. At **1:10** a 1 in line on the page is labelled 10 in; at **10:1**, 0.1 in. It scales lengths, not angles or the size of text and arrows. diff --git a/docs/mcp.md b/docs/mcp.md index 5bc273289c..e577417826 100644 --- a/docs/mcp.md +++ b/docs/mcp.md @@ -6095,6 +6095,12 @@ the `…Open` rings…) and marks (`Bar`, `DoubleBar`, `DotOnBar`, `Slash`, `Dou `arrowScale`, at least 0.25 pt. `LineArrow` has two arms of the head's weight (the line's weight at 100 % for lines of 0.25 pt or more) at right angles and spreads twice as wide. +A dimension's options (`dimension.create`, `dimension.update` and the Dimension tool's `style`) take `arrowStyle` +(`filled`, `open`, `tick` or `none`: `Triangle`, `TriangleOpen`, `Slash` or no head) and `arrowHead`, `null` or one of +the same built-in head names, drawn at both ends in place of the arrow style's head. Versions that do not read +`arrowHead` draw `arrowStyle`. The Arrow Style menu sets `arrowStyle` to `filled` when it sets `arrowHead`. A custom +arrowhead and an unknown name are refused. + Custom arrowheads come from the arrowheads file, `Arrowheads.vectorcraft` next to the preferences (none on the web or in runs with `VECTORCRAFT_NO_PREFS`). `stroke.arrowheads.edit` (Stroke panel menu › Edit Arrowheads…) opens it, and first creates it with one example head when it is missing. Each symbol in the file is one head, named after the diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index 641d87bdcc..a0ae897cd4 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -655,6 +655,7 @@ since 2026-10-01. **Drawing tools, Dimension tool lines line up with dimensions already drawn (#8063, #5590):** By VectorCraft's own rule, with Smart Guides on, a linear dimension placed with its line within the Smart Guides snapping tolerance of the level of a parallel line of a visible, unlocked linear dimension already drawn has its line on that level, and with Alignment Guides on a guide runs along the level across both lines while it is placed. `a_dimension_line_placed_beside_another_lands_on_its_level`, `a_dimension_line_on_another_level_shows_one_guide_across_both`, `a_dimension_of_the_same_points_lines_up_and_the_line_follows_the_pointer`, `a_dimension_dragged_out_beside_another_lands_on_its_level` and `a_line_the_pointer_lies_across_wins_on_one_level` cover it. **Drawing tools, Dimension tool dimensions selected with their art keep their lines and label:** Object › Expand, Object › Expand Appearance and Object › Path › Outline Stroke leave a dimension selected with art it measures, directly or in selected groups without fills, strokes or effects of their own, as it is and change only the other art; when the new art no longer fits its link, the dimension stays where it was, no longer linked, and undo links it again. `expand_leaves_a_dimension_selected_with_its_art_as_it_is`, `expand_appearance_leaves_a_dimension_selected_with_its_art_as_it_is`, `outline_stroke_leaves_a_dimension_selected_with_its_art_as_it_is`, `a_dimension_selected_with_art_that_has_nothing_to_expand_changes_nothing`, `a_group_effect_expanded_reaches_the_dimension_it_holds`, `expand_keeps_a_dimension_in_its_asset_and_its_variable_binding`, `a_dimension_keeps_no_link_to_the_art_expand_replaced`, `a_dimension_outlasts_the_art_outline_stroke_or_expand_appearance_replaced`, `a_dimension_outlasts_the_stroke_expand_outlined` and `expand_appearance_in_safe_mode_leaves_a_dimension_selected_with_its_art` cover it. **Drawing tools, Dimension tool Arrow Style shows each arrowhead (#8049):** The Arrow Style dropdown in Dimension Tool Options and in the Properties panel's Dimension section draws each style's arrowhead at the end of a short line before its name, in the open list and in the closed field, using the Stroke panel's arrowhead previews. Filled, Open, Tick and None are the same four styles, saved as before. `arrow_style_shows_a_drawn_arrowhead` and `each_arrow_style_draws_its_stroke_arrowhead_at_both_ends` cover it. +**Drawing tools, Dimension tool Arrow Style offers every stroke arrowhead (#8049, #3222):** By VectorCraft's own rule, Arrow Style lists Filled, Open, Tick and None, then the other 38 built-in Stroke panel arrowheads, each with its drawn preview. The options save the head in `arrowHead` (`Barbed`) and keep `arrowStyle` at `filled`, so versions without `arrowHead` open such a dimension with Filled arrows; documents and tool settings saved before open unchanged. `every_stroke_arrowhead_draws_as_a_dimension_arrowhead`, `arrow_style_shows_a_stroke_arrowhead` and `arrow_style_list_names_each_style_once` cover it. **Drawing tools, Line Segment from one curve onto a common tangent of another:** By VectorCraft's own rule, with Smart Guides and Snap to Tangent on, a Line Segment drag pressed anywhere on a convex closed path with curves and dragged to within the snapping tolerance of another such path lands on a common tangent of the two ([tangent lines to circles](https://en.wikipedia.org/wiki/Tangent_lines_to_circles)): both ends move to where the line touches the paths, the start sliding along the first path, and each end shows the "tangent" label when Anchor/Path Labels is on, with the line drawn as a guide when Alignment Guides is on. The line is the tangent whose touch point on the second path is nearest the pointer, so moving the pointer around the second path switches between the outer tangent and the one crossing between the paths. The start stays where it was pressed when Shift, Alt or Space is held, when an anchor, center or crossing lies nearer the pointer than the second path does, when the press snapped to an anchor, center or crossing off the first path, when Snap to Tangent is off, when Snap to Grid or pixel snapping places drawn points, or when either path bends inward somewhere or has more than 512 segments. `a_line_from_one_circle_to_another_lands_on_their_common_tangent`, `a_line_from_a_turned_ellipse_lands_on_its_tangent_with_a_circle`, `a_line_near_the_second_path_takes_the_tangent_touching_it_nearest`, `a_line_keeps_its_start_without_a_tangent_snap`, `a_line_to_a_crescent_or_from_an_anchor_beside_the_curve_keeps_its_start` and `a_line_segment_drag_draws_the_common_tangent_as_one_undo_step` cover it. **Live trace result bounds and selection highlights exclude the retained bitmap except in source-image views:** `live_trace_result_bounds_exclude_the_retained_bitmap_at_any_angle` checks every TraceView, geometric and visual bounds and rotated result bounds. `live_trace_selection_highlight_excludes_the_retained_source_rectangle` checks result highlights and the existing ordinary-group policy. Shared editing-child traversal also preserves Shaper handling. **Artboard Options shares existing presets and orientation controls and can fit artwork without moving it; artwork fitting includes all drawn document art across artboards and off-board; artwork bounds are cached by active document and revision, and selection uses the shared bounds cache across artboards:** Shared existing preset definitions are reused; no external preset assets are added. Presets preserve each selected artboard's orientation, and orientation choices apply even when the active board already matches. Fit operations draft bounds until OK, affect only the active artboard and leave artwork in place. Regression coverage checks draft/Cancel, selected-set application, active-only fitting and Undo. From a0e67959467a525d308b4327e3f31497847bbaef Mon Sep 17 00:00:00 2001 From: yoriswind Date: Wed, 18 Nov 2026 12:39:58 -0800 Subject: [PATCH 48/78] Split sampler double-click scenarios into a focused helper --- .../tests/image_trace_ignore_sampler.rs | 149 +++++++++--------- 1 file changed, 76 insertions(+), 73 deletions(-) diff --git a/crates/ui-egui/tests/image_trace_ignore_sampler.rs b/crates/ui-egui/tests/image_trace_ignore_sampler.rs index 5a61946659..6a05c7f086 100644 --- a/crates/ui-egui/tests/image_trace_ignore_sampler.rs +++ b/crates/ui-egui/tests/image_trace_ignore_sampler.rs @@ -408,6 +408,12 @@ fn a_stale_sampler_and_canvas_press_in_one_frame_do_not_reselect_the_source() { /// A stale sampler consumes its second press, including the release's double-click action. #[test] fn a_consumed_stale_sampler_press_does_not_complete_a_double_click() { + // Run the legitimate control first: this geometry and these real UI frames must isolate. + check_sampler_double_click(false); + check_sampler_double_click(true); +} + +fn check_sampler_double_click(sampler: bool) { fn frame_at(app: &mut VectorcraftApp, ctx: &egui::Context, time: f64, events: Vec) { let mut raw = RawInput { time: Some(time), @@ -425,80 +431,77 @@ fn a_consumed_stale_sampler_press_does_not_complete_a_double_click() { assert_eq!(ctx.time(), time, "the real UI frame uses the supplied gesture time"); } - // Run the legitimate control first: this geometry and these real UI frames must isolate. - for sampler in [false, true] { - let (mut app, ctx) = fixture(true, [37, 83, 149], false); - let source = selected(&app).id; - app.session.prefs.double_click_to_isolate = true; - let first = app.run("shape.rectangle", json!({"x": 100, "y": 140, "width": 20, "height": 20})).unwrap()["id"].clone(); - let second = app.run("shape.rectangle", json!({"x": 120, "y": 140, "width": 20, "height": 20})).unwrap()["id"].clone(); - app.run("paint.setFill", json!({"ids": [first.clone(), second.clone()], "color": "#cc3322"})).unwrap(); - app.run("select.set", json!({"ids": [first, second]})).unwrap(); - let group = NodeId(app.run("object.group", json!({})).unwrap()["id"].as_u64().unwrap()); - app.run("select.set", json!({"ids": [source.0]})).unwrap(); - settle(&mut app, &ctx); - let point = Point::new(110.0, 150.0); - assert!(point.x < source_point(&app, 0.0).x - 40.0, "the group is outside the source image"); - if sampler { - click_control(&mut app, &ctx, SAMPLE_TIP); - assert_eq!(app.session.tool_id(), "eyedropper"); - assert!(app.ui.trace_ignore_sampler.is_some()); - } - let at = canvas::Xf::at(app.canvas_rect.unwrap(), app.view().unwrap(), ctx.zoom_factor()).to_screen(point); - assert!(app.canvas_rect.unwrap().contains(at)); - let (delay, hold) = ctx.options(|o| (o.input_options.max_double_click_delay, o.input_options.max_click_duration)); - assert!(delay.is_finite() && delay > 0.0 && hold.is_finite() && hold > 0.0); - let step = delay.min(hold) / 8.0; - // Leave the panel-button click outside the interval; only these two canvas clicks count. - let start = ctx.time() + delay + 1.0; - let press = |pressed| Event::PointerButton { pos: at, button: PointerButton::Primary, pressed, modifiers: Default::default() }; - frame_at(&mut app, &ctx, start, vec![Event::PointerMoved(at), press(true)]); - frame_at(&mut app, &ctx, start + step, vec![press(false)]); - assert!(!ctx.input(|i| i.pointer.button_double_clicked(PointerButton::Primary)), "the first canvas click is single"); - assert_eq!(app.session.active().unwrap().isolation, None); + let (mut app, ctx) = fixture(true, [37, 83, 149], false); + let source = selected(&app).id; + app.session.prefs.double_click_to_isolate = true; + let first = app.run("shape.rectangle", json!({"x": 100, "y": 140, "width": 20, "height": 20})).unwrap()["id"].clone(); + let second = app.run("shape.rectangle", json!({"x": 120, "y": 140, "width": 20, "height": 20})).unwrap()["id"].clone(); + app.run("paint.setFill", json!({"ids": [first.clone(), second.clone()], "color": "#cc3322"})).unwrap(); + app.run("select.set", json!({"ids": [first, second]})).unwrap(); + let group = NodeId(app.run("object.group", json!({})).unwrap()["id"].as_u64().unwrap()); + app.run("select.set", json!({"ids": [source.0]})).unwrap(); + settle(&mut app, &ctx); + let point = Point::new(110.0, 150.0); + assert!(point.x < source_point(&app, 0.0).x - 40.0, "the group is outside the source image"); + if sampler { + click_control(&mut app, &ctx, SAMPLE_TIP); + assert_eq!(app.session.tool_id(), "eyedropper"); + assert!(app.ui.trace_ignore_sampler.is_some()); + } + let at = canvas::Xf::at(app.canvas_rect.unwrap(), app.view().unwrap(), ctx.zoom_factor()).to_screen(point); + assert!(app.canvas_rect.unwrap().contains(at)); + let (delay, hold) = ctx.options(|o| (o.input_options.max_double_click_delay, o.input_options.max_click_duration)); + assert!(delay.is_finite() && delay > 0.0 && hold.is_finite() && hold > 0.0); + let step = delay.min(hold) / 8.0; + // Leave the panel-button click outside the interval; only these two canvas clicks count. + let start = ctx.time() + delay + 1.0; + let press = |pressed| Event::PointerButton { pos: at, button: PointerButton::Primary, pressed, modifiers: Default::default() }; + frame_at(&mut app, &ctx, start, vec![Event::PointerMoved(at), press(true)]); + frame_at(&mut app, &ctx, start + step, vec![press(false)]); + assert!(!ctx.input(|i| i.pointer.button_double_clicked(PointerButton::Primary)), "the first canvas click is single"); + assert_eq!(app.session.active().unwrap().isolation, None); - if sampler { - assert_eq!(app.session.tool_id(), "eyedropper", "the first click is a source-image miss"); - assert!(app.ui.trace_ignore_sampler.is_some(), "the miss keeps sampling armed"); - assert_eq!(app.session.active().unwrap().selection.objects, vec![source], "the miss does not select the group"); - // No intervening UI frame: canvas refresh must consume the stale second press. - app.run("select.none", json!({})).unwrap(); - let state = app.session.active().unwrap(); - let (document, selection, revision) = (state.doc.clone(), state.selection.clone(), state.revision); - let history = (state.history.undo.len(), state.history.redo.len()); - let paint = app.session.paint.clone(); - frame_at(&mut app, &ctx, start + 3.0 * step, vec![press(true)]); - assert_eq!(app.session.tool_id(), "selection"); - assert!(app.ui.trace_ignore_sampler.is_none()); - assert_eq!(app.session.active().unwrap().selection, selection, "the second press was consumed"); - frame_at(&mut app, &ctx, start + 4.0 * step, vec![press(false)]); - assert!(ctx.input(|i| i.pointer.button_double_clicked(PointerButton::Primary)), "egui recognizes the timed release as a double-click"); - let state = app.session.active().unwrap(); - assert_eq!(state.isolation, None, "the release of the consumed press must not isolate the group"); - assert_eq!(state.doc, document); - assert_eq!(state.selection, selection); - assert_eq!(state.revision, revision); - assert_eq!((state.history.undo.len(), state.history.redo.len()), history); - assert_eq!(app.session.paint, paint); - assert_eq!(app.session.tool_id(), "selection"); - // The consumed release must not take the next independent ordinary gesture with it. - let next = start + 4.0 * step + delay + 1.0; - frame_at(&mut app, &ctx, next, vec![Event::PointerMoved(at), press(true)]); - frame_at(&mut app, &ctx, next + step, vec![press(false)]); - assert!(!ctx.input(|i| i.pointer.button_double_clicked(PointerButton::Primary))); - assert_eq!(app.session.active().unwrap().selection.objects, vec![group], "the next ordinary first click selects the group"); - assert_eq!(app.session.active().unwrap().isolation, None); - frame_at(&mut app, &ctx, next + 3.0 * step, vec![press(true)]); - frame_at(&mut app, &ctx, next + 4.0 * step, vec![press(false)]); - assert!(ctx.input(|i| i.pointer.button_double_clicked(PointerButton::Primary))); - assert_eq!(app.session.active().unwrap().isolation, Some(group), "the next ordinary double-click still isolates the group"); - } else { - assert_eq!(app.session.active().unwrap().selection.objects, vec![group], "the ordinary first click really selects the group"); - frame_at(&mut app, &ctx, start + 3.0 * step, vec![press(true)]); - frame_at(&mut app, &ctx, start + 4.0 * step, vec![press(false)]); - assert!(ctx.input(|i| i.pointer.button_double_clicked(PointerButton::Primary))); - assert_eq!(app.session.active().unwrap().isolation, Some(group), "the legitimate unarmed double-click isolates the same group"); - } + if sampler { + assert_eq!(app.session.tool_id(), "eyedropper", "the first click is a source-image miss"); + assert!(app.ui.trace_ignore_sampler.is_some(), "the miss keeps sampling armed"); + assert_eq!(app.session.active().unwrap().selection.objects, vec![source], "the miss does not select the group"); + // No intervening UI frame: canvas refresh must consume the stale second press. + app.run("select.none", json!({})).unwrap(); + let state = app.session.active().unwrap(); + let (document, selection, revision) = (state.doc.clone(), state.selection.clone(), state.revision); + let history = (state.history.undo.len(), state.history.redo.len()); + let paint = app.session.paint.clone(); + frame_at(&mut app, &ctx, start + 3.0 * step, vec![press(true)]); + assert_eq!(app.session.tool_id(), "selection"); + assert!(app.ui.trace_ignore_sampler.is_none()); + assert_eq!(app.session.active().unwrap().selection, selection, "the second press was consumed"); + frame_at(&mut app, &ctx, start + 4.0 * step, vec![press(false)]); + assert!(ctx.input(|i| i.pointer.button_double_clicked(PointerButton::Primary)), "egui recognizes the timed release as a double-click"); + let state = app.session.active().unwrap(); + assert_eq!(state.isolation, None, "the release of the consumed press must not isolate the group"); + assert_eq!(state.doc, document); + assert_eq!(state.selection, selection); + assert_eq!(state.revision, revision); + assert_eq!((state.history.undo.len(), state.history.redo.len()), history); + assert_eq!(app.session.paint, paint); + assert_eq!(app.session.tool_id(), "selection"); + // The consumed release must not take the next independent ordinary gesture with it. + let next = start + 4.0 * step + delay + 1.0; + frame_at(&mut app, &ctx, next, vec![Event::PointerMoved(at), press(true)]); + frame_at(&mut app, &ctx, next + step, vec![press(false)]); + assert!(!ctx.input(|i| i.pointer.button_double_clicked(PointerButton::Primary))); + assert_eq!(app.session.active().unwrap().selection.objects, vec![group], "the next ordinary first click selects the group"); + assert_eq!(app.session.active().unwrap().isolation, None); + frame_at(&mut app, &ctx, next + 3.0 * step, vec![press(true)]); + frame_at(&mut app, &ctx, next + 4.0 * step, vec![press(false)]); + assert!(ctx.input(|i| i.pointer.button_double_clicked(PointerButton::Primary))); + assert_eq!(app.session.active().unwrap().isolation, Some(group), "the next ordinary double-click still isolates the group"); + } else { + assert_eq!(app.session.active().unwrap().selection.objects, vec![group], "the ordinary first click really selects the group"); + frame_at(&mut app, &ctx, start + 3.0 * step, vec![press(true)]); + frame_at(&mut app, &ctx, start + 4.0 * step, vec![press(false)]); + assert!(ctx.input(|i| i.pointer.button_double_clicked(PointerButton::Primary))); + assert_eq!(app.session.active().unwrap().isolation, Some(group), "the legitimate unarmed double-click isolates the same group"); } } From a8041ce586df6486644a0a3a4b1c31331636387c Mon Sep 17 00:00:00 2001 From: yoriswind Date: Wed, 18 Nov 2026 12:53:20 -0800 Subject: [PATCH 49/78] Separate the following ordinary gesture control from sampler setup --- .../tests/image_trace_ignore_sampler.rs | 57 ++++++++++--------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/crates/ui-egui/tests/image_trace_ignore_sampler.rs b/crates/ui-egui/tests/image_trace_ignore_sampler.rs index 6a05c7f086..0e7d5a1ba1 100644 --- a/crates/ui-egui/tests/image_trace_ignore_sampler.rs +++ b/crates/ui-egui/tests/image_trace_ignore_sampler.rs @@ -413,24 +413,37 @@ fn a_consumed_stale_sampler_press_does_not_complete_a_double_click() { check_sampler_double_click(true); } -fn check_sampler_double_click(sampler: bool) { - fn frame_at(app: &mut VectorcraftApp, ctx: &egui::Context, time: f64, events: Vec) { - let mut raw = RawInput { - time: Some(time), - events, - focused: true, - screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(1600.0, 1400.0))), - ..Default::default() - }; - app.raw_input_hook(ctx, &mut raw); - let mut out = ctx.run_ui(raw, |ui| { - app.tick(ui.ctx()); - app.ui(ui); - }); - out.textures_delta.clear(); - assert_eq!(ctx.time(), time, "the real UI frame uses the supplied gesture time"); - } +fn frame_at(app: &mut VectorcraftApp, ctx: &egui::Context, time: f64, events: Vec) { + let mut raw = RawInput { + time: Some(time), + events, + focused: true, + screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(1600.0, 1400.0))), + ..Default::default() + }; + app.raw_input_hook(ctx, &mut raw); + let mut out = ctx.run_ui(raw, |ui| { + app.tick(ui.ctx()); + app.ui(ui); + }); + out.textures_delta.clear(); + assert_eq!(ctx.time(), time, "the real UI frame uses the supplied gesture time"); +} +fn check_next_ordinary_double_click(app: &mut VectorcraftApp, ctx: &egui::Context, at: Pos2, group: NodeId, next: f64, step: f64) { + let press = |pressed| Event::PointerButton { pos: at, button: PointerButton::Primary, pressed, modifiers: Default::default() }; + frame_at(app, ctx, next, vec![Event::PointerMoved(at), press(true)]); + frame_at(app, ctx, next + step, vec![press(false)]); + assert!(!ctx.input(|i| i.pointer.button_double_clicked(PointerButton::Primary))); + assert_eq!(app.session.active().unwrap().selection.objects, vec![group], "the next ordinary first click selects the group"); + assert_eq!(app.session.active().unwrap().isolation, None); + frame_at(app, ctx, next + 3.0 * step, vec![press(true)]); + frame_at(app, ctx, next + 4.0 * step, vec![press(false)]); + assert!(ctx.input(|i| i.pointer.button_double_clicked(PointerButton::Primary))); + assert_eq!(app.session.active().unwrap().isolation, Some(group), "the next ordinary double-click still isolates the group"); +} + +fn check_sampler_double_click(sampler: bool) { let (mut app, ctx) = fixture(true, [37, 83, 149], false); let source = selected(&app).id; app.session.prefs.double_click_to_isolate = true; @@ -487,15 +500,7 @@ fn check_sampler_double_click(sampler: bool) { assert_eq!(app.session.tool_id(), "selection"); // The consumed release must not take the next independent ordinary gesture with it. let next = start + 4.0 * step + delay + 1.0; - frame_at(&mut app, &ctx, next, vec![Event::PointerMoved(at), press(true)]); - frame_at(&mut app, &ctx, next + step, vec![press(false)]); - assert!(!ctx.input(|i| i.pointer.button_double_clicked(PointerButton::Primary))); - assert_eq!(app.session.active().unwrap().selection.objects, vec![group], "the next ordinary first click selects the group"); - assert_eq!(app.session.active().unwrap().isolation, None); - frame_at(&mut app, &ctx, next + 3.0 * step, vec![press(true)]); - frame_at(&mut app, &ctx, next + 4.0 * step, vec![press(false)]); - assert!(ctx.input(|i| i.pointer.button_double_clicked(PointerButton::Primary))); - assert_eq!(app.session.active().unwrap().isolation, Some(group), "the next ordinary double-click still isolates the group"); + check_next_ordinary_double_click(&mut app, &ctx, at, group, next, step); } else { assert_eq!(app.session.active().unwrap().selection.objects, vec![group], "the ordinary first click really selects the group"); frame_at(&mut app, &ctx, start + 3.0 * step, vec![press(true)]); From fa87b41da11238b42fc6450197f848707632e441 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Wed, 18 Nov 2026 14:01:12 -0800 Subject: [PATCH 50/78] Swatches: Add to Swatches brings a library color group with its gradient and pattern swatches swatch.library.add no longer refuses a library color group that holds a gradient or pattern swatch. main now adds a .ai library's pattern swatch in its color group (#8081), and Recolor Artwork keeps a group's gradient and pattern swatches at their places (#8556), so the group comes in whole, each swatch at its place. --- crates/engine/src/cmd/swatchlib.rs | 15 ++------------ crates/engine/src/tests/swatchlib.rs | 30 ++++++++++++---------------- docs/mcp.md | 3 +-- 3 files changed, 16 insertions(+), 32 deletions(-) diff --git a/crates/engine/src/cmd/swatchlib.rs b/crates/engine/src/cmd/swatchlib.rs index 66f6afa5f7..f072a75bf3 100644 --- a/crates/engine/src/cmd/swatchlib.rs +++ b/crates/engine/src/cmd/swatchlib.rs @@ -49,7 +49,7 @@ pub fn specs() -> Vec { "Add to Swatches", ["Window", "Swatch Libraries"], None, - "{library: id or name, names?: [swatch or colour group names in the library] (default: all of it; a group comes as a colour group, a single swatch ungrouped), apply?: \"fill\"|\"stroke\" (also apply the first one to the selection and the defaults, as paint.setFill / paint.setStroke), focus?: true (with apply: false keeps the active proxy)} copy library swatches into the document as one undo step. A gradient or pattern swatch in a library color group is refused (color groups hold solid colors only), and the document is left unchanged. A swatch the document already has (same name and paint) isn't added again; a name taken by another swatch gets a number (\"Clay 1 2\"). A pattern swatch brings its pattern, as pasting art painted with it does: the same pattern the document has is used, and a name another pattern or swatch has gets a number; a global or spot color its art links to whose name the document gives another color comes in numbered, and the pattern links to it → {library, added: [names in the document], existing: [names already there], applied?: name}", + "{library: id or name, names?: [swatch or colour group names in the library] (default: all of it; a group comes as a colour group, a single swatch ungrouped), apply?: \"fill\"|\"stroke\" (also apply the first one to the selection and the defaults, as paint.setFill / paint.setStroke), focus?: true (with apply: false keeps the active proxy)} copy library swatches into the document as one undo step. A swatch the document already has (same name and paint) isn't added again; a name taken by another swatch gets a number (\"Clay 1 2\"). A pattern swatch brings its pattern, as pasting art painted with it does: the same pattern the document has is used, and a name another pattern or swatch has gets a number; a global or spot color its art links to whose name the document gives another color comes in numbered, and the pattern links to it → {library, added: [names in the document], existing: [names already there], applied?: name}", has_doc, add ), @@ -860,14 +860,7 @@ fn copy_to_user(s: &mut Session, p: &Value) -> Result { /// The library swatches `names` stand for, each once, with the colour group it goes into (`None`: /// ungrouped): a group's name brings the group, a swatch's name the swatch alone; no names, all. -/// A picked group that holds a gradient or pattern swatch is refused. fn picked<'a>(lib: &'a SwatchLibrary, names: &[String], cmd: &str) -> Result, &'a Swatch)>> { - // Color groups hold solid colors only, as swatch.new, swatch.newGroup and swatch.move keep them. - // Each picked group is checked whole, so a member also named on its own is not skipped. - let solid = |g: &SwatchGroup| match g.swatches.iter().find(|w| w.paint.color().is_none()) { - Some(w) => Err(bad(cmd, format!("`{}`: colour groups hold solid colours only", w.name))), - None => Ok(()), - }; let mut out: Vec<(Option<&str>, &Swatch)> = vec![]; let mut seen: HashSet<&str> = HashSet::new(); let mut push = |g: Option<&'a str>, w: &'a Swatch| { @@ -876,16 +869,12 @@ fn picked<'a>(lib: &'a SwatchLibrary, names: &[String], cmd: &str) -> Result { - solid(g)?; - g.swatches.iter().for_each(|w| push(Some(&g.name), w)); - } + (Some(g), _) => g.swatches.iter().for_each(|w| push(Some(&g.name), w)), (None, Some(w)) => push(None, w), (None, None) => return Err(bad(cmd, format!("no swatch or colour group `{n}` in `{}`", lib.name))), } diff --git a/crates/engine/src/tests/swatchlib.rs b/crates/engine/src/tests/swatchlib.rs index 02000abbe1..8036bf04c3 100644 --- a/crates/engine/src/tests/swatchlib.rs +++ b/crates/engine/src/tests/swatchlib.rs @@ -160,10 +160,10 @@ fn save_and_load_round_trip_keeps_cmyk_spot_and_groups() { assert!(s.execute("swatch.library.save", &json!({"user": true})).is_err(), "no user folder in a headless session"); } -/// A library color group that holds a gradient is not copied into the document: color groups -/// hold solid colors only. The document keeps its swatches and no undo step is recorded. +/// A library color group that holds a gradient comes into the document whole, the gradient at its +/// place in the group, as a `.ai` library's pattern swatch comes in its color group. #[test] -fn add_refuses_a_library_color_group_holding_a_gradient() { +fn add_brings_a_library_color_group_holding_a_gradient_whole() { let mut s = session(); run(&mut s, "swatch.newGroup", json!({"name": "Brand", "colors": ["#123456", "#abcdef"]})); let r = run(&mut s, "swatch.library.save", json!({"names": ["Brand", "Sunset"], "name": "Mixed"})); @@ -178,21 +178,17 @@ fn add_refuses_a_library_color_group_holding_a_gradient() { let (_, loaded) = cmd::swatchlib::library(&s, &id).unwrap(); assert!(matches!(loaded.groups[0].swatches[1].paint, Paint::Gradient(_)), "the reader keeps the gradient in the group"); run(&mut s, "swatch.delete", json!({"names": ["Brand", "Sunset"]})); - let (before, swatches, undo) = (doc(&s).swatch_groups.clone(), doc(&s).swatches.len(), undo_len(&s)); - // A group is refused whole even when its gradient was also named on its own before it. - let cases = [json!({"library": id}), json!({"library": id, "names": ["Brand"]}), json!({"library": id, "names": ["Sunset", "Brand"]})]; - for p in cases { - let e = s.execute("swatch.library.add", &p).unwrap_err().to_string(); - assert!(e.contains("`Sunset`: colour groups hold solid colours only"), "{p}: {e}"); - assert_eq!(doc(&s).swatch_groups, before, "{p}"); - assert_eq!(doc(&s).swatches.len(), swatches, "{p}"); - assert_eq!(undo_len(&s), undo, "{p}"); + for p in [json!({"library": id}), json!({"library": id, "names": ["Brand"]})] { + let undo = undo_len(&s); + let r = run(&mut s, "swatch.library.add", p.clone()); + assert!(r["added"].as_array().unwrap().iter().any(|n| n == "Sunset"), "{p}: {r}"); + let brand = doc(&s).swatch_groups.iter().find(|g| g.name == "Brand").map(|g| g.swatches.clone()).unwrap_or_default(); + let kinds: Vec<(&str, bool)> = brand.iter().map(|w| (w.name.as_str(), matches!(w.paint, Paint::Gradient(_)))).collect(); + assert_eq!(kinds.len(), 3, "{p}: {kinds:?}"); + assert_eq!(kinds[1], ("Sunset", true), "{p}: the gradient keeps its place in the group"); + assert_eq!(undo_len(&s), undo + 1, "{p}: one undo step"); + run(&mut s, "edit.undo", json!({})); } - // The gradient on its own comes in ungrouped. - let r = run(&mut s, "swatch.library.add", json!({"library": id, "names": ["Sunset"]})); - assert_eq!(r["added"], json!(["Sunset"]), "{r}"); - assert!(doc(&s).swatches.iter().any(|w| w.name == "Sunset" && matches!(w.paint, Paint::Gradient(_)))); - assert_eq!(doc(&s).swatch_groups, before); } /// The swatch library commands, and the graphic style library save and load that share their file diff --git a/docs/mcp.md b/docs/mcp.md index 4de93ac867..e3110b0de2 100644 --- a/docs/mcp.md +++ b/docs/mcp.md @@ -5355,8 +5355,7 @@ them (`id`, `name`, `category`, `count`) and `swatch.library.get {library}` retu in the `swatch.list` shape (`library` is an id or a name). `swatch.library.add {library, names?}` copies swatches into the document as one undo step: a colour group's name brings the whole group, a swatch's name the swatch alone, no names the whole library; swatches the document already has (same name and paint) are reported under `existing` -and not added again. Color groups hold solid colors only: an add that would bring a gradient or pattern swatch -into a color group is refused, and the document is left unchanged. `apply: "fill"|"stroke"` also applies the first one, in the same undo step (what clicking a +and not added again. `apply: "fill"|"stroke"` also applies the first one, in the same undo step (what clicking a swatch in the library panel does). The pattern libraries Geometric Patterns (`geometric-patterns`), Grit Textures (`grit-textures`: seamless black grain, grit, sand, speckle, stipple, scratch and fleck tiles) and Optical Effects (`optical-effects`: VectorCraft's own black wave, ring, warped-check, pinched-stripe, chevron and lens tiles), From 7dad81201121ce620fe3201e15318ef2ec53387c Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Wed, 18 Nov 2026 14:07:32 -0800 Subject: [PATCH 51/78] Command Palette: Recent keeps the home hint, and an unindexed catalog uses the substring rule Under the recent picks of an empty search, the line under the list now says where the highlighted pick's home is when no callout can point at it, without a result count, and the list keeps room for that line. A catalog too large to index matches by the substring rule alone again: query words that are each text inside a name no longer combine there. The canceled-dialog test now cancels through dialogs::cancel. --- crates/ui-egui/src/palette.rs | 34 +++++++++++++++++++++------- crates/ui-egui/src/palette/search.rs | 21 +++++++++++++++-- docs/target-app-parity.md | 2 +- 3 files changed, 46 insertions(+), 11 deletions(-) diff --git a/crates/ui-egui/src/palette.rs b/crates/ui-egui/src/palette.rs index 328c39d2a0..1dbad13cdf 100644 --- a/crates/ui-egui/src/palette.rs +++ b/crates/ui-egui/src/palette.rs @@ -1273,9 +1273,9 @@ pub fn show(app: &mut VectorcraftApp, ctx: &egui::Context) { // The list shows as many rows as fit above the footer in the window, up to // VISIBLE_ROWS; a page is that many rows. let spacing = ui.spacing().item_spacing.y; - // Under the recent picks no footer line is drawn. - let footer_line = if empty { 0.0 } else { spacing + 6.0 + ui.text_style_height(&egui::TextStyle::Body) }; - let footer_height = footer_line + f32::from(margin) + BOTTOM_GAP; + // Under the recent picks the footer line holds only where the highlighted pick's home is, + // when no callout shows it, so the line's room is kept there too. + let footer_height = spacing + 6.0 + ui.text_style_height(&egui::TextStyle::Body) + f32::from(margin) + BOTTOM_GAP; let room = screen.bottom() - footer_height - ui.cursor().top() - spacing; let rows = ((room / ROW_HEIGHT).floor().max(1.0) as usize).min(VISIBLE_ROWS); sel = moves.apply(sel, n, rows); @@ -1385,15 +1385,17 @@ pub fn show(app: &mut VectorcraftApp, ctx: &egui::Context) { Some(Pointer::Footer(text)) => hint = Some(text), None => {} } - // Under the recent picks no count is shown; with none, one dimmed line says what a search - // finds. - if !empty { + // Under the recent picks no count is shown, only where the highlighted pick's home is when + // no callout shows it; with no picks, one dimmed line says what a search finds. + if !empty || (n > 0 && hint.is_some()) { ui.add_space(6.0); ui.scope(|ui| { // The footer stays one line of text tall, as the list's height counts it. ui.spacing_mut().interact_size.y = 0.0; ui.horizontal(|ui| { - ui.label(egui::RichText::new(footer(n, total)).color(t.text_dim)); + if !empty { + ui.label(egui::RichText::new(footer(n, total)).color(t.text_dim)); + } if let Some(hint) = hint { ui.add(egui::Label::new(egui::RichText::new(hint).color(t.text_dim)).truncate()); } @@ -2354,7 +2356,8 @@ mod tests { assert!(open.app.ui.dialog.is_some(), "{}", open.app.ui.status); assert_eq!(open.app.ui.recent_commands, [id, "paint.swap"]); // Cancel closes the dialog without running the command. - open.app.ui.dialog = None; + crate::dialogs::cancel(&mut open.app); + assert!(open.app.ui.dialog.is_none()); open.frame(vec![]); assert_eq!(open.app.ui.recent_commands, [id, "paint.swap"]); } @@ -4447,6 +4450,21 @@ mod tests { assert!(!footer.iter().any(|l| l.contains("not shown now")), "{footer:?}"); } + /// Under the recent picks of an empty search, the footer still says where the highlighted + /// pick's home is when no callout can show it, without a count of the results. + #[test] + fn under_the_recent_picks_the_footer_names_a_home_out_of_view() { + let mut window = Window::new(); + window.app.ui.recent_commands = vec!["tool:pen".into()]; + window.app.ui.screen_mode = 3; + let nodes = window.search(""); + assert_eq!(window.highlighted(), "tool:pen"); + assert_eq!(window.callout(), None); + let footer = window.popup_labels(&nodes); + assert!(footer.contains(&"Toolbar, not shown now".to_string()), "{footer:?}"); + assert!(!footer.iter().any(|l| l.ends_with(" result") || l.ends_with(" results")), "no count: {footer:?}"); + } + /// No callout where no control in view shows the home: in Presentation Mode, with the Tools /// panel hidden, and for a command with no menu item. The footer says where it lives. #[test] diff --git a/crates/ui-egui/src/palette/search.rs b/crates/ui-egui/src/palette/search.rs index cd56399442..66679ec42b 100644 --- a/crates/ui-egui/src/palette/search.rs +++ b/crates/ui-egui/src/palette/search.rs @@ -607,6 +607,12 @@ impl Index { let (offset, len) = (offset as usize, usize::from(len)); self.initials_text.get(offset..offset + len).is_some_and(|text| text.lines().any(|l| l == query)) } + + /// Does the index hold the `n` results it was built from? A catalog too large to index gets an + /// empty index ([`Index::build`]), which holds none. + fn holds(&self, n: usize) -> bool { + self.initials.len() == n + } } /// `query` trimmed, lowercased, with each run of whitespace made one space. @@ -722,8 +728,8 @@ pub(crate) fn rank(entries: &[Entry], index: &Index, query: &str, recent: &[u32] typos.push(near); } // The index reads only the start of a longer query, so such a query matches by the substring - // rule, which reads all of it. - let fits = query.chars().count() <= INDEX_CHARS; + // rule, which reads all of it, as every query does in a catalog too large to index. + let fits = query.chars().count() <= INDEX_CHARS && index.holds(n); let packed: String = query.chars().filter(|c| !c.is_whitespace()).collect(); let packed = Some(packed).filter(|p| (2..=6).contains(&p.chars().count()) && p.chars().all(char::is_alphabetic)); let mut ranked: Vec<(RankKey, u32)> = vec![]; @@ -1323,6 +1329,17 @@ mod tests { assert!(ranked(&c, "bg qxq").is_empty()); } + /// A catalog without an index (one with more results than a posting can name) matches by the + /// substring rule alone: a query word whose parts are each text in a name, where the word + /// itself is not, finds nothing. + #[test] + fn without_an_index_only_the_substring_rule_matches() { + let entries = vec![entry("Remove Background…", "a.one"), entry("Zz Group", "b.two")]; + let c = Catalog { list: entries, index: Index::default(), ranked: std::sync::Mutex::new(None) }; + assert!(ranked(&c, "mov.nd").is_empty(), "{:?}", ranked(&c, "mov.nd")); + assert_eq!(ranked(&c, "background mov"), ["a.one"]); + } + /// A catalog row adds words in the UI language to a group, and a word that is not a single word /// or that is a word of another group is left out. #[test] diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index cde1925b37..66a55c9096 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -1124,7 +1124,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - Native macOS menu bar, vector tool cursors, a command palette (Help › Search Commands…), middle-button panning with any tool. Native menus explicitly end tracking on command selection, outside window presses and Escape; menu updates wait until tracking ends, and a dismissing press never starts a canvas gesture (M14.8). - Help › Search Commands… is the first item of the Help menu in the window, with its shortcut and a separator after it; in the native macOS menu bar it is the first item below the system's search field. This is VectorCraft's own order and does not raise a score (`menus::tests::help_starts_with_search_commands`, `tests::nativemenu::the_mac_help_menu_starts_with_search_commands`). - A Recent Commands button beside the Help › Search Commands field lists the last eight commands, tools, panels and effects picked from the palette, most recent first, with a command picked again moved to the top. A pick is recorded when it runs or opens a dialog, even if the dialog is then canceled; a pick that is refused because its menu item is dimmed, its tool can't be chosen or its panel can't be shown is not recorded, unless it opened a dialog. Choosing a row closes the palette and runs it as a pick of the same result does; with no picks yet the list shows a dimmed No recent commands row, and a command that is not available now, such as a filter of a plug-in that is not loaded, is left out until it comes back. The ids are saved with the UI state. While the list is open, Up and Down move through its rows, wrapping at the ends, and Escape closes the list before the palette. This is VectorCraft's own addition and does not raise a score (#6376; `palette` tests `recent_commands_*`, `a_recent_command_runs_what_its_pick_runs`, `the_keys_wrap_within_recent_commands`, `escape_closes_recent_commands_before_the_palette`). - - With an empty search, or one of spaces only, the Help › Search Commands field lists the picks of the Recent Commands list (at most eight, leaving out a filter of a plug-in that is not loaded) under a Recent heading, most recent first, with the first highlighted and no result count, so opening the palette and pressing Enter picks the last pick again; a pick that is dimmed now shows why in the status line, as from a search, and keeps its place in the list. With no picks yet it lists no results and shows a dimmed Type to search commands, tools, panels and effects line. A pick of Search Commands… itself is not recorded. The palette opens with its first result highlighted and its list scrolled to the top. This is VectorCraft's own behavior (`palette` tests `an_empty_search_lists_the_recent_picks_most_recent_first`, `an_empty_search_without_picks_says_what_to_type`, `enter_on_an_empty_search_runs_the_last_pick_again`, `the_palette_opens_again_with_its_first_row_highlighted`, `the_palette_toggle_is_not_a_recent_pick`, `a_click_on_a_recent_pick_runs_it_and_moves_it_first`, `a_pick_says_whether_it_ran_opened_a_dialog_or_was_refused`, `a_refused_pick_is_not_recorded`, `a_pick_that_opens_a_dialog_is_recorded_even_when_canceled`). + - With an empty search, or one of spaces only, the Help › Search Commands field lists the picks of the Recent Commands list (at most eight, leaving out a filter of a plug-in that is not loaded) under a Recent heading, most recent first, with the first highlighted and no result count, so opening the palette and pressing Enter picks the last pick again; when no callout can point at the highlighted pick's home, the line under the list still says where it is. A pick that is dimmed now shows why in the status line, as from a search, and keeps its place in the list. With no picks yet it lists no results and shows a dimmed Type to search commands, tools, panels and effects line. A pick of Search Commands… itself is not recorded. The palette opens with its first result highlighted and its list scrolled to the top. This is VectorCraft's own behavior (`palette` tests `an_empty_search_lists_the_recent_picks_most_recent_first`, `an_empty_search_without_picks_says_what_to_type`, `enter_on_an_empty_search_runs_the_last_pick_again`, `the_palette_opens_again_with_its_first_row_highlighted`, `the_palette_toggle_is_not_a_recent_pick`, `a_click_on_a_recent_pick_runs_it_and_moves_it_first`, `a_pick_says_whether_it_ran_opened_a_dialog_or_was_refused`, `a_refused_pick_is_not_recorded`, `a_pick_that_opens_a_dialog_is_recorded_even_when_canceled`, `under_the_recent_picks_the_footer_names_a_home_out_of_view`). - The app bar's search control is a field showing a magnifier, "Search commands" and the Help › Search Commands… shortcut. The field shows no shortcut when the shortcut is cleared or too long to fit beside the text; the tooltip and the screen-reader name still give it. A click on the field, or Enter or Space while it has the keyboard focus, toggles the command palette as the shortcut does, and the palette's popup holds the text field. While the field has the focus, the app's existing rule for a focused control keeps the app's own keys off, so Enter does not open Move and Tab moves the focus on. While a dialog is open the field and the icon are drawn disabled and do nothing, as the shortcut does. Screen readers name the field and the icon Search commands, with the shortcut. As the bar narrows, the community button goes first, then Explore tutorials, then the field becomes the magnifier icon, then the workspace switcher narrows to 64 points, then the icon goes; Safe Mode's label keeps its room first. The field is wider than the icon, so the community button and Explore tutorials go at wider bars than they did beside the icon. This is VectorCraft's own addition and does not raise a score (`chrome::tests`: `the_app_bar_gives_up_its_right_hand_controls_in_order`, `a_wide_app_bar_shows_a_search_field_with_the_palette_shortcut`, `the_search_field_follows_the_palettes_shortcut`, `a_long_shortcut_leaves_the_search_hint_readable`, `a_click_on_the_search_field_opens_the_palette`, `the_search_icon_has_the_fields_name_and_both_are_disabled_under_a_dialog`, `the_keyboard_opens_the_palette_from_the_search_field`, `a_narrowing_app_bar_turns_the_search_field_into_the_icon`). - The Learn panel (Window › Learn, or Explore tutorials beside the search field on the app bar) has a For you tab with a Get started section and a Quick skill guide card, and a Skills tab that lists VectorCraft's own skills with their progress rings and counts of tutorials finished; a skill lists its tutorials, a tutorial shows its numbered steps, and Back goes up a level; `learn.list`, `learn.tab {tab}`, `learn.skill {skill}`, `learn.show {tutorial}` and `learn.back` script it, and the tab buttons, the rows and Back run them ([the help page](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/learn-skills-quick-skill-guide.html); `panels::learn::tests`). - A tool's name in a Learn tutorial step is a blue link that shows where the tool is without choosing it (`learn.locateTool {tool}`): its toolbar button is marked, a collapsed group's flyout opens with the tool's row marked, a torn-off strip comes to the front, and a tool no shown toolbar holds is marked in the All Tools drawer. The mark, its 3 seconds and the hidden-toolbar cases are VectorCraft's own rules ([the help page](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/learn-skills-quick-skill-guide.html); `panels::learn::tests`, the `a_learn_link_*` tests in `toolbar::tests`). From e496cfd103543df1eab22fae78320c0e956a547a Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Wed, 18 Nov 2026 14:07:43 -0800 Subject: [PATCH 52/78] i18n: Polish calls the art kompozycja when it can't be its pattern's tile The Polish row for the message about art painted with the pattern it would replace said grafika. The catalog calls art and artwork kompozycja, and polish_rows_call_artwork_kompozycja checks every row for it. --- crates/ui-egui/src/i18n/pl.tsv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/ui-egui/src/i18n/pl.tsv b/crates/ui-egui/src/i18n/pl.tsv index 78cfd9b002..efb651d1ca 100644 --- a/crates/ui-egui/src/i18n/pl.tsv +++ b/crates/ui-egui/src/i18n/pl.tsv @@ -5184,7 +5184,7 @@ liquify-list-end {0}, {1} {0} i {1} @msg no native format brak formatu natywnego @msg no pages brak stron @msg no pattern `{name}` brak wzorka `{name}` -@msg art painted with `{name}` can't be its tile grafika malowana wzorkiem `{name}` nie może być jego kafelkiem +@msg art painted with `{name}` can't be its tile kompozycja malowana wzorkiem `{name}` nie może być jego kafelkiem @msg no perspective grid preset named `{name}` brak ustawienia siatki perspektywy o nazwie `{name}` @msg no plug-in {0} is installed wtyczka {0} nie jest zainstalowana @msg no plug-in {id} is installed wtyczka {id} nie jest zainstalowana From a07eac2e9f8b26e262ac8f7d614ae528bdd9d289 Mon Sep 17 00:00:00 2001 From: yoriswind Date: Wed, 18 Nov 2026 14:25:05 -0800 Subject: [PATCH 53/78] #8068: test held sampler ownership, fresh clicks and preset cancellation --- .../tests/image_trace_ignore_sampler.rs | 334 ++++++++++++++++++ 1 file changed, 334 insertions(+) diff --git a/crates/ui-egui/tests/image_trace_ignore_sampler.rs b/crates/ui-egui/tests/image_trace_ignore_sampler.rs index 0e7d5a1ba1..6d26b0816a 100644 --- a/crates/ui-egui/tests/image_trace_ignore_sampler.rs +++ b/crates/ui-egui/tests/image_trace_ignore_sampler.rs @@ -690,3 +690,337 @@ fn cancelling_a_borrowed_sampler_clears_the_restored_eyedropper() { assert_eq!(ordinary_sample(&mut app, &ctx, point), expected_sample_effects, "the next real click follows the ordinary eyedropper path"); } } + +fn review_gesture_group_fixture() -> (VectorcraftApp, egui::Context, Point, NodeId) { + let (mut app, ctx) = fixture(true, [37, 83, 149], false); + let source = selected(&app).id; + app.session.prefs.double_click_to_isolate = true; + let first = app.run("shape.rectangle", json!({"x": 100, "y": 140, "width": 20, "height": 20})).unwrap()["id"].clone(); + let second = app.run("shape.rectangle", json!({"x": 120, "y": 140, "width": 20, "height": 20})).unwrap()["id"].clone(); + app.run("paint.setFill", json!({"ids": [first.clone(), second.clone()], "color": "#cc3322"})).unwrap(); + app.run("select.set", json!({"ids": [first, second]})).unwrap(); + let group = NodeId(app.run("object.group", json!({})).unwrap()["id"].as_u64().unwrap()); + app.run("select.set", json!({"ids": [source.0]})).unwrap(); + settle(&mut app, &ctx); + let point = Point::new(110.0, 150.0); + assert!(point.x < source_point(&app, 0.0).x - 40.0, "the gesture group is outside the sampled image"); + (app, ctx, point, group) +} + +fn review_gesture_screen(app: &VectorcraftApp, ctx: &egui::Context, point: Point) -> Pos2 { + let rect = app.canvas_rect.unwrap(); + let at = canvas::Xf::at(rect, app.view().unwrap(), ctx.zoom_factor()).to_screen(point); + assert!(rect.contains(at), "the real canvas contains the gesture point"); + at +} + +fn review_gesture_times(ctx: &egui::Context) -> (f64, f64) { + let (delay, hold) = ctx.options(|o| (o.input_options.max_double_click_delay, o.input_options.max_click_duration)); + assert!(delay.is_finite() && delay > 0.0 && hold.is_finite() && hold > 0.0); + (ctx.time() + delay + 1.0, delay.min(hold) / 8.0) +} + +fn review_gesture_press(app: &mut VectorcraftApp, ctx: &egui::Context, at: Pos2, time: f64) { + let event = Event::PointerButton { pos: at, button: PointerButton::Primary, pressed: true, modifiers: Default::default() }; + frame_at(app, ctx, time, vec![Event::PointerMoved(at), event]); +} + +fn review_gesture_release(app: &mut VectorcraftApp, ctx: &egui::Context, at: Pos2, time: f64) { + let event = Event::PointerButton { pos: at, button: PointerButton::Primary, pressed: false, modifiers: Default::default() }; + frame_at(app, ctx, time, vec![event]); +} + +fn review_gesture_state(app: &VectorcraftApp) -> impl PartialEq + std::fmt::Debug + use<> { + let state = app.session.active().unwrap(); + ( + state.doc.clone(), + state.selection.clone(), + state.revision, + (state.history.undo.len(), state.history.redo.len()), + app.session.paint.clone(), + state.isolation, + ) +} + +fn review_gesture_observation(app: &VectorcraftApp, ctx: &egui::Context) -> (bool, bool, Vec, Option) { + let state = app.session.active().unwrap(); + ( + ctx.input(|i| i.pointer.button_double_clicked(PointerButton::Primary)), + ctx.input(|i| i.pointer.button_triple_clicked(PointerButton::Primary)), + state.selection.objects.clone(), + state.isolation, + ) +} + +fn review_gesture_ordinary_pair(app: &mut VectorcraftApp, ctx: &egui::Context, first: Pos2, second: Pos2, group: NodeId) { + let (start, step) = review_gesture_times(ctx); + review_gesture_press(app, ctx, first, start); + review_gesture_release(app, ctx, first, start + step); + assert!(!ctx.input(|i| i.pointer.button_double_clicked(PointerButton::Primary))); + assert_eq!(app.session.active().unwrap().selection.objects, vec![group], "the ordinary first click selects the group"); + assert_eq!(app.session.active().unwrap().isolation, None); + review_gesture_press(app, ctx, second, start + 3.0 * step); + frame_at(app, ctx, start + 3.5 * step, vec![]); + review_gesture_release(app, ctx, second, start + 4.0 * step); + assert!(ctx.input(|i| i.pointer.button_double_clicked(PointerButton::Primary))); + assert_eq!(app.session.active().unwrap().isolation, Some(group), "the ordinary held double-click isolates the group"); +} + +#[test] +fn review_followup_sampler_cancelled_mid_hold_keeps_release_owned() { + let (mut control, control_ctx, control_point, control_group) = review_gesture_group_fixture(); + let control_at = review_gesture_screen(&control, &control_ctx, control_point); + review_gesture_ordinary_pair(&mut control, &control_ctx, control_at, control_at, control_group); + + let (mut app, ctx, point, _) = review_gesture_group_fixture(); + let source = selected(&app).id; + click_control(&mut app, &ctx, SAMPLE_TIP); + let at = review_gesture_screen(&app, &ctx, point); + let (start, step) = review_gesture_times(&ctx); + review_gesture_press(&mut app, &ctx, at, start); + review_gesture_release(&mut app, &ctx, at, start + step); + assert_eq!(app.session.tool_id(), "eyedropper"); + assert!(app.ui.trace_ignore_sampler.is_some(), "the first canvas click is a sampler miss"); + assert_eq!(app.session.active().unwrap().selection.objects, vec![source]); + assert_eq!(app.session.active().unwrap().isolation, None); + review_gesture_press(&mut app, &ctx, at, start + 3.0 * step); + assert!(app.ui.trace_ignore_sampler.is_some(), "the second Down still belongs to the valid sampler"); + app.run("select.none", json!({})).unwrap(); + let expected = review_gesture_state(&app); + frame_at(&mut app, &ctx, start + 3.5 * step, vec![]); + assert!(ctx.input(|i| i.pointer.primary_down())); + assert!(!ctx.input(|i| i.pointer.primary_pressed())); + assert_eq!(app.session.tool_id(), "selection"); + assert!(app.ui.trace_ignore_sampler.is_none(), "the held frame cancelled the invalid binding"); + review_gesture_release(&mut app, &ctx, at, start + 4.0 * step); + assert!(ctx.input(|i| i.pointer.button_double_clicked(PointerButton::Primary))); + assert_eq!(review_gesture_state(&app), expected, "a mid-hold cancellation must retain ownership through release"); + assert_eq!(app.session.tool_id(), "selection"); +} + +#[test] +fn review_followup_consumed_prefix_keeps_two_fresh_clicks_single_then_double() { + let (mut control, control_ctx, control_point, control_group) = review_gesture_group_fixture(); + let control_at = review_gesture_screen(&control, &control_ctx, control_point); + review_gesture_ordinary_pair(&mut control, &control_ctx, control_at, control_at, control_group); + + let (mut app, ctx, point, group) = review_gesture_group_fixture(); + click_control(&mut app, &ctx, SAMPLE_TIP); + app.run("select.none", json!({})).unwrap(); + let at = review_gesture_screen(&app, &ctx, point); + let expected = review_gesture_state(&app); + let (start, step) = review_gesture_times(&ctx); + review_gesture_press(&mut app, &ctx, at, start); + review_gesture_release(&mut app, &ctx, at, start + step); + assert!(!ctx.input(|i| i.pointer.button_double_clicked(PointerButton::Primary))); + assert_eq!(review_gesture_state(&app), expected, "the single stale prefix itself is consumed"); + assert_eq!(app.session.tool_id(), "selection"); + + review_gesture_press(&mut app, &ctx, at, start + 3.0 * step); + review_gesture_release(&mut app, &ctx, at, start + 4.0 * step); + let first = review_gesture_observation(&app, &ctx); + // Always run the second fresh click, even when the first app-level oracle was wrong. + review_gesture_press(&mut app, &ctx, at, start + 6.0 * step); + review_gesture_release(&mut app, &ctx, at, start + 7.0 * step); + let second = review_gesture_observation(&app, &ctx); + assert!(first.0 && !first.1 && !second.0 && second.1, "expected raw Double then Triple: first={first:?}, second={second:?}"); + assert!( + first.2 == vec![group] && first.3.is_none() && second.3 == Some(group), + "fresh clicks must select without isolation, then isolate: first={first:?}, second={second:?}" + ); +} + +fn review_gesture_enclose_source(app: &mut VectorcraftApp, source: NodeId) -> NodeId { + let background = app.run("shape.rectangle", json!({"x": 50, "y": 30, "width": 300, "height": 240})).unwrap()["id"].clone(); + app.run("paint.setFill", json!({"ids": [background.clone()], "color": "#e020c0"})).unwrap(); + app.run("select.set", json!({"ids": [source.0, background]})).unwrap(); + let group = NodeId(app.run("object.group", json!({})).unwrap()["id"].as_u64().unwrap()); + app.run("select.set", json!({"ids": [source.0]})).unwrap(); + group +} + +fn review_gesture_original_pixels(app: &VectorcraftApp) { + let trace = selected(app); + let original = trace.children().unwrap()[0].as_ref(); + let NodeKind::Image(image) = &original.kind else { panic!("the fixture retains its original image") }; + let state = app.session.active().unwrap(); + let blob = &state.doc.images[&image.key]; + assert!(blob.sample_object(19.5, 10.0, (image.width, image.height), 1).is_none(), "the first point is really transparent"); + assert_eq!(blob.sample_object(5.0, 10.0, (image.width, image.height), 1), Some([37, 83, 149, 255]), "the second point has a distinct nonwhite source color"); +} + +fn review_gesture_close_pair(app: &VectorcraftApp, ctx: &egui::Context, miss: Point, hit: Point) -> (Pos2, Pos2) { + let miss = review_gesture_screen(app, ctx, miss); + let hit = review_gesture_screen(app, ctx, hit); + let distance = ctx.options(|o| o.input_options.max_click_dist); + assert!(distance.is_finite() && distance > 0.0); + assert!(miss.distance_sq(hit) < distance * distance, "the actual transformed miss/hit pair satisfies egui's click distance"); + (miss, hit) +} + +fn review_gesture_completion_fixture() -> (VectorcraftApp, egui::Context, Point, Point, NodeId) { + let (mut app, ctx) = fixture_with_transparent_edge(true, [37, 83, 149], false, true); + let source = selected(&app).id; + review_gesture_original_pixels(&app); + app.session.prefs.double_click_to_isolate = true; + let group = review_gesture_enclose_source(&mut app, source); + // view.setZoom takes display percent; use its public 10% setting, then assert actual geometry. + app.run("view.setZoom", json!({"zoom": 10.0, "center": [200, 150]})).unwrap(); + settle(&mut app, &ctx); + let miss = source_point(&app, 0.975); + let hit = source_point(&app, 0.25); + (app, ctx, miss, hit, group) +} + +#[test] +fn review_followup_valid_sampler_down_completes_without_lending_its_release() { + let (mut control, control_ctx, control_miss, control_hit, control_group) = review_gesture_completion_fixture(); + control.run("select.none", json!({})).unwrap(); + settle(&mut control, &control_ctx); + let (control_miss, control_hit) = review_gesture_close_pair(&control, &control_ctx, control_miss, control_hit); + review_gesture_ordinary_pair(&mut control, &control_ctx, control_miss, control_hit, control_group); + + let (mut app, ctx, miss, hit, _) = review_gesture_completion_fixture(); + click_control(&mut app, &ctx, SAMPLE_TIP); + let (miss, hit) = review_gesture_close_pair(&app, &ctx, miss, hit); + let (start, step) = review_gesture_times(&ctx); + review_gesture_press(&mut app, &ctx, miss, start); + review_gesture_release(&mut app, &ctx, miss, start + step); + assert_eq!(app.session.tool_id(), "eyedropper"); + assert!(app.ui.trace_ignore_sampler.is_some(), "the transparent first click keeps the sampler armed"); + let expected = review_gesture_state(&app); + review_gesture_press(&mut app, &ctx, hit, start + 3.0 * step); + assert_eq!(app.session.tool_id(), "selection", "the opaque Down completes sampling and restores the tool"); + assert!(app.ui.trace_ignore_sampler.is_none()); + assert_eq!(review_gesture_state(&app), expected, "Preview off sampling changes only the panel draft"); + review_gesture_release(&mut app, &ctx, hit, start + 4.0 * step); + assert!(ctx.input(|i| i.pointer.button_double_clicked(PointerButton::Primary))); + assert_eq!(review_gesture_state(&app), expected, "a completed sampler still owns its matching release"); + assert_eq!(app.session.tool_id(), "selection"); + // A fix that merely cancels the valid Down must not pass without accepting its actual color. + click_control(&mut app, &ctx, "Trace"); + assert_eq!(settings(&app)["params"]["ignoreColor"], "#255395", "Trace persists the real opaque source sample"); + assert_eq!(settings(&app)["params"]["ignoreWhite"], true); +} + +fn review_preset_checkbox(app: &mut VectorcraftApp, ctx: &egui::Context, label: &str) -> bool { + for _ in 0..3 { + let mut output = frame(app, ctx, vec![]); + let checked = output.platform_output.accesskit_update.as_ref().and_then(|update| { + update.nodes.iter().find(|(_, node)| node.label() == Some(label) && node.role() == egui::accesskit::Role::CheckBox).and_then(|(_, node)| { + match node.toggled() { + Some(egui::accesskit::Toggled::True) => Some(true), + Some(egui::accesskit::Toggled::False) => Some(false), + _ => None, + } + }) + }); + output.textures_delta.clear(); + if let Some(checked) = checked { + return checked; + } + } + panic!("fixture: missing accessible Image Trace checkbox state: {label}"); +} + +fn review_preset_assert_shown(app: &mut VectorcraftApp, ctx: &egui::Context, preset: &str) { + fn contains(shape: &egui::Shape, text: &str) -> bool { + match shape { + egui::Shape::Text(drawn) => drawn.galley.text() == text, + egui::Shape::Vec(shapes) => shapes.iter().any(|shape| contains(shape, text)), + _ => false, + } + } + let mut output = frame(app, ctx, vec![]); + let shown = output.shapes.iter().any(|clipped| contains(&clipped.shape, preset)); + output.textures_delta.clear(); + assert!(shown, "fixture: the real Preset control must show {preset}"); +} + +fn review_preset_click_opaque_source(app: &mut VectorcraftApp, ctx: &egui::Context) { + let point = source_point(app, 0.25); + let source = selected(app); + let original = source.children().and_then(|children| children.first()).unwrap(); + let NodeKind::Image(image) = &original.kind else { panic!("fixture: the live trace retains its original image") }; + assert_eq!( + app.session.active().unwrap().doc.images[&image.key].sample_object( + f64::from(image.width) * 0.25, + f64::from(image.height) * 0.5, + (image.width, image.height), + 1, + ), + Some([37, 83, 149, 255]), + "fixture: the actual canvas point is an opaque original pixel" + ); + let at = canvas::Xf::at(app.canvas_rect.unwrap(), app.view().unwrap(), ctx.zoom_factor()).to_screen(point); + assert!(app.canvas_rect.unwrap().contains(at), "fixture: the source point lies on the actual canvas"); + let press = |pressed| Event::PointerButton { pos: at, button: PointerButton::Primary, pressed, modifiers: Default::default() }; + frame(app, ctx, vec![Event::PointerMoved(at), press(true)]).textures_delta.clear(); + frame(app, ctx, vec![press(false)]).textures_delta.clear(); + settle(app, ctx); +} + +fn review_preset_enhanced_on_control() { + // Legitimate control first: the real Enhanced pair retains Ignore Color and a valid pick. + let (mut control, control_ctx) = fixture(true, [37, 83, 149], false); + click_control(&mut control, &control_ctx, "Black and White"); + review_preset_assert_shown(&mut control, &control_ctx, "Black and White Logo"); + assert!(review_preset_checkbox(&mut control, &control_ctx, "Ignore Color")); + let enhanced = review_preset_checkbox(&mut control, &control_ctx, "Enhanced"); + click_control(&mut control, &control_ctx, SAMPLE_TIP); + assert_eq!(control.session.tool_id(), "eyedropper"); + assert!(control.ui.trace_ignore_sampler.is_some()); + click_control(&mut control, &control_ctx, "Enhanced"); + assert_ne!(review_preset_checkbox(&mut control, &control_ctx, "Enhanced"), enhanced, "fixture: the real Enhanced checkbox changed"); + assert!(review_preset_checkbox(&mut control, &control_ctx, "Ignore Color"), "Enhanced keeps this preset's Ignore Color on"); + assert!(control.ui.trace_ignore_sampler.is_some(), "an on-to-on settings change keeps the pick armed"); + assert_eq!(control.session.tool_id(), "eyedropper"); + assert!(!control.session.tool_options()["imageTraceIgnoreColor"].is_null()); + review_preset_click_opaque_source(&mut control, &control_ctx); + assert!(control.ui.trace_ignore_sampler.is_none(), "the opaque pick completes normally"); + assert_eq!(control.session.tool_id(), "selection"); + click_control(&mut control, &control_ctx, "Trace"); + assert_eq!(settings(&control)["params"]["ignoreWhite"], true); + assert_eq!(settings(&control)["params"]["ignoreColor"], "#255395", "the on-to-on control really accepted the source color"); + +} + +#[test] +fn review_followup_preset_off_cancels_sampler_but_enhanced_on_keeps_it() { + review_preset_enhanced_on_control(); + + // Separate causal fixture: Preview off leaves the target/revision valid when a preset turns Ignore Color off. + let (mut app, ctx) = fixture(true, [37, 83, 149], false); + let presets = app.run("imageTrace.presets", json!({})).unwrap(); + let expected = presets["presets"].as_array().unwrap().iter().find(|preset| preset["name"] == "High Fidelity Photo").unwrap()["params"].clone(); + assert_eq!(expected["ignoreWhite"], false, "fixture: High Color's public preset disables Ignore Color"); + assert_ne!(expected["ignoreColor"], "#255395"); + click_control(&mut app, &ctx, "Black and White"); + assert!(review_preset_checkbox(&mut app, &ctx, "Ignore Color")); + click_control(&mut app, &ctx, SAMPLE_TIP); + assert!(app.ui.trace_ignore_sampler.is_some()); + assert_eq!(app.session.tool_id(), "eyedropper"); + let state = app.session.active().unwrap(); + let (document, revision) = (state.doc.clone(), state.revision); + let history = (state.history.undo.len(), state.history.redo.len()); + let paint = app.session.paint.clone(); + click_control(&mut app, &ctx, "High Color"); + review_preset_assert_shown(&mut app, &ctx, "High Fidelity Photo"); + assert!(!review_preset_checkbox(&mut app, &ctx, "Ignore Color"), "the actual preset button made Ignore Color off"); + let state = app.session.active().unwrap(); + assert_eq!(state.doc, document, "Preview off changes the panel draft, not the document"); + assert_eq!(state.revision, revision, "the sampler target binding was not invalidated by a trace"); + assert_eq!((state.history.undo.len(), state.history.redo.len()), history); + assert!(app.ui.trace_ignore_sampler.is_none(), "choosing an Ignore Color-off preset must cancel the armed sampler"); + assert_eq!(app.session.tool_id(), "selection", "cancelling the panel pick restores the previous tool"); + assert!(app.session.tool_options_of("eyedropper")["imageTraceIgnoreColor"].is_null()); + review_preset_click_opaque_source(&mut app, &ctx); + assert!(app.ui.trace_ignore_sampler.is_none()); + assert_eq!(app.session.tool_id(), "selection"); + assert_eq!(app.session.paint, paint); + review_preset_assert_shown(&mut app, &ctx, "High Fidelity Photo"); + assert!(!review_preset_checkbox(&mut app, &ctx, "Ignore Color")); + click_control(&mut app, &ctx, "Trace"); + assert_eq!(settings(&app)["preset"], "High Fidelity Photo", "the following opaque canvas click cannot turn the off preset into Custom"); + assert_eq!(settings(&app)["params"], expected, "the hidden pick cannot replace the off preset's ignored color"); +} From b956474dbf255bfa294dcb538b49a14a3afad369 Mon Sep 17 00:00:00 2001 From: yoriswind Date: Wed, 18 Nov 2026 14:38:10 -0800 Subject: [PATCH 54/78] Format sampler review follow-up witnesses --- .../ui-egui/tests/image_trace_ignore_sampler.rs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/crates/ui-egui/tests/image_trace_ignore_sampler.rs b/crates/ui-egui/tests/image_trace_ignore_sampler.rs index 6d26b0816a..7d7f63f8ac 100644 --- a/crates/ui-egui/tests/image_trace_ignore_sampler.rs +++ b/crates/ui-egui/tests/image_trace_ignore_sampler.rs @@ -846,7 +846,11 @@ fn review_gesture_original_pixels(app: &VectorcraftApp) { let state = app.session.active().unwrap(); let blob = &state.doc.images[&image.key]; assert!(blob.sample_object(19.5, 10.0, (image.width, image.height), 1).is_none(), "the first point is really transparent"); - assert_eq!(blob.sample_object(5.0, 10.0, (image.width, image.height), 1), Some([37, 83, 149, 255]), "the second point has a distinct nonwhite source color"); + assert_eq!( + blob.sample_object(5.0, 10.0, (image.width, image.height), 1), + Some([37, 83, 149, 255]), + "the second point has a distinct nonwhite source color" + ); } fn review_gesture_close_pair(app: &VectorcraftApp, ctx: &egui::Context, miss: Point, hit: Point) -> (Pos2, Pos2) { @@ -907,13 +911,13 @@ fn review_preset_checkbox(app: &mut VectorcraftApp, ctx: &egui::Context, label: for _ in 0..3 { let mut output = frame(app, ctx, vec![]); let checked = output.platform_output.accesskit_update.as_ref().and_then(|update| { - update.nodes.iter().find(|(_, node)| node.label() == Some(label) && node.role() == egui::accesskit::Role::CheckBox).and_then(|(_, node)| { - match node.toggled() { + update.nodes.iter().find(|(_, node)| node.label() == Some(label) && node.role() == egui::accesskit::Role::CheckBox).and_then( + |(_, node)| match node.toggled() { Some(egui::accesskit::Toggled::True) => Some(true), Some(egui::accesskit::Toggled::False) => Some(false), _ => None, - } - }) + }, + ) }); output.textures_delta.clear(); if let Some(checked) = checked { @@ -982,7 +986,6 @@ fn review_preset_enhanced_on_control() { click_control(&mut control, &control_ctx, "Trace"); assert_eq!(settings(&control)["params"]["ignoreWhite"], true); assert_eq!(settings(&control)["params"]["ignoreColor"], "#255395", "the on-to-on control really accepted the source color"); - } #[test] From 269e8d85feee1afdc8eed7dd641bbd0d57bfad34 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Wed, 18 Nov 2026 14:47:13 -0800 Subject: [PATCH 55/78] Dimension: arrowhead names in every complete catalog The de, gu, it, ja, ko, uk, vi, zh-hans and zh-hant catalogs had no rows for the built-in arrowhead names, so the Stroke panel and the Dimension tool's Arrow Style showed them in English, and no catalog had Line Arrow. Those nine catalogs get the names, every catalog gets Line Arrow, and built_in_arrowhead_names_are_in_complete_catalogs checks them. Feather is left out of the nine: a plain Feather row would also rename the History steps of the Feather effect. Dimension art is saved as child paths whose strokes carry the arrowhead, so the docs, params text and comments no longer say that older versions draw arrowStyle in place of arrowHead. --- crates/doc/src/dimension.rs | 3 +-- crates/engine/src/cmd/dimension.rs | 2 +- crates/ui-egui/src/dialogs/dimension.rs | 5 ++--- crates/ui-egui/src/i18n/bg.tsv | 1 + crates/ui-egui/src/i18n/bs.tsv | 1 + crates/ui-egui/src/i18n/ca.tsv | 1 + crates/ui-egui/src/i18n/cs.tsv | 1 + crates/ui-egui/src/i18n/da.tsv | 1 + crates/ui-egui/src/i18n/de.tsv | 29 ++++++++++++++++++++++++ crates/ui-egui/src/i18n/el.tsv | 1 + crates/ui-egui/src/i18n/es.tsv | 1 + crates/ui-egui/src/i18n/fi.tsv | 1 + crates/ui-egui/src/i18n/fr.tsv | 1 + crates/ui-egui/src/i18n/gu.tsv | 30 +++++++++++++++++++++++++ crates/ui-egui/src/i18n/hi.tsv | 1 + crates/ui-egui/src/i18n/hu.tsv | 1 + crates/ui-egui/src/i18n/id.tsv | 1 + crates/ui-egui/src/i18n/it.tsv | 29 ++++++++++++++++++++++++ crates/ui-egui/src/i18n/ja.tsv | 29 ++++++++++++++++++++++++ crates/ui-egui/src/i18n/ka.tsv | 1 + crates/ui-egui/src/i18n/ko.tsv | 29 ++++++++++++++++++++++++ crates/ui-egui/src/i18n/nl.tsv | 1 + crates/ui-egui/src/i18n/pl.tsv | 1 + crates/ui-egui/src/i18n/pt-br.tsv | 1 + crates/ui-egui/src/i18n/ru.tsv | 1 + crates/ui-egui/src/i18n/sv.tsv | 1 + crates/ui-egui/src/i18n/tests.rs | 12 ++++++++++ crates/ui-egui/src/i18n/tr.tsv | 1 + crates/ui-egui/src/i18n/uk.tsv | 29 ++++++++++++++++++++++++ crates/ui-egui/src/i18n/vi.tsv | 29 ++++++++++++++++++++++++ crates/ui-egui/src/i18n/zh-hans.tsv | 29 ++++++++++++++++++++++++ crates/ui-egui/src/i18n/zh-hant.tsv | 29 ++++++++++++++++++++++++ docs/dimensions.md | 3 +-- docs/mcp.md | 11 +++++---- docs/target-app-parity.md | 2 +- 35 files changed, 304 insertions(+), 15 deletions(-) diff --git a/crates/doc/src/dimension.rs b/crates/doc/src/dimension.rs index 35c8431661..42b6b9a76d 100644 --- a/crates/doc/src/dimension.rs +++ b/crates/doc/src/dimension.rs @@ -177,8 +177,7 @@ pub struct DimensionOptions { pub line_type: LineType, pub line_color: [u8; 3], pub arrow_style: ArrowStyle, - /// A built-in stroke arrowhead drawn at both ends in place of `arrow_style`'s head. Versions - /// that do not read it draw `arrow_style`. + /// A built-in stroke arrowhead drawn at both ends in place of `arrow_style`'s head. #[serde(deserialize_with = "arrow_head::deserialize")] pub arrow_head: Option, pub arrow_scale: f64, diff --git a/crates/engine/src/cmd/dimension.rs b/crates/engine/src/cmd/dimension.rs index 768384f578..680511b2aa 100644 --- a/crates/engine/src/cmd/dimension.rs +++ b/crates/engine/src/cmd/dimension.rs @@ -14,7 +14,7 @@ pub fn specs() -> Vec { "Create Dimension", [], None, - "{mode?: linear|angular|radius|diameter, a?: [x,y], b?: [x,y], vertex?: [x,y], source?: {kind: segment, edge: {node,subpath,segment}}|{kind: angle, first: edge, second: edge}|{kind: circle, node}|{kind: arc, edge}|{kind: points, a?, b?, vertex?: {node,subpath,anchor}, freeA?, freeB?: a point that is not an anchor, {kind: onSegment, edge: {node,subpath,segment}, t: 0..1 (curve parameter)}|{kind: anchors, node, anchors: [{subpath,anchor,part?: point|in|out (the anchor, default, or its in or out handle),weight}] (2 or 3 points of one path whose weights add up to 1), across?: (2 anchors only: times the first-to-second anchor vector (x,y) turned to (-y,x), which points down when the vector points right)} (an end is an anchor or a free point, not both)}, orientation?: aligned|horizontal|vertical (linear only: the distance between the points, or only its horizontal or vertical part; default aligned), offset?: pt (the line's distance from the first point: along the left normal of a → b when aligned, downward when horizontal, leftward when vertical; negative goes the other way), options?: {units: in|mm|pt|pc|px|cm|m|ft|yd, precision: 0-6, scale: drawing:real, hideUnits, lineWeight, lineType: solid|dashed|dotted, lineColor: [r,g,b], arrowStyle: filled|open|tick|none, arrowHead: null|a built-in stroke.set arrowhead name (Barbed, LineArrow…; drawn at both ends in place of arrowStyle's head, which versions that do not read arrowHead draw; custom arrowheads are refused), arrowScale: %, extensionWeight, extensionType, extensionColor, extensionOffset, extensionLength, hideExtensions, fontFamily, fontStyle, fontSize, textColor, textPosition: away|between, textAlignment: left|center|right, textOffset}} → {id,label}; linked measurements follow source edits", + "{mode?: linear|angular|radius|diameter, a?: [x,y], b?: [x,y], vertex?: [x,y], source?: {kind: segment, edge: {node,subpath,segment}}|{kind: angle, first: edge, second: edge}|{kind: circle, node}|{kind: arc, edge}|{kind: points, a?, b?, vertex?: {node,subpath,anchor}, freeA?, freeB?: a point that is not an anchor, {kind: onSegment, edge: {node,subpath,segment}, t: 0..1 (curve parameter)}|{kind: anchors, node, anchors: [{subpath,anchor,part?: point|in|out (the anchor, default, or its in or out handle),weight}] (2 or 3 points of one path whose weights add up to 1), across?: (2 anchors only: times the first-to-second anchor vector (x,y) turned to (-y,x), which points down when the vector points right)} (an end is an anchor or a free point, not both)}, orientation?: aligned|horizontal|vertical (linear only: the distance between the points, or only its horizontal or vertical part; default aligned), offset?: pt (the line's distance from the first point: along the left normal of a → b when aligned, downward when horizontal, leftward when vertical; negative goes the other way), options?: {units: in|mm|pt|pc|px|cm|m|ft|yd, precision: 0-6, scale: drawing:real, hideUnits, lineWeight, lineType: solid|dashed|dotted, lineColor: [r,g,b], arrowStyle: filled|open|tick|none, arrowHead: null|a built-in stroke.set arrowhead name (Barbed, LineArrow…; drawn at both ends in place of arrowStyle's head; custom arrowheads are refused), arrowScale: %, extensionWeight, extensionType, extensionColor, extensionOffset, extensionLength, hideExtensions, fontFamily, fontStyle, fontSize, textColor, textPosition: away|between, textAlignment: left|center|right, textOffset}} → {id,label}; linked measurements follow source edits", has_doc, create ), diff --git a/crates/ui-egui/src/dialogs/dimension.rs b/crates/ui-egui/src/dialogs/dimension.rs index c3c929b50d..b4f79f0836 100644 --- a/crates/ui-egui/src/dialogs/dimension.rs +++ b/crates/ui-egui/src/dialogs/dimension.rs @@ -48,8 +48,7 @@ impl ArrowChoice { } } /// The Arrow Style entries: Filled, Open, Tick and None, then the other built-in stroke arrowheads -/// in the Stroke panel's order. A stroke arrowhead keeps `filled` as its `arrowStyle`, the head that -/// versions which do not read `arrowHead` draw. +/// in the Stroke panel's order. A stroke arrowhead keeps `filled` as its `arrowStyle`. fn arrow_choices() -> Vec { let named = [(ArrowStyle::Filled, "Filled"), (ArrowStyle::Open, "Open"), (ArrowStyle::Tick, "Tick"), (ArrowStyle::None, "None")]; let heads = Arrowhead::ALL.into_iter().filter(|h| !named.iter().any(|(s, _)| s.arrowhead().as_ref() == Some(h))); @@ -496,7 +495,7 @@ mod tests { } /// The Arrow Style list names each arrowhead once, with the four older styles first, and each - /// stroke arrowhead keeps Filled for versions that do not read `arrowHead`. + /// stroke arrowhead keeps Filled as its `arrowStyle`. #[test] fn arrow_style_list_names_each_style_once() { let choices = arrow_choices(); diff --git a/crates/ui-egui/src/i18n/bg.tsv b/crates/ui-egui/src/i18n/bg.tsv index d371a5f1e4..9bc64ef92b 100644 --- a/crates/ui-egui/src/i18n/bg.tsv +++ b/crates/ui-egui/src/i18n/bg.tsv @@ -1951,6 +1951,7 @@ font-technology Variable Променливи Limit to Library: Ограничаване до библиотека: Limit: Ограничение: Line Линия + Line Arrow Линейна стрелка Line Art and Text Resolution: Разделителна способност на линеарна графика и текст: Line Breaks Паузи на редове Line Color Цвят на линията diff --git a/crates/ui-egui/src/i18n/bs.tsv b/crates/ui-egui/src/i18n/bs.tsv index 00d07d469d..9f47390398 100644 --- a/crates/ui-egui/src/i18n/bs.tsv +++ b/crates/ui-egui/src/i18n/bs.tsv @@ -5919,6 +5919,7 @@ imageTrace Outline Obris Kite Zmaj Triangle to Bar Trougao u traku Oval Oval + Line Arrow Linijska strelica Complementary Komplementarne Complementary 2 Komplementarne 2 Split Complementary Podijeljene komplementarne diff --git a/crates/ui-egui/src/i18n/ca.tsv b/crates/ui-egui/src/i18n/ca.tsv index 78e5a77c9e..3bc8a2c6ef 100644 --- a/crates/ui-egui/src/i18n/ca.tsv +++ b/crates/ui-egui/src/i18n/ca.tsv @@ -2532,6 +2532,7 @@ digits Malayalam Malaiàlam Limit: Límit: Limited Limitat Line Línia + Line Arrow Fletxa de línies Line Art Art lineal Line Art and Text Resolution: Resolució de l’art lineal i del text: Line Breaks Salts de línia diff --git a/crates/ui-egui/src/i18n/cs.tsv b/crates/ui-egui/src/i18n/cs.tsv index bd3e76ec50..d43fe6bab8 100644 --- a/crates/ui-egui/src/i18n/cs.tsv +++ b/crates/ui-egui/src/i18n/cs.tsv @@ -6300,6 +6300,7 @@ variable-list-end {0}, {1} {0} a {1} Kite Deltoid Triangle to Bar Trojúhelník k příčce Oval Ovál + Line Arrow Čárová šipka # Colour harmony rules (Color Guide, Recolor Artwork, Color Themes) Complementary Komplementární Complementary 2 Komplementární 2 diff --git a/crates/ui-egui/src/i18n/da.tsv b/crates/ui-egui/src/i18n/da.tsv index 3fb128a27a..e31a9f3762 100644 --- a/crates/ui-egui/src/i18n/da.tsv +++ b/crates/ui-egui/src/i18n/da.tsv @@ -8374,6 +8374,7 @@ imageTrace Outline Kontur Kite Drage Triangle to Bar Trekant til bjælke Oval Oval + Line Arrow Stregpil Complementary Komplementær Complementary 2 Komplementær 2 Split Complementary Delt komplementær diff --git a/crates/ui-egui/src/i18n/de.tsv b/crates/ui-egui/src/i18n/de.tsv index 6ad4e3850b..1144e40b34 100644 --- a/crates/ui-egui/src/i18n/de.tsv +++ b/crates/ui-egui/src/i18n/de.tsv @@ -7365,6 +7365,35 @@ anchor Points: Punkte: @msg `{id}` is not a colour adjustment `{id}` ist keine Farbkorrektur @msg missing `effect` `effect` fehlt @msg `params` must be an object `params` muss ein Objekt sein +# Stroke arrowheads (Stroke panel, Dimension Tool Options and Properties › Arrow Style). + Triangle (open) Dreieck (offen) + Circle (open) Kreis (offen) + Square (open) Quadrat (offen) + Arrow (open) Pfeil (offen) + Barbed Mit Widerhaken + Half Arrow (left) Halber Pfeil (links) + Half Arrow (right) Halber Pfeil (rechts) + Double Bar Doppelbalken + Dot on Bar Punkt auf Balken + Chevron Winkel + Plus Plus + Hexagon (open) Sechseck (offen) + Tag Etikett + Tag (open) Etikett (offen) + Half Circle Halbkreis + Drop Tropfen + Slash Schrägstrich + Double Slash Doppelter Schrägstrich + Diamond (open) Raute (offen) + Reverse Triangle Umgekehrtes Dreieck + Swallowtail Schwalbenschwanz + Bracket Klammer + Fork Gabel + Leaf Blatt + Kite Drachen + Triangle to Bar Dreieck zu Balken + Oval Oval + Line Arrow Linienpfeil # Path Precision Tools add-on (Object › Plug-ins › Path Precision Tools): its tools, Anchor Inspector panel, commands and messages. Path Precision Tools Pfad-Präzisionswerkzeuge Anchor Eraser Brush Ankerpunkt-Radierpinsel diff --git a/crates/ui-egui/src/i18n/el.tsv b/crates/ui-egui/src/i18n/el.tsv index 7d2e5b6363..680c4d4ac1 100644 --- a/crates/ui-egui/src/i18n/el.tsv +++ b/crates/ui-egui/src/i18n/el.tsv @@ -1915,6 +1915,7 @@ font-technology Variable Μεταβλητές Lighten Φώτισμα Lightness Φωτεινότητα Line Γραμμή + Line Arrow Γραμμικό βέλος Line Segment Tool Ευθύγραμμο τμήμα (Line Segment Tool) Linear Gradient Γραμμικό ντεγκραντέ Lines Γραμμές diff --git a/crates/ui-egui/src/i18n/es.tsv b/crates/ui-egui/src/i18n/es.tsv index 30678f8a13..f55b74ee31 100644 --- a/crates/ui-egui/src/i18n/es.tsv +++ b/crates/ui-egui/src/i18n/es.tsv @@ -6253,6 +6253,7 @@ effect Regular Regular Kite Cometa Triangle to Bar Triángulo a barra Oval Óvalo + Line Arrow Flecha de líneas Complementary Complementario Complementary 2 Complementario 2 Split Complementary Complementario dividido diff --git a/crates/ui-egui/src/i18n/fi.tsv b/crates/ui-egui/src/i18n/fi.tsv index 873d339833..0012b6f87b 100644 --- a/crates/ui-egui/src/i18n/fi.tsv +++ b/crates/ui-egui/src/i18n/fi.tsv @@ -6212,6 +6212,7 @@ variable-list-end {0}, {1} {0} ja {1} Kite Leija Triangle to Bar Kolmiosta palkkiin Oval Soikio + Line Arrow Viivanuoli Complementary Vastaväri Complementary 2 Vastaväri 2 Split Complementary Jaettu vastaväri diff --git a/crates/ui-egui/src/i18n/fr.tsv b/crates/ui-egui/src/i18n/fr.tsv index 68bcc455b2..fc37f336b5 100644 --- a/crates/ui-egui/src/i18n/fr.tsv +++ b/crates/ui-egui/src/i18n/fr.tsv @@ -2036,6 +2036,7 @@ font-technology Variable Variables Limit to Library: Limiter à la bibliothèque : Limit: Limite : Line Ligne + Line Arrow Flèche filaire Line Art and Text Resolution: Résolution des dessins au trait et du texte : Line Breaks Sauts de ligne Line Color Couleur de ligne diff --git a/crates/ui-egui/src/i18n/gu.tsv b/crates/ui-egui/src/i18n/gu.tsv index d7bb081e02..dbbc5db7bc 100644 --- a/crates/ui-egui/src/i18n/gu.tsv +++ b/crates/ui-egui/src/i18n/gu.tsv @@ -3095,6 +3095,36 @@ Remove Effect ઇફેક્ટ દૂર કરો Remove Effects ઇફેક્ટ્સ દૂર કરો Remove Gaps ગેપ દૂર કરો +# Stroke arrowheads (Stroke panel, Dimension Tool Options and Properties › Arrow Style). + Triangle (open) ત્રિકોણ (ખુલ્લો) + Circle (open) વર્તુળ (ખુલ્લું) + Square (open) ચોરસ (ખુલ્લો) + Arrow (open) તીર (ખુલ્લું) + Barbed કાંટાળું + Half Arrow (left) અડધું તીર (ડાબે) + Half Arrow (right) અડધું તીર (જમણે) + Double Bar બેવડી પટ્ટી + Dot on Bar પટ્ટી પર બિંદુ + Chevron શેવરોન + Cross ક્રોસ + Plus પ્લસ + Hexagon (open) ષટ્કોણ (ખુલ્લો) + Tag ટૅગ + Tag (open) ટૅગ (ખુલ્લો) + Half Circle અર્ધવર્તુળ + Drop ટીપું + Slash સ્લૅશ + Double Slash બેવડો સ્લૅશ + Diamond (open) ડાયમંડ (ખુલ્લો) + Reverse Triangle ઊંધો ત્રિકોણ + Swallowtail અબાબીલની પૂંછડી + Bracket કૌંસ + Fork કાંટો + Leaf પાંદડું + Kite પતંગ + Triangle to Bar ત્રિકોણથી પટ્ટી + Oval અંડાકાર + Line Arrow રેખા તીર # Path Precision Tools add-on: Common Tangents. Common Tangents… સામાન્ય સ્પર્શરેખાઓ… Common Tangents સામાન્ય સ્પર્શરેખાઓ diff --git a/crates/ui-egui/src/i18n/hi.tsv b/crates/ui-egui/src/i18n/hi.tsv index 2837a15b67..f0b4e57d16 100644 --- a/crates/ui-egui/src/i18n/hi.tsv +++ b/crates/ui-egui/src/i18n/hi.tsv @@ -3029,6 +3029,7 @@ antiAlias Sharp शार्प Limit: सीमा: Limited लिमिटेड Line लाइन + Line Arrow लाइन तीर line {line} लाइन {line} Line {line} लाइन {line} Line {line}: {name}: {status} लाइन {line}: {name}: {status} diff --git a/crates/ui-egui/src/i18n/hu.tsv b/crates/ui-egui/src/i18n/hu.tsv index fbc2e30bd1..248471e24a 100644 --- a/crates/ui-egui/src/i18n/hu.tsv +++ b/crates/ui-egui/src/i18n/hu.tsv @@ -2534,6 +2534,7 @@ file-filter Templates Sablonok Limit: Határ: Limited Korlátozott Line Vonal + Line Arrow Vonalas nyíl Line Art Vonalas rajz Line Art and Text Resolution: Vonalas grafika és szöveg felbontása: Line Breaks Sortörések diff --git a/crates/ui-egui/src/i18n/id.tsv b/crates/ui-egui/src/i18n/id.tsv index ab48475d3d..bc3a63101a 100644 --- a/crates/ui-egui/src/i18n/id.tsv +++ b/crates/ui-egui/src/i18n/id.tsv @@ -5568,6 +5568,7 @@ imageTrace Outline Kontur Kite Layang-layang Triangle to Bar Segitiga ke batang Oval Oval + Line Arrow Panah garis Complementary Komplementer Complementary 2 Komplementer 2 Split Complementary Komplementer terpisah diff --git a/crates/ui-egui/src/i18n/it.tsv b/crates/ui-egui/src/i18n/it.tsv index a3b493cd1d..4bd0150964 100644 --- a/crates/ui-egui/src/i18n/it.tsv +++ b/crates/ui-egui/src/i18n/it.tsv @@ -7402,6 +7402,35 @@ anchor Points: Punti: @msg `{id}` is not a colour adjustment `{id}` non è una regolazione del colore @msg missing `effect` manca `effect` @msg `params` must be an object `params` deve essere un oggetto +# Stroke arrowheads (Stroke panel, Dimension Tool Options and Properties › Arrow Style). + Triangle (open) Triangolo (aperto) + Circle (open) Cerchio (aperto) + Square (open) Quadrato (aperto) + Arrow (open) Freccia (aperta) + Barbed Uncinata + Half Arrow (left) Mezza freccia (sinistra) + Half Arrow (right) Mezza freccia (destra) + Double Bar Doppia barra + Dot on Bar Punto su barra + Chevron Gallone + Plus Più + Hexagon (open) Esagono (aperto) + Tag Etichetta + Tag (open) Etichetta (aperta) + Half Circle Semicerchio + Drop Goccia + Slash Barra obliqua + Double Slash Doppia barra obliqua + Diamond (open) Rombo (aperto) + Reverse Triangle Triangolo invertito + Swallowtail Coda di rondine + Bracket Parentesi + Fork Forcella + Leaf Foglia + Kite Aquilone + Triangle to Bar Da triangolo a barra + Oval Ovale + Line Arrow Freccia a linee # Path Precision Tools add-on (Object › Plug-ins › Path Precision Tools): its tools, Anchor Inspector panel, commands and messages. Path Precision Tools Strumenti di precisione per tracciati Anchor Eraser Brush Pennello gomma punti di ancoraggio diff --git a/crates/ui-egui/src/i18n/ja.tsv b/crates/ui-egui/src/i18n/ja.tsv index 5de0cae50c..f7ff828023 100644 --- a/crates/ui-egui/src/i18n/ja.tsv +++ b/crates/ui-egui/src/i18n/ja.tsv @@ -9292,6 +9292,35 @@ anchor Points: ポイント: @msg `{id}` is not a colour adjustment `{id}` はカラー補正ではありません @msg missing `effect` `effect` が指定されていません @msg `params` must be an object `params` にはオブジェクトを指定してください +# Stroke arrowheads (Stroke panel, Dimension Tool Options and Properties › Arrow Style). + Triangle (open) 三角形 (白抜き) + Circle (open) 円 (白抜き) + Square (open) 正方形 (白抜き) + Arrow (open) 矢印 (白抜き) + Barbed かえし付き + Half Arrow (left) 片矢印 (左) + Half Arrow (right) 片矢印 (右) + Double Bar 二重バー + Dot on Bar バー上のドット + Chevron 山形 + Plus プラス + Hexagon (open) 六角形 (白抜き) + Tag タグ + Tag (open) タグ (白抜き) + Half Circle 半円 + Drop しずく + Slash スラッシュ + Double Slash 二重スラッシュ + Diamond (open) ひし形 (白抜き) + Reverse Triangle 逆三角形 + Swallowtail 燕尾 + Bracket 角かっこ + Fork フォーク + Leaf 葉 + Kite カイト + Triangle to Bar 三角形からバー + Oval 楕円 + Line Arrow 線矢印 # Path Precision Tools add-on (Object › Plug-ins › Path Precision Tools): its tools, Anchor Inspector panel, commands and messages. Path Precision Tools パス精密ツール Anchor Eraser Brush アンカーポイント消去ブラシ diff --git a/crates/ui-egui/src/i18n/ka.tsv b/crates/ui-egui/src/i18n/ka.tsv index 81fc06870d..2543c8b152 100644 --- a/crates/ui-egui/src/i18n/ka.tsv +++ b/crates/ui-egui/src/i18n/ka.tsv @@ -7691,6 +7691,7 @@ font-technology Variable ცვლადი Kite ფრანი Triangle to Bar სამკუთხედიდან ზოლამდე Oval ოვალი + Line Arrow ხაზოვანი ისარი Complementary დამატებითი Complementary 2 დამატებითი 2 Split Complementary გაყოფილი დამატებითი diff --git a/crates/ui-egui/src/i18n/ko.tsv b/crates/ui-egui/src/i18n/ko.tsv index 4a6963bbd2..46515dc315 100644 --- a/crates/ui-egui/src/i18n/ko.tsv +++ b/crates/ui-egui/src/i18n/ko.tsv @@ -7374,6 +7374,35 @@ anchor Points: 포인트: @msg `{id}` is not a colour adjustment `{id}`은(는) 색상 조정이 아닙니다 @msg missing `effect` `effect`이 없습니다 @msg `params` must be an object `params`는 개체여야 합니다 +# Stroke arrowheads (Stroke panel, Dimension Tool Options and Properties › Arrow Style). + Triangle (open) 삼각형 (윤곽) + Circle (open) 원 (윤곽) + Square (open) 사각 (윤곽) + Arrow (open) 화살표 (윤곽) + Barbed 미늘 + Half Arrow (left) 반쪽 화살표 (왼쪽) + Half Arrow (right) 반쪽 화살표 (오른쪽) + Double Bar 이중 막대 + Dot on Bar 막대 위 점 + Chevron 갈매기형 + Plus 더하기 + Hexagon (open) 육각형 (윤곽) + Tag 태그 + Tag (open) 태그 (윤곽) + Half Circle 반원 + Drop 물방울 + Slash 슬래시 + Double Slash 이중 슬래시 + Diamond (open) 다이아몬드 (윤곽) + Reverse Triangle 역삼각형 + Swallowtail 제비 꼬리 + Bracket 대괄호 + Fork 포크 + Leaf 잎 + Kite 연 + Triangle to Bar 삼각형에서 막대 + Oval 타원 + Line Arrow 선 화살표 # Path Precision Tools add-on (Object › Plug-ins › Path Precision Tools): its tools, Anchor Inspector panel, commands and messages. Path Precision Tools 패스 정밀 도구 Anchor Eraser Brush 앵커 포인트 지우개 브러시 diff --git a/crates/ui-egui/src/i18n/nl.tsv b/crates/ui-egui/src/i18n/nl.tsv index 894c7096f6..c7af9b1404 100644 --- a/crates/ui-egui/src/i18n/nl.tsv +++ b/crates/ui-egui/src/i18n/nl.tsv @@ -8087,6 +8087,7 @@ imageTrace Outline Contour Kite Vlieger Triangle to Bar Driehoek naar balk Oval Ovaal + Line Arrow Lijnpijl Complementary Complementair Complementary 2 Complementair 2 Split Complementary Gesplitst complementair diff --git a/crates/ui-egui/src/i18n/pl.tsv b/crates/ui-egui/src/i18n/pl.tsv index c69ed2cf28..427ff037a8 100644 --- a/crates/ui-egui/src/i18n/pl.tsv +++ b/crates/ui-egui/src/i18n/pl.tsv @@ -6152,6 +6152,7 @@ variable-list-end {0}, {1} {0} i {1} Kite Latawiec Triangle to Bar Trójkąt z kreską Oval Owal + Line Arrow Strzałka liniowa Complementary Dopełniające Complementary 2 Dopełniające 2 Split Complementary Rozdzielone dopełniające diff --git a/crates/ui-egui/src/i18n/pt-br.tsv b/crates/ui-egui/src/i18n/pt-br.tsv index 6bae5e26f1..e5bbd3db53 100644 --- a/crates/ui-egui/src/i18n/pt-br.tsv +++ b/crates/ui-egui/src/i18n/pt-br.tsv @@ -6235,6 +6235,7 @@ effect Regular Regular Kite Pipa Triangle to Bar Triângulo para Barra Oval Oval + Line Arrow Seta de Linha Complementary Complementar Complementary 2 Complementar 2 Split Complementary Complementar Dividida diff --git a/crates/ui-egui/src/i18n/ru.tsv b/crates/ui-egui/src/i18n/ru.tsv index 74156da429..862a0c3616 100644 --- a/crates/ui-egui/src/i18n/ru.tsv +++ b/crates/ui-egui/src/i18n/ru.tsv @@ -2073,6 +2073,7 @@ file-filter Templates Шаблоны Limit to Library: Ограничить библиотекой: Limit: Предел: Line Линия + Line Arrow Линейная стрелка Line Art and Text Resolution: Разрешение штрихового рисунка и текста: Line Breaks Разрывы строк Line Color Цвет линии diff --git a/crates/ui-egui/src/i18n/sv.tsv b/crates/ui-egui/src/i18n/sv.tsv index 4d683cb1ea..047a1ebf93 100644 --- a/crates/ui-egui/src/i18n/sv.tsv +++ b/crates/ui-egui/src/i18n/sv.tsv @@ -1975,6 +1975,7 @@ font-technology Variable Variabla Limit to Library: Begränsa till bibliotek: Limit: Gränsvärde: Line Linje + Line Arrow Linjepil Line Art and Text Resolution: Upplösning för streckteckning och text: Line Breaks Radbrytningar Line Color Linjefärg diff --git a/crates/ui-egui/src/i18n/tests.rs b/crates/ui-egui/src/i18n/tests.rs index 19e8f367c6..3521580eac 100644 --- a/crates/ui-egui/src/i18n/tests.rs +++ b/crates/ui-egui/src/i18n/tests.rs @@ -673,6 +673,18 @@ fn built_in_library_style_names_are_in_complete_catalogs() { assert!(bad.is_empty(), "{}", bad.join("\n")); } +/// The Stroke panel and the Dimension tool's Arrow Style list the built-in arrowheads by name, so +/// each name has a row in each complete catalog. Feather is not checked: a plain `Feather` row also +/// names the History steps of the Feather effect, which otherwise take the effect's menu row. +#[test] +fn built_in_arrowhead_names_are_in_complete_catalogs() { + use vectorcraft_doc::Arrowhead; + let names = distinct(Arrowhead::ALL.iter().filter(|h| **h != Arrowhead::Feather).map(|h| h.label().to_string()).collect()); + assert_eq!(names.len(), 40, "{names:?}"); + let bad = lacking(&names, |c, n| c.plain(n).is_some()); + assert!(bad.is_empty(), "{}", bad.join("\n")); +} + /// A built-in symbol library's panel lists its symbols in the UI language, so every symbol of /// every built-in library has a row in each complete catalog. #[test] diff --git a/crates/ui-egui/src/i18n/tr.tsv b/crates/ui-egui/src/i18n/tr.tsv index d0e30b8fdc..4505a40fb9 100644 --- a/crates/ui-egui/src/i18n/tr.tsv +++ b/crates/ui-egui/src/i18n/tr.tsv @@ -1868,6 +1868,7 @@ font-technology Variable Değişken Limit to Library: Kütüphaneyle Sınırlama: Limit: Sınır: Line Hat + Line Arrow Çizgi Ok Line Art and Text Resolution: Çizgi Sanatı ve Metin Çözünürlüğü: Line Breaks Satır Sonları Line Color Çizgi Rengi diff --git a/crates/ui-egui/src/i18n/uk.tsv b/crates/ui-egui/src/i18n/uk.tsv index 82ba9af243..787fcd5ffb 100644 --- a/crates/ui-egui/src/i18n/uk.tsv +++ b/crates/ui-egui/src/i18n/uk.tsv @@ -7384,6 +7384,35 @@ anchor Points: Точки: @msg `{id}` is not a colour adjustment `{id}` не є корекцією кольору @msg missing `effect` відсутня `effect` @msg `params` must be an object `params` має бути об’єктом +# Stroke arrowheads (Stroke panel, Dimension Tool Options and Properties › Arrow Style). + Triangle (open) Трикутник (контурний) + Circle (open) Коло (контурне) + Square (open) Квадрат (контурний) + Arrow (open) Стрілка (контурна) + Barbed Зазубрена + Half Arrow (left) Половина стрілки (ліворуч) + Half Arrow (right) Половина стрілки (праворуч) + Double Bar Подвійна смуга + Dot on Bar Крапка на смузі + Chevron Шеврон + Plus Плюс + Hexagon (open) Шестикутник (контурний) + Tag Ярлик + Tag (open) Ярлик (контурний) + Half Circle Півколо + Drop Крапля + Slash Скісна риска + Double Slash Подвійна скісна риска + Diamond (open) Ромб (контурний) + Reverse Triangle Обернений трикутник + Swallowtail Ластівчин хвіст + Bracket Дужка + Fork Вилка + Leaf Листок + Kite Дельтоїд + Triangle to Bar Трикутник до смуги + Oval Овал + Line Arrow Лінійна стрілка # Path Precision Tools add-on (Object › Plug-ins › Path Precision Tools): its tools, Anchor Inspector panel, commands and messages. Path Precision Tools Інструменти точного редагування контурів Anchor Eraser Brush Пензель-гумка опорних точок diff --git a/crates/ui-egui/src/i18n/vi.tsv b/crates/ui-egui/src/i18n/vi.tsv index 04ebd9992d..e4c0e838e5 100644 --- a/crates/ui-egui/src/i18n/vi.tsv +++ b/crates/ui-egui/src/i18n/vi.tsv @@ -7428,6 +7428,35 @@ anchor Points: Điểm: @msg `{id}` is not a colour adjustment `{id}` không phải là điều chỉnh màu @msg missing `effect` thiếu `effect` @msg `params` must be an object `params` phải là một đối tượng +# Stroke arrowheads (Stroke panel, Dimension Tool Options and Properties › Arrow Style). + Triangle (open) Tam giác (rỗng) + Circle (open) Hình tròn (rỗng) + Square (open) Hình vuông (rỗng) + Arrow (open) Mũi tên (rỗng) + Barbed Có ngạnh + Half Arrow (left) Nửa mũi tên (trái) + Half Arrow (right) Nửa mũi tên (phải) + Double Bar Thanh đôi + Dot on Bar Chấm trên thanh + Chevron Hình chữ V + Plus Dấu cộng + Hexagon (open) Lục giác (rỗng) + Tag Nhãn + Tag (open) Nhãn (rỗng) + Half Circle Nửa hình tròn + Drop Giọt nước + Slash Gạch chéo + Double Slash Gạch chéo đôi + Diamond (open) Hình thoi (rỗng) + Reverse Triangle Tam giác ngược + Swallowtail Đuôi én + Bracket Ngoặc + Fork Chạc + Leaf Chiếc lá + Kite Hình diều + Triangle to Bar Tam giác đến thanh + Oval Hình bầu dục + Line Arrow Mũi tên nét # Path Precision Tools add-on (Object › Plug-ins › Path Precision Tools): its tools, Anchor Inspector panel, commands and messages. Path Precision Tools Công cụ chính xác cho đường dẫn Anchor Eraser Brush Cọ tẩy điểm neo diff --git a/crates/ui-egui/src/i18n/zh-hans.tsv b/crates/ui-egui/src/i18n/zh-hans.tsv index d20ae8d9e8..a3d805eefa 100644 --- a/crates/ui-egui/src/i18n/zh-hans.tsv +++ b/crates/ui-egui/src/i18n/zh-hans.tsv @@ -7611,6 +7611,35 @@ anchor Points: 点: @msg `{id}` is not a colour adjustment `{id}` 不是颜色调整 @msg missing `effect` 缺少 `effect` @msg `params` must be an object `params` 必须是对象 +# Stroke arrowheads (Stroke panel, Dimension Tool Options and Properties › Arrow Style). + Triangle (open) 三角 (空心) + Circle (open) 圆形 (空心) + Square (open) 正方形 (空心) + Arrow (open) 箭头 (空心) + Barbed 倒钩 + Half Arrow (left) 半箭头 (左) + Half Arrow (right) 半箭头 (右) + Double Bar 双条形 + Dot on Bar 条形上的圆点 + Chevron 人字形 + Plus 加号 + Hexagon (open) 六边形 (空心) + Tag 标签 + Tag (open) 标签 (空心) + Half Circle 半圆 + Drop 水滴 + Slash 斜线 + Double Slash 双斜线 + Diamond (open) 菱形 (空心) + Reverse Triangle 倒三角 + Swallowtail 燕尾 + Bracket 括号 + Fork 叉形 + Leaf 叶形 + Kite 风筝形 + Triangle to Bar 三角至条形 + Oval 椭圆 + Line Arrow 线条箭头 # Path Precision Tools add-on (Object › Plug-ins › Path Precision Tools): its tools, Anchor Inspector panel, commands and messages. Path Precision Tools 路径精确工具 Anchor Eraser Brush 锚点橡皮擦画笔 diff --git a/crates/ui-egui/src/i18n/zh-hant.tsv b/crates/ui-egui/src/i18n/zh-hant.tsv index d5fde762f9..bbc027d990 100644 --- a/crates/ui-egui/src/i18n/zh-hant.tsv +++ b/crates/ui-egui/src/i18n/zh-hant.tsv @@ -7433,6 +7433,35 @@ anchor Points: 點: @msg `{id}` is not a colour adjustment `{id}` 不是顏色調整 @msg missing `effect` 未提供 `effect` @msg `params` must be an object `params` 必須是物件 +# Stroke arrowheads (Stroke panel, Dimension Tool Options and Properties › Arrow Style). + Triangle (open) 三角 (空心) + Circle (open) 圓形 (空心) + Square (open) 正方形 (空心) + Arrow (open) 箭頭 (空心) + Barbed 倒鉤 + Half Arrow (left) 半箭頭 (左) + Half Arrow (right) 半箭頭 (右) + Double Bar 雙長條 + Dot on Bar 長條上的圓點 + Chevron 人字形 + Plus 加號 + Hexagon (open) 六邊形 (空心) + Tag 標籤 + Tag (open) 標籤 (空心) + Half Circle 半圓 + Drop 水滴 + Slash 斜線 + Double Slash 雙斜線 + Diamond (open) 菱形 (空心) + Reverse Triangle 倒三角 + Swallowtail 燕尾 + Bracket 括號 + Fork 叉形 + Leaf 葉形 + Kite 風箏形 + Triangle to Bar 三角至長條 + Oval 橢圓 + Line Arrow 線條箭頭 # Path Precision Tools add-on (Object › Plug-ins › Path Precision Tools): its tools, Anchor Inspector panel, commands and messages. Path Precision Tools 路徑精確工具 Anchor Eraser Brush 錨點橡皮擦筆刷 diff --git a/docs/dimensions.md b/docs/dimensions.md index ef7323f07b..f5404d5880 100644 --- a/docs/dimensions.md +++ b/docs/dimensions.md @@ -90,8 +90,7 @@ from the object) or **Between Line and Object**; **Alignment** is **Left**, **Ce **Arrow Style** lists **Filled**, **Open**, **Tick** and **None**, then every other built-in arrowhead of the Stroke panel, each with a drawn preview before its name. Custom arrowheads are not -listed. A dimension with one of the other arrowheads opens in versions without them with -**Filled** arrows. +listed. Scale means **drawing : real size**, independent of zoom. At **1:10** a 1 in line on the page is labelled 10 in; at **10:1**, 0.1 in. It scales lengths, not angles or the size of text and arrows. diff --git a/docs/mcp.md b/docs/mcp.md index e577417826..fd8fb76a0a 100644 --- a/docs/mcp.md +++ b/docs/mcp.md @@ -6095,12 +6095,6 @@ the `…Open` rings…) and marks (`Bar`, `DoubleBar`, `DotOnBar`, `Slash`, `Dou `arrowScale`, at least 0.25 pt. `LineArrow` has two arms of the head's weight (the line's weight at 100 % for lines of 0.25 pt or more) at right angles and spreads twice as wide. -A dimension's options (`dimension.create`, `dimension.update` and the Dimension tool's `style`) take `arrowStyle` -(`filled`, `open`, `tick` or `none`: `Triangle`, `TriangleOpen`, `Slash` or no head) and `arrowHead`, `null` or one of -the same built-in head names, drawn at both ends in place of the arrow style's head. Versions that do not read -`arrowHead` draw `arrowStyle`. The Arrow Style menu sets `arrowStyle` to `filled` when it sets `arrowHead`. A custom -arrowhead and an unknown name are refused. - Custom arrowheads come from the arrowheads file, `Arrowheads.vectorcraft` next to the preferences (none on the web or in runs with `VECTORCRAFT_NO_PREFS`). `stroke.arrowheads.edit` (Stroke panel menu › Edit Arrowheads…) opens it, and first creates it with one example head when it is missing. Each symbol in the file is one head, named after the @@ -6137,6 +6131,11 @@ arrowheads in a separate arrowheads file. {"name":"run_command","arguments":{"command":"stroke.set","params":{"ids":[9],"endArrow":{"custom":"Example Arrowhead"}}}} ``` +A dimension's options (`dimension.create`, `dimension.update` and the Dimension tool's `style`) take `arrowStyle` +(`filled`, `open`, `tick` or `none`: `Triangle`, `TriangleOpen`, `Slash` or no head) and `arrowHead`, `null` or one of +the built-in head names `stroke.set` takes, drawn at both ends in place of the arrow style's head. The Arrow Style menu +sets `arrowStyle` to `filled` when it sets `arrowHead`. A custom arrowhead and an unknown name are refused. + ## Stroke bounds and clicks Visual bounds (Fit to Selected Art, Rasterize, exporting all art) and clicks on the canvas take diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index a0ae897cd4..3fd725c54c 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -655,7 +655,7 @@ since 2026-10-01. **Drawing tools, Dimension tool lines line up with dimensions already drawn (#8063, #5590):** By VectorCraft's own rule, with Smart Guides on, a linear dimension placed with its line within the Smart Guides snapping tolerance of the level of a parallel line of a visible, unlocked linear dimension already drawn has its line on that level, and with Alignment Guides on a guide runs along the level across both lines while it is placed. `a_dimension_line_placed_beside_another_lands_on_its_level`, `a_dimension_line_on_another_level_shows_one_guide_across_both`, `a_dimension_of_the_same_points_lines_up_and_the_line_follows_the_pointer`, `a_dimension_dragged_out_beside_another_lands_on_its_level` and `a_line_the_pointer_lies_across_wins_on_one_level` cover it. **Drawing tools, Dimension tool dimensions selected with their art keep their lines and label:** Object › Expand, Object › Expand Appearance and Object › Path › Outline Stroke leave a dimension selected with art it measures, directly or in selected groups without fills, strokes or effects of their own, as it is and change only the other art; when the new art no longer fits its link, the dimension stays where it was, no longer linked, and undo links it again. `expand_leaves_a_dimension_selected_with_its_art_as_it_is`, `expand_appearance_leaves_a_dimension_selected_with_its_art_as_it_is`, `outline_stroke_leaves_a_dimension_selected_with_its_art_as_it_is`, `a_dimension_selected_with_art_that_has_nothing_to_expand_changes_nothing`, `a_group_effect_expanded_reaches_the_dimension_it_holds`, `expand_keeps_a_dimension_in_its_asset_and_its_variable_binding`, `a_dimension_keeps_no_link_to_the_art_expand_replaced`, `a_dimension_outlasts_the_art_outline_stroke_or_expand_appearance_replaced`, `a_dimension_outlasts_the_stroke_expand_outlined` and `expand_appearance_in_safe_mode_leaves_a_dimension_selected_with_its_art` cover it. **Drawing tools, Dimension tool Arrow Style shows each arrowhead (#8049):** The Arrow Style dropdown in Dimension Tool Options and in the Properties panel's Dimension section draws each style's arrowhead at the end of a short line before its name, in the open list and in the closed field, using the Stroke panel's arrowhead previews. Filled, Open, Tick and None are the same four styles, saved as before. `arrow_style_shows_a_drawn_arrowhead` and `each_arrow_style_draws_its_stroke_arrowhead_at_both_ends` cover it. -**Drawing tools, Dimension tool Arrow Style offers every stroke arrowhead (#8049, #3222):** By VectorCraft's own rule, Arrow Style lists Filled, Open, Tick and None, then the other 38 built-in Stroke panel arrowheads, each with its drawn preview. The options save the head in `arrowHead` (`Barbed`) and keep `arrowStyle` at `filled`, so versions without `arrowHead` open such a dimension with Filled arrows; documents and tool settings saved before open unchanged. `every_stroke_arrowhead_draws_as_a_dimension_arrowhead`, `arrow_style_shows_a_stroke_arrowhead` and `arrow_style_list_names_each_style_once` cover it. +**Drawing tools, Dimension tool Arrow Style offers every stroke arrowhead (#8049, #3222):** By VectorCraft's own rule, Arrow Style lists Filled, Open, Tick and None, then the other 38 built-in Stroke panel arrowheads, each with its drawn preview. The options save the head in `arrowHead` (`Barbed`) and keep `arrowStyle` at `filled`; documents and tool settings saved before open unchanged. `every_stroke_arrowhead_draws_as_a_dimension_arrowhead`, `arrow_style_shows_a_stroke_arrowhead`, `arrow_style_list_names_each_style_once` and `built_in_arrowhead_names_are_in_complete_catalogs` cover it. **Drawing tools, Line Segment from one curve onto a common tangent of another:** By VectorCraft's own rule, with Smart Guides and Snap to Tangent on, a Line Segment drag pressed anywhere on a convex closed path with curves and dragged to within the snapping tolerance of another such path lands on a common tangent of the two ([tangent lines to circles](https://en.wikipedia.org/wiki/Tangent_lines_to_circles)): both ends move to where the line touches the paths, the start sliding along the first path, and each end shows the "tangent" label when Anchor/Path Labels is on, with the line drawn as a guide when Alignment Guides is on. The line is the tangent whose touch point on the second path is nearest the pointer, so moving the pointer around the second path switches between the outer tangent and the one crossing between the paths. The start stays where it was pressed when Shift, Alt or Space is held, when an anchor, center or crossing lies nearer the pointer than the second path does, when the press snapped to an anchor, center or crossing off the first path, when Snap to Tangent is off, when Snap to Grid or pixel snapping places drawn points, or when either path bends inward somewhere or has more than 512 segments. `a_line_from_one_circle_to_another_lands_on_their_common_tangent`, `a_line_from_a_turned_ellipse_lands_on_its_tangent_with_a_circle`, `a_line_near_the_second_path_takes_the_tangent_touching_it_nearest`, `a_line_keeps_its_start_without_a_tangent_snap`, `a_line_to_a_crescent_or_from_an_anchor_beside_the_curve_keeps_its_start` and `a_line_segment_drag_draws_the_common_tangent_as_one_undo_step` cover it. **Live trace result bounds and selection highlights exclude the retained bitmap except in source-image views:** `live_trace_result_bounds_exclude_the_retained_bitmap_at_any_angle` checks every TraceView, geometric and visual bounds and rotated result bounds. `live_trace_selection_highlight_excludes_the_retained_source_rectangle` checks result highlights and the existing ordinary-group policy. Shared editing-child traversal also preserves Shaper handling. **Artboard Options shares existing presets and orientation controls and can fit artwork without moving it; artwork fitting includes all drawn document art across artboards and off-board; artwork bounds are cached by active document and revision, and selection uses the shared bounds cache across artboards:** Shared existing preset definitions are reused; no external preset assets are added. Presets preserve each selected artboard's orientation, and orientation choices apply even when the active board already matches. Fit operations draft bounds until OK, affect only the active artboard and leave artwork in place. Regression coverage checks draft/Cancel, selected-set application, active-only fitting and Undo. From fdbab6e06d76f5da6567eec4e8e8239f8932734f Mon Sep 17 00:00:00 2001 From: yoriswind Date: Wed, 18 Nov 2026 14:54:41 -0800 Subject: [PATCH 56/78] #8068: retain sampler gesture ownership and exclude consumed clicks --- crates/ui-egui/src/canvas.rs | 132 ++++++++++++++++++++--- crates/ui-egui/src/canvas/input.rs | 16 ++- crates/ui-egui/src/panels/image_trace.rs | 4 + 3 files changed, 131 insertions(+), 21 deletions(-) diff --git a/crates/ui-egui/src/canvas.rs b/crates/ui-egui/src/canvas.rs index 7392ad73b8..77487cc9ab 100644 --- a/crates/ui-egui/src/canvas.rs +++ b/crates/ui-egui/src/canvas.rs @@ -263,7 +263,15 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) { if app.ui.home.is_some_and(|k| k != crate::menus::home_key(app)) { app.ui.home = None; } - if crate::menus::home_showing(app) { + let home_showing = crate::menus::home_showing(app); + if home_showing || app.session.active().is_none() { + // Home and the empty window still advance egui's click history. Observe the same + // correction there so it retires after the two ordinary clicks that replace a pick. + let id = egui::Id::unique("canvas"); + begin_ignore_sampler_pointer(ui, id, false); + end_ignore_sampler_pointer(ui, id); + } + if home_showing { // No IME owner this pass (`ime_caret_rect` stays None): the end-of-pass observation marks // the context absent and keeps any marked text as typed. home(app, ui, full); @@ -466,25 +474,115 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) { } } -/// A press arriving with an invalidated sampler and its release belong to that cancelled pick. -fn input_after_sampler_refresh(app: &mut VectorcraftApp, ui: &Ui, resp: &egui::Response, rect: egui::Rect, cancelled: bool) { - let (pressed, released, down, any_pressed) = - ui.input(|i| (i.pointer.primary_pressed(), i.pointer.primary_released(), i.pointer.primary_down(), i.pointer.any_pressed())); - let consumed_primary = ui.data_mut(|data| { - let id = resp.id.with("image-trace-consumed-primary"); - // A fresh press replaces any ownership whose release this canvas did not observe. - let consumed = if pressed { cancelled } else { data.get_temp::(id).unwrap_or(false) }; - if consumed && down { - data.insert_temp(id, true); - } else { - data.remove::(id); - } - // egui classifies double/triple clicks on release, independently of the tool's Down. - consumed && (pressed || released || down) +/// Two non-sampler clicks replace egui's last two click times after a consumed pick. +#[derive(Clone, Copy)] +struct IgnoreSamplerClicks { + last: Option<(f64, Pos2)>, + remaining: u8, +} + +fn ignore_sampler_primary_id(id: egui::Id) -> egui::Id { + id.with("image-trace-consumed-primary") +} + +fn ignore_sampler_owns_primary(ui: &Ui, id: egui::Id) -> bool { + ui.data(|data| data.get_temp::(ignore_sampler_primary_id(id)).unwrap_or(false)) +} + +fn reset_ignore_sampler_clicks(ui: &Ui, id: egui::Id) { + ui.data_mut(|data| data.insert_temp(id.with("image-trace-clicks"), IgnoreSamplerClicks { last: None, remaining: 2 })); +} + +/// Reclassify only the two clicks whose raw history can still contain a consumed pick. +/// Other widgets' clicks count too, as they do in egui; its pointer state stays untouched. +fn ignore_sampler_clicks(ui: &Ui, id: egui::Id, consumed: bool) { + let (delay, distance) = ui.ctx().options(|o| (o.input_options.max_double_click_delay, o.input_options.max_click_dist)); + let (clicked, primary, at, time) = ui.input(|i| { + ( + i.pointer.any_click(), + i.pointer.button_clicked(egui::PointerButton::Primary), + i.pointer.interact_pos(), + i.time, + ) }); - if !consumed_primary && (!cancelled || !any_pressed) { + ui.data_mut(|data| data.remove::(id.with("image-trace-click-count"))); + if !clicked { + return; + } + if consumed { + reset_ignore_sampler_clicks(ui, id); + return; + } + let Some(at) = at else { return }; + ui.data_mut(|data| { + let history_id = id.with("image-trace-clicks"); + let Some(mut clicks) = data.remove_temp::(history_id) else { return }; + let double = clicks.last.is_some_and(|(last, pos)| time - last < delay && pos.distance_sq(at) < distance * distance); + if primary { + data.insert_temp(id.with("image-trace-click-count"), if double { 2u8 } else { 1u8 }); + } + clicks.last = Some((time, at)); + clicks.remaining -= 1; + if clicks.remaining != 0 { + data.insert_temp(history_id, clicks); + } + }); +} + +fn primary_click_count(ui: &Ui, resp: &egui::Response) -> u8 { + if !resp.clicked_by(egui::PointerButton::Primary) { + return 0; + } + ui.data(|data| data.get_temp::(resp.id.with("image-trace-click-count"))) + .unwrap_or_else(|| if resp.triple_clicked() { 3 } else if resp.double_clicked() { 2 } else { 1 }) +} + +/// Remove only the pointer sequence acquired by this sampler, never a view or tool drag. +fn clear_ignore_sampler_gesture(ui: &Ui, id: egui::Id) { + ui.data_mut(|data| { + data.remove::(ignore_sampler_primary_id(id)); + if matches!(data.get_temp::(drag::drag_id()), Some(Drag::Gesture)) { + data.remove::(drag::drag_id()); + data.remove::(drag::drag_pos_id()); + data.remove::(drag::tool_drag_doc_id()); + data.remove::(drag::tool_press_doc_id()); + } + }); +} + +fn begin_ignore_sampler_pointer(ui: &Ui, id: egui::Id, cancelled: bool) -> bool { + let (pressed, released, down) = ui.input(|i| (i.pointer.primary_pressed(), i.pointer.primary_released(), i.pointer.primary_down())); + if pressed { + // A fresh press replaces the complete sampler gesture if its release was not observed. + if ignore_sampler_owns_primary(ui, id) { + clear_ignore_sampler_gesture(ui, id); + } + if cancelled { + ui.data_mut(|data| data.insert_temp(ignore_sampler_primary_id(id), true)); + } + } + let consumed = ignore_sampler_owns_primary(ui, id) && (pressed || released || down); + ignore_sampler_clicks(ui, id, consumed); + consumed +} + +fn end_ignore_sampler_pointer(ui: &Ui, id: egui::Id) { + // A valid Down can acquire ownership and complete in the same frame. + if ignore_sampler_owns_primary(ui, id) && !ui.input(|i| i.pointer.primary_down()) { + if ui.input(|i| i.pointer.button_clicked(egui::PointerButton::Primary)) { + reset_ignore_sampler_clicks(ui, id); + } + clear_ignore_sampler_gesture(ui, id); + } +} + +/// A sampler press keeps its release, even if its Down completes or its binding expires held. +fn input_after_sampler_refresh(app: &mut VectorcraftApp, ui: &Ui, resp: &egui::Response, rect: egui::Rect, cancelled: bool) { + let consumed = begin_ignore_sampler_pointer(ui, resp.id, cancelled); + if !consumed && (!cancelled || !ui.input(|i| i.pointer.any_pressed())) { canvas_input(app, ui, resp, rect); } + end_ignore_sampler_pointer(ui, resp.id); } /// The pointer on the canvas: the tool's input, unless the context menu or the 3D gizmo has the press. diff --git a/crates/ui-egui/src/canvas/input.rs b/crates/ui-egui/src/canvas/input.rs index 9467596cf7..3aa3b48613 100644 --- a/crates/ui-egui/src/canvas/input.rs +++ b/crates/ui-egui/src/canvas/input.rs @@ -186,13 +186,15 @@ pub(super) fn handle_input(app: &mut VectorcraftApp, ui: &Ui, resp: &egui::Respo .unwrap_or(m.shift); select_named_artboard(app, i, shift || release_shift); } - if resp.double_clicked() + if !super::ignore_sampler_owns_primary(ui, resp.id) + && super::primary_click_count(ui, resp) == 2 && !f.modal && let Some(p) = at { double_click(app, ui, &f, p); } - if resp.triple_clicked() + if !super::ignore_sampler_owns_primary(ui, resp.id) + && super::primary_click_count(ui, resp) == 3 && !f.modal && let Some(p) = at { @@ -343,9 +345,15 @@ fn begin_drag(app: &mut VectorcraftApp, ui: &Ui, f: &Pointing, p: Pos2) { pressure: pen_pressure(ui, app, true), pen: pen_pose(app, &xf), }; + // Only a Down actually sent to this sampler owns the gesture. Cmd/Ctrl's borrowed + // selection press keeps the ordinary tool path. + let sampler = app.ui.trace_ignore_sampler.is_some() && tool == "eyedropper" && app.session.lent_tool_id(&ev.mods).is_none(); + if sampler { + ui.data_mut(|data| data.insert_temp(super::ignore_sampler_primary_id(resp.id), true)); + } dispatch(app, &ev, view); crate::document_drag::begin(app, ui.ctx(), ev.pos); - Drag::Tool + if sampler { Drag::Gesture } else { Drag::Tool } }; // A drag of the Zoom, Hand or Rotate View tool uses the tool of a held shortcut; held Space's // view tools are not that tool. @@ -527,7 +535,7 @@ fn drag_released(app: &mut VectorcraftApp, ui: &Ui, f: &Pointing, d: Drag, p: Po // The second click of a double-click: don't fit another artboard on this release. // A double-click on an object does not open Artboard Options. Empty artboard // space still does. - if resp.double_clicked() && app.session.tool_id() == "artboard" { + if super::primary_click_count(ui, resp) == 2 && app.session.tool_id() == "artboard" { app.session.set_tool_option("suppressFitClick", &json!(true)); } // A move that came in the release's own frame shapes the preview first: the diff --git a/crates/ui-egui/src/panels/image_trace.rs b/crates/ui-egui/src/panels/image_trace.rs index 1d646a8c87..04000ee0d4 100644 --- a/crates/ui-egui/src/panels/image_trace.rs +++ b/crates/ui-egui/src/panels/image_trace.rs @@ -1070,6 +1070,10 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) { if is_trace || !preview { st.preview_off = !preview; } + // Presets and restored panel settings can turn Ignore Color off without its checkbox. + if st.params["ignoreWhite"] != true { + cancel_ignore_sampler(app, true); + } if retrace && is_trace && preview { trace(app, ui.ctx(), &mut st); } From 6b594abbd9ba7cb86639dcdfa7e2d9e95b193a0d Mon Sep 17 00:00:00 2001 From: yoriswind Date: Wed, 18 Nov 2026 14:56:59 -0800 Subject: [PATCH 57/78] Format sampler click classification --- crates/ui-egui/src/canvas.rs | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/crates/ui-egui/src/canvas.rs b/crates/ui-egui/src/canvas.rs index 77487cc9ab..8ae8a897c6 100644 --- a/crates/ui-egui/src/canvas.rs +++ b/crates/ui-egui/src/canvas.rs @@ -497,14 +497,8 @@ fn reset_ignore_sampler_clicks(ui: &Ui, id: egui::Id) { /// Other widgets' clicks count too, as they do in egui; its pointer state stays untouched. fn ignore_sampler_clicks(ui: &Ui, id: egui::Id, consumed: bool) { let (delay, distance) = ui.ctx().options(|o| (o.input_options.max_double_click_delay, o.input_options.max_click_dist)); - let (clicked, primary, at, time) = ui.input(|i| { - ( - i.pointer.any_click(), - i.pointer.button_clicked(egui::PointerButton::Primary), - i.pointer.interact_pos(), - i.time, - ) - }); + let (clicked, primary, at, time) = + ui.input(|i| (i.pointer.any_click(), i.pointer.button_clicked(egui::PointerButton::Primary), i.pointer.interact_pos(), i.time)); ui.data_mut(|data| data.remove::(id.with("image-trace-click-count"))); if !clicked { return; @@ -533,8 +527,15 @@ fn primary_click_count(ui: &Ui, resp: &egui::Response) -> u8 { if !resp.clicked_by(egui::PointerButton::Primary) { return 0; } - ui.data(|data| data.get_temp::(resp.id.with("image-trace-click-count"))) - .unwrap_or_else(|| if resp.triple_clicked() { 3 } else if resp.double_clicked() { 2 } else { 1 }) + ui.data(|data| data.get_temp::(resp.id.with("image-trace-click-count"))).unwrap_or_else(|| { + if resp.triple_clicked() { + 3 + } else if resp.double_clicked() { + 2 + } else { + 1 + } + }) } /// Remove only the pointer sequence acquired by this sampler, never a view or tool drag. From 0343bbf2a404a842617c22ada000d0922c124d53 Mon Sep 17 00:00:00 2001 From: yoriswind Date: Wed, 18 Nov 2026 15:00:11 -0800 Subject: [PATCH 58/78] Satisfy egui temporary click-state removal bound --- crates/ui-egui/src/canvas.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/ui-egui/src/canvas.rs b/crates/ui-egui/src/canvas.rs index 8ae8a897c6..11f681cb39 100644 --- a/crates/ui-egui/src/canvas.rs +++ b/crates/ui-egui/src/canvas.rs @@ -475,7 +475,7 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) { } /// Two non-sampler clicks replace egui's last two click times after a consumed pick. -#[derive(Clone, Copy)] +#[derive(Clone, Copy, Default)] struct IgnoreSamplerClicks { last: Option<(f64, Pos2)>, remaining: u8, From 20791a7314ff6b82d9a3337923dd3cf2e46199be Mon Sep 17 00:00:00 2001 From: yoriswind Date: Wed, 18 Nov 2026 15:03:14 -0800 Subject: [PATCH 59/78] Keep sampler lifecycle conditions in focused helpers --- crates/ui-egui/src/canvas.rs | 18 +++++++++++------- crates/ui-egui/src/panels/image_trace.rs | 12 ++++++++---- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/crates/ui-egui/src/canvas.rs b/crates/ui-egui/src/canvas.rs index 11f681cb39..3aa4c262fc 100644 --- a/crates/ui-egui/src/canvas.rs +++ b/crates/ui-egui/src/canvas.rs @@ -264,13 +264,7 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) { app.ui.home = None; } let home_showing = crate::menus::home_showing(app); - if home_showing || app.session.active().is_none() { - // Home and the empty window still advance egui's click history. Observe the same - // correction there so it retires after the two ordinary clicks that replace a pick. - let id = egui::Id::unique("canvas"); - begin_ignore_sampler_pointer(ui, id, false); - end_ignore_sampler_pointer(ui, id); - } + observe_hidden_ignore_sampler_pointer(app, ui, home_showing); if home_showing { // No IME owner this pass (`ime_caret_rect` stays None): the end-of-pass observation marks // the context absent and keeps any marked text as typed. @@ -577,6 +571,16 @@ fn end_ignore_sampler_pointer(ui: &Ui, id: egui::Id) { } } +fn observe_hidden_ignore_sampler_pointer(app: &VectorcraftApp, ui: &Ui, home_showing: bool) { + if home_showing || app.session.active().is_none() { + // Home and the empty window still advance egui's click history. Observe the same + // correction there so it retires after the two ordinary clicks that replace a pick. + let id = egui::Id::unique("canvas"); + begin_ignore_sampler_pointer(ui, id, false); + end_ignore_sampler_pointer(ui, id); + } +} + /// A sampler press keeps its release, even if its Down completes or its binding expires held. fn input_after_sampler_refresh(app: &mut VectorcraftApp, ui: &Ui, resp: &egui::Response, rect: egui::Rect, cancelled: bool) { let consumed = begin_ignore_sampler_pointer(ui, resp.id, cancelled); diff --git a/crates/ui-egui/src/panels/image_trace.rs b/crates/ui-egui/src/panels/image_trace.rs index 04000ee0d4..0303467c3c 100644 --- a/crates/ui-egui/src/panels/image_trace.rs +++ b/crates/ui-egui/src/panels/image_trace.rs @@ -316,6 +316,13 @@ pub(crate) fn cancel_ignore_sampler(app: &mut VectorcraftApp, restore: bool) { } } +/// Presets and restored panel settings can turn Ignore Color off without its checkbox. +fn cancel_disabled_ignore_sampler(app: &mut VectorcraftApp, params: &Value) { + if params["ignoreWhite"] != true { + cancel_ignore_sampler(app, true); + } +} + /// Also runs when the panel is closed: document changes and tool changes end the pick. pub(crate) fn refresh_ignore_sampler(app: &mut VectorcraftApp) -> bool { let Some(s) = app.ui.trace_ignore_sampler.as_ref() else { return false }; @@ -1070,10 +1077,7 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) { if is_trace || !preview { st.preview_off = !preview; } - // Presets and restored panel settings can turn Ignore Color off without its checkbox. - if st.params["ignoreWhite"] != true { - cancel_ignore_sampler(app, true); - } + cancel_disabled_ignore_sampler(app, &st.params); if retrace && is_trace && preview { trace(app, ui.ctx(), &mut st); } From 3a8fa06f9ea83a456c1fa40e3f4618e17d62e337 Mon Sep 17 00:00:00 2001 From: yoriswind Date: Wed, 18 Nov 2026 15:06:44 -0800 Subject: [PATCH 60/78] Keep click release positions separate from later hover moves --- crates/ui-egui/src/canvas.rs | 10 ++++-- .../tests/image_trace_ignore_sampler.rs | 31 +++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/crates/ui-egui/src/canvas.rs b/crates/ui-egui/src/canvas.rs index 3aa4c262fc..d1406d77d6 100644 --- a/crates/ui-egui/src/canvas.rs +++ b/crates/ui-egui/src/canvas.rs @@ -491,8 +491,14 @@ fn reset_ignore_sampler_clicks(ui: &Ui, id: egui::Id) { /// Other widgets' clicks count too, as they do in egui; its pointer state stays untouched. fn ignore_sampler_clicks(ui: &Ui, id: egui::Id, consumed: bool) { let (delay, distance) = ui.ctx().options(|o| (o.input_options.max_double_click_delay, o.input_options.max_click_dist)); - let (clicked, primary, at, time) = - ui.input(|i| (i.pointer.any_click(), i.pointer.button_clicked(egui::PointerButton::Primary), i.pointer.interact_pos(), i.time)); + let (clicked, primary, at, time) = ui.input(|i| { + // A hover move after the release is not the position egui put in its click history. + let at = i.events.iter().rev().find_map(|event| match event { + egui::Event::PointerButton { pos, button, pressed: false, .. } if i.pointer.button_clicked(*button) => Some(*pos), + _ => None, + }); + (i.pointer.any_click(), i.pointer.button_clicked(egui::PointerButton::Primary), at, i.time) + }); ui.data_mut(|data| data.remove::(id.with("image-trace-click-count"))); if !clicked { return; diff --git a/crates/ui-egui/tests/image_trace_ignore_sampler.rs b/crates/ui-egui/tests/image_trace_ignore_sampler.rs index 7d7f63f8ac..167f275a96 100644 --- a/crates/ui-egui/tests/image_trace_ignore_sampler.rs +++ b/crates/ui-egui/tests/image_trace_ignore_sampler.rs @@ -1027,3 +1027,34 @@ fn review_followup_preset_off_cancels_sampler_but_enhanced_on_keeps_it() { assert_eq!(settings(&app)["preset"], "High Fidelity Photo", "the following opaque canvas click cannot turn the off preset into Custom"); assert_eq!(settings(&app)["params"], expected, "the hidden pick cannot replace the off preset's ignored color"); } + +#[test] +fn review_followup_release_position_survives_a_later_hover_move() { + let (mut app, ctx, point, group) = review_gesture_group_fixture(); + click_control(&mut app, &ctx, SAMPLE_TIP); + app.run("select.none", json!({})).unwrap(); + let at = review_gesture_screen(&app, &ctx, point); + let hover = at + vec2(80.0, 0.0); + assert!(app.canvas_rect.unwrap().contains(hover)); + assert!(at.distance(hover) > ctx.options(|o| o.input_options.max_click_dist)); + let expected = review_gesture_state(&app); + let (start, step) = review_gesture_times(&ctx); + review_gesture_press(&mut app, &ctx, at, start); + review_gesture_release(&mut app, &ctx, at, start + step); + assert_eq!(review_gesture_state(&app), expected, "the stale prefix is consumed"); + review_gesture_press(&mut app, &ctx, at, start + 3.0 * step); + frame_at( + &mut app, + &ctx, + start + 4.0 * step, + vec![Event::PointerButton { pos: at, button: PointerButton::Primary, pressed: false, modifiers: Default::default() }, Event::PointerMoved(hover)], + ); + assert!(ctx.input(|i| i.pointer.button_double_clicked(PointerButton::Primary))); + assert_eq!(ctx.input(|i| i.pointer.interact_pos()), Some(hover)); + assert_eq!(app.session.active().unwrap().selection.objects, vec![group]); + assert_eq!(app.session.active().unwrap().isolation, None, "the first fresh click remains single"); + review_gesture_press(&mut app, &ctx, at, start + 6.0 * step); + review_gesture_release(&mut app, &ctx, at, start + 7.0 * step); + assert!(ctx.input(|i| i.pointer.button_triple_clicked(PointerButton::Primary))); + assert_eq!(app.session.active().unwrap().isolation, Some(group), "the fresh pair uses release positions, not subsequent hover positions"); +} From 518f9b4eb59b16838c51d37b7317a0bacfb0b7ff Mon Sep 17 00:00:00 2001 From: yoriswind Date: Wed, 18 Nov 2026 15:08:45 -0800 Subject: [PATCH 61/78] Format release-position control input events --- crates/ui-egui/tests/image_trace_ignore_sampler.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crates/ui-egui/tests/image_trace_ignore_sampler.rs b/crates/ui-egui/tests/image_trace_ignore_sampler.rs index 167f275a96..af8e9d6757 100644 --- a/crates/ui-egui/tests/image_trace_ignore_sampler.rs +++ b/crates/ui-egui/tests/image_trace_ignore_sampler.rs @@ -1047,7 +1047,10 @@ fn review_followup_release_position_survives_a_later_hover_move() { &mut app, &ctx, start + 4.0 * step, - vec![Event::PointerButton { pos: at, button: PointerButton::Primary, pressed: false, modifiers: Default::default() }, Event::PointerMoved(hover)], + vec![ + Event::PointerButton { pos: at, button: PointerButton::Primary, pressed: false, modifiers: Default::default() }, + Event::PointerMoved(hover), + ], ); assert!(ctx.input(|i| i.pointer.button_double_clicked(PointerButton::Primary))); assert_eq!(ctx.input(|i| i.pointer.interact_pos()), Some(hover)); From ab2c9b4dc808ee6d8500ac7d1a01395978e5b5e9 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Wed, 18 Nov 2026 15:45:40 -0800 Subject: [PATCH 62/78] Show in Browser: no --connect hint, disabled on the web, no folder left after a failed write The headless MCP error for attributes.openUrl, file.export.svg.browser, file.saveForWeb.browser and file.showPackage says only the person at the keyboard can run them, instead of suggesting --connect: the desktop app refuses all four for every control and MCP request. Show in Browser and Preview in Browser are disabled on the web build, so the command palette no longer offers them there. A failed write in Show in Browser, or a failed export in Preview in Browser, removes the folder made for that preview. The Show in Browser tests write their previews to a temporary folder of their own. --- crates/mcp/src/headless.rs | 9 +++++ crates/mcp/src/tests.rs | 17 ++++++++++ crates/ui-egui/src/dialogs/save_for_web.rs | 21 +++++++++++- crates/ui-egui/src/dialogs/svg_options.rs | 34 ++++++++++++++++--- .../ui-egui/src/dialogs/tests_save_for_web.rs | 15 ++++++++ crates/ui-egui/src/menus/state.rs | 4 ++- docs/mcp.md | 2 +- 7 files changed, 95 insertions(+), 7 deletions(-) diff --git a/crates/mcp/src/headless.rs b/crates/mcp/src/headless.rs index db6c51d47d..593ca61c64 100644 --- a/crates/mcp/src/headless.rs +++ b/crates/mcp/src/headless.rs @@ -29,6 +29,10 @@ impl Default for Headless { } } +/// Desktop UI commands that the app refuses for every control and MCP request, because each one +/// opens another app (`refuse_automation` in `vectorcraft-ui-egui`). `--connect` does not run them. +const KEYBOARD_ONLY: &[&str] = &["attributes.openUrl", "file.export.svg.browser", "file.saveForWeb.browser", "file.showPackage"]; + /// Commands the desktop app adds on top of the engine; the headless backend implements them too so /// `run_command` behaves the same in both modes. const HOST_COMMANDS: &[(&str, &str, &str)] = &[ @@ -157,6 +161,11 @@ impl Headless { None if vectorcraft_engine::find_command(id).is_some() => { self.session.check_params(id, params).map_err(|e| e.to_string())?; } + None if KEYBOARD_ONLY.contains(&id) => { + return Err(format!( + "`{id}` opens another app: only the person at the keyboard can run it in the desktop app; control and MCP requests are refused, `--connect` included" + )); + } None if crate::ui_catalog::UI_COMMANDS.iter().any(|(cid, ..)| *cid == id) => { return Err(format!( "`{id}` is a desktop UI command (`ui: true`); start `vectorcraft --control 7979` and use `vectorcraft-cli mcp --connect`" diff --git a/crates/mcp/src/tests.rs b/crates/mcp/src/tests.rs index 870f4a23a3..6a95469d92 100644 --- a/crates/mcp/src/tests.rs +++ b/crates/mcp/src/tests.rs @@ -338,6 +338,23 @@ fn headless_command_list_includes_ui_commands() { assert!(text_of(&r).contains("--connect"), "{r}"); } +/// Desktop commands that the app refuses for every automated request are not offered through +/// `--connect`: the headless error says only the person at the keyboard can run them. +#[test] +fn headless_does_not_send_keyboard_only_commands_to_connect() { + let mut s = server(); + rpc(&mut s, 1, "initialize", json!({"protocolVersion": PROTOCOL_VERSION})); + s.handle_line(r#"{"jsonrpc":"2.0","method":"notifications/initialized"}"#); + for (n, id) in ["attributes.openUrl", "file.export.svg.browser", "file.saveForWeb.browser", "file.showPackage"].iter().enumerate() { + assert!(crate::ui_catalog::UI_COMMANDS.iter().any(|(cid, ..)| cid == id), "{id} is not a desktop UI command"); + let r = call(&mut s, 10 + n as u64, "command_run", json!({"id": id, "params": {}})); + assert_eq!(r["isError"], true, "{id}: {r}"); + let text = text_of(&r); + assert!(text.contains("only the person at the keyboard"), "{id}: {r}"); + assert!(!text.contains("start `vectorcraft --control"), "{id}: {r}"); + } +} + // ---------- headless end-to-end ---------- #[test] diff --git a/crates/ui-egui/src/dialogs/save_for_web.rs b/crates/ui-egui/src/dialogs/save_for_web.rs index 7ad629afb8..7376973d6f 100644 --- a/crates/ui-egui/src/dialogs/save_for_web.rs +++ b/crates/ui-egui/src/dialogs/save_for_web.rs @@ -232,7 +232,7 @@ pub(crate) fn browser_preview(app: &mut VectorcraftApp, p: &Value) -> Result Result { /// `root` ([`preview_folder_under`]). #[cfg(not(target_arch = "wasm32"))] pub(super) fn temp_folder_under(root: &str) -> Result { + #[cfg(test)] + if let Some(tmp) = TEST_TMP.with_borrow(Clone::clone) { + return preview_folder_under(&tmp, root, PREVIEW_KEEP); + } preview_folder_under(&std::env::temp_dir(), root, PREVIEW_KEEP) } +#[cfg(all(test, not(target_arch = "wasm32")))] +thread_local! { + /// The folder this test thread's browser previews go to instead of the system's temporary + /// folder, when set. + pub(super) static TEST_TMP: std::cell::RefCell> = const { std::cell::RefCell::new(None) }; +} + +/// Remove the folder `dir` made for a browser preview whose files could not all be written, so +/// a failed preview leaves no folder behind. The log says when it can't be removed. +pub(super) fn remove_preview_folder(dir: &str) { + if let Err(e) = std::fs::remove_dir_all(dir) { + log::warn!("vectorcraft: the browser preview folder {dir} can't be removed: {e}"); + } +} + /// A new folder for a Save for Web browser preview in the temporary folder `tmp` /// ([`preview_folder_under`] with `VectorCraft Save for Web`). #[cfg(all(test, not(target_arch = "wasm32")))] diff --git a/crates/ui-egui/src/dialogs/svg_options.rs b/crates/ui-egui/src/dialogs/svg_options.rs index c185a3d5cb..99b471e3f6 100644 --- a/crates/ui-egui/src/dialogs/svg_options.rs +++ b/crates/ui-egui/src/dialogs/svg_options.rs @@ -354,7 +354,8 @@ fn encode_page<'a>( /// the default browser (desktop) → `{path, warnings}`. Nothing is written to the chosen /// destination, and the document, its path and the remembered choices are left as they were. /// When the export has warnings, the status bar shows them as [`io::report_saved`] shows a save's -/// notes. Nothing opens when a check, the encoding or a write fails. +/// notes. Nothing opens when a check, the encoding or a write fails, and a failed write removes +/// the new folder. pub(crate) fn browser_preview(app: &mut VectorcraftApp, p: &Value) -> Result { if io::is_web(app) { return Err("no file system here".into()); @@ -370,7 +371,7 @@ pub(crate) fn browser_preview(app: &mut VectorcraftApp, p: &Value) -> Result>>; - /// [`app`] whose browser records each URL it is asked to open. + /// [`app`] whose browser records each URL it is asked to open. Its previews go to a temporary + /// folder of the test's own ([`preview_tmp`]), not the system's. fn browsing(picked: &str) -> (VectorcraftApp, Written, Opened) { + static N: std::sync::atomic::AtomicUsize = std::sync::atomic::AtomicUsize::new(0); + let tmp = vectorcraft_testkit::temp_dir(&format!("svg-browser-{}", N.fetch_add(1, std::sync::atomic::Ordering::Relaxed))); + super::super::save_for_web::TEST_TMP.set(Some(tmp)); let (mut app, written) = app(picked); let opened = Opened::default(); let o = opened.clone(); @@ -489,6 +494,13 @@ mod tests { (app, written, opened) } + /// The SVG preview folder inside this test's temporary folder ([`browsing`]), with `/` between + /// its parts. + fn preview_tmp() -> String { + let tmp = super::super::save_for_web::TEST_TMP.with_borrow(Clone::clone).expect("browsing sets the temporary folder"); + tmp.join(PREVIEW_ROOT).to_string_lossy().replace('\\', "/") + } + /// Show in Browser for the open dialog's current choices, as its button runs it. fn show_in_browser(app: &mut VectorcraftApp) -> Result { let p = preview_params(app.ui.dialog.as_ref().expect("SVG Options open")); @@ -510,7 +522,7 @@ mod tests { let remembered = app.ui.svg_options.clone(); let r = show_in_browser(&mut app).unwrap_or_else(|e| panic!("{e}")); let path = r["path"].as_str().unwrap().to_string(); - assert!(path.contains("/VectorCraft SVG Preview/") && path.ends_with("/Untitled-1.svg"), "{path}"); + assert!(path.starts_with(&format!("{}/", preview_tmp())) && path.ends_with("/Untitled-1.svg"), "{path}"); assert_eq!(*opened.borrow(), [io::file_url(&path)]); assert_eq!(written.borrow().len(), 1); assert_eq!(written.borrow()[0].0, path); @@ -538,6 +550,18 @@ mod tests { assert!(app.ui.dialog.is_some()); } + /// A write that fails opens nothing and removes the folder made for that preview. + #[test] + fn show_in_browser_removes_its_folder_when_a_write_fails() { + let (mut app, _, opened) = browsing("/tmp/out.svg"); + app.services.write = Some(Box::new(|_: &str, _: &[u8]| Err("disk full".to_string()))); + app.run("file.export.svg", Value::Null).unwrap(); + assert!(show_in_browser(&mut app).unwrap_err().contains("disk full")); + assert!(opened.borrow().is_empty()); + let left: Vec<_> = std::fs::read_dir(preview_tmp()).map(|d| d.flatten().map(|e| e.file_name()).collect()).unwrap_or_default(); + assert!(left.is_empty(), "{left:?}"); + } + /// Under Export Selection the preview is the selection alone, cropped to it, as OK writes it. #[test] fn show_in_browser_under_export_selection_shows_the_selection() { @@ -606,7 +630,9 @@ mod tests { app.ui.answering_control = true; assert!(show_in_browser(&mut app).unwrap_err().contains("opens another app")); app.ui.answering_control = false; + assert!(crate::menus::enabled(&app, BROWSER)); app.services.download = Some(Box::new(|_: &str, _: &[u8]| Ok(()))); + assert!(!crate::menus::enabled(&app, BROWSER), "the command palette and menus show it disabled on the web"); assert!(show_in_browser(&mut app).is_err()); assert!(written.borrow().is_empty() && opened.borrow().is_empty()); } diff --git a/crates/ui-egui/src/dialogs/tests_save_for_web.rs b/crates/ui-egui/src/dialogs/tests_save_for_web.rs index a965977b14..63ed3e2ded 100644 --- a/crates/ui-egui/src/dialogs/tests_save_for_web.rs +++ b/crates/ui-egui/src/dialogs/tests_save_for_web.rs @@ -385,6 +385,8 @@ fn the_web_downloads_and_has_no_browser_preview() { let log = log.borrow().clone(); assert!(log[0].starts_with("download Untitled-1.html ") && log[1].starts_with("download Untitled-1.png "), "{log:?}"); assert!(app.run("file.saveForWeb.browser", json!({})).is_err()); + assert!(crate::menus::enabled(&app, "file.saveForWeb")); + assert!(!crate::menus::enabled(&app, "file.saveForWeb.browser"), "the command palette and menus show it disabled on the web"); } #[test] @@ -414,6 +416,19 @@ fn preview_in_browser_opens_the_page() { assert!(log.last().unwrap().starts_with("open file://") && log.last().unwrap().ends_with("Untitled-1.html"), "{log:?}"); } +/// A preview whose export fails opens nothing and removes the folder made for it. +#[test] +fn a_failed_browser_preview_removes_its_folder() { + let tmp = vectorcraft_testkit::temp_dir("sfw-browser-failed"); + save_for_web::TEST_TMP.set(Some(tmp.clone())); + let (mut app, log) = app(&tmp, false); + assert!(app.run("file.saveForWeb.browser", json!({"format": "bogus"})).is_err()); + assert!(!log.borrow().iter().any(|l| l.starts_with("open ")), "{:?}", log.borrow()); + let left: Vec<_> = + std::fs::read_dir(tmp.join("VectorCraft Save for Web")).map(|d| d.flatten().map(|e| e.file_name()).collect()).unwrap_or_default(); + assert!(left.is_empty(), "{left:?}"); +} + /// Each preview has its own folder: a second one, from another app or the same one, leaves the /// first page and its image as they were. #[test] diff --git a/crates/ui-egui/src/menus/state.rs b/crates/ui-egui/src/menus/state.rs index a424d98714..b6f6810cc3 100644 --- a/crates/ui-egui/src/menus/state.rs +++ b/crates/ui-egui/src/menus/state.rs @@ -329,7 +329,9 @@ pub fn enabled(app: &VectorcraftApp, id: &str) -> bool { "ui.packageDialog" | "docInfo.save" => app.session.active().is_some(), "ui.batchDialog" => !app.ui.action_sets.is_empty() && app.ui.action_sets.iter().any(|s| !s.actions.is_empty()), "ui.epsOptionsDialog" => app.session.active().is_some(), - "file.saveForWeb" | "file.saveForWeb.browser" | "file.export.svg.browser" => app.session.active().is_some(), + "file.saveForWeb" => app.session.active().is_some(), + // A browser preview opens a file, and the web build has none to open. + "file.saveForWeb.browser" | "file.export.svg.browser" => app.session.active().is_some() && !crate::io::is_web(app), "file.exportSelection" => app.session.active().is_some_and(|d| !d.selection.is_empty()), "css.copy" | "css.exportFile" => app.session.active().is_some(), "print.printerSetup" => app.services.print.as_ref().is_some_and(|s| s.has_setup()), diff --git a/docs/mcp.md b/docs/mcp.md index 5bc273289c..1e257b937d 100644 --- a/docs/mcp.md +++ b/docs/mcp.md @@ -721,7 +721,7 @@ ends the wait, so the sampler can be shown again. The BSDs and headless sessions | `press_key` | `{key, mods?}` | Remote: a real key event. Headless: runs the command or tool bound to that shortcut, or sends the key to the busy tool (digits too: `5` while dragging with the Perspective Selection tool; `e` while dragging a Selection or Group Selection marquee; `c` and `f` while dragging out an arc; `f`, `v`, `x` and `c` while dragging out a rectangular or polar grid). | | `type_text` | `{text}` | Remote only. | | `answer_dialog` | `{set?: [{field, value?}], action?}` | Remote only. Sets fields of the app's open dialog in the order given with one `ui.dialog.set {fields, action?}` (a missing `value` is `null`). The app stores all of them or none, then answers that same dialog with `action` in the same request: `confirm` (OK) or `cancel`. Another connection cannot open a dialog between the two steps. When the app refuses the `ui.dialog.set`, for example because no dialog is open, the call is an error and the dialog is not confirmed or canceled. `set` cannot change a `__` field other than the dialog's controls held under a `__` name (such as Save PDF's `__section` or the Preferences `__search`): the `__command` and `__params` of a `confirm` or `command` dialog, and every other `__` field that holds what OK acts on, are refused with "the `` dialog cannot set protected field ``", so OK runs what the dialog was opened for. `action` alone is sent as `ui.dialog.confirm` or `ui.dialog.cancel`. Give `set`, `action` or both; `set` holds at most 256 fields. `inspect_ui` shows the open dialog and its fields as `ui.dialog`. Returns `{dialog, result}`: the dialog after the fields were set (or `null`) and the reply to `confirm` or `cancel` (or `null`). After `invoke_menu` `app.quit`, `file.close` or `file.closeAll` replies `{"pending": "saveChanges"}`, `{action: "confirm"}` saves, `{set: [{field: "discard", value: true}], action: "confirm"}` closes without saving and `{action: "cancel"}` cancels the close or quit. | -| `invoke_menu` | `{command, params?}` | Invokes a menu item by command id. UI commands such as `view.*` and `window.*` are in `command_list` with `ui: true`; running them needs the desktop app (`--connect`). | +| `invoke_menu` | `{command, params?}` | Invokes a menu item by command id. UI commands such as `view.*` and `window.*` are in `command_list` with `ui: true`; running them needs the desktop app (`--connect`). The app refuses `attributes.openUrl`, `file.export.svg.browser`, `file.saveForWeb.browser` and `file.showPackage` for every control and MCP request, since each opens another app, so the headless error for them does not suggest `--connect`. | | `open_panel` | `{panel}` | Remote only. `panel` is a panel id (`layers`, `swatches`, `colorGuide`, …, as `window.panel` takes) or its display label (`"Color Guide"`), in any case. | | `screenshot` | `{path?, scale?, artboard?, window?, max_side?, traceViews?}` | Returns MCP image content (`image/png`, base64) plus a text block. Renders the artboard with the pixels of a PNG `export` with `background: "white"` at the same scale; `traceViews:true` draws Image Trace objects in the view set with `imageTrace.setView`, as in the app's window; `window:true` captures the app window (remote only), as `ui_screenshot` does, and `max_side` (1–4096, window captures only) scales the returned image down as described for `ui_screenshot`. With `path` the backend (the headless session or the app) writes the PNG there too; a window capture written there keeps its full size with `max_side`. An app that does not send the image back writes a window capture without `path` to a file in a new folder inside the system's temporary folder (on Unix only the user can open it); the server reads the file and then removes the folder, also when the capture or the read fails. | | `open_file` | `{path, importer?, params?}` | Opens any readable file as a new active document: `.vectorcraft`/`.drawcraft`, `.vctemplate`, `.svg`/`.svgz`, `.pdf`/`.ai`, `.ait`, `.eps`/`.epsf`, `.ps`, `.dxf`, `.emf`, `.wmf`, PICT (`.pct`/`.pic`/`.pict`, and a version 2 picture of any extension), HP-GL (`.plt`/`.hpgl`/`.hgl`/`.hpg`, and a file of an extension no other format reads that starts with plotter instructions), PNG (`.png`/`.pns`), JPEG, GIF, WebP, TIFF, BMP (`.bmp`/`.dib`/`.rle`), Targa (`.tga`/`.vda`/`.icb`/`.vst`), PCX, Pixar (`.pxr`), JPEG 2000 (`.jpf`/`.jpx`/`.jp2`/`.j2k`/`.j2c`/`.jpc`), HEIC/HEIF (`.heic`/`.heif`), JPEG XL (`.jxl`), PSD (`.psd`/`.pdd`)/PSB (an image opens as a document of its pixel size; a PSD or PSB file with its layers as layers, or as its merged image through `run_command document.open` with `layers: false`; a JPEG XL file as its first frame). Templates (`.vctemplate`, `.ait`) open as a new untitled document. PDF, `.ai` and SVG files saved with Preserve Editing reopen as the document they carry. The reply is `document.open`'s: its `warnings` say what didn't come in as it was (an EPS whose PostScript can't be read opens as its preview, and the warning names the PostScript error, the operator and the procedure). A file of an extension only an installed importer plug-in lists opens with that importer ([Plug-ins](#plug-ins)); `importer: "plugin."` opens the file with the importer it names, which must list the file's extension, also one a built-in format reads (in the app, as File › Open With does), and `params` gives that importer's parameters (their defaults when omitted). `run_command document.formats` lists the formats. | From 76705afc2ff5ba0640da4d1682e712fa4fa8a792 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Wed, 18 Nov 2026 15:01:52 -0800 Subject: [PATCH 63/78] Dimension: leave a null arrowHead out of saved options Saved and recorded dimension options carried "arrowHead": null even without a stroke head, so a recorded dimension.create failed in versions that do not know the option. The field is now left out when it is null. dimension.create, dimension.update and Dimension Tool Options still take it. The name is read without a copy of its own, and a name longer than any built-in one is refused before it is parsed. Through ui.dialog.set, an arrowStyle set in Dimension Tool Options clears arrowHead, and a built-in arrowHead sets the arrowStyle of its Arrow Style entry, as that menu does. The Arrow Style field reads only a built-in head's name from a draft. The Stroke panel and Arrow Style look up a built-in arrowhead's name in the catalog's arrowhead rows first, then its plain row. Every complete catalog gets an arrowhead row for Feather, so the Feather arrowhead is named as an arrowhead in each, and the de, gu, it, ja, ko, uk, vi, zh-hans and zh-hant catalogs no longer show it in English. Versions that have the stroke arrowhead but do not read arrowHead keep a dimension's saved arrows until they draw the dimension again, and then draw arrowStyle; versions without the stroke arrowhead do not open the file. The params text, the doc comments, docs/dimensions.md, docs/mcp.md and docs/target-app-parity.md say so. The French Line Arrow row moves next to the other rows of its block. --- crates/doc/src/dimension.rs | 54 +++++++++++++++++----- crates/engine/src/cmd/dimension.rs | 2 +- crates/engine/tests/it/dimensions.rs | 12 +++-- crates/ui-egui/src/dialogs.rs | 5 ++ crates/ui-egui/src/dialogs/dimension.rs | 61 +++++++++++++++++++++++-- crates/ui-egui/src/i18n/bg.tsv | 1 + crates/ui-egui/src/i18n/bs.tsv | 1 + crates/ui-egui/src/i18n/ca.tsv | 1 + crates/ui-egui/src/i18n/cs.tsv | 1 + crates/ui-egui/src/i18n/da.tsv | 1 + crates/ui-egui/src/i18n/de.tsv | 1 + crates/ui-egui/src/i18n/el.tsv | 1 + crates/ui-egui/src/i18n/es.tsv | 1 + crates/ui-egui/src/i18n/fi.tsv | 1 + crates/ui-egui/src/i18n/fr.tsv | 3 +- crates/ui-egui/src/i18n/gu.tsv | 1 + crates/ui-egui/src/i18n/hi.tsv | 1 + crates/ui-egui/src/i18n/hu.tsv | 1 + crates/ui-egui/src/i18n/id.tsv | 1 + crates/ui-egui/src/i18n/it.tsv | 1 + crates/ui-egui/src/i18n/ja.tsv | 1 + crates/ui-egui/src/i18n/ka.tsv | 1 + crates/ui-egui/src/i18n/ko.tsv | 1 + crates/ui-egui/src/i18n/nl.tsv | 1 + crates/ui-egui/src/i18n/pl.tsv | 1 + crates/ui-egui/src/i18n/pt-br.tsv | 1 + crates/ui-egui/src/i18n/ru.tsv | 1 + crates/ui-egui/src/i18n/sv.tsv | 1 + crates/ui-egui/src/i18n/tests.rs | 10 ++-- crates/ui-egui/src/i18n/tr.tsv | 1 + crates/ui-egui/src/i18n/uk.tsv | 1 + crates/ui-egui/src/i18n/vi.tsv | 1 + crates/ui-egui/src/i18n/zh-hans.tsv | 1 + crates/ui-egui/src/i18n/zh-hant.tsv | 1 + crates/ui-egui/src/panels/stroke.rs | 8 +++- docs/dimensions.md | 4 +- docs/mcp.md | 4 +- docs/target-app-parity.md | 2 +- 38 files changed, 164 insertions(+), 28 deletions(-) diff --git a/crates/doc/src/dimension.rs b/crates/doc/src/dimension.rs index 42b6b9a76d..4d66f5d74c 100644 --- a/crates/doc/src/dimension.rs +++ b/crates/doc/src/dimension.rs @@ -128,17 +128,45 @@ impl ArrowStyle { /// it). A custom arrowhead and an unknown name are refused. mod arrow_head { use crate::Arrowhead; - use serde::de::{Error, IntoDeserializer}; + use serde::de::{Error, IntoDeserializer, Visitor}; use serde::{Deserialize, Deserializer}; pub fn deserialize<'de, D: Deserializer<'de>>(deserializer: D) -> Result, D::Error> { - let Some(name) = Option::::deserialize(deserializer)? else { return Ok(None) }; - let parsed: Result = Arrowhead::deserialize(name.as_str().into_deserializer()); - match parsed { - Ok(head) if !matches!(head, Arrowhead::Custom(_)) => Ok(Some(head)), - _ => { - let shown: String = name.chars().take(64).collect(); - Err(D::Error::custom(format!("Unknown arrowhead {shown}: a built-in stroke arrowhead name or null"))) + deserializer.deserialize_option(Name) + } + + /// Reads the name where it is, without a copy of its own. + struct Name; + + impl<'de> Visitor<'de> for Name { + type Value = Option; + + fn expecting(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { + f.write_str("a built-in stroke arrowhead name or null") + } + + fn visit_none(self) -> Result { + Ok(None) + } + + fn visit_unit(self) -> Result { + Ok(None) + } + + fn visit_some>(self, deserializer: D) -> Result { + deserializer.deserialize_str(self) + } + + fn visit_str(self, name: &str) -> Result { + // No built-in name is this long, so a longer one is refused without parsing it. + let parsed: Result = + if name.len() > 64 { Err(serde::de::value::Error::custom("too long")) } else { Arrowhead::deserialize(name.into_deserializer()) }; + match parsed { + Ok(head) if !matches!(head, Arrowhead::Custom(_)) => Ok(Some(head)), + _ => { + let shown: String = name.chars().take(64).collect(); + Err(E::custom(format!("Unknown arrowhead {shown}: a built-in stroke arrowhead name or null"))) + } } } } @@ -177,8 +205,11 @@ pub struct DimensionOptions { pub line_type: LineType, pub line_color: [u8; 3], pub arrow_style: ArrowStyle, - /// A built-in stroke arrowhead drawn at both ends in place of `arrow_style`'s head. - #[serde(deserialize_with = "arrow_head::deserialize")] + /// A built-in stroke arrowhead drawn at both ends in place of `arrow_style`'s head. Versions + /// that have the stroke arrowhead but do not read this keep the saved arrows until they draw + /// the dimension again, and then draw `arrow_style`. Versions without the stroke arrowhead do + /// not open the file. + #[serde(deserialize_with = "arrow_head::deserialize", skip_serializing_if = "Option::is_none")] pub arrow_head: Option, pub arrow_scale: f64, pub extension_weight: f64, @@ -233,7 +264,8 @@ impl DimensionOptions { /// tolerantly so a newer version's options don't stop a document opening. pub fn from_params(v: serde_json::Value) -> Result { if let (Some(given), Ok(serde_json::Value::Object(known))) = (v.as_object(), serde_json::to_value(Self::default())) - && let Some(k) = given.keys().find(|k| !known.contains_key(*k)) + // `arrowHead` is left out of the saved options when it is null. + && let Some(k) = given.keys().find(|k| !known.contains_key(*k) && k.as_str() != "arrowHead") { return Err(format!("Unknown dimension option {k}")); } diff --git a/crates/engine/src/cmd/dimension.rs b/crates/engine/src/cmd/dimension.rs index 680511b2aa..e38f8f99bb 100644 --- a/crates/engine/src/cmd/dimension.rs +++ b/crates/engine/src/cmd/dimension.rs @@ -14,7 +14,7 @@ pub fn specs() -> Vec { "Create Dimension", [], None, - "{mode?: linear|angular|radius|diameter, a?: [x,y], b?: [x,y], vertex?: [x,y], source?: {kind: segment, edge: {node,subpath,segment}}|{kind: angle, first: edge, second: edge}|{kind: circle, node}|{kind: arc, edge}|{kind: points, a?, b?, vertex?: {node,subpath,anchor}, freeA?, freeB?: a point that is not an anchor, {kind: onSegment, edge: {node,subpath,segment}, t: 0..1 (curve parameter)}|{kind: anchors, node, anchors: [{subpath,anchor,part?: point|in|out (the anchor, default, or its in or out handle),weight}] (2 or 3 points of one path whose weights add up to 1), across?: (2 anchors only: times the first-to-second anchor vector (x,y) turned to (-y,x), which points down when the vector points right)} (an end is an anchor or a free point, not both)}, orientation?: aligned|horizontal|vertical (linear only: the distance between the points, or only its horizontal or vertical part; default aligned), offset?: pt (the line's distance from the first point: along the left normal of a → b when aligned, downward when horizontal, leftward when vertical; negative goes the other way), options?: {units: in|mm|pt|pc|px|cm|m|ft|yd, precision: 0-6, scale: drawing:real, hideUnits, lineWeight, lineType: solid|dashed|dotted, lineColor: [r,g,b], arrowStyle: filled|open|tick|none, arrowHead: null|a built-in stroke.set arrowhead name (Barbed, LineArrow…; drawn at both ends in place of arrowStyle's head; custom arrowheads are refused), arrowScale: %, extensionWeight, extensionType, extensionColor, extensionOffset, extensionLength, hideExtensions, fontFamily, fontStyle, fontSize, textColor, textPosition: away|between, textAlignment: left|center|right, textOffset}} → {id,label}; linked measurements follow source edits", + "{mode?: linear|angular|radius|diameter, a?: [x,y], b?: [x,y], vertex?: [x,y], source?: {kind: segment, edge: {node,subpath,segment}}|{kind: angle, first: edge, second: edge}|{kind: circle, node}|{kind: arc, edge}|{kind: points, a?, b?, vertex?: {node,subpath,anchor}, freeA?, freeB?: a point that is not an anchor, {kind: onSegment, edge: {node,subpath,segment}, t: 0..1 (curve parameter)}|{kind: anchors, node, anchors: [{subpath,anchor,part?: point|in|out (the anchor, default, or its in or out handle),weight}] (2 or 3 points of one path whose weights add up to 1), across?: (2 anchors only: times the first-to-second anchor vector (x,y) turned to (-y,x), which points down when the vector points right)} (an end is an anchor or a free point, not both)}, orientation?: aligned|horizontal|vertical (linear only: the distance between the points, or only its horizontal or vertical part; default aligned), offset?: pt (the line's distance from the first point: along the left normal of a → b when aligned, downward when horizontal, leftward when vertical; negative goes the other way), options?: {units: in|mm|pt|pc|px|cm|m|ft|yd, precision: 0-6, scale: drawing:real, hideUnits, lineWeight, lineType: solid|dashed|dotted, lineColor: [r,g,b], arrowStyle: filled|open|tick|none, arrowHead: null|a built-in stroke.set arrowhead name (Barbed, LineArrow…; drawn at both ends in place of arrowStyle's head; versions that have the stroke arrowhead but do not read arrowHead draw arrowStyle when they draw the dimension again; custom arrowheads are refused), arrowScale: %, extensionWeight, extensionType, extensionColor, extensionOffset, extensionLength, hideExtensions, fontFamily, fontStyle, fontSize, textColor, textPosition: away|between, textAlignment: left|center|right, textOffset}} → {id,label}; linked measurements follow source edits", has_doc, create ), diff --git a/crates/engine/tests/it/dimensions.rs b/crates/engine/tests/it/dimensions.rs index d2c6148f7d..759b36d245 100644 --- a/crates/engine/tests/it/dimensions.rs +++ b/crates/engine/tests/it/dimensions.rs @@ -120,8 +120,9 @@ fn each_arrow_style_draws_its_stroke_arrowhead_at_both_ends() { /// `arrowHead` draws any built-in stroke arrowhead at both ends of the dimension line, and the /// native file keeps it. The saved `arrowStyle` stays one of the four values versions without -/// `arrowHead` read, and a dimension saved without `arrowHead` draws its arrow style. A custom -/// arrowhead and an unknown name are refused. +/// `arrowHead` read, and a dimension saved without `arrowHead` draws its arrow style. Options +/// without a stroke head are saved without `arrowHead`. A custom arrowhead, an unknown name and an +/// overlong name are refused. #[test] fn every_stroke_arrowhead_draws_as_a_dimension_arrowhead() { use vectorcraft_doc::{Arrowhead, dimension::ArrowStyle}; @@ -166,8 +167,13 @@ fn every_stroke_arrowhead_draws_as_a_dimension_arrowhead() { older.add_document(vectorcraft_format::load(&serde_json::to_vec(&file).unwrap()).unwrap(), None); let o = recipe(&older, id).options; assert_eq!((o.arrow_style, o.arrow_head.clone(), o.arrowhead()), (ArrowStyle::Open, None, Some(Arrowhead::TriangleOpen))); + // Without a stroke head, the saved and recorded options carry no `arrowHead`, and a null one + // is still taken. + let saved = serde_json::to_value(&recipe(&s, id).options).unwrap(); + assert!(saved.get("arrowHead").is_none(), "{saved}"); + assert!(s.execute("dimension.create", &json!({"a":[0,0],"b":[72,0],"options":{"arrowHead":null}})).is_ok()); let custom = json!({"Custom":{"name":"Dot","path":{"subpaths":[]}}}); - for bad in [json!("Custom"), json!("Arrowhead"), json!("barbed"), json!(3), custom] { + for bad in [json!("Custom"), json!("Arrowhead"), json!("barbed"), json!(3), json!("Barbed".repeat(20)), custom] { let p = json!({"a":[0,0],"b":[72,0],"options":{"arrowHead":bad}}); assert!(s.execute("dimension.create", &p).is_err(), "{bad}"); } diff --git a/crates/ui-egui/src/dialogs.rs b/crates/ui-egui/src/dialogs.rs index 9e9c4e6816..b109ca486b 100644 --- a/crates/ui-egui/src/dialogs.rs +++ b/crates/ui-egui/src/dialogs.rs @@ -610,6 +610,8 @@ pub fn accepts_field(d: &Dialog, field: &str) -> bool { /// one picked from its menu does, and the preset it shows follows the DXF options set this way. /// A Graph Data Column Width set this way sets every column, as Cell Style's does. An Import PDF /// `allPages` set this way to the other pick sets Import PDF pages as links back to its default. +/// A Dimension Tool Options `arrowStyle` set this way clears `arrowHead`, and a built-in +/// `arrowHead` set this way sets the `arrowStyle` of its Arrow Style entry, as that menu does. pub fn set_field(d: &mut Dialog, field: String, value: Value) { if d.kind == brush_options::KIND { brush_art_options::note_set(d, &field); @@ -623,6 +625,9 @@ pub fn set_field(d: &mut Dialog, field: String, value: Value) { if d.kind == import_pdf::KIND { import_pdf::note_set(d, &field, &value); } + if d.kind == dimension::KIND { + dimension::note_set(d, &field, &value); + } if d.kind == "preferences" { crate::prefs_dialog::note_set(d, &field, &value); } diff --git a/crates/ui-egui/src/dialogs/dimension.rs b/crates/ui-egui/src/dialogs/dimension.rs index b4f79f0836..00a06c90fd 100644 --- a/crates/ui-egui/src/dialogs/dimension.rs +++ b/crates/ui-egui/src/dialogs/dimension.rs @@ -15,6 +15,8 @@ pub(super) const SPEC: DialogSpec = DialogSpec { ok: Some("Save"), min_width: 520.0, max_width: Some(560.0), + // The saved options leave `arrowHead` out when it is null. + inputs: |_| &["arrowHead"], ..DialogSpec::FORM }; @@ -48,7 +50,8 @@ impl ArrowChoice { } } /// The Arrow Style entries: Filled, Open, Tick and None, then the other built-in stroke arrowheads -/// in the Stroke panel's order. A stroke arrowhead keeps `filled` as its `arrowStyle`. +/// in the Stroke panel's order. A stroke arrowhead keeps `filled` as its `arrowStyle`, the head that +/// versions which do not read `arrowHead` draw when they draw the dimension again. fn arrow_choices() -> Vec { let named = [(ArrowStyle::Filled, "Filled"), (ArrowStyle::Open, "Open"), (ArrowStyle::Tick, "Tick"), (ArrowStyle::None, "None")]; let heads = Arrowhead::ALL.into_iter().filter(|h| !named.iter().any(|(s, _)| s.arrowhead().as_ref() == Some(h))); @@ -73,6 +76,32 @@ pub fn open(app: &mut VectorcraftApp) -> Result { Ok(json!({"dialog":KIND})) } +/// For `ui.dialog.set`, as the Arrow Style menu sets them: an `arrowStyle` set alone draws that +/// style's own head, and a built-in head set as `arrowHead` takes the arrow style of its Arrow +/// Style entry (`tick` for `Slash`, `filled` for `Barbed`). +pub(super) fn note_set(d: &mut Dialog, field: &str, value: &Value) { + match field { + "arrowStyle" => { + d.fields.insert("arrowHead".into(), Value::Null); + } + "arrowHead" => { + let head = built_in_head(value); + if let Some(ch) = arrow_choices().into_iter().find(|ch| head.is_some() && ch.drawn() == head) + && let Ok(style) = serde_json::to_value(ch.style) + { + d.fields.insert("arrowStyle".into(), style); + } + } + _ => {} + } +} + +/// The built-in stroke arrowhead `value` names. Only a short name is read: a draft may hold anything. +fn built_in_head(value: &Value) -> Option { + let name = value.as_str().filter(|name| name.len() <= 64)?; + serde_json::from_value::(Value::String(name.into())).ok().filter(|h| !matches!(h, Arrowhead::Custom(_))) +} + fn read(fields: &serde_json::Map) -> Result { let o: DimensionOptions = serde_json::from_value(Value::Object(fields.clone())).map_err(|e| e.to_string())?; o.validate()?; @@ -105,10 +134,10 @@ fn arrow_style(ui: &mut Ui, fields: &mut serde_json::Map, id: &st widgets::label_row(ui, tl!("Arrow Style:"), 96.0, |ui| { let choices = arrow_choices(); let style = fields.get(STYLE).cloned().and_then(|v| serde_json::from_value::(v).ok()); - let head = fields.get(HEAD).cloned().and_then(|v| serde_json::from_value::>(v).ok()).flatten(); + let head = fields.get(HEAD).and_then(built_in_head); let current = style.map(|s| head.or_else(|| s.arrowhead())); let shown = current.and_then(|c| choices.iter().position(|ch| ch.drawn() == c)); - let names: Vec<&str> = choices.iter().map(|ch| tl!(ch.name)).collect(); + let names: Vec<&str> = choices.iter().map(|ch| crate::panels::stroke::builtin_arrow_name(ch.name)).collect(); let icon = |ui: &Ui, rect: egui::Rect, i: usize, ink: egui::Color32, _: bool| { // Only the rows in view render their previews. if ui.is_rect_visible(rect) @@ -413,9 +442,13 @@ mod tests { assert!(text.contains(label), "{label}: {text}"); } let d = app.ui.dialog.as_mut().unwrap(); + // The default style has no `arrowHead`, and the dialog still takes one. + assert!(!d.fields.contains_key("arrowHead") && super::super::accepts_field(d, "arrowHead")); d.fields.insert("scale".into(), json!("1:10")); d.fields.insert("units".into(), json!("pc")); + d.fields.insert("arrowHead".into(), json!("Barbed")); super::super::confirm(&mut app).unwrap(); + assert_eq!(app.session.tool_options_of("dimension")["style"]["arrowHead"], "Barbed"); assert_eq!(app.session.tool_options_of("dimension")["style"]["scale"], "1:10"); assert_eq!(app.session.tool_options_of("dimension")["style"]["units"], "pc"); open(&mut app).unwrap(); @@ -423,6 +456,28 @@ mod tests { assert!(super::super::confirm(&mut app).is_err()); app.ui.dialog = None; assert_eq!(app.session.tool_options_of("dimension")["style"]["scale"], "1:10"); + // An arrow style set by `ui.dialog.set` replaces the Barbed head, as the menu does. + open(&mut app).unwrap(); + super::super::set_field(app.ui.dialog.as_mut().unwrap(), "arrowStyle".into(), json!("none")); + super::super::confirm(&mut app).unwrap(); + let style = serde_json::from_value::(app.session.tool_options_of("dimension")["style"].clone()).unwrap(); + assert_eq!((style.arrow_style, style.arrowhead()), (ArrowStyle::None, None)); + // A stroke head set by `ui.dialog.set` keeps Filled as the arrow style, as the menu does; an + // unknown name leaves the arrow style as it was. + open(&mut app).unwrap(); + let d = app.ui.dialog.as_mut().unwrap(); + super::super::set_field(d, "arrowStyle".into(), json!("tick")); + super::super::set_field(d, "arrowHead".into(), json!("Nope")); + assert_eq!(d.fields["arrowStyle"], "tick"); + super::super::set_field(d, "arrowHead".into(), json!("Barbed")); + super::super::confirm(&mut app).unwrap(); + let style = serde_json::from_value::(app.session.tool_options_of("dimension")["style"].clone()).unwrap(); + assert_eq!((style.arrow_style, style.arrowhead()), (ArrowStyle::Filled, Some(Arrowhead::Barbed))); + // The head of an older style takes that style, as its menu entry does. + open(&mut app).unwrap(); + let d = app.ui.dialog.as_mut().unwrap(); + super::super::set_field(d, "arrowHead".into(), json!("Slash")); + assert_eq!(d.fields["arrowStyle"], "tick"); } /// A selected dimension shows its style in Properties, with Apply to All and Set as Default. diff --git a/crates/ui-egui/src/i18n/bg.tsv b/crates/ui-egui/src/i18n/bg.tsv index 9bc64ef92b..d3a96d84ab 100644 --- a/crates/ui-egui/src/i18n/bg.tsv +++ b/crates/ui-egui/src/i18n/bg.tsv @@ -5688,6 +5688,7 @@ lighting Light Светлина B5 B5 Bar Лента Barbed С кукички +arrowhead Feather Перо Baseline (Standard) Основна линия (стандартна) Baseline Optimized Оптимизирана основна линия Basic Основен diff --git a/crates/ui-egui/src/i18n/bs.tsv b/crates/ui-egui/src/i18n/bs.tsv index 9f47390398..fbaa4c373e 100644 --- a/crates/ui-egui/src/i18n/bs.tsv +++ b/crates/ui-egui/src/i18n/bs.tsv @@ -5892,6 +5892,7 @@ imageTrace Outline Obris Arrow Strelica Arrow (open) Strelica (otvorena) Barbed Bodljikavo +arrowhead Feather Pero Half Arrow (left) Polustrelica (lijevo) Half Arrow (right) Polustrelica (desno) Concave Konkavno diff --git a/crates/ui-egui/src/i18n/ca.tsv b/crates/ui-egui/src/i18n/ca.tsv index 3bc8a2c6ef..6e3a18afb1 100644 --- a/crates/ui-egui/src/i18n/ca.tsv +++ b/crates/ui-egui/src/i18n/ca.tsv @@ -456,6 +456,7 @@ antiAlias Sharp Nítid Bar Barra Bar Graph Tool Eina de gràfic de barres Barbed Amb pues +arrowhead Feather Ploma Bas Relief Baix relleu Bas Relief… Baix relleu… Base Along: Base al llarg de: diff --git a/crates/ui-egui/src/i18n/cs.tsv b/crates/ui-egui/src/i18n/cs.tsv index d43fe6bab8..a77d54e4e6 100644 --- a/crates/ui-egui/src/i18n/cs.tsv +++ b/crates/ui-egui/src/i18n/cs.tsv @@ -6273,6 +6273,7 @@ variable-list-end {0}, {1} {0} a {1} Arrow Šipka Arrow (open) Šipka (otevřená) Barbed S protihroty +arrowhead Feather Pírko Half Arrow (left) Poloviční šipka (vlevo) Half Arrow (right) Poloviční šipka (vpravo) Concave Vkleslá diff --git a/crates/ui-egui/src/i18n/da.tsv b/crates/ui-egui/src/i18n/da.tsv index e31a9f3762..d9196c7013 100644 --- a/crates/ui-egui/src/i18n/da.tsv +++ b/crates/ui-egui/src/i18n/da.tsv @@ -8347,6 +8347,7 @@ imageTrace Outline Kontur Arrow Pil Arrow (open) Pil (åben) Barbed Modhager +arrowhead Feather Fjer Half Arrow (left) Halvpil (venstre) Half Arrow (right) Halvpil (højre) Concave Konkav diff --git a/crates/ui-egui/src/i18n/de.tsv b/crates/ui-egui/src/i18n/de.tsv index 1144e40b34..57cb36aa50 100644 --- a/crates/ui-egui/src/i18n/de.tsv +++ b/crates/ui-egui/src/i18n/de.tsv @@ -7371,6 +7371,7 @@ anchor Points: Punkte: Square (open) Quadrat (offen) Arrow (open) Pfeil (offen) Barbed Mit Widerhaken +arrowhead Feather Feder Half Arrow (left) Halber Pfeil (links) Half Arrow (right) Halber Pfeil (rechts) Double Bar Doppelbalken diff --git a/crates/ui-egui/src/i18n/el.tsv b/crates/ui-egui/src/i18n/el.tsv index 680c4d4ac1..7dace6b35e 100644 --- a/crates/ui-egui/src/i18n/el.tsv +++ b/crates/ui-egui/src/i18n/el.tsv @@ -6057,6 +6057,7 @@ variable-list-end {0}, {1} {0} και {1} Auto Size Αυτόματο μέγεθος Bar Ράβδος Barbed Αγκιστρωτό +arrowhead Feather Φτερό Baseline (Standard) Γραμμή βάσης (τυπική) Baseline Optimized Βελτιστοποιημένο για γραμμή βάσης Black Outline Μαύρο περίγραμμα diff --git a/crates/ui-egui/src/i18n/es.tsv b/crates/ui-egui/src/i18n/es.tsv index f55b74ee31..33f95be895 100644 --- a/crates/ui-egui/src/i18n/es.tsv +++ b/crates/ui-egui/src/i18n/es.tsv @@ -6226,6 +6226,7 @@ effect Regular Regular Arrow Flecha Arrow (open) Flecha (abierta) Barbed Con púas +arrowhead Feather Emplumado Half Arrow (left) Media flecha (izquierda) Half Arrow (right) Media flecha (derecha) Concave Cóncava diff --git a/crates/ui-egui/src/i18n/fi.tsv b/crates/ui-egui/src/i18n/fi.tsv index 0012b6f87b..f8060bf336 100644 --- a/crates/ui-egui/src/i18n/fi.tsv +++ b/crates/ui-egui/src/i18n/fi.tsv @@ -6185,6 +6185,7 @@ variable-list-end {0}, {1} {0} ja {1} Arrow Nuoli Arrow (open) Nuoli (avoin) Barbed Väkänen +arrowhead Feather Sulka Half Arrow (left) Puolinuoli (vasen) Half Arrow (right) Puolinuoli (oikea) Concave Kovera diff --git a/crates/ui-egui/src/i18n/fr.tsv b/crates/ui-egui/src/i18n/fr.tsv index fc37f336b5..2b7d5d50df 100644 --- a/crates/ui-egui/src/i18n/fr.tsv +++ b/crates/ui-egui/src/i18n/fr.tsv @@ -2036,7 +2036,6 @@ font-technology Variable Variables Limit to Library: Limiter à la bibliothèque : Limit: Limite : Line Ligne - Line Arrow Flèche filaire Line Art and Text Resolution: Résolution des dessins au trait et du texte : Line Breaks Sauts de ligne Line Color Couleur de ligne @@ -6261,6 +6260,7 @@ lighting Light Lumière B5 B5 Bar Barre Barbed Barbelée +arrowhead Feather Empennage Baseline (Standard) De base (standard) Baseline Optimized De base optimisé Basic De base @@ -6389,6 +6389,7 @@ lighting Light Lumière Letterhead A4 Papier à en-tête A4 Letterhead Letter Papier à en-tête Lettre US Line Art Dessin au trait + Line Arrow Flèche filaire Linear Linéaire Logo 1000×1000 Logo 1000×1000 Low Fidelity Photo Photo basse fidélité diff --git a/crates/ui-egui/src/i18n/gu.tsv b/crates/ui-egui/src/i18n/gu.tsv index dbbc5db7bc..357c376b56 100644 --- a/crates/ui-egui/src/i18n/gu.tsv +++ b/crates/ui-egui/src/i18n/gu.tsv @@ -3101,6 +3101,7 @@ Square (open) ચોરસ (ખુલ્લો) Arrow (open) તીર (ખુલ્લું) Barbed કાંટાળું +arrowhead Feather પીંછું Half Arrow (left) અડધું તીર (ડાબે) Half Arrow (right) અડધું તીર (જમણે) Double Bar બેવડી પટ્ટી diff --git a/crates/ui-egui/src/i18n/hi.tsv b/crates/ui-egui/src/i18n/hi.tsv index f0b4e57d16..00660141a0 100644 --- a/crates/ui-egui/src/i18n/hi.tsv +++ b/crates/ui-egui/src/i18n/hi.tsv @@ -807,6 +807,7 @@ antiAlias Sharp शार्प Bar बार Bar Graph Tool बार ग्राफ़ टूल Barbed कंटीले +arrowhead Feather पंख Bas Relief बास रिलीफ़ Bas Relief… बास रिलीफ़… Base Along: आधार के साथ: diff --git a/crates/ui-egui/src/i18n/hu.tsv b/crates/ui-egui/src/i18n/hu.tsv index 248471e24a..732efa4a98 100644 --- a/crates/ui-egui/src/i18n/hu.tsv +++ b/crates/ui-egui/src/i18n/hu.tsv @@ -409,6 +409,7 @@ font-technology Variable Változó Bar Vonal Bar Graph Tool Sávdiagram Barbed Szakállas +arrowhead Feather Tollazat Baseline Alapvonal Baseline (Standard) Alapvonali (szabványos) Baseline Optimized Alapvonali, optimalizált diff --git a/crates/ui-egui/src/i18n/id.tsv b/crates/ui-egui/src/i18n/id.tsv index bc3a63101a..1c8ee40797 100644 --- a/crates/ui-egui/src/i18n/id.tsv +++ b/crates/ui-egui/src/i18n/id.tsv @@ -5541,6 +5541,7 @@ imageTrace Outline Kontur Arrow Panah Arrow (open) Panah (terbuka) Barbed Berduri +arrowhead Feather Bulu Half Arrow (left) Setengah panah (kiri) Half Arrow (right) Setengah panah (kanan) Concave Cekung diff --git a/crates/ui-egui/src/i18n/it.tsv b/crates/ui-egui/src/i18n/it.tsv index 4bd0150964..108b682ab2 100644 --- a/crates/ui-egui/src/i18n/it.tsv +++ b/crates/ui-egui/src/i18n/it.tsv @@ -7408,6 +7408,7 @@ anchor Points: Punti: Square (open) Quadrato (aperto) Arrow (open) Freccia (aperta) Barbed Uncinata +arrowhead Feather Piuma Half Arrow (left) Mezza freccia (sinistra) Half Arrow (right) Mezza freccia (destra) Double Bar Doppia barra diff --git a/crates/ui-egui/src/i18n/ja.tsv b/crates/ui-egui/src/i18n/ja.tsv index f7ff828023..278dc41ecf 100644 --- a/crates/ui-egui/src/i18n/ja.tsv +++ b/crates/ui-egui/src/i18n/ja.tsv @@ -9298,6 +9298,7 @@ anchor Points: ポイント: Square (open) 正方形 (白抜き) Arrow (open) 矢印 (白抜き) Barbed かえし付き +arrowhead Feather 矢羽根 Half Arrow (left) 片矢印 (左) Half Arrow (right) 片矢印 (右) Double Bar 二重バー diff --git a/crates/ui-egui/src/i18n/ka.tsv b/crates/ui-egui/src/i18n/ka.tsv index 2543c8b152..26c6774c75 100644 --- a/crates/ui-egui/src/i18n/ka.tsv +++ b/crates/ui-egui/src/i18n/ka.tsv @@ -7664,6 +7664,7 @@ font-technology Variable ცვლადი Arrow ისარი Arrow (open) ისარი (ღია) Barbed წვეტიანი +arrowhead Feather ბუმბული Half Arrow (left) ნახევარი ისარი (მარცხენა) Half Arrow (right) ნახევარი ისარი (მარჯვენა) Concave ჩაზნექილი diff --git a/crates/ui-egui/src/i18n/ko.tsv b/crates/ui-egui/src/i18n/ko.tsv index 46515dc315..f622d20def 100644 --- a/crates/ui-egui/src/i18n/ko.tsv +++ b/crates/ui-egui/src/i18n/ko.tsv @@ -7380,6 +7380,7 @@ anchor Points: 포인트: Square (open) 사각 (윤곽) Arrow (open) 화살표 (윤곽) Barbed 미늘 +arrowhead Feather 깃털 Half Arrow (left) 반쪽 화살표 (왼쪽) Half Arrow (right) 반쪽 화살표 (오른쪽) Double Bar 이중 막대 diff --git a/crates/ui-egui/src/i18n/nl.tsv b/crates/ui-egui/src/i18n/nl.tsv index c7af9b1404..d31e894f5f 100644 --- a/crates/ui-egui/src/i18n/nl.tsv +++ b/crates/ui-egui/src/i18n/nl.tsv @@ -8060,6 +8060,7 @@ imageTrace Outline Contour Arrow Pijl Arrow (open) Pijl (open) Barbed Weerhaak +arrowhead Feather Veer Half Arrow (left) Halve pijl (links) Half Arrow (right) Halve pijl (rechts) Concave Concaaf diff --git a/crates/ui-egui/src/i18n/pl.tsv b/crates/ui-egui/src/i18n/pl.tsv index 427ff037a8..4f8d371227 100644 --- a/crates/ui-egui/src/i18n/pl.tsv +++ b/crates/ui-egui/src/i18n/pl.tsv @@ -6125,6 +6125,7 @@ variable-list-end {0}, {1} {0} i {1} Arrow Strzałka Arrow (open) Strzałka (otwarta) Barbed Zadziorowata +arrowhead Feather Pióro Half Arrow (left) Pół strzałki (lewa) Half Arrow (right) Pół strzałki (prawa) Concave Wklęsła diff --git a/crates/ui-egui/src/i18n/pt-br.tsv b/crates/ui-egui/src/i18n/pt-br.tsv index e5bbd3db53..940562d907 100644 --- a/crates/ui-egui/src/i18n/pt-br.tsv +++ b/crates/ui-egui/src/i18n/pt-br.tsv @@ -6208,6 +6208,7 @@ effect Regular Regular Arrow Seta Arrow (open) Seta (aberta) Barbed Farpada +arrowhead Feather Pena Half Arrow (left) Meia Seta (esquerda) Half Arrow (right) Meia Seta (direita) Concave Côncava diff --git a/crates/ui-egui/src/i18n/ru.tsv b/crates/ui-egui/src/i18n/ru.tsv index 862a0c3616..db35beb9ad 100644 --- a/crates/ui-egui/src/i18n/ru.tsv +++ b/crates/ui-egui/src/i18n/ru.tsv @@ -7357,6 +7357,7 @@ axis Y Axis Ось Y Auto Size Авторазмер Bar Черта Barbed С зазубриной +arrowhead Feather Перо Baseline (Standard) Базовый (стандартный) Baseline Optimized Базовый оптимизированный Bicubic Бикубическая diff --git a/crates/ui-egui/src/i18n/sv.tsv b/crates/ui-egui/src/i18n/sv.tsv index 047a1ebf93..ae199e1e80 100644 --- a/crates/ui-egui/src/i18n/sv.tsv +++ b/crates/ui-egui/src/i18n/sv.tsv @@ -6173,6 +6173,7 @@ lighting Light Ljus B5 B5 Bar Lodstreck Barbed Hullingförsedd +arrowhead Feather Fjäder Baseline (Standard) Baseline (standard) Baseline Optimized Baseline optimerad Basic Grundläggande diff --git a/crates/ui-egui/src/i18n/tests.rs b/crates/ui-egui/src/i18n/tests.rs index 3521580eac..bb31ef765d 100644 --- a/crates/ui-egui/src/i18n/tests.rs +++ b/crates/ui-egui/src/i18n/tests.rs @@ -674,14 +674,14 @@ fn built_in_library_style_names_are_in_complete_catalogs() { } /// The Stroke panel and the Dimension tool's Arrow Style list the built-in arrowheads by name, so -/// each name has a row in each complete catalog. Feather is not checked: a plain `Feather` row also -/// names the History steps of the Feather effect, which otherwise take the effect's menu row. +/// each name has a row in each complete catalog: an `arrowhead` row, or a plain one. Feather needs +/// its `arrowhead` row, since its plain row may name the Feather effect. #[test] fn built_in_arrowhead_names_are_in_complete_catalogs() { use vectorcraft_doc::Arrowhead; - let names = distinct(Arrowhead::ALL.iter().filter(|h| **h != Arrowhead::Feather).map(|h| h.label().to_string()).collect()); - assert_eq!(names.len(), 40, "{names:?}"); - let bad = lacking(&names, |c, n| c.plain(n).is_some()); + let names = distinct(Arrowhead::ALL.iter().map(|h| h.label().to_string()).collect()); + assert_eq!(names.len(), 41, "{names:?}"); + let bad = lacking(&names, |c, n| c.contextual("arrowhead", n).is_some() || (n != "Feather" && c.plain(n).is_some())); assert!(bad.is_empty(), "{}", bad.join("\n")); } diff --git a/crates/ui-egui/src/i18n/tr.tsv b/crates/ui-egui/src/i18n/tr.tsv index 4505a40fb9..1c4a7dad54 100644 --- a/crates/ui-egui/src/i18n/tr.tsv +++ b/crates/ui-egui/src/i18n/tr.tsv @@ -6026,6 +6026,7 @@ lighting Light Işık B5 B5 Bar Bar Barbed Dikenli +arrowhead Feather Tüy Baseline (Standard) Temel (Standart) Baseline Optimized Temel Optimize Edilmiş Basic Temel diff --git a/crates/ui-egui/src/i18n/uk.tsv b/crates/ui-egui/src/i18n/uk.tsv index 787fcd5ffb..916d1e2609 100644 --- a/crates/ui-egui/src/i18n/uk.tsv +++ b/crates/ui-egui/src/i18n/uk.tsv @@ -7390,6 +7390,7 @@ anchor Points: Точки: Square (open) Квадрат (контурний) Arrow (open) Стрілка (контурна) Barbed Зазубрена +arrowhead Feather Оперення Half Arrow (left) Половина стрілки (ліворуч) Half Arrow (right) Половина стрілки (праворуч) Double Bar Подвійна смуга diff --git a/crates/ui-egui/src/i18n/vi.tsv b/crates/ui-egui/src/i18n/vi.tsv index e4c0e838e5..0ce8b85e91 100644 --- a/crates/ui-egui/src/i18n/vi.tsv +++ b/crates/ui-egui/src/i18n/vi.tsv @@ -7434,6 +7434,7 @@ anchor Points: Điểm: Square (open) Hình vuông (rỗng) Arrow (open) Mũi tên (rỗng) Barbed Có ngạnh +arrowhead Feather Lông vũ Half Arrow (left) Nửa mũi tên (trái) Half Arrow (right) Nửa mũi tên (phải) Double Bar Thanh đôi diff --git a/crates/ui-egui/src/i18n/zh-hans.tsv b/crates/ui-egui/src/i18n/zh-hans.tsv index a3d805eefa..b4c292757d 100644 --- a/crates/ui-egui/src/i18n/zh-hans.tsv +++ b/crates/ui-egui/src/i18n/zh-hans.tsv @@ -7617,6 +7617,7 @@ anchor Points: 点: Square (open) 正方形 (空心) Arrow (open) 箭头 (空心) Barbed 倒钩 +arrowhead Feather 羽毛 Half Arrow (left) 半箭头 (左) Half Arrow (right) 半箭头 (右) Double Bar 双条形 diff --git a/crates/ui-egui/src/i18n/zh-hant.tsv b/crates/ui-egui/src/i18n/zh-hant.tsv index bbc027d990..da9b5d13e8 100644 --- a/crates/ui-egui/src/i18n/zh-hant.tsv +++ b/crates/ui-egui/src/i18n/zh-hant.tsv @@ -7439,6 +7439,7 @@ anchor Points: 點: Square (open) 正方形 (空心) Arrow (open) 箭頭 (空心) Barbed 倒鉤 +arrowhead Feather 羽毛 Half Arrow (left) 半箭頭 (左) Half Arrow (right) 半箭頭 (右) Double Bar 雙長條 diff --git a/crates/ui-egui/src/panels/stroke.rs b/crates/ui-egui/src/panels/stroke.rs index 33faeec41e..8bdad7d576 100644 --- a/crates/ui-egui/src/panels/stroke.rs +++ b/crates/ui-egui/src/panels/stroke.rs @@ -109,10 +109,16 @@ fn arrow_label(a: Option<&Arrowhead>) -> &'static str { fn arrow_name(a: Option<&Arrowhead>) -> String { match a { Some(Arrowhead::Custom(c)) => c.name.clone(), - _ => tl!(arrow_label(a)).to_string(), + _ => builtin_arrow_name(arrow_label(a)).to_string(), } } +/// A built-in arrowhead's name `label` in the interface language. Its `arrowhead` row comes first, +/// so a name that is also an effect's (Feather) can be translated for each one. +pub(crate) fn builtin_arrow_name(label: &str) -> &str { + crate::i18n::tr_ctx(crate::i18n::current(), "arrowhead", label) +} + /// The preview cache key of `a`: its name, and for a custom head its art. fn arrow_key(a: Option<&Arrowhead>) -> String { match a { diff --git a/docs/dimensions.md b/docs/dimensions.md index f5404d5880..26acdee9fb 100644 --- a/docs/dimensions.md +++ b/docs/dimensions.md @@ -90,7 +90,9 @@ from the object) or **Between Line and Object**; **Alignment** is **Left**, **Ce **Arrow Style** lists **Filled**, **Open**, **Tick** and **None**, then every other built-in arrowhead of the Stroke panel, each with a drawn preview before its name. Custom arrowheads are not -listed. +listed. A version that has the arrowhead in the Stroke panel but not in Arrow Style keeps the saved +arrows of such a dimension until it draws the dimension again, and then draws **Filled** arrows. A +version without the arrowhead does not open the file. Scale means **drawing : real size**, independent of zoom. At **1:10** a 1 in line on the page is labelled 10 in; at **10:1**, 0.1 in. It scales lengths, not angles or the size of text and arrows. diff --git a/docs/mcp.md b/docs/mcp.md index fd8fb76a0a..a9e563d0f1 100644 --- a/docs/mcp.md +++ b/docs/mcp.md @@ -6134,7 +6134,9 @@ arrowheads in a separate arrowheads file. A dimension's options (`dimension.create`, `dimension.update` and the Dimension tool's `style`) take `arrowStyle` (`filled`, `open`, `tick` or `none`: `Triangle`, `TriangleOpen`, `Slash` or no head) and `arrowHead`, `null` or one of the built-in head names `stroke.set` takes, drawn at both ends in place of the arrow style's head. The Arrow Style menu -sets `arrowStyle` to `filled` when it sets `arrowHead`. A custom arrowhead and an unknown name are refused. +sets `arrowStyle` to `filled` when it sets `arrowHead`. A custom arrowhead and an unknown name are refused. Versions +that have the stroke arrowhead but do not read `arrowHead` keep the saved arrows until they draw the dimension again, +and then draw `arrowStyle`. Versions without the stroke arrowhead do not open the file. ## Stroke bounds and clicks diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index 3fd725c54c..e3bb443dd8 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -655,7 +655,7 @@ since 2026-10-01. **Drawing tools, Dimension tool lines line up with dimensions already drawn (#8063, #5590):** By VectorCraft's own rule, with Smart Guides on, a linear dimension placed with its line within the Smart Guides snapping tolerance of the level of a parallel line of a visible, unlocked linear dimension already drawn has its line on that level, and with Alignment Guides on a guide runs along the level across both lines while it is placed. `a_dimension_line_placed_beside_another_lands_on_its_level`, `a_dimension_line_on_another_level_shows_one_guide_across_both`, `a_dimension_of_the_same_points_lines_up_and_the_line_follows_the_pointer`, `a_dimension_dragged_out_beside_another_lands_on_its_level` and `a_line_the_pointer_lies_across_wins_on_one_level` cover it. **Drawing tools, Dimension tool dimensions selected with their art keep their lines and label:** Object › Expand, Object › Expand Appearance and Object › Path › Outline Stroke leave a dimension selected with art it measures, directly or in selected groups without fills, strokes or effects of their own, as it is and change only the other art; when the new art no longer fits its link, the dimension stays where it was, no longer linked, and undo links it again. `expand_leaves_a_dimension_selected_with_its_art_as_it_is`, `expand_appearance_leaves_a_dimension_selected_with_its_art_as_it_is`, `outline_stroke_leaves_a_dimension_selected_with_its_art_as_it_is`, `a_dimension_selected_with_art_that_has_nothing_to_expand_changes_nothing`, `a_group_effect_expanded_reaches_the_dimension_it_holds`, `expand_keeps_a_dimension_in_its_asset_and_its_variable_binding`, `a_dimension_keeps_no_link_to_the_art_expand_replaced`, `a_dimension_outlasts_the_art_outline_stroke_or_expand_appearance_replaced`, `a_dimension_outlasts_the_stroke_expand_outlined` and `expand_appearance_in_safe_mode_leaves_a_dimension_selected_with_its_art` cover it. **Drawing tools, Dimension tool Arrow Style shows each arrowhead (#8049):** The Arrow Style dropdown in Dimension Tool Options and in the Properties panel's Dimension section draws each style's arrowhead at the end of a short line before its name, in the open list and in the closed field, using the Stroke panel's arrowhead previews. Filled, Open, Tick and None are the same four styles, saved as before. `arrow_style_shows_a_drawn_arrowhead` and `each_arrow_style_draws_its_stroke_arrowhead_at_both_ends` cover it. -**Drawing tools, Dimension tool Arrow Style offers every stroke arrowhead (#8049, #3222):** By VectorCraft's own rule, Arrow Style lists Filled, Open, Tick and None, then the other 38 built-in Stroke panel arrowheads, each with its drawn preview. The options save the head in `arrowHead` (`Barbed`) and keep `arrowStyle` at `filled`; documents and tool settings saved before open unchanged. `every_stroke_arrowhead_draws_as_a_dimension_arrowhead`, `arrow_style_shows_a_stroke_arrowhead`, `arrow_style_list_names_each_style_once` and `built_in_arrowhead_names_are_in_complete_catalogs` cover it. +**Drawing tools, Dimension tool Arrow Style offers every stroke arrowhead (#8049, #3222):** By VectorCraft's own rule, Arrow Style lists Filled, Open, Tick and None, then the other 38 built-in Stroke panel arrowheads, each with its drawn preview. The options save the head in `arrowHead` (`Barbed`) and keep `arrowStyle` at `filled`, so versions that have the stroke arrowhead but not `arrowHead` keep the saved arrows until they draw the dimension again and then draw Filled arrows (versions without the stroke arrowhead do not open the file); documents and tool settings saved before open unchanged. `every_stroke_arrowhead_draws_as_a_dimension_arrowhead`, `arrow_style_shows_a_stroke_arrowhead`, `arrow_style_list_names_each_style_once` and `built_in_arrowhead_names_are_in_complete_catalogs` cover it. **Drawing tools, Line Segment from one curve onto a common tangent of another:** By VectorCraft's own rule, with Smart Guides and Snap to Tangent on, a Line Segment drag pressed anywhere on a convex closed path with curves and dragged to within the snapping tolerance of another such path lands on a common tangent of the two ([tangent lines to circles](https://en.wikipedia.org/wiki/Tangent_lines_to_circles)): both ends move to where the line touches the paths, the start sliding along the first path, and each end shows the "tangent" label when Anchor/Path Labels is on, with the line drawn as a guide when Alignment Guides is on. The line is the tangent whose touch point on the second path is nearest the pointer, so moving the pointer around the second path switches between the outer tangent and the one crossing between the paths. The start stays where it was pressed when Shift, Alt or Space is held, when an anchor, center or crossing lies nearer the pointer than the second path does, when the press snapped to an anchor, center or crossing off the first path, when Snap to Tangent is off, when Snap to Grid or pixel snapping places drawn points, or when either path bends inward somewhere or has more than 512 segments. `a_line_from_one_circle_to_another_lands_on_their_common_tangent`, `a_line_from_a_turned_ellipse_lands_on_its_tangent_with_a_circle`, `a_line_near_the_second_path_takes_the_tangent_touching_it_nearest`, `a_line_keeps_its_start_without_a_tangent_snap`, `a_line_to_a_crescent_or_from_an_anchor_beside_the_curve_keeps_its_start` and `a_line_segment_drag_draws_the_common_tangent_as_one_undo_step` cover it. **Live trace result bounds and selection highlights exclude the retained bitmap except in source-image views:** `live_trace_result_bounds_exclude_the_retained_bitmap_at_any_angle` checks every TraceView, geometric and visual bounds and rotated result bounds. `live_trace_selection_highlight_excludes_the_retained_source_rectangle` checks result highlights and the existing ordinary-group policy. Shared editing-child traversal also preserves Shaper handling. **Artboard Options shares existing presets and orientation controls and can fit artwork without moving it; artwork fitting includes all drawn document art across artboards and off-board; artwork bounds are cached by active document and revision, and selection uses the shared bounds cache across artboards:** Shared existing preset definitions are reused; no external preset assets are added. Presets preserve each selected artboard's orientation, and orientation choices apply even when the active board already matches. Fit operations draft bounds until OK, affect only the active artboard and leave artwork in place. Regression coverage checks draft/Cancel, selected-set application, active-only fitting and Undo. From 779cbae110121b3dfbf8f266a291fa35df405807 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Wed, 18 Nov 2026 17:02:31 -0800 Subject: [PATCH 64/78] Links: the label resets the list the panel reads and decides the filter from the drawn rows - show_selected_image resets the Arc entry that cached() reads, so the next draw reads the list again. It wrote a plain Cache under the same key before, which cached() never saw. - The Show filter goes back to Show All when the rows the panel draws leave out the selected image, instead of from a separate query made when the label was clicked. - reveal_panel brings a panel to the front of its open flyout when another tab of the group is in front. - The Control bar test docks Links beside Layers and checks where it opens, so both passes reach a docked panel. --- crates/ui-egui/src/chrome/tests.rs | 10 ++++++ crates/ui-egui/src/panel_docking.rs | 20 ++++++++++-- crates/ui-egui/src/panel_docking/tests.rs | 22 +++++++++++++ crates/ui-egui/src/panels/links.rs | 38 +++++++++++------------ crates/ui-egui/src/panels/tests_links.rs | 24 ++++++++++++++ 5 files changed, 92 insertions(+), 22 deletions(-) diff --git a/crates/ui-egui/src/chrome/tests.rs b/crates/ui-egui/src/chrome/tests.rs index 618c28baee..d9cf307b52 100644 --- a/crates/ui-egui/src/chrome/tests.rs +++ b/crates/ui-egui/src/chrome/tests.rs @@ -4173,12 +4173,22 @@ fn the_linked_file_and_embedded_labels_open_the_links_panel() { let id = app.run("shape.rectangle", json!({"x": 10, "y": 10, "width": 30, "height": 20})).unwrap()["id"].clone(); let linked = app.run("file.place", json!({"path": path, "link": true})).unwrap()["ids"].clone(); let embedded = app.run("file.place", json!({"path": path, "link": false})).unwrap()["ids"].clone(); + // The default layout floats Links: dock it beside Layers so that both passes reach a docked panel. + app.run("window.panel", json!({"panel": links})).unwrap(); + app.run("window.panel.dock", json!({"panel": links, "onto": "layers"})).unwrap(); + // Whether Links floats, and whether its dock column is collapsed to icons. + let placed = |app: &crate::VectorcraftApp| { + let layout = crate::panel_docking::layout_of(&app.ui); + (layout.floating.iter().any(|w| w.panels().any(|p| p == links)), crate::panel_docking::in_iconic_column(&layout, links)) + }; for collapsed in [false, true] { app.run("window.collapseDock", json!({ "collapsed": collapsed })).unwrap(); app.run("select.set", json!({ "ids": linked })).unwrap(); assert!(click(&mut app, "Linked File"), "collapsed {collapsed}, status: {}", app.ui.status); + assert_eq!(placed(&app), (false, collapsed), "Links opened in its dock, collapsed {collapsed}"); app.run("select.set", json!({ "ids": embedded })).unwrap(); assert!(click(&mut app, "Embedded"), "collapsed {collapsed}, status: {}", app.ui.status); + assert_eq!(placed(&app), (false, collapsed), "Links opened in its dock, collapsed {collapsed}"); app.run("select.set", json!({ "ids": [id] })).unwrap(); let name = crate::panels::appearance::object_label(&app); assert!(!click(&mut app, name), "collapsed {collapsed}: a rectangle's label opens nothing"); diff --git a/crates/ui-egui/src/panel_docking.rs b/crates/ui-egui/src/panel_docking.rs index c4269e6190..a62d174267 100644 --- a/crates/ui-egui/src/panel_docking.rs +++ b/crates/ui-egui/src/panel_docking.rs @@ -429,11 +429,27 @@ fn restore_hidden_group(app: &mut VectorcraftApp, panel: &str) -> Result, panel: &str) -> Option { + dock_columns(layout) + .into_iter() + .filter(|column| column.iconic) + .flat_map(|column| &column.groups) + .find(|group| group.panels.iter().any(|p| p == panel)) + .and_then(|group| group.active_panel()) + .map(|front| front.to_string()) +} + /// Show `panel` as `window.panel` does, but leave it be when it can be seen already ([`visible`]): -/// a command that opens a panel to work in (Edit › Color Settings…) never puts it away. In -/// Presentation Mode the panel comes to the front of its group and shows when the mode ends. +/// a command that opens a panel to work in (Edit › Color Settings…) never puts it away. A flyout +/// keeps the name of the icon that opened it after another of its tabs is clicked, so a panel whose +/// flyout is open with another tab in front comes to the front of it. In Presentation Mode the +/// panel comes to the front of its group and shows when the mode ends. pub(crate) fn reveal_panel(app: &mut VectorcraftApp, panel: &str) -> Result { if visible(&app.ui, panel) { + if app.ui.docking.is_some() && flyout_tab(&layout_of(&app.ui), panel).is_some_and(|front| front != panel) { + gesture(app, Action::Activate { panel: panel.to_string() })?; + } return Ok(json!({"open": panel})); } let id = normalize(panel).ok_or_else(|| format!("unknown panel `{panel}`"))?; diff --git a/crates/ui-egui/src/panel_docking/tests.rs b/crates/ui-egui/src/panel_docking/tests.rs index 6c861c0db9..2c90c7cd54 100644 --- a/crates/ui-egui/src/panel_docking/tests.rs +++ b/crates/ui-egui/src/panel_docking/tests.rs @@ -397,6 +397,28 @@ fn a_collapsed_dock_uses_the_flyouts_active_tab_for_thumbnail_work() { assert!(!thumbnail_panel_showing(&h.app.ui, &h.ctx), "a Properties tab under the Layers icon does not need thumbnails"); } +/// Revealing a panel whose flyout is open with another tab of its group in front brings that panel +/// to the front and keeps the flyout open. +#[test] +fn reveal_brings_the_panel_to_the_front_of_its_open_flyout() { + let mut h = Harness::new(); + h.app.run("window.collapseDock", json!({"collapsed": true})).unwrap(); + h.app.ui.docking = Some(layout_of(&h.app.ui)); + h.app.run("window.panel", json!({"panel": "properties"})).unwrap(); + h.frame(vec![]); + gesture(&mut h.app, Action::Activate { panel: "layers".into() }).unwrap(); + h.frame(vec![]); + assert_eq!(h.app.ui.open_panel.as_deref(), Some("properties"), "the flyout is still named for its opening icon"); + assert_eq!(flyout_tab(&layout_of(&h.app.ui), "properties").as_deref(), Some("layers"), "Layers is in front"); + reveal_panel(&mut h.app, "properties").unwrap(); + h.frame(vec![]); + assert_eq!(h.app.ui.open_panel.as_deref(), Some("properties"), "the flyout stays open"); + assert_eq!(flyout_tab(&layout_of(&h.app.ui), "properties").as_deref(), Some("properties"), "Properties is in front"); + // Revealed again while in front, the panel stays as it is. + reveal_panel(&mut h.app, "properties").unwrap(); + assert_eq!(h.app.ui.open_panel.as_deref(), Some("properties")); +} + /// A Character field shortcut with the Character panel in front of its floating window brings /// that window forward and leaves the panel showing. #[test] diff --git a/crates/ui-egui/src/panels/links.rs b/crates/ui-egui/src/panels/links.rs index c2c9fb5ab7..49706b4294 100644 --- a/crates/ui-egui/src/panels/links.rs +++ b/crates/ui-egui/src/panels/links.rs @@ -84,29 +84,18 @@ fn set_options(ctx: &egui::Context, f: impl FnOnce(&mut Options)) { /// Show the Links panel on the selected image (the Control bar's Linked File or Embedded label), /// wherever the panel is docked or floats; a panel that is already shown stays where it is. The -/// Link Info section opens, a Show filter that leaves out the image's row goes back to Show All, -/// and the list scrolls to the row when the panel next draws it. The sort, thumbnail size and DCS -/// option keep their settings. +/// Link Info section opens, and when the panel next draws the list, a Show filter that leaves out +/// the image's row goes back to Show All and the list scrolls to the row ([`show`]). The sort, +/// thumbnail size and DCS option keep their settings. pub(crate) fn show_selected_image(app: &mut VectorcraftApp, ctx: &egui::Context) { - let o = options(ctx); - let listed = |list: Value, id: u64| list["links"].as_array().is_some_and(|rows| rows.iter().any(|r| r["id"].as_u64() == Some(id))); let first = selected_images(app).first().copied(); - let hidden = match first { - Some(id) if o.show != "all" => app.session.execute("links.list", &json!({ "show": o.show, "sort": o.sort })).is_ok_and(|l| !listed(l, id)), - _ => false, - }; set_pstate(ctx, "links-scroll-to", first); // The list drawn next is read after this request, so a row a file change has just brought // into the Show filter is there to scroll to. - let mut c: Cache = pstate(ctx, "links-cache"); - c.at = f64::NEG_INFINITY; + let mut c: std::sync::Arc = pstate(ctx, "links-cache"); + std::sync::Arc::make_mut(&mut c).at = f64::NEG_INFINITY; set_pstate(ctx, "links-cache", c); - set_options(ctx, |o| { - o.info = true; - if hidden { - o.show = "all"; - } - }); + set_options(ctx, |o| o.info = true); if let Err(e) = crate::panel_docking::reveal_panel(app, ID) { app.status(e); } @@ -607,12 +596,22 @@ fn click(app: &mut VectorcraftApp, ctx: &egui::Context, rows: &[Value], id: u64, pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) { let t = Tokens::get(ui.ctx()); - let o = options(ui.ctx()); + let mut o = options(ui.ctx()); super::layers::show_thumbs_of(app.session.active().map(|st| st.uid)); - let Some(cache) = cached(app, ui.ctx(), &o) else { + let Some(mut cache) = cached(app, ui.ctx(), &o) else { widgets::dim_label(ui, tl!("No document")); return; }; + // A Show filter that leaves out the row `show_selected_image` asks for goes back to Show All, + // decided from the rows this frame draws and scrolls through. + let scroll_to: Option = pstate(ui.ctx(), "links-scroll-to"); + let listed = |cache: &Cache, id: u64| cache.list["links"].as_array().is_some_and(|rows| rows.iter().any(|r| r["id"].as_u64() == Some(id))); + if scroll_to.filter(|id| o.show != "all" && !listed(&cache, *id)).is_some() { + set_options(ui.ctx(), |o| o.show = "all"); + o = options(ui.ctx()); + let Some(all) = cached(app, ui.ctx(), &o) else { return }; + cache = all; + } let Some(st) = app.session.active() else { return }; let doc = st.doc.clone(); let thumbs = super::layers::ThumbSource::of(app, st, &doc); @@ -632,7 +631,6 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) { return; } // The row that `show_selected_image` asks the list to scroll to, once. - let scroll_to: Option = pstate(ui.ctx(), "links-scroll-to"); if scroll_to.is_some() { set_pstate::>(ui.ctx(), "links-scroll-to", None); } diff --git a/crates/ui-egui/src/panels/tests_links.rs b/crates/ui-egui/src/panels/tests_links.rs index 9bb87d1fa2..1fda3486a5 100644 --- a/crates/ui-egui/src/panels/tests_links.rs +++ b/crates/ui-egui/src/panels/tests_links.rs @@ -242,6 +242,30 @@ fn opening_the_panel_on_the_selected_image_reads_the_list_again() { assert_eq!(drawn(&mut app, 2.1), 2, "the missing image's row and its Link Info are drawn"); } +/// The Show filter is set back to Show All from the rows the panel draws, not from the files as +/// they were when the panel was asked to open: a missing image restored before the list is drawn +/// still gets its row. +#[test] +fn opening_the_panel_on_the_selected_image_decides_the_filter_from_the_drawn_rows() { + let dir = Folder::new("show-selected-drawn"); + let (mut app, linked, _) = app(&dir); + let ctx = egui::Context::default(); + crate::theme::install_fonts(&ctx); + let drawn = |app: &mut VectorcraftApp, time: f64| { + let raw = egui::RawInput { time: Some(time), ..Default::default() }; + let texts = super::tests_appearance::frame_raw(&ctx, app, raw, super::links::show); + texts.iter().filter(|(t, _)| t == "linked.png").count() + }; + app.run("select.set", json!({"ids": [linked]})).unwrap(); + click_menu_item(&mut app, &ctx, "Show Missing", 1.0); + let bytes = std::fs::read(dir.0.join("linked.png")).unwrap(); + std::fs::remove_file(dir.0.join("linked.png")).unwrap(); + super::links::show_selected_image(&mut app, &ctx); + std::fs::write(dir.0.join("linked.png"), bytes).unwrap(); + assert_eq!(drawn(&mut app, 2.0), 2, "the restored image's row and its Link Info are drawn"); + assert_eq!(super::pstate::>(&ctx, "links-scroll-to"), None, "the scroll request is used on the row"); +} + /// A frame that fetches nothing keeps the stored rows and Link Info as they are, without a copy; the /// two-second recheck, another first selected image and an edit each store a new cache. #[test] From 5e62518a096d2828362e7965c8c556faeac35338 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Wed, 18 Nov 2026 17:07:36 -0800 Subject: [PATCH 65/78] Swatches: a drop lands where the button came up, with the keys held then A drop on the Swatches panel is decided by the position and modifiers of the primary button's release, so moving on to another swatch or letting go of Alt later in the same frame no longer changes which swatch takes the drop or whether it replaces one. Hover feedback still follows the pointer and the keys held now. Replace Pattern Art also refuses type whose inline graphic shows a symbol painted with the pattern, which would make a tile that refers to itself. --- crates/engine/src/cmd/patterncmds.rs | 13 ++- crates/engine/src/tests/pattern.rs | 7 +- crates/ui-egui/src/panels/swatches/dnd.rs | 101 ++++++++++++++------ crates/ui-egui/src/panels/swatches/tests.rs | 47 +++++++++ 4 files changed, 134 insertions(+), 34 deletions(-) diff --git a/crates/engine/src/cmd/patterncmds.rs b/crates/engine/src/cmd/patterncmds.rs index ccc1bbfec9..e4b6d810a6 100644 --- a/crates/engine/src/cmd/patterncmds.rs +++ b/crates/engine/src/cmd/patterncmds.rs @@ -473,9 +473,9 @@ enum Uses<'a> { Brush(&'a str), } -/// Does `art` paint pattern `name`, itself or through the symbols, patterns, graph designs and -/// brushes it uses? A graph's stored series and label paints count, since its marks and labels -/// take them each time it is drawn again. +/// Does `art` paint pattern `name`, itself or through the symbols (of its instances and of the +/// inline graphics in its type), patterns, graph designs and brushes it uses? A graph's stored +/// series and label paints count, since its marks and labels take them each time it is drawn again. fn paints_pattern(d: &Document, art: &[Arc], name: &str) -> bool { let brushes = vectorcraft_brush::library(d); // What was already looked into, and the art left to look at. @@ -484,8 +484,11 @@ fn paints_pattern(d: &Document, art: &[Arc], name: &str) -> bool { while let Some(n) = left.pop() { let mut used = vec![]; walk_with_masks(n, &mut |c| { - if let NodeKind::SymbolInstance { symbol, .. } = &c.kind { - used.push(Uses::Symbol(symbol.as_str())); + match &c.kind { + NodeKind::SymbolInstance { symbol, .. } => used.push(Uses::Symbol(symbol.as_str())), + // The symbol of every inline graphic in type counts, overset or not. + NodeKind::Text(t) => used.extend(t.runs.iter().filter_map(|r| r.inline.as_ref()).map(|a| Uses::Symbol(a.symbol.as_str()))), + _ => {} } for it in &c.appearance.items { if let vectorcraft_doc::AppearanceItem::Stroke(sk) = it diff --git a/crates/engine/src/tests/pattern.rs b/crates/engine/src/tests/pattern.rs index 11afc930c3..01f8e76fbc 100644 --- a/crates/engine/src/tests/pattern.rs +++ b/crates/engine/src/tests/pattern.rs @@ -285,7 +285,8 @@ fn replace_art_that_matches_the_tile_art_records_nothing() { /// Replace Pattern Art is refused, changing nothing, for a missing name or pattern, with no art, /// while a pattern is edited, and for art painted with the pattern itself, directly, through /// another pattern, through a symbol, through the paints a graph stores, through a graph design a -/// graph draws its columns with and through the art of a brush on a stroke. +/// graph draws its columns with, through the art of a brush on a stroke and through the symbol of an +/// inline graphic in type. #[test] fn replace_art_is_refused_without_changing_anything() { let mut s = session(); @@ -321,6 +322,9 @@ fn replace_art_is_refused_without_changing_anything() { s.execute("paint.setFill", &json!({"ids": [brushed.0], "none": true})).unwrap(); s.execute("paint.setStroke", &json!({"ids": [brushed.0], "color": "#000000"})).unwrap(); s.execute("brush.apply", &json!({"name": "Dotted brush", "ids": [brushed.0]})).unwrap(); + // Type that shows symbol "Dotted" as an inline graphic. + let typed = id_of(&s.execute("text.create", &json!({"x": 20, "y": 420, "text": "Hi"})).unwrap()); + s.execute("text.insertInline", &json!({"id": typed.0, "at": 0, "symbol": "Dotted"})).unwrap(); let plain = blue_rect(&mut s); let unchanged = |s: &Session, before: &vectorcraft_doc::Document, steps: usize, case: &str| { assert_eq!(doc(s), before, "{case}: the document stays"); @@ -337,6 +341,7 @@ fn replace_art_is_refused_without_changing_anything() { ("through a graph's paints", json!({"name": "Dots", "ids": [graph.0]}), "art painted with `Dots` can't be its tile".into()), ("through a graph design", json!({"name": "Dots", "ids": [designed.0]}), "art painted with `Dots` can't be its tile".into()), ("through a brush", json!({"name": "Dots", "ids": [brushed.0]}), "art painted with `Dots` can't be its tile".into()), + ("through an inline graphic", json!({"name": "Dots", "ids": [typed.0]}), "art painted with `Dots` can't be its tile".into()), ] { let err = s.execute("object.pattern.replaceArt", &p).unwrap_err(); assert!(err.to_string().contains(&why), "{case}: {err}"); diff --git a/crates/ui-egui/src/panels/swatches/dnd.rs b/crates/ui-egui/src/panels/swatches/dnd.rs index dae955709e..69c934350f 100644 --- a/crates/ui-egui/src/panels/swatches/dnd.rs +++ b/crates/ui-egui/src/panels/swatches/dnd.rs @@ -88,10 +88,36 @@ impl Drop { } } -/// The drag held over `resp`, if the panel takes it (paints and art dragged off the canvas, not the -/// Appearance panel's thumbnail). +/// Whether the panel takes drag `d`: paints and art dragged off the canvas, not the Appearance +/// panel's thumbnail. +fn takes(d: &PanelDrag) -> bool { + matches!(d, PanelDrag::Paint { .. } | PanelDrag::Art(_)) +} + +/// The drag held over `resp`, if the panel takes it ([`takes`]). fn held(resp: &Response) -> Option> { - resp.dnd_hover_payload::().filter(|d| matches!(**d, PanelDrag::Paint { .. } | PanelDrag::Art(_))) + resp.dnd_hover_payload::().filter(|d| takes(d)) +} + +/// The drag in progress, if the panel takes it ([`takes`]), wherever the pointer is. +fn dragged(ui: &Ui) -> Option> { + egui::DragAndDrop::payload::(ui.ctx()).filter(|d| takes(d)) +} + +/// Where the primary button came up this frame and the modifiers held then, when that was over +/// `resp` with no other layer on top (the test [`egui::Context::rect_contains_pointer`] makes of the +/// pointer). A drop lands there with those modifiers, even when the pointer moved on or a key was +/// let go later in the same frame. +fn released_over(ui: &Ui, resp: &Response) -> Option<(egui::Pos2, egui::Modifiers)> { + let up = ui.input(|i| { + i.events.iter().find_map(|e| match e { + egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed: false, modifiers } => Some((*pos, *modifiers)), + _ => None, + }) + })?; + let ctx = ui.ctx(); + let rect = ctx.layer_transform_to_global(resp.layer_id).map_or(resp.interact_rect, |t| t * resp.interact_rect); + (rect.is_positive() && rect.contains(up.0) && ctx.layer_id_at(up.0) == Some(resp.layer_id)).then_some(up) } /// The drag a tile or row of `e` starts, moving rows `names`. Colour groups have no paint of their @@ -158,57 +184,76 @@ pub(super) fn tile_input(ui: &Ui, resp: Response, e: &Entry, items: &[Entry], se } /// A drag held over the tile or row `resp` of entry `e` shows where it would land (before or after -/// it by the pointer's half, or into a folder); a release there sets the drop. +/// it by the pointer's half, or into a folder), by where the pointer is and the keys held now. A +/// release over it ([`released_over`]) sets the drop, by where the button came up and the keys held +/// then. fn tile_drop(ui: &Ui, resp: &Response, e: &Entry, list: bool, ev: &mut TileEvents) { - let Some(d) = held(resp) else { return }; + let up = released_over(ui, resp); + let hover = held(resp); + let Some(d) = hover.clone().or_else(|| up.and_then(|_| dragged(ui))) else { return }; + let take = || egui::DragAndDrop::take_payload::(ui.ctx()).is_some(); // Art held with Alt over a pattern swatch would replace its tile art, and the swatch is // outlined; other art goes to the list (see [`zone_input`]). if let PanelDrag::Art(_) = &*d { - if crate::panels::alt_held(ui) && matches!(e, Entry::Swatch { paint: Paint::Pattern { .. }, .. }) { + if !matches!(e, Entry::Swatch { paint: Paint::Pattern { .. }, .. }) { + return; + } + if hover.is_some() && crate::panels::alt_held(ui) { ev.over = true; let t = Tokens::get(ui.ctx()); ui.painter().rect_stroke(resp.rect.expand(1.0), 0.0, Stroke::new(1.5, t.accent), StrokeKind::Outside); - if resp.dnd_release_payload::().is_some() { - ev.drop = Drop::of(&d, Some(e.name().to_string()), false, true); - } + } + if up.is_some_and(|(_, m)| m.alt) && take() { + ev.drop = Drop::of(&d, Some(e.name().to_string()), false, true); } return; } let PanelDrag::Paint { rows, .. } = &*d else { return }; let name = e.name(); - ev.over = true; + if hover.is_some() { + ev.over = true; + } // Swatches dropped on one of themselves stay where they are. if rows.as_ref().is_some_and(|r| r.names.iter().any(|n| n == name)) { - resp.dnd_release_payload::(); + if up.is_some() { + take(); + } return; } - let t = Tokens::get(ui.ctx()); let r = resp.rect; - let at = ui.input(|i| i.pointer.interact_pos()).unwrap_or(r.center()); - let after = if list { at.y > r.center().y } else { at.x > r.center().x }; - // A paint from elsewhere, or swatches over a folder, go into it; otherwise a bar marks the slot. - if rows.as_ref().is_none_or(|d| e.is_folder() && !d.groups) { - ui.painter().rect_stroke(r.expand(1.0), 0.0, Stroke::new(1.5, t.accent), StrokeKind::Outside); - } else if list { - let y = if after { r.bottom() } else { r.top() }; - ui.painter().line_segment([pos2(r.left(), y), pos2(r.right(), y)], Stroke::new(2.0, t.accent)); - } else { - let x = if after { r.right() + 0.75 } else { r.left() - 0.75 }; - ui.painter().line_segment([pos2(x, r.top() - 1.0), pos2(x, r.bottom() + 1.0)], Stroke::new(2.0, t.accent)); + let side = |at: egui::Pos2| if list { at.y > r.center().y } else { at.x > r.center().x }; + if hover.is_some() { + let t = Tokens::get(ui.ctx()); + let after = side(ui.input(|i| i.pointer.interact_pos()).unwrap_or(r.center())); + // A paint from elsewhere, or swatches over a folder, go into it; otherwise a bar marks the slot. + if rows.as_ref().is_none_or(|d| e.is_folder() && !d.groups) { + ui.painter().rect_stroke(r.expand(1.0), 0.0, Stroke::new(1.5, t.accent), StrokeKind::Outside); + } else if list { + let y = if after { r.bottom() } else { r.top() }; + ui.painter().line_segment([pos2(r.left(), y), pos2(r.right(), y)], Stroke::new(2.0, t.accent)); + } else { + let x = if after { r.right() + 0.75 } else { r.left() - 0.75 }; + ui.painter().line_segment([pos2(x, r.top() - 1.0), pos2(x, r.bottom() + 1.0)], Stroke::new(2.0, t.accent)); + } } - if resp.dnd_release_payload::().is_some() { - ev.drop = Drop::of(&d, Some(name.to_string()), after, crate::panels::alt_held(ui)); + if let Some((at, m)) = up + && take() + { + ev.drop = Drop::of(&d, Some(name.to_string()), side(at), m.alt); } } /// Drops between and after the tiles (`zone`: the list's viewport) go to the end of the ungrouped /// swatches (colour groups to the end of the groups); the list is outlined while one is held there. +/// A tile that took the release first leaves nothing to drop here. pub(super) fn zone_input(ui: &Ui, zone: &Response, ev: &mut TileEvents) { - let Some(d) = held(zone) else { return }; - if !ev.over { + if held(zone).is_some() && !ev.over { ui.painter().rect_stroke(zone.rect, 0.0, Stroke::new(1.5, Tokens::get(ui.ctx()).accent), StrokeKind::Inside); } - if zone.dnd_release_payload::().is_some() { + if released_over(ui, zone).is_some() + && let Some(d) = dragged(ui) + && egui::DragAndDrop::take_payload::(ui.ctx()).is_some() + { ev.drop = Drop::of(&d, None, false, false); } } diff --git a/crates/ui-egui/src/panels/swatches/tests.rs b/crates/ui-egui/src/panels/swatches/tests.rs index 84b126eb07..65c97bb8e9 100644 --- a/crates/ui-egui/src/panels/swatches/tests.rs +++ b/crates/ui-egui/src/panels/swatches/tests.rs @@ -869,6 +869,53 @@ fn art_alt_dropped_on_a_pattern_swatch_replaces_its_tile_art() { assert_eq!(tile_art(&app), Some(art), "Dots keeps its tile art"); } +/// A drop lands where the button came up, with the keys held then. Art released with Alt held +/// over pattern swatch Dots replaces the tile art of Dots when Alt is let go, or the pointer moves +/// on to pattern swatch Stripes, later in the same frame. Art released over Dots without Alt makes +/// a new pattern when Alt is pressed later in that frame. A color released with Alt held over Red +/// gives Red that color when Alt is let go later in the frame. +#[test] +fn a_drop_lands_where_the_button_came_up_with_the_keys_held_then() { + let mut app = app(); + for (x, name) in [(0, "Dots"), (20, "Stripes")] { + let id = app.run("shape.rectangle", json!({"x": x, "y": 0, "width": 10, "height": 10})).unwrap()["id"].as_u64().unwrap(); + app.run("object.pattern.make", json!({"ids": [id], "name": name, "edit": false})).unwrap(); + } + let id = app.run("shape.star", json!({"cx": 50, "cy": 50, "radius1": 20, "radius2": 9, "points": 5})).unwrap()["id"].as_u64().unwrap(); + let star = vectorcraft_doc::NodeId(id); + let star_kind = app.session.doc().unwrap().doc.node(star).map(|n| n.kind.clone()); + let tile_kind = + |app: &VectorcraftApp, name: &str| app.session.doc().unwrap().doc.pattern(name).and_then(|p| p.art.first().map(|n| n.kind.clone())); + let count = |app: &mut VectorcraftApp| app.run("pattern.list", json!({})).unwrap()["patterns"].as_array().map(Vec::len); + let ctx = context(); + // In one frame: release over `on` with `up` held, then hold `then` and move over `to`. + let drop = |app: &mut VectorcraftApp, payload: PanelDrag, on: &str, up: Modifiers, then: Modifiers, to: &str, time: f64| { + frame(app, &ctx, vec![], time, show); + let (at, next) = (tile_center(&ctx, on), tile_center(&ctx, to)); + egui::DragAndDrop::set_payload(&ctx, payload); + let release = Event::PointerButton { pos: at, button: PointerButton::Primary, pressed: false, modifiers: up }; + let events = vec![Event::PointerMoved(at), release, Event::ModifiersChanged(then), Event::PointerMoved(next)]; + frame_with(app, &ctx, events, up, time + 0.5, show); + assert!(egui::DragAndDrop::payload::(&ctx).is_none(), "{on}: the drop is taken"); + }; + let stripes = tile_kind(&app, "Stripes"); + drop(&mut app, PanelDrag::Art(vec![star]), "Dots", Modifiers::ALT, Modifiers::NONE, "Dots", 0.0); + assert_eq!(tile_kind(&app, "Dots"), star_kind, "Alt let go after the release: {}", app.ui.status); + assert_eq!(count(&mut app), Some(2), "no new pattern"); + app.run("edit.undo", json!({})).unwrap(); + drop(&mut app, PanelDrag::Art(vec![star]), "Dots", Modifiers::ALT, Modifiers::ALT, "Stripes", 1.0); + assert_eq!(tile_kind(&app, "Dots"), star_kind, "the pointer moved on to Stripes after the release"); + assert_eq!(tile_kind(&app, "Stripes"), stripes, "Stripes keeps its tile art"); + app.run("edit.undo", json!({})).unwrap(); + let dots = tile_kind(&app, "Dots"); + drop(&mut app, PanelDrag::Art(vec![star]), "Dots", Modifiers::NONE, Modifiers::ALT, "Dots", 2.0); + assert_eq!(count(&mut app), Some(3), "Alt pressed after a plain release makes a pattern"); + assert_eq!(tile_kind(&app, "Dots"), dots, "Dots keeps its tile art"); + let rgb = Color::from_hex("#2a6fb0").unwrap(); + drop(&mut app, PanelDrag::paint(Paint::solid(rgb)), "Red", Modifiers::ALT, Modifiers::NONE, "Red", 3.0); + assert_eq!(app.session.doc().unwrap().doc.swatch("Red").map(|w| w.paint.color()), Some(Some(rgb)), "Alt let go after the release on Red"); +} + #[test] fn a_proxy_dropped_on_the_panel_becomes_a_swatch() { let mut app = app(); From a0274c6feb404458b2a6d11c2e5e9863c4805c46 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Wed, 18 Nov 2026 17:32:13 -0800 Subject: [PATCH 66/78] Dimension: a set arrowHead matches its Arrow Style entry Through ui.dialog.set, a built-in arrowHead now sets both values of its Arrow Style entry, as the menu does: Slash sets arrowStyle tick and clears arrowHead, so the saved options match a menu pick of Tick. The Target arrowhead gets an arrowhead row in the ca, es, hu, it, ko, ru and uk catalogs, whose plain Target row names a destination or an object rather than the shape. --- crates/ui-egui/src/dialogs.rs | 6 +++--- crates/ui-egui/src/dialogs/dimension.rs | 19 ++++++++++++------- crates/ui-egui/src/i18n/ca.tsv | 1 + crates/ui-egui/src/i18n/es.tsv | 1 + crates/ui-egui/src/i18n/hu.tsv | 1 + crates/ui-egui/src/i18n/it.tsv | 1 + crates/ui-egui/src/i18n/ko.tsv | 1 + crates/ui-egui/src/i18n/ru.tsv | 1 + crates/ui-egui/src/i18n/tests.rs | 3 +++ crates/ui-egui/src/i18n/uk.tsv | 1 + 10 files changed, 25 insertions(+), 10 deletions(-) diff --git a/crates/ui-egui/src/dialogs.rs b/crates/ui-egui/src/dialogs.rs index b109ca486b..e1b48cb9c4 100644 --- a/crates/ui-egui/src/dialogs.rs +++ b/crates/ui-egui/src/dialogs.rs @@ -611,7 +611,7 @@ pub fn accepts_field(d: &Dialog, field: &str) -> bool { /// A Graph Data Column Width set this way sets every column, as Cell Style's does. An Import PDF /// `allPages` set this way to the other pick sets Import PDF pages as links back to its default. /// A Dimension Tool Options `arrowStyle` set this way clears `arrowHead`, and a built-in -/// `arrowHead` set this way sets the `arrowStyle` of its Arrow Style entry, as that menu does. +/// `arrowHead` set this way sets both values of its Arrow Style entry, as that menu does. pub fn set_field(d: &mut Dialog, field: String, value: Value) { if d.kind == brush_options::KIND { brush_art_options::note_set(d, &field); @@ -625,8 +625,8 @@ pub fn set_field(d: &mut Dialog, field: String, value: Value) { if d.kind == import_pdf::KIND { import_pdf::note_set(d, &field, &value); } - if d.kind == dimension::KIND { - dimension::note_set(d, &field, &value); + if d.kind == dimension::KIND && dimension::note_set(d, &field, &value) { + return; } if d.kind == "preferences" { crate::prefs_dialog::note_set(d, &field, &value); diff --git a/crates/ui-egui/src/dialogs/dimension.rs b/crates/ui-egui/src/dialogs/dimension.rs index 00a06c90fd..8eab0be40b 100644 --- a/crates/ui-egui/src/dialogs/dimension.rs +++ b/crates/ui-egui/src/dialogs/dimension.rs @@ -77,22 +77,27 @@ pub fn open(app: &mut VectorcraftApp) -> Result { } /// For `ui.dialog.set`, as the Arrow Style menu sets them: an `arrowStyle` set alone draws that -/// style's own head, and a built-in head set as `arrowHead` takes the arrow style of its Arrow -/// Style entry (`tick` for `Slash`, `filled` for `Barbed`). -pub(super) fn note_set(d: &mut Dialog, field: &str, value: &Value) { +/// style's own head, and a built-in head set as `arrowHead` sets both values of its Arrow Style +/// entry (`tick` with no `arrowHead` for `Slash`, `filled` with `Barbed` for `Barbed`). Returns +/// whether it set the field itself. +pub(super) fn note_set(d: &mut Dialog, field: &str, value: &Value) -> bool { match field { "arrowStyle" => { d.fields.insert("arrowHead".into(), Value::Null); + false } "arrowHead" => { let head = built_in_head(value); if let Some(ch) = arrow_choices().into_iter().find(|ch| head.is_some() && ch.drawn() == head) - && let Ok(style) = serde_json::to_value(ch.style) + && let (Ok(style), Ok(head)) = (serde_json::to_value(ch.style), serde_json::to_value(&ch.head)) { d.fields.insert("arrowStyle".into(), style); + d.fields.insert("arrowHead".into(), head); + return true; } + false } - _ => {} + _ => false, } } @@ -473,11 +478,11 @@ mod tests { super::super::confirm(&mut app).unwrap(); let style = serde_json::from_value::(app.session.tool_options_of("dimension")["style"].clone()).unwrap(); assert_eq!((style.arrow_style, style.arrowhead()), (ArrowStyle::Filled, Some(Arrowhead::Barbed))); - // The head of an older style takes that style, as its menu entry does. + // The head of an older style sets that style and no `arrowHead`, as its menu entry does. open(&mut app).unwrap(); let d = app.ui.dialog.as_mut().unwrap(); super::super::set_field(d, "arrowHead".into(), json!("Slash")); - assert_eq!(d.fields["arrowStyle"], "tick"); + assert_eq!((&d.fields["arrowStyle"], &d.fields["arrowHead"]), (&json!("tick"), &Value::Null)); } /// A selected dimension shows its style in Properties, with Apply to All and Set as Default. diff --git a/crates/ui-egui/src/i18n/ca.tsv b/crates/ui-egui/src/i18n/ca.tsv index 6e3a18afb1..9c7335b9bb 100644 --- a/crates/ui-egui/src/i18n/ca.tsv +++ b/crates/ui-egui/src/i18n/ca.tsv @@ -457,6 +457,7 @@ antiAlias Sharp Nítid Bar Graph Tool Eina de gràfic de barres Barbed Amb pues arrowhead Feather Ploma +arrowhead Target Diana Bas Relief Baix relleu Bas Relief… Baix relleu… Base Along: Base al llarg de: diff --git a/crates/ui-egui/src/i18n/es.tsv b/crates/ui-egui/src/i18n/es.tsv index 33f95be895..3f078d6084 100644 --- a/crates/ui-egui/src/i18n/es.tsv +++ b/crates/ui-egui/src/i18n/es.tsv @@ -6227,6 +6227,7 @@ effect Regular Regular Arrow (open) Flecha (abierta) Barbed Con púas arrowhead Feather Emplumado +arrowhead Target Diana Half Arrow (left) Media flecha (izquierda) Half Arrow (right) Media flecha (derecha) Concave Cóncava diff --git a/crates/ui-egui/src/i18n/hu.tsv b/crates/ui-egui/src/i18n/hu.tsv index 732efa4a98..6771d4043d 100644 --- a/crates/ui-egui/src/i18n/hu.tsv +++ b/crates/ui-egui/src/i18n/hu.tsv @@ -410,6 +410,7 @@ font-technology Variable Változó Bar Graph Tool Sávdiagram Barbed Szakállas arrowhead Feather Tollazat +arrowhead Target Céltábla Baseline Alapvonal Baseline (Standard) Alapvonali (szabványos) Baseline Optimized Alapvonali, optimalizált diff --git a/crates/ui-egui/src/i18n/it.tsv b/crates/ui-egui/src/i18n/it.tsv index 108b682ab2..545ace87ff 100644 --- a/crates/ui-egui/src/i18n/it.tsv +++ b/crates/ui-egui/src/i18n/it.tsv @@ -7409,6 +7409,7 @@ anchor Points: Punti: Arrow (open) Freccia (aperta) Barbed Uncinata arrowhead Feather Piuma +arrowhead Target Bersaglio Half Arrow (left) Mezza freccia (sinistra) Half Arrow (right) Mezza freccia (destra) Double Bar Doppia barra diff --git a/crates/ui-egui/src/i18n/ko.tsv b/crates/ui-egui/src/i18n/ko.tsv index f622d20def..c2f8f160ec 100644 --- a/crates/ui-egui/src/i18n/ko.tsv +++ b/crates/ui-egui/src/i18n/ko.tsv @@ -7381,6 +7381,7 @@ anchor Points: 포인트: Arrow (open) 화살표 (윤곽) Barbed 미늘 arrowhead Feather 깃털 +arrowhead Target 과녁 Half Arrow (left) 반쪽 화살표 (왼쪽) Half Arrow (right) 반쪽 화살표 (오른쪽) Double Bar 이중 막대 diff --git a/crates/ui-egui/src/i18n/ru.tsv b/crates/ui-egui/src/i18n/ru.tsv index db35beb9ad..173b5308d3 100644 --- a/crates/ui-egui/src/i18n/ru.tsv +++ b/crates/ui-egui/src/i18n/ru.tsv @@ -7358,6 +7358,7 @@ axis Y Axis Ось Y Bar Черта Barbed С зазубриной arrowhead Feather Перо +arrowhead Target Мишень Baseline (Standard) Базовый (стандартный) Baseline Optimized Базовый оптимизированный Bicubic Бикубическая diff --git a/crates/ui-egui/src/i18n/tests.rs b/crates/ui-egui/src/i18n/tests.rs index bb31ef765d..be64866a45 100644 --- a/crates/ui-egui/src/i18n/tests.rs +++ b/crates/ui-egui/src/i18n/tests.rs @@ -681,6 +681,9 @@ fn built_in_arrowhead_names_are_in_complete_catalogs() { use vectorcraft_doc::Arrowhead; let names = distinct(Arrowhead::ALL.iter().map(|h| h.label().to_string()).collect()); assert_eq!(names.len(), 41, "{names:?}"); + // Spanish's plain Target row names a destination; its arrowhead row names the shape. + let es = crate::i18n::Lang::from_code("es").expect("es registered"); + assert_eq!(crate::i18n::tr_ctx(es, "arrowhead", "Target"), "Diana"); let bad = lacking(&names, |c, n| c.contextual("arrowhead", n).is_some() || (n != "Feather" && c.plain(n).is_some())); assert!(bad.is_empty(), "{}", bad.join("\n")); } diff --git a/crates/ui-egui/src/i18n/uk.tsv b/crates/ui-egui/src/i18n/uk.tsv index 916d1e2609..2bdc31cdff 100644 --- a/crates/ui-egui/src/i18n/uk.tsv +++ b/crates/ui-egui/src/i18n/uk.tsv @@ -7391,6 +7391,7 @@ anchor Points: Точки: Arrow (open) Стрілка (контурна) Barbed Зазубрена arrowhead Feather Оперення +arrowhead Target Мішень Half Arrow (left) Половина стрілки (ліворуч) Half Arrow (right) Половина стрілки (праворуч) Double Bar Подвійна смуга From 67c446b31345e91074265c3ff7358b1662b24e1a Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Wed, 18 Nov 2026 18:16:47 -0800 Subject: [PATCH 67/78] PSD import: a knockout that cuts nothing gives back the warnings of a merge it left short of memory A visible knockout whose trial merge cut nothing kept the warnings that drawing the layers below it recorded while its canvas was held. A merge below it that only failed for want of that memory then came in merged, with a warning that it hadn't been applied. Such a trial now gives back what it counted, and the layers count again when they come in. The PSD catalog test compares the whole numbers of each warning and its translation, and checks that each complete catalog puts the translated reason inside the warnings that carry one. --- crates/engine/src/cmd/fileio/psdlayers.rs | 11 ++++++++++ .../engine/src/cmd/fileio/tests_psdlayers.rs | 22 +++++++++++++++++++ crates/ui-egui/src/i18n/tests.rs | 11 ++++++---- 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/crates/engine/src/cmd/fileio/psdlayers.rs b/crates/engine/src/cmd/fileio/psdlayers.rs index 3779b72745..17e6c3f814 100644 --- a/crates/engine/src/cmd/fileio/psdlayers.rs +++ b/crates/engine/src/cmd/fileio/psdlayers.rs @@ -863,6 +863,8 @@ struct Builder<'a, F> { laid_blank: Vec, /// The groups of both, in the order they were found. blank_log: Vec, + /// How many times a merge was counted as not made because it needed more memory than allowed. + squeezed: usize, } impl [f32; 3]> Builder<'_, F> { @@ -1274,6 +1276,7 @@ impl [f32; 3]> Builder<'_, F> { /// Count record `i` as a clipped layer left unclipped (once). fn unclip(&mut self, i: usize) { + self.squeezed += 1; if let Some(s) = self.unclipped.get_mut(i) && !*s { @@ -1305,6 +1308,7 @@ impl [f32; 3]> Builder<'_, F> { if self.knocks(&u, &out, level)? { let saved = self.saved(); let noted = self.noted_so_far(); + let squeezed = self.squeezed; let outer = self.try_from_here(); let knocked = self.knock(&out, &u)?; self.tried(outer, u.visible && matches!(knocked, Knocked::Merged(_)))?; @@ -1334,9 +1338,14 @@ impl [f32; 3]> Builder<'_, F> { self.restore(saved)?; self.unnote(noted); } + // A merge below it that its held canvas left without the memory it needed may + // be made when they come in without it: what drawing them counted is given back + // and counted again then. + Knocked::Nothing if self.squeezed != squeezed => self.restore(saved)?, Knocked::Nothing => self.refund(saved.spent)?, Knocked::TooLarge => { self.restore(saved)?; + self.squeezed += 1; self.unknock(u.record); } } @@ -1382,6 +1391,7 @@ impl [f32; 3]> Builder<'_, F> { } } else { self.restore(saved)?; + self.squeezed += 1; self.notes.unmerged += 1; u.blend = Blend::Mode(BlendMode::Normal); out.push(u); @@ -2025,6 +2035,7 @@ pub(super) fn import( blank: vec![None; records.len()], laid_blank: vec![false; records.len()], blank_log: vec![], + squeezed: 0, }; let layers = b.list(&items, Level::Top)?; // A drawing for a knockout or a clip leaves hidden layers out; those that came in anyway aren't. diff --git a/crates/engine/src/cmd/fileio/tests_psdlayers.rs b/crates/engine/src/cmd/fileio/tests_psdlayers.rs index d197658c20..d5dccfd662 100644 --- a/crates/engine/src/cmd/fileio/tests_psdlayers.rs +++ b/crates/engine/src/cmd/fileio/tests_psdlayers.rs @@ -890,6 +890,28 @@ fn a_knockout_merge_past_the_memory_allowed_leaves_the_layers_apart() { } } +/// A knockout that cuts nothing gives back what drawing the layers below it counted: here a +/// knockout at 0 fill beside a group, whose own knockout doesn't fit 192 bytes while the outer +/// knockout's canvas is held, but merges when the group comes in. +#[test] +fn a_knockout_that_cuts_nothing_doesnt_keep_what_drawing_below_it_counted() { + let cms = |c: [f32; 4]| [c[0], c[1], c[2]]; + let layers = [ + group_end(), + group_end(), + layer("Opaque", [0, 0, 2, 2], [255, 0, 0, 255]), + knockout(layer("Inner cut", [0, 0, 1, 2], [0, 0, 255, 255]), 1, 0), + group("Inner", b"norm"), + knockout(layer("Outer cut", [2, 2, 4, 4], [0, 0, 255, 255]), 1, 0), + group("Outer", b"norm"), + ]; + let (doc, warnings) = psdlayers::import(&file(4, 4, &layers, 8, false, false), false, 192, cms).unwrap().unwrap(); + let outer = doc.layers[0].children().unwrap(); + assert_eq!(outer.iter().map(|c| name(c)).collect::>(), ["Inner", "Outer cut"], "{warnings:?}"); + assert_eq!(outer[0].children().unwrap().iter().map(|c| name(c)).collect::>(), ["Opaque + Inner cut"], "{warnings:?}"); + assert!(warnings.is_empty(), "{warnings:?}"); +} + /// A knockout merge that can't be made leaves the import the whole allowance for reading the layers /// apart: here the merge decodes 22 layers over one another before the layer beside them makes its /// canvas too large, which used up nearly all of eight times 64 KiB. The merge has that allowance diff --git a/crates/ui-egui/src/i18n/tests.rs b/crates/ui-egui/src/i18n/tests.rs index 8cdd1a490e..34d4c3f9f1 100644 --- a/crates/ui-egui/src/i18n/tests.rs +++ b/crates/ui-egui/src/i18n/tests.rs @@ -625,12 +625,15 @@ fn psd_import_strings_are_in_complete_catalogs() { for s in &shown { let tr = message(lang, s); assert_ne!(&tr, s, "{code}"); - for n in numbers(s) { - assert!(tr.contains(&n), "{code}: {tr} lost {n}"); - } + let (mut source, mut translated) = (numbers(s), numbers(&tr)); + source.sort(); + translated.sort(); + assert_eq!(source, translated, "{code}: {tr}"); } for (s, inner) in [(unread_slices, nested), (unread_layers, damaged)] { - assert!(!message(lang, s).contains(inner), "{code}: {s}"); + let reason = message(lang, inner); + assert_ne!(reason, inner, "{code}"); + assert!(message(lang, s).contains(&reason), "{code}: {s}"); } assert!(message(lang, &merged).contains("Hue, Luminosity"), "{code}"); assert!(message(lang, &opened_with_notes(1, &one)).ends_with(&message(lang, &one)), "{code}"); From eb7f64d5b3311f5995f4ccebb288b6a0f7b2e244 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Wed, 18 Nov 2026 18:25:27 -0800 Subject: [PATCH 68/78] Transform: a shape turn past the coordinate limit is an error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - object.setLiveShape checks every shape named in `ids` against the coordinate limit (±4,000,000 pt) after the edit, so a rectangle, ellipse or polygon that is not selected can no longer be turned out of range; the call is an error and changes nothing. - LiveShape::set_shape_angle brings the angle into [0, 360) before it works out the turn, so a very large angle reaches the same final angle from any starting angle. - The params text and docs/mcp.md say that `null` counts as an omitted key, that a pixel-aligned shape goes back on the pixel grid after the turn, and that a turn out of range is an error. - The panel test reads the Rotate and Angle fields by name, and checks that the Angle field is empty for mixed angles. --- crates/doc/src/node/live_shape.rs | 2 ++ crates/doc/src/node/tests.rs | 14 ++++++++ crates/engine/src/cmd/object/commands.rs | 2 +- crates/engine/src/cmd/object/shape.rs | 5 +++ crates/engine/src/tests/livecorners.rs | 22 +++++++++++++ crates/ui-egui/src/panels/transform/tests.rs | 34 +++++++++++++++----- docs/mcp.md | 11 ++++--- 7 files changed, 77 insertions(+), 13 deletions(-) diff --git a/crates/doc/src/node/live_shape.rs b/crates/doc/src/node/live_shape.rs index 42544be99b..0a17301331 100644 --- a/crates/doc/src/node/live_shape.rs +++ b/crates/doc/src/node/live_shape.rs @@ -164,6 +164,8 @@ impl LiveShape { if !angle.is_finite() { return; } + // Brought into [0, 360) first: `now - angle` loses `now` for a very large angle. + let angle = angle.rem_euclid(360.0); let (xf, local) = match self { LiveShape::Rectangle { w, h, xf, .. } | LiveShape::Ellipse { w, h, xf, .. } => (xf, Point::new(*w / 2.0, *h / 2.0)), LiveShape::Polygon { xf, .. } => (xf, Point::ZERO), diff --git a/crates/doc/src/node/tests.rs b/crates/doc/src/node/tests.rs index 789e0f66b2..cdcbf2cf85 100644 --- a/crates/doc/src/node/tests.rs +++ b/crates/doc/src/node/tests.rs @@ -184,6 +184,20 @@ fn a_polygon_reports_and_takes_its_radius_angle_and_equal_sides() { assert_eq!((e.polygon_radius(), e.polygon_angle()), (None, None)); } +/// A very large angle turns a rectangle to that angle modulo 360, whatever angle it had before. +#[test] +fn a_shape_takes_a_very_large_angle() { + let close = |a: f64, b: f64| (a - b).abs() < 1e-6; + let want = 1e20f64.rem_euclid(360.0); + for turned in [0.0, 90.0] { + let xf = Affine::translate((50.0, 50.0)) * Affine::rotate(-f64::to_radians(turned)); + let mut r = LiveShape::Rectangle { w: 100.0, h: 50.0, radii: [0.0; 4], kinds: Default::default(), radii_relative: false, xf }; + assert!(close(r.shape_angle().unwrap(), turned), "{:?}", r.shape_angle()); + r.set_shape_angle(1e20); + assert!(close(r.shape_angle().unwrap(), want), "from {turned}°: {:?}, not {want}", r.shape_angle()); + } +} + /// A node holding a live rectangle (`w` × `h`, all radii `r`, placed by `xf`) and its path. fn live_rect(w: f64, h: f64, r: f64, xf: Affine) -> Node { let live = LiveShape::Rectangle { w, h, radii: [r; 4], kinds: Default::default(), radii_relative: false, xf }; diff --git a/crates/engine/src/cmd/object/commands.rs b/crates/engine/src/cmd/object/commands.rs index d0ab36bfd0..39e9d3eab5 100644 --- a/crates/engine/src/cmd/object/commands.rs +++ b/crates/engine/src/cmd/object/commands.rs @@ -305,7 +305,7 @@ pub fn specs() -> Vec { "Live Shape Properties", [], None, - "{id?, ids?, radius?: pt (or % of each corner's maximum when `relativeRadii` is true), kind?: \"round\"|\"invertedRound\"|\"chamfer\", relativeRadii?: bool (Relative rounding, as in the reference app: store radii as fractions of each corner's maximum so they scale with the shape), corners?: [i…], items?: [{id, corners?: [i…]}] (several objects, each with its own corners, in place of ids and corners: the canvas's corner widgets across a selection), sides?: n, polygonAngle?: degrees (counter-clockwise from its first vertex straight up), polygonRadius?: pt (centre to vertex), sideLength?: pt (sets the radius), makeSidesEqual?: true (a polygon scaled unevenly: drops the uneven scale and shear, keeping its centre, angle and mean radius), pieStart?, pieEnd?: degrees (an ellipse's pie, counter-clockwise from 3 o'clock; 0 to 360 is the whole ellipse), invertPie?: true (swaps them: the other part of the ellipse), constrainPie?: bool (Constrain Pie Angle: with one of pieStart and pieEnd, not both and not with invertPie, the other angle moves by as much, so each ellipse keeps its span), lineLength?: pt (a live line's length, above 0; its first end stays), lineAngle?: degrees (a live line's angle, counter-clockwise from 3 o'clock, from its first end to its second; it turns about its midpoint), rectangleAngle?: degrees (a live rectangle's, counterclockwise from level), ellipseAngle?: degrees (a live ellipse's, counterclockwise from level; its pie turns with it)} (rectangleAngle, ellipseAngle and polygonAngle turn each shape of that kind about its own center and leave other objects as they are; an angle that is not a number is an error; Live Corners on any path: radius and kind set its corners (anchors that aren't smooth, where two sides, straight or curved (#1144), meet at an angle): `corners` (anchor indices of the path with its corners uncut, counting every subpath's anchors in order: a rectangle's 0 top-left, 1 top-right, 2 bottom-right, 3 bottom-left; a polygon's from the first vertex clockwise), else the corners with a Direct-Selected anchor, else every corner; each radius is drawn no larger than half the corner's shorter side allows; a path that isn't a live shape keeps its uncut outline so its corners stay editable, and is plain again once none is cut; sides: a polygon's, which keep the radius they shared; the polygon params apply in that order: sides, makeSidesEqual, polygonAngle, then sideLength or else polygonRadius; a line's lineLength applies before its lineAngle)", + "{id?, ids?, radius?: pt (or % of each corner's maximum when `relativeRadii` is true), kind?: \"round\"|\"invertedRound\"|\"chamfer\", relativeRadii?: bool (Relative rounding, as in the reference app: store radii as fractions of each corner's maximum so they scale with the shape), corners?: [i…], items?: [{id, corners?: [i…]}] (several objects, each with its own corners, in place of ids and corners: the canvas's corner widgets across a selection), sides?: n, polygonAngle?: degrees (counter-clockwise from its first vertex straight up), polygonRadius?: pt (centre to vertex), sideLength?: pt (sets the radius), makeSidesEqual?: true (a polygon scaled unevenly: drops the uneven scale and shear, keeping its centre, angle and mean radius), pieStart?, pieEnd?: degrees (an ellipse's pie, counter-clockwise from 3 o'clock; 0 to 360 is the whole ellipse), invertPie?: true (swaps them: the other part of the ellipse), constrainPie?: bool (Constrain Pie Angle: with one of pieStart and pieEnd, not both and not with invertPie, the other angle moves by as much, so each ellipse keeps its span), lineLength?: pt (a live line's length, above 0; its first end stays), lineAngle?: degrees (a live line's angle, counter-clockwise from 3 o'clock, from its first end to its second; it turns about its midpoint), rectangleAngle?: degrees (a live rectangle's, counterclockwise from level), ellipseAngle?: degrees (a live ellipse's, counterclockwise from level; its pie turns with it)} (rectangleAngle, ellipseAngle and polygonAngle turn each shape of that kind about its own center and leave other objects as they are; a pixel-aligned shape then goes back on the pixel grid, as after other edits, which can move its center or change its size; an angle that is not a number is an error, and `null` counts as an omitted key; a shape that a turn would take past the coordinate limit (±4,000,000 pt) is an error that changes nothing; Live Corners on any path: radius and kind set its corners (anchors that aren't smooth, where two sides, straight or curved (#1144), meet at an angle): `corners` (anchor indices of the path with its corners uncut, counting every subpath's anchors in order: a rectangle's 0 top-left, 1 top-right, 2 bottom-right, 3 bottom-left; a polygon's from the first vertex clockwise), else the corners with a Direct-Selected anchor, else every corner; each radius is drawn no larger than half the corner's shorter side allows; a path that isn't a live shape keeps its uncut outline so its corners stay editable, and is plain again once none is cut; sides: a polygon's, which keep the radius they shared; the polygon params apply in that order: sides, makeSidesEqual, polygonAngle, then sideLength or else polygonRadius; a line's lineLength applies before its lineAngle)", has_selection, set_live_shape ), diff --git a/crates/engine/src/cmd/object/shape.rs b/crates/engine/src/cmd/object/shape.rs index dcefca2501..b2e69cc279 100644 --- a/crates/engine/src/cmd/object/shape.rs +++ b/crates/engine/src/cmd/object/shape.rs @@ -361,6 +361,11 @@ pub(super) fn set_live_shape(s: &mut Session, p: &Value) -> Result { for id in &ids { super::pixelgrid::resnap(d, *id); } + // A shape named in `ids` and not selected is not checked after the edit: one that a turn or + // a new radius would take past the coordinate limit is an error here, and nothing changes. + if !crate::sanity::objects_in_range(d, &ids) { + return Err(bad("object.setLiveShape", format!("coordinate out of range (limit ±{MAX_COORD} pt)"))); + } Ok(()) })?; ok() diff --git a/crates/engine/src/tests/livecorners.rs b/crates/engine/src/tests/livecorners.rs index 89958d66f1..1ea6e5091f 100644 --- a/crates/engine/src/tests/livecorners.rs +++ b/crates/engine/src/tests/livecorners.rs @@ -663,6 +663,28 @@ fn a_rectangle_and_an_ellipse_take_their_angle() { assert!(close(angle(&s, rect), 20.0) && close(before.x, after.x) && close(before.y, after.y), "{before:?} → {after:?}"); } +/// A shape named in `ids` that a turn would take past the coordinate limit (±4,000,000 pt) is an +/// error that changes nothing, whether or not it is selected. +#[test] +fn a_turn_past_the_coordinate_limit_is_an_error() { + let mut s = Session::new(); + s.execute("file.new", &json!({"width": 400, "height": 400})).unwrap(); + let mut add = |cmd: &str, p: Value| s.execute(cmd, &p).unwrap()["id"].as_u64().unwrap(); + // Each reaches within 10 pt of the limit and past it when turned. + let rect = add("shape.rectangle", json!({"x": 3_999_890, "y": 100, "width": 100, "height": 100})); + let ellipse = add("shape.ellipse", json!({"x": 3_999_950, "y": 100, "width": 40, "height": 100})); + let polygon = add("shape.polygon", json!({"cx": 3_999_955, "cy": 200, "radius": 50, "sides": 6})); + for (id, key, angle) in [(rect, "rectangleAngle", 45), (ellipse, "ellipseAngle", 90), (polygon, "polygonAngle", 90)] { + for selected in [false, true] { + s.execute("select.set", &json!({"ids": if selected { vec![id] } else { vec![] }})).unwrap(); + let (doc, steps) = (s.doc().unwrap().doc.clone(), s.doc().unwrap().history.undo.len()); + let e = s.execute("object.setLiveShape", &json!({"ids": [id], key: angle})).unwrap_err(); + assert!(e.to_string().contains("out of range"), "{key}, selected {selected}: {e}"); + assert!(*s.doc().unwrap().doc == *doc && s.doc().unwrap().history.undo.len() == steps, "{key}, selected {selected}: changed"); + } + } +} + /// A live line's Line Properties: Line Length keeps its first end in place, Line Angle (degrees /// counterclockwise, any finite value brought into 0 to 360) turns it about its midpoint, the /// length applies before the angle, every selected line takes them in one undo step, and a value diff --git a/crates/ui-egui/src/panels/transform/tests.rs b/crates/ui-egui/src/panels/transform/tests.rs index 0e86ac39fe..dfd6ed66b3 100644 --- a/crates/ui-egui/src/panels/transform/tests.rs +++ b/crates/ui-egui/src/panels/transform/tests.rs @@ -171,21 +171,39 @@ fn a_rectangle_and_an_ellipse_show_their_angle() { ids.push(id); } app.run("select.set", json!({"ids": [ids[0]]})).unwrap(); - for draw in [show as fn(&mut VectorcraftApp, &mut Ui), crate::panels::properties::transform_section] { - let shown = texts(&mut app, draw); - for t in ["Angle:", "0°", "30°"] { - assert!(shown.iter().any(|s| s == t), "{t} in {shown:?}"); - } + for (draw, rotate) in [(show as fn(&mut VectorcraftApp, &mut Ui), "Rotate"), (crate::panels::properties::transform_section, "Rotation")] { + assert_eq!(field_text(&mut app, draw, rotate), "0°", "{shape}: {rotate}"); + assert_eq!(field_text(&mut app, draw, "Angle:"), "30°", "{shape}: {rotate}"); } assert!(texts(&mut app, show).iter().any(|s| s == heading), "{heading}"); app.run("select.set", json!({"ids": ids})).unwrap(); - let shown = texts(&mut app, show); - assert!(shown.iter().any(|s| s == "Angle:") && !shown.iter().any(|s| s == "30°" || s == "60°"), "{shape}: {shown:?}"); + assert_eq!(field_text(&mut app, show, "Angle:"), "", "{shape}: mixed angles"); app.run("select.set", json!({"ids": [ids[1]]})).unwrap(); - assert!(texts(&mut app, show).iter().any(|s| s == "60°"), "{shape}"); + assert_eq!(field_text(&mut app, show, "Angle:"), "60°", "{shape}"); } } +/// The text in `draw`'s input named `label`, read from the accessibility tree of a headless frame. +fn field_text(app: &mut VectorcraftApp, draw: fn(&mut VectorcraftApp, &mut Ui), label: &str) -> String { + use egui_kittest::kittest::Queryable; + let state = std::mem::replace(app, VectorcraftApp::new(vectorcraft_engine::Session::new(), Default::default())); + let mut fonts = false; + let mut h = egui_kittest::Harness::builder().with_size(egui::vec2(320.0, 900.0)).with_accessibility_check(false).build_ui_state( + move |ui, app: &mut VectorcraftApp| { + if !std::mem::replace(&mut fonts, true) { + crate::theme::install_fonts(ui.ctx()); + return; + } + draw(app, ui); + }, + state, + ); + h.run_steps(3); + let text = h.get_by_role_and_label(egui::accesskit::Role::TextInput, label).value().unwrap_or_default(); + *app = h.into_state(); + text +} + /// Ellipse Properties' Constrain Pie Angle link, in the Transform panel and the Properties panel's /// Transform section: off at first, a click or Space with the keyboard on it toggles it, and while /// it is on a typed Pie Start or End Angle moves the other angle by as much, keeping the span, in diff --git a/docs/mcp.md b/docs/mcp.md index 071a5f21f3..16b212f64f 100644 --- a/docs/mcp.md +++ b/docs/mcp.md @@ -7061,11 +7061,14 @@ A live rectangle's Rectangle Angle and a live ellipse's Ellipse Angle are `recta (https://helpx.adobe.com/illustrator/desktop/draw-shapes-and-paths/modify-live-shapes/live-shape-properties.html) lists both as the shape's rotation on the canvas from 0° to 360°. The rest are VectorCraft's own rules: each selected shape of that kind turns about its own center, keeping its size, corners and pie (an ellipse's pie turns with it), and other -objects stay as they are. The Transform and Properties panels show the angle in each shape's Properties section, blank -when the selected shapes of that kind differ. It is the shape's own angle: after Reset Bounding Box +objects stay as they are. A pixel-aligned shape then goes back on the pixel grid, as after other edits, which can move +its center or change its size. The Transform and Properties panels show the angle in each shape's Properties section, +blank when the selected shapes of that kind differ. It is the shape's own angle: after Reset Bounding Box (`object.resetBoundingBox`) the Rotate field reads 0° while the shape angle keeps the turn. An angle that is not a -number is an error and changes nothing, and the angle the shape already has records no undo step; the same holds for -`polygonAngle`, and the Polygon Properties angle is blank, too, when the selected polygons differ. +number is an error and changes nothing (`null` counts as an omitted key), a shape that the turn would take past the +coordinate limit (±4,000,000 pt) is an error that changes nothing, whether or not it is selected, and the angle the +shape already has records no undo step; the same holds for `polygonAngle`, and the Polygon Properties angle is blank, +too, when the selected polygons differ. ```json {"name":"run_command","arguments":{"command":"object.setLiveShape","params":{"rectangleAngle":30}}} From 2108617fa5ce248ddcd2f37ee86200691cb55097 Mon Sep 17 00:00:00 2001 From: yoriswind Date: Wed, 18 Nov 2026 21:13:03 -0800 Subject: [PATCH 69/78] Image Trace: preserve sampler gesture and target ownership Keep consumed releases separate from fresh canvas presses, use click release positions, share the engine trace target selector, reject source misses before sampling, and return from the temporary tool without fresh activation. --- crates/engine/src/cmd.rs | 2 +- crates/engine/src/cmd/buildcmds.rs | 2 +- crates/engine/src/cmd/buildcmds/trace.rs | 44 +-- crates/ui-egui/src/canvas.rs | 138 +++++++++- crates/ui-egui/src/canvas/input.rs | 15 +- crates/ui-egui/src/panels/image_trace.rs | 40 ++- .../tests/image_trace_ignore_sampler.rs | 257 ++++++++++++++++++ 7 files changed, 435 insertions(+), 63 deletions(-) diff --git a/crates/engine/src/cmd.rs b/crates/engine/src/cmd.rs index 359fc8761f..250110527c 100644 --- a/crates/engine/src/cmd.rs +++ b/crates/engine/src/cmd.rs @@ -903,7 +903,7 @@ pub use gradpresets::{GradientPreset, GradientPresetEntry}; pub use buildcmds::{TracePreset, TracePresetChange}; /// An Image Trace made off the UI thread, and what it traced (#3098). -pub use buildcmds::{TraceRun, Traced}; +pub use buildcmds::{TraceRun, Traced, image_trace_target}; /// The saved Image Trace presets' revision and latest changes ([`crate::Session`] keeps them). pub(crate) use buildcmds::TracePresetChanges; diff --git a/crates/engine/src/cmd/buildcmds.rs b/crates/engine/src/cmd/buildcmds.rs index b739ca5f7e..905372fd06 100644 --- a/crates/engine/src/cmd/buildcmds.rs +++ b/crates/engine/src/cmd/buildcmds.rs @@ -42,7 +42,7 @@ pub(crate) use live_paint::{LivePaintMove, check_part_name, clear_part_name, iso use live_paint::{lp_expand, lp_fill, lp_gap_options, lp_info, lp_make, lp_merge, lp_release, lp_stroke_edge}; use shape_builder::{sb_merge, sb_regions}; pub(crate) use trace::TracePresetChanges; -pub use trace::{TracePreset, TracePresetChange, TraceRun, Traced}; +pub use trace::{TracePreset, TracePresetChange, TraceRun, Traced, image_trace_target}; use trace::{trace_expand, trace_make, trace_presets_delete, trace_presets_save, trace_release, trace_set_view}; /// Name of an Image Trace group. diff --git a/crates/engine/src/cmd/buildcmds/trace.rs b/crates/engine/src/cmd/buildcmds/trace.rs index 203fd62338..3ef8edc5c4 100644 --- a/crates/engine/src/cmd/buildcmds/trace.rs +++ b/crates/engine/src/cmd/buildcmds/trace.rs @@ -600,6 +600,30 @@ struct Prepared { library: Vec<([u8; 3], Paint)>, } +/// The object `imageTrace.make` would trace, without preparing settings or reading image bytes. +pub fn image_trace_target(s: &Session, p: &Value) -> Result { + target_image(s, "imageTrace.make", p).map(|(target, _)| target) +} + +fn target_image(s: &Session, c: &str, p: &Value) -> Result<(NodeId, Box)> { + let roots = root_ids(s, p)?; + let d = &s.doc()?.doc; + roots + .iter() + .find_map(|r| { + let n = d.node(*r)?; + match &n.kind { + NodeKind::Image(i) => Some((*r, i.clone())), + _ if is_trace_group(n) => match &n.children()?.first()?.kind { + NodeKind::Image(i) => Some((*r, i.clone())), + _ => None, + }, + _ => None, + } + }) + .ok_or_else(|| bad(c, "select an image (or an Image Trace group)")) +} + /// What command `c` with params `p` traces, and how, from the session: everything but the trace. fn prepare(s: &Session, c: &str, p: &Value) -> Result { let mut params = trace_params(s, c, p)?; @@ -619,25 +643,7 @@ fn prepare(s: &Session, c: &str, p: &Value) -> Result { None if is(tr::preset(named)) || is(tr::enhanced_preset(named)) => named.to_string(), None => "Custom".to_string(), }; - let roots = root_ids(s, p)?; - // The image (inside a trace group, or selected directly). - let (target, image) = { - let d = &s.doc()?.doc; - roots - .iter() - .find_map(|r| { - let n = d.node(*r)?; - match &n.kind { - NodeKind::Image(i) => Some((*r, i.clone())), - _ if is_trace_group(n) => match &n.children()?.first()?.kind { - NodeKind::Image(i) => Some((*r, i.clone())), - _ => None, - }, - _ => None, - } - }) - .ok_or_else(|| bad(c, "select an image (or an Image Trace group)"))? - }; + let (target, image) = target_image(s, c, p)?; if by_color && s.doc()?.doc.node(target).is_some_and(vectorcraft_render::effects::has_pathfinder) { return Err(bad(c, LIVE_PATHFINDER_BY_COLOR)); } diff --git a/crates/ui-egui/src/canvas.rs b/crates/ui-egui/src/canvas.rs index d1406d77d6..bfb89b5833 100644 --- a/crates/ui-egui/src/canvas.rs +++ b/crates/ui-egui/src/canvas.rs @@ -490,7 +490,6 @@ fn reset_ignore_sampler_clicks(ui: &Ui, id: egui::Id) { /// Reclassify only the two clicks whose raw history can still contain a consumed pick. /// Other widgets' clicks count too, as they do in egui; its pointer state stays untouched. fn ignore_sampler_clicks(ui: &Ui, id: egui::Id, consumed: bool) { - let (delay, distance) = ui.ctx().options(|o| (o.input_options.max_double_click_delay, o.input_options.max_click_dist)); let (clicked, primary, at, time) = ui.input(|i| { // A hover move after the release is not the position egui put in its click history. let at = i.events.iter().rev().find_map(|event| match event { @@ -508,6 +507,11 @@ fn ignore_sampler_clicks(ui: &Ui, id: egui::Id, consumed: bool) { return; } let Some(at) = at else { return }; + record_ignore_sampler_click(ui, id, at, time, primary); +} + +fn record_ignore_sampler_click(ui: &Ui, id: egui::Id, at: Pos2, time: f64, primary: bool) { + let (delay, distance) = ui.ctx().options(|o| (o.input_options.max_double_click_delay, o.input_options.max_click_dist)); ui.data_mut(|data| { let history_id = id.with("image-trace-clicks"); let Some(mut clicks) = data.remove_temp::(history_id) else { return }; @@ -551,20 +555,126 @@ fn clear_ignore_sampler_gesture(ui: &Ui, id: egui::Id) { }); } -fn begin_ignore_sampler_pointer(ui: &Ui, id: egui::Id, cancelled: bool) -> bool { - let (pressed, released, down) = ui.input(|i| (i.pointer.primary_pressed(), i.pointer.primary_released(), i.pointer.primary_down())); - if pressed { - // A fresh press replaces the complete sampler gesture if its release was not observed. - if ignore_sampler_owns_primary(ui, id) { - clear_ignore_sampler_gesture(ui, id); +#[derive(Clone, Copy)] +struct IgnoreSamplerRelease { + button: egui::PointerButton, + at: Pos2, + clicked: bool, +} + +#[derive(Default)] +struct IgnoreSamplerPointer { + owned: bool, + replaced: bool, + ordinary_pressed: bool, + consumed_release: bool, + releases: Vec, +} + +/// Attribute a fresh press after an owned release before egui's per-frame flags lose their order. +fn ignore_sampler_pointer_frame(ui: &Ui, id: egui::Id, cancelled: bool) -> IgnoreSamplerPointer { + let owned = ignore_sampler_owns_primary(ui, id); + if !owned && !cancelled { + return IgnoreSamplerPointer::default(); + } + let (distance, duration) = ui.ctx().options(|o| (o.input_options.max_click_dist, o.input_options.max_click_duration)); + ui.input(|i| { + let mut frame = IgnoreSamplerPointer { owned, ..Default::default() }; + let mut first_press_owned = cancelled; + let mut press = None; + let mut moved = false; + let mut primary_pressed = false; + for event in &i.events { + match event { + egui::Event::PointerMoved(at) => { + if let Some((_, origin)) = press { + moved |= Pos2::distance(origin, *at) > distance; + } + } + egui::Event::PointerButton { pos, button, pressed, .. } => { + if *pressed { + press = Some((*button, *pos)); + moved = false; + if *button == egui::PointerButton::Primary { + primary_pressed = true; + frame.replaced |= frame.owned; + // An observed old Up ends that cancelled sequence; without it, + // a fresh invalid press keeps the existing cancellation gate. + frame.owned = first_press_owned && !frame.consumed_release; + first_press_owned = false; + frame.ordinary_pressed |= !frame.owned; + } + } else { + // A fresh primary click needs its own Down, not an earlier owned click. + // Slop/origin are shared by buttons in egui; each press resets them, and + // a release clears its press time. In-frame presses have the same time. + let clicked = ignore_sampler_release_clicked(press, moved, primary_pressed, *button, duration); + ignore_sampler_release(&mut frame, *button, *pos, clicked); + if *button == egui::PointerButton::Primary { + primary_pressed = false; + } + press = None; + } + } + _ => {} + } } - if cancelled { - ui.data_mut(|data| data.insert_temp(ignore_sampler_primary_id(id), true)); + frame + }) +} + +fn ignore_sampler_release_clicked( + press: Option<(egui::PointerButton, Pos2)>, + moved: bool, + primary_pressed: bool, + button: egui::PointerButton, + duration: f64, +) -> bool { + let matched = if button == egui::PointerButton::Primary { primary_pressed } else { press.is_some_and(|(b, _)| b == button) }; + matched && !moved && (press.is_none() || !matches!(duration.partial_cmp(&0.0), Some(std::cmp::Ordering::Less))) +} + +fn ignore_sampler_release(frame: &mut IgnoreSamplerPointer, button: egui::PointerButton, at: Pos2, clicked: bool) { + if button == egui::PointerButton::Primary && frame.owned { + frame.consumed_release = true; + frame.releases.clear(); + } else if frame.consumed_release { + frame.releases.push(IgnoreSamplerRelease { button, at, clicked }); + } +} + +fn ignore_sampler_frame_clicks(ui: &Ui, id: egui::Id, frame: &IgnoreSamplerPointer, consumed: bool) { + if !frame.consumed_release || !frame.ordinary_pressed { + ignore_sampler_clicks(ui, id, consumed); + return; + } + // Consume the old sequence, then classify only subsequent ordinary releases. A new Down + // still reaches the tool when the last release belongs to the consumed sequence. + reset_ignore_sampler_clicks(ui, id); + ui.data_mut(|data| data.insert_temp(id.with("image-trace-click-count"), 0u8)); + let time = ui.input(|i| i.time); + for release in &frame.releases { + let primary = release.button == egui::PointerButton::Primary; + if release.clicked { + record_ignore_sampler_click(ui, id, release.at, time, primary); + } else if primary { + ui.data_mut(|data| data.insert_temp(id.with("image-trace-click-count"), 0u8)); } } - let consumed = ignore_sampler_owns_primary(ui, id) && (pressed || released || down); - ignore_sampler_clicks(ui, id, consumed); - consumed +} + +fn begin_ignore_sampler_pointer(ui: &Ui, id: egui::Id, cancelled: bool) -> (bool, bool) { + let frame = ignore_sampler_pointer_frame(ui, id, cancelled); + if frame.replaced { + // This also replaces an abandoned sampler Down whose release was not observed. + clear_ignore_sampler_gesture(ui, id); + } + if frame.owned { + ui.data_mut(|data| data.insert_temp(ignore_sampler_primary_id(id), true)); + } + let consumed = frame.owned && ui.input(|i| i.pointer.primary_pressed() || i.pointer.primary_released() || i.pointer.primary_down()); + ignore_sampler_frame_clicks(ui, id, &frame, consumed); + (consumed, frame.ordinary_pressed) } fn end_ignore_sampler_pointer(ui: &Ui, id: egui::Id) { @@ -589,8 +699,8 @@ fn observe_hidden_ignore_sampler_pointer(app: &VectorcraftApp, ui: &Ui, home_sho /// A sampler press keeps its release, even if its Down completes or its binding expires held. fn input_after_sampler_refresh(app: &mut VectorcraftApp, ui: &Ui, resp: &egui::Response, rect: egui::Rect, cancelled: bool) { - let consumed = begin_ignore_sampler_pointer(ui, resp.id, cancelled); - if !consumed && (!cancelled || !ui.input(|i| i.pointer.any_pressed())) { + let (consumed, ordinary_pressed) = begin_ignore_sampler_pointer(ui, resp.id, cancelled); + if !consumed && (ordinary_pressed || !cancelled || !ui.input(|i| i.pointer.any_pressed())) { canvas_input(app, ui, resp, rect); } end_ignore_sampler_pointer(ui, resp.id); diff --git a/crates/ui-egui/src/canvas/input.rs b/crates/ui-egui/src/canvas/input.rs index 3aa3b48613..748ad07654 100644 --- a/crates/ui-egui/src/canvas/input.rs +++ b/crates/ui-egui/src/canvas/input.rs @@ -136,7 +136,7 @@ pub(super) fn handle_input(app: &mut VectorcraftApp, ui: &Ui, resp: &egui::Respo drag_held(app, ui, &f, d, p); } else { // The drag ends where its button went up: the moves after the release in this frame are hover. - drag_released(app, ui, &f, d, release_pos(ui, button).unwrap_or(p)); + drag_released(app, ui, &f, d, release_pos(ui, button, false).unwrap_or(p)); } } else if let Some(p) = hover_tool // A press on an artboard's name starts no drag: the moves while it is held are not hover. @@ -189,14 +189,14 @@ pub(super) fn handle_input(app: &mut VectorcraftApp, ui: &Ui, resp: &egui::Respo if !super::ignore_sampler_owns_primary(ui, resp.id) && super::primary_click_count(ui, resp) == 2 && !f.modal - && let Some(p) = at + && let Some(p) = release_pos(ui, egui::PointerButton::Primary, true).or(at) { double_click(app, ui, &f, p); } if !super::ignore_sampler_owns_primary(ui, resp.id) && super::primary_click_count(ui, resp) == 3 && !f.modal - && let Some(p) = at + && let Some(p) = release_pos(ui, egui::PointerButton::Primary, true).or(at) { triple_click(app, ui, &f, p); } @@ -638,13 +638,14 @@ fn triple_click(app: &mut VectorcraftApp, ui: &Ui, f: &Pointing, p: Pos2) { dispatch(app, &ev, view); } -/// Where `button` went up in this frame, if it did. -fn release_pos(ui: &Ui, button: egui::PointerButton) -> Option { +/// Where `button` went up: the first release ends a drag, the last classifies this frame's click. +fn release_pos(ui: &Ui, button: egui::PointerButton, last: bool) -> Option { ui.input(|i| { - i.events.iter().find_map(|e| match e { + let mut releases = i.events.iter().filter_map(|e| match e { egui::Event::PointerButton { pos, button: b, pressed: false, .. } if *b == button => Some(*pos), _ => None, - }) + }); + if last { releases.next_back() } else { releases.next() } }) } diff --git a/crates/ui-egui/src/panels/image_trace.rs b/crates/ui-egui/src/panels/image_trace.rs index 0303467c3c..b669f972b3 100644 --- a/crates/ui-egui/src/panels/image_trace.rs +++ b/crates/ui-egui/src/panels/image_trace.rs @@ -171,28 +171,17 @@ thread_local! { static TARGET_LOOKUPS: std::cell::Cell = const { std::cell::Cell::new(0) }; } -/// The object Trace acts on: the first selected image or Image Trace object in paint order, as -/// `imageTrace.make` takes it, else the first selected object. Only the selected images and Image -/// Trace objects are put in paint order. +/// The image or Image Trace object `imageTrace.make` takes from the selected roots, else the +/// first selected non-traceable object's metadata. Release and Expand keep their own selection scope. fn find_target(app: &VectorcraftApp) -> Target { let Some(st) = app.session.active() else { return Target::default() }; #[cfg(test)] TARGET_LOOKUPS.with(|n| n.set(n.get() + 1)); - let mut any_trace = false; - let traceable: Vec = st - .selection - .objects - .iter() - .copied() - .filter(|id| { - st.doc.node(*id).is_some_and(|n| { - let trace = is_trace(n); - any_trace |= trace; - trace || matches!(n.kind, NodeKind::Image(_)) - }) - }) - .collect(); - let node = st.doc.paint_order(traceable).into_iter().find_map(|id| st.doc.node(id)).or_else(|| first_node(app)); + let any_trace = st.selection.objects.iter().any(|id| st.doc.node(*id).is_some_and(is_trace)); + let node = vectorcraft_engine::cmd::image_trace_target(&app.session, &Value::Null) + .ok() + .and_then(|id| st.doc.node(id)) + .or_else(|| first_node(app).filter(|n| !is_trace(n) && !matches!(n.kind, NodeKind::Image(_)))); let Some(n) = node else { return Target { any_trace, ..Target::default() } }; Target { object: Some((st.uid, n.id)), @@ -388,6 +377,15 @@ fn sampled_ignore_color(app: &VectorcraftApp, s: &crate::state::TraceIgnoreSampl return None; } let pixel = image.xf.inverse() * point; + if !pixel.x.is_finite() + || !pixel.y.is_finite() + || pixel.x < 0.0 + || pixel.y < 0.0 + || pixel.x >= f64::from(image.width.max(1)) + || pixel.y >= f64::from(image.height.max(1)) + { + return None; + } let [r, g, b, alpha] = doc.images.get(&image.key)?.sample_object(pixel.x, pixel.y, (image.width, image.height), 1)?; (alpha != 0).then(|| format!("#{r:02x}{g:02x}{b:02x}")) } @@ -431,9 +429,9 @@ pub(crate) fn apply_ignore_color_sample(app: &mut VectorcraftApp, p: &Value) { } set_pstate(&ctx, "image-trace", st); ctx.request_repaint(); - // The old deferred SwitchTool ran after the panel accepted the color. Keep that order and - // fresh tool choice; a miss above has no switch request and remains armed. - app.select_tool(&s.back); + // Complete the temporary tool without treating its return as a fresh explicit tool choice. + // A miss above has no switch request and remains armed. + app.return_to_tool(&s.back); } /// The selected Image Trace object's View row (Control bar, Properties). diff --git a/crates/ui-egui/tests/image_trace_ignore_sampler.rs b/crates/ui-egui/tests/image_trace_ignore_sampler.rs index af8e9d6757..4496089271 100644 --- a/crates/ui-egui/tests/image_trace_ignore_sampler.rs +++ b/crates/ui-egui/tests/image_trace_ignore_sampler.rs @@ -1061,3 +1061,260 @@ fn review_followup_release_position_survives_a_later_hover_move() { assert!(ctx.input(|i| i.pointer.button_triple_clicked(PointerButton::Primary))); assert_eq!(app.session.active().unwrap().isolation, Some(group), "the fresh pair uses release positions, not subsequent hover positions"); } + +fn review_596866_button(at: Pos2, pressed: bool) -> Event { + Event::PointerButton { pos: at, button: PointerButton::Primary, pressed, modifiers: Default::default() } +} + +fn review_596866_owned_release_then_press(coalesced: bool) { + let (mut app, ctx, point, group) = review_gesture_group_fixture(); + click_control(&mut app, &ctx, SAMPLE_TIP); + app.run("select.none", json!({})).unwrap(); + let at = review_gesture_screen(&app, &ctx, point); + let (start, step) = review_gesture_times(&ctx); + review_gesture_press(&mut app, &ctx, at, start); + assert_eq!(app.session.tool_id(), "selection"); + assert!(app.ui.trace_ignore_sampler.is_none()); + assert!(ctx.input(|i| i.pointer.primary_down())); + let document = app.session.active().unwrap().doc.clone(); + let paint = app.session.paint.clone(); + let history = (app.session.active().unwrap().history.undo.len(), app.session.active().unwrap().history.redo.len()); + if coalesced { + frame_at(&mut app, &ctx, start + step, vec![review_596866_button(at, false), review_596866_button(at, true)]); + assert!(ctx.input(|i| i.pointer.primary_released() && i.pointer.primary_pressed() && i.pointer.primary_down())); + } else { + review_gesture_release(&mut app, &ctx, at, start + step); + assert_eq!(app.session.active().unwrap().selection.objects, Vec::::new(), "CONTROL: the owned Up remains consumed"); + review_gesture_press(&mut app, &ctx, at, start + 3.0 * step); + } + let before_release = review_gesture_observation(&app, &ctx); + review_gesture_release(&mut app, &ctx, at, start + 4.0 * step); + let after_release = review_gesture_observation(&app, &ctx); + assert!(after_release.0 && !after_release.1, "the owned prefix and one fresh click form egui's raw Double"); + assert!( + before_release.2 == vec![group] && before_release.3.is_none() && after_release.2 == vec![group] && after_release.3.is_none(), + "coalesced={coalesced}: the first fresh click must select without isolation: before={before_release:?}, after={after_release:?}" + ); + assert_eq!(app.session.active().unwrap().doc, document); + assert_eq!(app.session.paint, paint); + assert_eq!((app.session.active().unwrap().history.undo.len(), app.session.active().unwrap().history.redo.len()), history); + if !coalesced { + review_gesture_press(&mut app, &ctx, at, start + 6.0 * step); + review_gesture_release(&mut app, &ctx, at, start + 7.0 * step); + assert_eq!(app.session.active().unwrap().isolation, Some(group), "CONTROL: the second fresh click still isolates"); + } +} + +#[test] +fn review_596866_owned_up_then_new_down_in_one_frame_keeps_the_next_click_single() { + review_596866_owned_release_then_press(false); + review_596866_owned_release_then_press(true); +} + +#[test] +fn review_596866_second_corrected_release_uses_its_release_position() { + let (mut control, control_ctx, control_point, control_group) = review_gesture_group_fixture(); + let control_at = review_gesture_screen(&control, &control_ctx, control_point); + review_gesture_ordinary_pair(&mut control, &control_ctx, control_at, control_at, control_group); + + let (mut app, ctx, point, group) = review_gesture_group_fixture(); + click_control(&mut app, &ctx, SAMPLE_TIP); + app.run("select.none", json!({})).unwrap(); + let at = review_gesture_screen(&app, &ctx, point); + let hover = review_gesture_screen(&app, &ctx, Point::new(340.0, 250.0)); + assert!(at.distance(hover) > ctx.options(|o| o.input_options.max_click_dist)); + let expected = review_gesture_state(&app); + let (start, step) = review_gesture_times(&ctx); + review_gesture_press(&mut app, &ctx, at, start); + review_gesture_release(&mut app, &ctx, at, start + step); + assert_eq!(review_gesture_state(&app), expected, "the stale prefix is consumed"); + review_gesture_press(&mut app, &ctx, at, start + 3.0 * step); + review_gesture_release(&mut app, &ctx, at, start + 4.0 * step); + assert_eq!(app.session.active().unwrap().selection.objects, vec![group]); + assert_eq!(app.session.active().unwrap().isolation, None, "the first fresh click is single"); + review_gesture_press(&mut app, &ctx, at, start + 6.0 * step); + frame_at(&mut app, &ctx, start + 7.0 * step, vec![review_596866_button(at, false), Event::PointerMoved(hover)]); + assert!(ctx.input(|i| i.pointer.button_triple_clicked(PointerButton::Primary))); + assert_eq!(ctx.input(|i| i.pointer.interact_pos()), Some(hover)); + assert_eq!( + app.session.active().unwrap().isolation, + Some(group), + "the corrected Double belongs to its release on the group, not the later blank hover" + ); +} + +fn review_596866_bound_point(app: &VectorcraftApp, target: NodeId) -> Point { + let state = app.session.active().unwrap(); + let node = state.doc.node(target).unwrap(); + let original = node.children().and_then(|children| children.first()).map_or(node, |child| child.as_ref()); + let NodeKind::Image(image) = &original.kind else { panic!("the retained binding has a source image") }; + image.xf * Point::new(f64::from(image.width) * 0.25, f64::from(image.height) * 0.5) +} + +fn review_596866_source_image(app: &VectorcraftApp, target: NodeId) -> NodeId { + let state = app.session.active().unwrap(); + let node = state.doc.node(target).unwrap(); + let original = node.children().and_then(|children| children.first()).map_or(node, |child| child.as_ref()); + assert!(matches!(original.kind, NodeKind::Image(_)), "the retained binding has an original source image"); + original.id +} + +fn review_596866_pick_binding(app: &mut VectorcraftApp, ctx: &egui::Context) -> NodeId { + click_control(app, ctx, SAMPLE_TIP); + let target = app.ui.trace_ignore_sampler.as_ref().unwrap().target; + let source = review_596866_source_image(app, target); + let point = review_596866_bound_point(app, target); + let at = review_gesture_screen(app, ctx, point); + let (start, step) = review_gesture_times(ctx); + review_gesture_press(app, ctx, at, start); + review_gesture_release(app, ctx, at, start + step); + settle(app, ctx); + assert!(app.ui.trace_ignore_sampler.is_none(), "an opaque original pixel completes the pick"); + source +} + +fn review_596866_ignore_color(app: &VectorcraftApp, source: NodeId) -> Value { + let doc = &app.session.active().unwrap().doc; + assert!(matches!(doc.node(source).unwrap().kind, NodeKind::Image(_)), "retrace retains the original source image identity"); + let trace = doc.node(doc.parent_of(source).unwrap()).unwrap(); + assert_eq!(trace.children().unwrap().first().unwrap().id, source, "the source remains the trace's first child"); + trace.extras().trace.as_ref().expect("the source's current parent is an Image Trace")["params"]["ignoreColor"].clone() +} + +fn review_596866_nested_trace_selection() -> (VectorcraftApp, egui::Context, NodeId, NodeId) { + let (mut app, ctx) = fixture(true, [37, 83, 149], true); + let first = selected(&app).id; + let parent = review_gesture_enclose_source(&mut app, first); + let bytes = { + let state = app.session.active().unwrap(); + let original = state.doc.node(first).unwrap().children().unwrap()[0].as_ref(); + let NodeKind::Image(image) = &original.kind else { panic!("the first trace retains its input") }; + state.doc.images[&image.key].bytes.clone() + }; + app.run( + "file.place", + json!({"name": "second-sampler-source.png", "dataBase64": vectorcraft_format::base64_encode(&bytes), "link": false, "at": [280, 150]}), + ) + .unwrap(); + app.run("imageTrace.make", json!({"preset": "Default", "params": {"mode": "blackAndWhite", "threshold": 127, "noise": 1, "ignoreWhite": false}})) + .unwrap(); + let second = selected(&app).id; + assert_ne!(first, second); + app.run("select.set", json!({"ids": [parent.0, first.0, second.0]})).unwrap(); + settle(&mut app, &ctx); + let state = app.session.active().unwrap(); + assert_eq!(state.selection.objects, vec![parent, first, second], "CONTROL: the public selection keeps the ordinary ancestor and nested trace"); + assert!(state.doc.node(parent).unwrap().extras().trace.is_none(), "the selected ancestor is not itself traceable"); + assert_eq!(state.doc.paint_order([first, second]), vec![first, second], "the nested trace precedes the top-level trace"); + (app, ctx, first, second) +} + +#[test] +fn review_596866_preview_retraces_the_retained_sampler_binding() { + let (mut control, control_ctx) = fixture(true, [37, 83, 149], true); + let control_source = review_596866_pick_binding(&mut control, &control_ctx); + assert_eq!(review_596866_ignore_color(&control, control_source), "#255395", "CONTROL: a single trace receives its sampled color"); + + let (mut app, ctx, first, second) = review_596866_nested_trace_selection(); + click_control(&mut app, &ctx, SAMPLE_TIP); + let bound = app.ui.trace_ignore_sampler.as_ref().unwrap().target; + assert!(bound == first || bound == second); + let other = if bound == first { second } else { first }; + let other_before = app.session.active().unwrap().doc.node(other).unwrap().clone(); + let bound_source = review_596866_source_image(&app, bound); + assert_ne!(review_596866_ignore_color(&app, bound_source), "#255395", "CONTROL: the sample must change the bound trace's stored color"); + let point = review_596866_bound_point(&app, bound); + let at = review_gesture_screen(&app, &ctx, point); + let (start, step) = review_gesture_times(&ctx); + review_gesture_press(&mut app, &ctx, at, start); + review_gesture_release(&mut app, &ctx, at, start + step); + settle(&mut app, &ctx); + let bound_color = review_596866_ignore_color(&app, bound_source); + let other_after = app.session.active().unwrap().doc.node(other).cloned(); + assert!( + bound_color == "#255395" && other_after.as_ref() == Some(&other_before), + "Preview must update only retained sampler target {bound:?}: bound_color={bound_color}, other_changed_or_missing={}", + other_after.as_ref() != Some(&other_before) + ); +} + +fn review_596866_grid_visible(app: &VectorcraftApp) -> bool { + vectorcraft_tools::distort::perspective::PerspectiveGrid::current(&app.session.active().unwrap().doc).visible +} + +fn review_596866_hidden_grid_fixture() -> (VectorcraftApp, egui::Context) { + let (mut app, ctx) = fixture(true, [37, 83, 149], false); + app.select_tool("perspectiveGrid"); + assert!(review_596866_grid_visible(&app), "CONTROL: a deliberate fresh tool choice shows the grid"); + app.run("perspective.grid.show", json!({"visible": false})).unwrap(); + settle(&mut app, &ctx); + assert_eq!(app.session.tool_id(), "perspectiveGrid"); + assert!(!review_596866_grid_visible(&app)); + (app, ctx) +} + +#[test] +fn review_596866_successful_pick_preserves_a_hidden_perspective_grid() { + let (mut control, _) = review_596866_hidden_grid_fixture(); + let revision = control.session.active().unwrap().revision; + control.select_tool("perspectiveGrid"); + assert!(review_596866_grid_visible(&control), "CONTROL: explicitly choosing the tool again still shows the grid"); + assert!(control.session.active().unwrap().revision > revision); + + let (mut app, ctx) = review_596866_hidden_grid_fixture(); + let expected = review_gesture_state(&app); + let source = review_596866_pick_binding(&mut app, &ctx); + assert_eq!(app.session.tool_id(), "perspectiveGrid"); + let observed = review_gesture_state(&app); + let visible = review_596866_grid_visible(&app); + click_control(&mut app, &ctx, "Trace"); + assert_eq!(review_596866_ignore_color(&app, source), "#255395", "CONTROL: the valid Preview-off pick really changed the panel draft"); + assert!(!visible, "returning from the temporary sampler must not show the hidden grid"); + assert_eq!(observed, expected, "the Preview-off pick must not change document, selection, revision, history or paint"); +} + +fn review_596866_coalesced_fresh_suffix(dragged: bool) { + let (mut app, ctx, point, group) = review_gesture_group_fixture(); + click_control(&mut app, &ctx, SAMPLE_TIP); + app.run("select.none", json!({})).unwrap(); + let at = review_gesture_screen(&app, &ctx, point); + let distance = ctx.options(|o| o.input_options.max_click_dist); + let away = at + vec2(distance + 8.0, 0.0); + assert!(away.distance(at) > distance && app.canvas_rect.unwrap().contains(away)); + let (start, step) = review_gesture_times(&ctx); + review_gesture_press(&mut app, &ctx, at, start); + assert_eq!(app.session.tool_id(), "selection"); + assert!(app.ui.trace_ignore_sampler.is_none() && ctx.input(|i| i.pointer.primary_down())); + let mut events = vec![review_596866_button(at, false), review_596866_button(at, true)]; + if dragged { + events.extend([Event::PointerMoved(away), Event::PointerMoved(at)]); + } + events.push(review_596866_button(at, false)); + frame_at(&mut app, &ctx, start + step, events); + assert!(ctx.input(|i| i.pointer.primary_pressed() && i.pointer.primary_released() && !i.pointer.primary_down())); + assert!(ctx.input(|i| i.pointer.button_clicked(PointerButton::Primary)), "the old owned release really contributed a raw click"); + assert_eq!(ctx.input(|i| i.pointer.button_double_clicked(PointerButton::Primary)), !dragged, "only the valid fresh suffix is a second raw click"); + assert_eq!(app.session.active().unwrap().selection.objects, vec![group], "the fresh Down still selects the group"); + assert_eq!(app.session.active().unwrap().isolation, None, "neither the first fresh click nor an out-and-back drag may isolate"); + // The ordinary tool receives its Up in the next empty frame; no document/history oracle + // forbids legitimate drag completion work. + frame_at(&mut app, &ctx, start + 2.0 * step, vec![]); + assert_eq!(app.session.active().unwrap().isolation, None); + review_gesture_press(&mut app, &ctx, at, start + 3.0 * step); + review_gesture_release(&mut app, &ctx, at, start + 4.0 * step); + if dragged { + assert!(ctx.input(|i| i.pointer.button_double_clicked(PointerButton::Primary))); + assert_eq!(app.session.active().unwrap().selection.objects, vec![group]); + assert_eq!(app.session.active().unwrap().isolation, None, "the invalid suffix must not advance ordinary click history"); + review_gesture_press(&mut app, &ctx, at, start + 6.0 * step); + review_gesture_release(&mut app, &ctx, at, start + 7.0 * step); + } + assert!(ctx.input(|i| i.pointer.button_triple_clicked(PointerButton::Primary))); + assert_eq!(app.session.active().unwrap().isolation, Some(group), "the second qualifying ordinary click still isolates: dragged={dragged}"); +} + +#[test] +fn review_596866_coalesced_fresh_release_qualifies_its_own_click() { + review_596866_coalesced_fresh_suffix(false); + review_596866_coalesced_fresh_suffix(true); +} From 04242429756abd9fabcc6d71b0d0edea75eba341 Mon Sep 17 00:00:00 2001 From: yoriswind Date: Wed, 18 Nov 2026 22:01:29 -0800 Subject: [PATCH 70/78] Image Trace test: enable sampling on both candidate traces --- crates/ui-egui/tests/image_trace_ignore_sampler.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/ui-egui/tests/image_trace_ignore_sampler.rs b/crates/ui-egui/tests/image_trace_ignore_sampler.rs index 4496089271..5de21672f7 100644 --- a/crates/ui-egui/tests/image_trace_ignore_sampler.rs +++ b/crates/ui-egui/tests/image_trace_ignore_sampler.rs @@ -1196,7 +1196,7 @@ fn review_596866_nested_trace_selection() -> (VectorcraftApp, egui::Context, Nod json!({"name": "second-sampler-source.png", "dataBase64": vectorcraft_format::base64_encode(&bytes), "link": false, "at": [280, 150]}), ) .unwrap(); - app.run("imageTrace.make", json!({"preset": "Default", "params": {"mode": "blackAndWhite", "threshold": 127, "noise": 1, "ignoreWhite": false}})) + app.run("imageTrace.make", json!({"preset": "Default", "params": {"mode": "blackAndWhite", "threshold": 127, "noise": 1, "ignoreWhite": true}})) .unwrap(); let second = selected(&app).id; assert_ne!(first, second); From 7d1a902c5932381bbb325e50c68c35adbe95baa1 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Thu, 19 Nov 2026 00:03:15 -0800 Subject: [PATCH 71/78] i18n: French Proof Setup label takes a no-break space before its colon --- crates/ui-egui/src/i18n/fr.tsv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/ui-egui/src/i18n/fr.tsv b/crates/ui-egui/src/i18n/fr.tsv index a3c18fdb3a..6731349e9e 100644 --- a/crates/ui-egui/src/i18n/fr.tsv +++ b/crates/ui-egui/src/i18n/fr.tsv @@ -2781,7 +2781,7 @@ font-technology Variable Variables Preserve Appearance and Overprints Conserver l’aspect et les surimpressions Preserve CMYK Numbers Conserver les valeurs CMJN Preserve RGB Numbers Conserver les valeurs RVB - Device to Simulate: Périphérique à simuler : + Device to Simulate: Périphérique à simuler : Simulate Paper Color Simuler la couleur du papier Simulate Black Ink Simuler l’encre noire Preserve Editing Capabilities Conserver les fonctions d’édition From 4b40c56f691a2e5766fcdbd07b4c3502c12d9ba7 Mon Sep 17 00:00:00 2001 From: yoriswind Date: Thu, 19 Nov 2026 08:30:32 +0000 Subject: [PATCH 72/78] Image Trace: preserve qualified click provenance and temporary tool return --- crates/ui-egui/src/app/input.rs | 1 + crates/ui-egui/src/canvas.rs | 174 ++++++++++-------- crates/ui-egui/src/canvas/drag.rs | 20 +- crates/ui-egui/src/canvas/input.rs | 21 ++- .../ui-egui/src/panels/image_trace/tests.rs | 36 +++- .../tests/image_trace_ignore_sampler.rs | 109 +++++++++++ 6 files changed, 273 insertions(+), 88 deletions(-) diff --git a/crates/ui-egui/src/app/input.rs b/crates/ui-egui/src/app/input.rs index 95f719d08b..5960a80187 100644 --- a/crates/ui-egui/src/app/input.rs +++ b/crates/ui-egui/src/app/input.rs @@ -179,6 +179,7 @@ impl VectorcraftApp { /// injected until the batch was actually applied, so a burst of hidden ticks cannot queue /// several steps of a drag or replay them together later. pub fn raw_input_hook(&mut self, ctx: &egui::Context, raw: &mut egui::RawInput) { + crate::canvas::capture_pointer_before_input(ctx, raw.viewport_id); self.fill_raw_input(ctx, raw); crate::font_menu::sync_wheel_target(self, ctx, raw.viewport_id); crate::font_menu::take_raw_wheel(ctx, raw); diff --git a/crates/ui-egui/src/canvas.rs b/crates/ui-egui/src/canvas.rs index bfb89b5833..d779b2a08b 100644 --- a/crates/ui-egui/src/canvas.rs +++ b/crates/ui-egui/src/canvas.rs @@ -468,6 +468,51 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) { } } +#[derive(Clone, Copy, Default)] +struct CanvasClick { + count: u8, + at: Option, +} + +fn pointer_before_input_id(viewport: egui::ViewportId) -> egui::Id { + egui::Id::unique("canvas-pointer-before-input").with(viewport) +} + +/// The existing host hook calls this before egui updates the pointer for this batch. +pub(crate) fn capture_pointer_before_input(ctx: &egui::Context, viewport: egui::ViewportId) { + let pointer = ctx.input_for(viewport, |i| i.pointer.clone()); + ctx.data_mut(|data| data.insert_temp(pointer_before_input_id(viewport), pointer)); +} + +/// Each release keeps egui's own qualification, including earlier releases in this batch. +fn canvas_pointer_releases(ui: &Ui) -> Vec { + let previous = ui.data(|data| data.get_temp::(pointer_before_input_id(ui.ctx().viewport_id()))).unwrap_or_default(); + let options = ui.ctx().options(|o| o.input_options); + let pixels_per_point = ui.ctx().pixels_per_point(); + ui.input(|i| { + let mut counts = [0usize; egui::NUM_POINTER_BUTTONS]; + for event in &i.events { + if let egui::Event::PointerButton { button, pressed: false, .. } = event { + counts[*button as usize] += 1; + } + } + i.events.iter().enumerate().filter_map(|(index, event)| { + let egui::Event::PointerButton { pos, button, pressed: false, .. } = event else { return None }; + let clicked = if counts[*button as usize] == 1 { + i.pointer.button_clicked(*button) + } else { + // Aggregated flags cannot identify a later non-click release. Replay only + // an ambiguous button's prefix, before its Up, through egui's public API. + let mut before = i.clone(); + before.pointer = previous.clone(); + let raw = egui::RawInput { time: Some(i.time), events: i.events[..index].to_vec(), ..i.raw.clone() }; + before.begin_pass(raw, false, pixels_per_point, options).pointer.could_any_button_be_click() + }; + Some(IgnoreSamplerRelease { button: *button, at: *pos, clicked }) + }).collect() + }) +} + /// Two non-sampler clicks replace egui's last two click times after a consumed pick. #[derive(Clone, Copy, Default)] struct IgnoreSamplerClicks { @@ -489,35 +534,34 @@ fn reset_ignore_sampler_clicks(ui: &Ui, id: egui::Id) { /// Reclassify only the two clicks whose raw history can still contain a consumed pick. /// Other widgets' clicks count too, as they do in egui; its pointer state stays untouched. -fn ignore_sampler_clicks(ui: &Ui, id: egui::Id, consumed: bool) { - let (clicked, primary, at, time) = ui.input(|i| { - // A hover move after the release is not the position egui put in its click history. - let at = i.events.iter().rev().find_map(|event| match event { - egui::Event::PointerButton { pos, button, pressed: false, .. } if i.pointer.button_clicked(*button) => Some(*pos), - _ => None, - }); - (i.pointer.any_click(), i.pointer.button_clicked(egui::PointerButton::Primary), at, i.time) - }); - ui.data_mut(|data| data.remove::(id.with("image-trace-click-count"))); - if !clicked { +fn ignore_sampler_clicks(ui: &Ui, id: egui::Id, consumed: bool, releases: &[IgnoreSamplerRelease]) { + ui.data_mut(|data| data.remove::(id.with("image-trace-click-count"))); + if !releases.iter().any(|release| release.clicked) { return; } if consumed { reset_ignore_sampler_clicks(ui, id); return; } - let Some(at) = at else { return }; - record_ignore_sampler_click(ui, id, at, time, primary); + let time = ui.input(|i| i.time); + for release in releases.iter().filter(|release| release.clicked) { + record_ignore_sampler_click(ui, id, release.at, time, release.button == egui::PointerButton::Primary); + } } fn record_ignore_sampler_click(ui: &Ui, id: egui::Id, at: Pos2, time: f64, primary: bool) { let (delay, distance) = ui.ctx().options(|o| (o.input_options.max_double_click_delay, o.input_options.max_click_dist)); ui.data_mut(|data| { let history_id = id.with("image-trace-clicks"); - let Some(mut clicks) = data.remove_temp::(history_id) else { return }; + let Some(mut clicks) = data.remove_temp::(history_id) else { + if primary { + data.remove::(id.with("image-trace-click-count")); + } + return; + }; let double = clicks.last.is_some_and(|(last, pos)| time - last < delay && pos.distance_sq(at) < distance * distance); if primary { - data.insert_temp(id.with("image-trace-click-count"), if double { 2u8 } else { 1u8 }); + data.insert_temp(id.with("image-trace-click-count"), CanvasClick { count: if double { 2 } else { 1 }, at: Some(at) }); } clicks.last = Some((time, at)); clicks.remaining -= 1; @@ -527,21 +571,21 @@ fn record_ignore_sampler_click(ui: &Ui, id: egui::Id, at: Pos2, time: f64, prima }); } -fn primary_click_count(ui: &Ui, resp: &egui::Response) -> u8 { +fn primary_click(ui: &Ui, resp: &egui::Response) -> CanvasClick { if !resp.clicked_by(egui::PointerButton::Primary) { - return 0; + return CanvasClick::default(); } - ui.data(|data| data.get_temp::(resp.id.with("image-trace-click-count"))).unwrap_or_else(|| { - if resp.triple_clicked() { - 3 - } else if resp.double_clicked() { - 2 - } else { - 1 - } + ui.data(|data| data.get_temp::(resp.id.with("image-trace-click-count"))).unwrap_or_else(|| { + let count = if resp.triple_clicked() { 3 } else if resp.double_clicked() { 2 } else { 1 }; + let at = ui.data(|data| data.get_temp::(resp.id.with("canvas-qualified-primary-release"))); + CanvasClick { count, at } }) } +fn primary_click_count(ui: &Ui, resp: &egui::Response) -> u8 { + primary_click(ui, resp).count +} + /// Remove only the pointer sequence acquired by this sampler, never a view or tool drag. fn clear_ignore_sampler_gesture(ui: &Ui, id: egui::Id) { ui.data_mut(|data| { @@ -572,68 +616,36 @@ struct IgnoreSamplerPointer { } /// Attribute a fresh press after an owned release before egui's per-frame flags lose their order. -fn ignore_sampler_pointer_frame(ui: &Ui, id: egui::Id, cancelled: bool) -> IgnoreSamplerPointer { +fn ignore_sampler_pointer_frame(ui: &Ui, id: egui::Id, cancelled: bool, releases: &[IgnoreSamplerRelease]) -> IgnoreSamplerPointer { let owned = ignore_sampler_owns_primary(ui, id); if !owned && !cancelled { return IgnoreSamplerPointer::default(); } - let (distance, duration) = ui.ctx().options(|o| (o.input_options.max_click_dist, o.input_options.max_click_duration)); ui.input(|i| { let mut frame = IgnoreSamplerPointer { owned, ..Default::default() }; let mut first_press_owned = cancelled; - let mut press = None; - let mut moved = false; - let mut primary_pressed = false; + let mut releases = releases.iter(); for event in &i.events { - match event { - egui::Event::PointerMoved(at) => { - if let Some((_, origin)) = press { - moved |= Pos2::distance(origin, *at) > distance; + if let egui::Event::PointerButton { pos, button, pressed, .. } = event { + if *pressed { + if *button == egui::PointerButton::Primary { + frame.replaced |= frame.owned; + // An observed old Up ends that cancelled sequence; without it, + // a fresh invalid press keeps the existing cancellation gate. + frame.owned = first_press_owned && !frame.consumed_release; + first_press_owned = false; + frame.ordinary_pressed |= !frame.owned; } + } else { + let clicked = releases.next().is_some_and(|release| release.clicked); + ignore_sampler_release(&mut frame, *button, *pos, clicked); } - egui::Event::PointerButton { pos, button, pressed, .. } => { - if *pressed { - press = Some((*button, *pos)); - moved = false; - if *button == egui::PointerButton::Primary { - primary_pressed = true; - frame.replaced |= frame.owned; - // An observed old Up ends that cancelled sequence; without it, - // a fresh invalid press keeps the existing cancellation gate. - frame.owned = first_press_owned && !frame.consumed_release; - first_press_owned = false; - frame.ordinary_pressed |= !frame.owned; - } - } else { - // A fresh primary click needs its own Down, not an earlier owned click. - // Slop/origin are shared by buttons in egui; each press resets them, and - // a release clears its press time. In-frame presses have the same time. - let clicked = ignore_sampler_release_clicked(press, moved, primary_pressed, *button, duration); - ignore_sampler_release(&mut frame, *button, *pos, clicked); - if *button == egui::PointerButton::Primary { - primary_pressed = false; - } - press = None; - } - } - _ => {} } } frame }) } -fn ignore_sampler_release_clicked( - press: Option<(egui::PointerButton, Pos2)>, - moved: bool, - primary_pressed: bool, - button: egui::PointerButton, - duration: f64, -) -> bool { - let matched = if button == egui::PointerButton::Primary { primary_pressed } else { press.is_some_and(|(b, _)| b == button) }; - matched && !moved && (press.is_none() || !matches!(duration.partial_cmp(&0.0), Some(std::cmp::Ordering::Less))) -} - fn ignore_sampler_release(frame: &mut IgnoreSamplerPointer, button: egui::PointerButton, at: Pos2, clicked: bool) { if button == egui::PointerButton::Primary && frame.owned { frame.consumed_release = true; @@ -643,28 +655,34 @@ fn ignore_sampler_release(frame: &mut IgnoreSamplerPointer, button: egui::Pointe } } -fn ignore_sampler_frame_clicks(ui: &Ui, id: egui::Id, frame: &IgnoreSamplerPointer, consumed: bool) { +fn ignore_sampler_frame_clicks(ui: &Ui, id: egui::Id, frame: &IgnoreSamplerPointer, consumed: bool, releases: &[IgnoreSamplerRelease]) { if !frame.consumed_release || !frame.ordinary_pressed { - ignore_sampler_clicks(ui, id, consumed); + ignore_sampler_clicks(ui, id, consumed, releases); return; } // Consume the old sequence, then classify only subsequent ordinary releases. A new Down // still reaches the tool when the last release belongs to the consumed sequence. reset_ignore_sampler_clicks(ui, id); - ui.data_mut(|data| data.insert_temp(id.with("image-trace-click-count"), 0u8)); + ui.data_mut(|data| data.insert_temp(id.with("image-trace-click-count"), CanvasClick::default())); let time = ui.input(|i| i.time); for release in &frame.releases { let primary = release.button == egui::PointerButton::Primary; if release.clicked { record_ignore_sampler_click(ui, id, release.at, time, primary); - } else if primary { - ui.data_mut(|data| data.insert_temp(id.with("image-trace-click-count"), 0u8)); } } } fn begin_ignore_sampler_pointer(ui: &Ui, id: egui::Id, cancelled: bool) -> (bool, bool) { - let frame = ignore_sampler_pointer_frame(ui, id, cancelled); + let releases = canvas_pointer_releases(ui); + ui.data_mut(|data| { + let position_id = id.with("canvas-qualified-primary-release"); + data.remove::(position_id); + if let Some(release) = releases.iter().rev().find(|release| release.clicked && release.button == egui::PointerButton::Primary) { + data.insert_temp(position_id, release.at); + } + }); + let frame = ignore_sampler_pointer_frame(ui, id, cancelled, &releases); if frame.replaced { // This also replaces an abandoned sampler Down whose release was not observed. clear_ignore_sampler_gesture(ui, id); @@ -673,7 +691,7 @@ fn begin_ignore_sampler_pointer(ui: &Ui, id: egui::Id, cancelled: bool) -> (bool ui.data_mut(|data| data.insert_temp(ignore_sampler_primary_id(id), true)); } let consumed = frame.owned && ui.input(|i| i.pointer.primary_pressed() || i.pointer.primary_released() || i.pointer.primary_down()); - ignore_sampler_frame_clicks(ui, id, &frame, consumed); + ignore_sampler_frame_clicks(ui, id, &frame, consumed, &releases); (consumed, frame.ordinary_pressed) } diff --git a/crates/ui-egui/src/canvas/drag.rs b/crates/ui-egui/src/canvas/drag.rs index c72539aba9..512df6e9a9 100644 --- a/crates/ui-egui/src/canvas/drag.rs +++ b/crates/ui-egui/src/canvas/drag.rs @@ -425,11 +425,27 @@ fn pressed_with(app: &mut VectorcraftApp, index: Option, pos: Point, tool pub fn apply_requests(app: &mut VectorcraftApp, r: vectorcraft_engine::Result>) { match r { Ok(reqs) => { + let mut sampler_return = None; for r in reqs { match r { - vectorcraft_engine::UiRequest::Dialog(kind, p) => crate::dialogs::open_tool_dialog(app, &kind, p), + vectorcraft_engine::UiRequest::Dialog(kind, p) => { + let back = if kind == "imageTraceIgnoreColor" && p["cancel"] == true { + app.ui.trace_ignore_sampler.as_ref().map(|sampler| sampler.back.clone()) + } else { + None + }; + crate::dialogs::open_tool_dialog(app, &kind, p); + // A matching callback must actually consume the active sampler. + sampler_return = back.filter(|_| app.ui.trace_ignore_sampler.is_none()); + } vectorcraft_engine::UiRequest::Panel(panel) => activate_panel(app, &panel), - vectorcraft_engine::UiRequest::SwitchTool(t) => app.select_tool(&t), + vectorcraft_engine::UiRequest::SwitchTool(t) => { + if sampler_return.take().is_some_and(|back| back == t) { + app.return_to_tool(&t); + } else { + app.select_tool(&t); + } + } vectorcraft_engine::UiRequest::Status(msg) => app.status(msg), vectorcraft_engine::UiRequest::Place(p) => crate::place::place_from_cursor(app, &p), // In the document the press was made in, which may no longer be the active one. diff --git a/crates/ui-egui/src/canvas/input.rs b/crates/ui-egui/src/canvas/input.rs index 748ad07654..ef8e596c4e 100644 --- a/crates/ui-egui/src/canvas/input.rs +++ b/crates/ui-egui/src/canvas/input.rs @@ -186,17 +186,18 @@ pub(super) fn handle_input(app: &mut VectorcraftApp, ui: &Ui, resp: &egui::Respo .unwrap_or(m.shift); select_named_artboard(app, i, shift || release_shift); } + let click = super::primary_click(ui, resp); if !super::ignore_sampler_owns_primary(ui, resp.id) - && super::primary_click_count(ui, resp) == 2 + && click.count == 2 && !f.modal - && let Some(p) = release_pos(ui, egui::PointerButton::Primary, true).or(at) + && let Some(p) = click.at.or(at) { double_click(app, ui, &f, p); } if !super::ignore_sampler_owns_primary(ui, resp.id) - && super::primary_click_count(ui, resp) == 3 + && click.count == 3 && !f.modal - && let Some(p) = release_pos(ui, egui::PointerButton::Primary, true).or(at) + && let Some(p) = click.at.or(at) { triple_click(app, ui, &f, p); } @@ -337,7 +338,7 @@ fn begin_drag(app: &mut VectorcraftApp, ui: &Ui, f: &Pointing, p: Pos2) { Drag::RotateView { start_angle: (p.y - c.y).atan2(p.x - c.x) as f64, start_rot: v.rotation, snaps: !space } } else { // Cmd with another tool drags with the selection tool used last (the session lends it). - let ev = PointerEvent { + let mut ev = PointerEvent { kind: PointerKind::Down, pos: xf.to_doc(p), mods: mods(m, space), @@ -349,6 +350,16 @@ fn begin_drag(app: &mut VectorcraftApp, ui: &Ui, f: &Pointing, p: Pos2) { // selection press keeps the ordinary tool path. let sampler = app.ui.trace_ignore_sampler.is_some() && tool == "eyedropper" && app.session.lent_tool_id(&ev.mods).is_none(); if sampler { + // A later hover move is not the source pixel that was pressed. + let pressed = ui.input(|i| { + i.events.iter().find_map(|event| match event { + egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed: true, .. } => Some(*pos), + _ => None, + }) + }); + if let Some(pressed) = pressed { + ev.pos = xf.to_doc(pressed); + } ui.data_mut(|data| data.insert_temp(super::ignore_sampler_primary_id(resp.id), true)); } dispatch(app, &ev, view); diff --git a/crates/ui-egui/src/panels/image_trace/tests.rs b/crates/ui-egui/src/panels/image_trace/tests.rs index af2ec39921..c6d5922661 100644 --- a/crates/ui-egui/src/panels/image_trace/tests.rs +++ b/crates/ui-egui/src/panels/image_trace/tests.rs @@ -1663,7 +1663,8 @@ fn lookup_fixture() -> (VectorcraftApp, std::collections::HashMap<&'static str, /// The panel's lookup gives what putting the whole selection in paint order gave, field for field, /// for every kind of selection: images in either selection order, an Image Trace object with its /// own image, a clipping group named Image Trace, nested groups, hidden and locked images, two -/// layers, repeated ids, ids the document lacks, and nothing selected. The result kept for a +/// layers, repeated ids, ids the document lacks, and nothing selected. Selected ancestors with +/// their descendants have separate canonical-root expectations below. The result kept for a /// revision follows each change of the selection, an edit, Undo and a switch of document. #[test] fn the_target_lookup_matches_sorting_the_whole_selection() { @@ -1679,10 +1680,8 @@ fn the_target_lookup_matches_sorting_the_whole_selection() { &["trace image", "trace"], &["rect", "trace image"], &["clip"], - &["clip", "clipped"], &["rect", "clipped"], &["outer"], - &["outer", "deep"], &["inner", "rect"], &["deep", "back"], &["hidden", "locked"], @@ -1738,6 +1737,37 @@ fn the_target_lookup_matches_sorting_the_whole_selection() { assert_eq!(target(&none, &ctx), Target::default()); } +/// Trace only accepts selected roots: a selected parent blocks its image descendant. +/// Missing implicit-selection ids are dropped, while explicit ids are validated. +#[test] +fn the_target_lookup_obeys_canonical_roots_and_explicit_id_validation() { + let (mut app, ids) = lookup_fixture(); + let ctx = egui::Context::default(); + for (parent, child) in [("clip", "clipped"), ("outer", "deep")] { + select_as_is(&mut app, &[ids[parent], ids[child]]); + let uid = app.session.active().unwrap().uid; + let expected = Target { object: Some((uid, ids[parent])), ..Default::default() }; + assert_eq!(find_target(&app), expected, "the selected {parent} supplies metadata, not its pruned image"); + assert_eq!(target(&app, &ctx), expected); + assert_eq!(target(&app, &ctx), expected, "the canonical result is also cached"); + assert!(vectorcraft_engine::cmd::image_trace_target(&app.session, &Value::Null).is_err()); + let document = app.session.active().unwrap().doc.clone(); + assert!(app.run("imageTrace.make", json!({})).is_err(), "Trace rejects that non-image root"); + assert_eq!(app.session.active().unwrap().doc, document); + select_as_is(&mut app, &[ids[child]]); + assert_eq!(vectorcraft_engine::cmd::image_trace_target(&app.session, &Value::Null).unwrap(), ids[child], "the image alone remains eligible"); + } + let stale = NodeId(u64::MAX); + select_as_is(&mut app, &[stale, ids["front"]]); + assert_eq!(target(&app, &ctx).object.map(|(_, id)| id), Some(ids["front"]), "implicit stale entries do not hide a valid image"); + assert_eq!(vectorcraft_engine::cmd::image_trace_target(&app.session, &Value::Null).unwrap(), ids["front"]); + let explicit = json!({"ids": [stale.0, ids["front"].0]}); + let document = app.session.active().unwrap().doc.clone(); + assert!(vectorcraft_engine::cmd::image_trace_target(&app.session, &explicit).is_err(), "explicit missing ids are invalid"); + assert!(app.run("imageTrace.make", explicit).is_err()); + assert_eq!(app.session.active().unwrap().doc, document); +} + /// The panel and its menu look the object Trace acts on up once for each revision of the document, /// however many frames show it, and again once the revision moves. #[test] diff --git a/crates/ui-egui/tests/image_trace_ignore_sampler.rs b/crates/ui-egui/tests/image_trace_ignore_sampler.rs index 5de21672f7..64d3efcff2 100644 --- a/crates/ui-egui/tests/image_trace_ignore_sampler.rs +++ b/crates/ui-egui/tests/image_trace_ignore_sampler.rs @@ -1318,3 +1318,112 @@ fn review_596866_coalesced_fresh_release_qualifies_its_own_click() { review_596866_coalesced_fresh_suffix(false); review_596866_coalesced_fresh_suffix(true); } + +fn review_597048_key(pressed: bool) -> Event { + Event::Key { key: egui::Key::Escape, physical_key: None, pressed, repeat: false, modifiers: Default::default() } +} + +#[test] +fn review_597048_escape_returns_to_a_hidden_grid_without_fresh_activation() { + let (mut control, _) = review_596866_hidden_grid_fixture(); + control.select_tool("perspectiveGrid"); + assert!(review_596866_grid_visible(&control), "CONTROL: explicit fresh selection still shows the grid"); + let (mut app, ctx) = review_596866_hidden_grid_fixture(); + let expected = review_gesture_state(&app); + click_control(&mut app, &ctx, SAMPLE_TIP); + assert_eq!(app.session.tool_id(), "eyedropper"); + frame(&mut app, &ctx, vec![review_597048_key(true)]).textures_delta.clear(); + frame(&mut app, &ctx, vec![review_597048_key(false)]).textures_delta.clear(); + assert!(app.ui.trace_ignore_sampler.is_none()); + assert_eq!(app.session.tool_id(), "perspectiveGrid"); + assert!(!review_596866_grid_visible(&app), "Escape returns without revealing the grid"); + assert_eq!(review_gesture_state(&app), expected, "cancellation changes no document, revision, history, selection or paint"); +} + +fn review_597048_down_pixel(later_move: bool) { + let (mut app, ctx) = fixture(true, [37, 83, 149], false); + let source = review_596866_source_image(&app, selected(&app).id); + let pressed = review_gesture_screen(&app, &ctx, source_point(&app, 0.25)); + let hover = review_gesture_screen(&app, &ctx, source_point(&app, 0.75)); + assert_ne!(pressed, hover); + let expected = review_gesture_state(&app); + click_control(&mut app, &ctx, SAMPLE_TIP); + let mut events = vec![Event::PointerMoved(pressed), review_596866_button(pressed, true)]; + if later_move { + events.push(Event::PointerMoved(hover)); + } + frame(&mut app, &ctx, events).textures_delta.clear(); + assert_eq!(ctx.input(|i| i.pointer.interact_pos()), Some(if later_move { hover } else { pressed })); + assert_eq!(app.session.tool_id(), "selection"); + assert!(app.ui.trace_ignore_sampler.is_none()); + assert_eq!(review_gesture_state(&app), expected, "Preview off stores a panel draft only"); + frame(&mut app, &ctx, vec![review_596866_button(if later_move { hover } else { pressed }, false)]).textures_delta.clear(); + click_control(&mut app, &ctx, "Trace"); + assert_eq!(review_596866_ignore_color(&app, source), "#255395", "the sampled pixel belongs to Down, later_move={later_move}"); +} + +#[test] +fn review_597048_sampler_uses_down_pixel_before_a_later_move() { + review_597048_down_pixel(false); + review_597048_down_pixel(true); +} + +fn review_597048_coalesced_pair(sampler_prefix: bool) { + let (mut app, ctx, point, group) = review_gesture_group_fixture(); + let at = review_gesture_screen(&app, &ctx, point); + if sampler_prefix { + click_control(&mut app, &ctx, SAMPLE_TIP); + } + app.run("select.none", json!({})).unwrap(); + let (start, step) = review_gesture_times(&ctx); + if sampler_prefix { + let expected = review_gesture_state(&app); + review_gesture_press(&mut app, &ctx, at, start); + review_gesture_release(&mut app, &ctx, at, start + step); + assert_eq!(review_gesture_state(&app), expected, "the stale prefix was consumed in the earlier frame"); + } + frame_at(&mut app, &ctx, start + 3.0 * step, vec![ + Event::PointerMoved(at), review_596866_button(at, true), review_596866_button(at, false), + review_596866_button(at, true), review_596866_button(at, false), + ]); + assert!(ctx.input(|i| i.pointer.button_double_clicked(PointerButton::Primary))); + assert_eq!(ctx.input(|i| i.pointer.button_triple_clicked(PointerButton::Primary)), sampler_prefix); + assert_eq!(app.session.active().unwrap().isolation, Some(group), "two ordinary clicks isolate after an earlier-frame prefix"); + app.run("object.exitIsolation", json!({"all": true})).unwrap(); + review_gesture_press(&mut app, &ctx, at, start + 5.0 * step); + review_gesture_release(&mut app, &ctx, at, start + 6.0 * step); + assert!(ctx.input(|i| i.pointer.button_triple_clicked(PointerButton::Primary))); + assert_eq!(app.session.active().unwrap().isolation, None, "the next ordinary Triple must not inherit a corrected Double"); +} + +#[test] +fn review_597048_two_ordinary_clicks_in_one_frame_survive_sampler_correction() { + review_597048_coalesced_pair(false); + review_597048_coalesced_pair(true); +} + +#[test] +fn review_597048_a_later_drag_release_does_not_replace_a_qualified_double_click() { + let (mut control, control_ctx, point, group) = review_gesture_group_fixture(); + let at = review_gesture_screen(&control, &control_ctx, point); + review_gesture_ordinary_pair(&mut control, &control_ctx, at, at, group); + let (mut app, ctx, point, group) = review_gesture_group_fixture(); + app.run("select.none", json!({})).unwrap(); + let at = review_gesture_screen(&app, &ctx, point); + let blank = review_gesture_screen(&app, &ctx, Point::new(340.0, 250.0)); + let distance = ctx.options(|o| o.input_options.max_click_dist); + let away = blank + vec2(distance + 8.0, 0.0); + assert!(app.canvas_rect.unwrap().contains(away) && away.distance(blank) > distance); + let (start, step) = review_gesture_times(&ctx); + review_gesture_press(&mut app, &ctx, at, start); + review_gesture_release(&mut app, &ctx, at, start + step); + review_gesture_press(&mut app, &ctx, at, start + 3.0 * step); + frame_at(&mut app, &ctx, start + 4.0 * step, vec![ + review_596866_button(at, false), Event::PointerMoved(blank), review_596866_button(blank, true), + Event::PointerMoved(away), review_596866_button(away, false), + ]); + assert!(ctx.input(|i| i.pointer.button_double_clicked(PointerButton::Primary))); + assert!(!ctx.input(|i| i.pointer.button_triple_clicked(PointerButton::Primary)), "the out-of-slop drag is not a third click"); + assert_eq!(ctx.input(|i| i.pointer.interact_pos()), Some(away)); + assert_eq!(app.session.active().unwrap().isolation, Some(group), "the qualified Double belongs to the earlier group release"); +} From 18793ed27db0dcea221350d2f05649972972e9c9 Mon Sep 17 00:00:00 2001 From: yoriswind Date: Thu, 19 Nov 2026 03:45:18 -0800 Subject: [PATCH 73/78] Fix redundant color-management closure borrow --- crates/engine/src/cmd/colormgmt.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/engine/src/cmd/colormgmt.rs b/crates/engine/src/cmd/colormgmt.rs index 0ac4f8c3b0..bfaece3d77 100644 --- a/crates/engine/src/cmd/colormgmt.rs +++ b/crates/engine/src/cmd/colormgmt.rs @@ -1003,7 +1003,7 @@ impl PasteProfile { if o.keys().any(|k| k != "rgb" && k != "cmyk") { return Err(refuse()); } - let model = |m: &str| o.get(m).map(&one).transpose(); + let model = |m: &str| o.get(m).map(one).transpose(); Ok(Some(PasteChoice { rgb: model("rgb")?, cmyk: model("cmyk")? })) } Some(v) => { From 24da5d29360ae2028f9579b43281072718098728 Mon Sep 17 00:00:00 2001 From: HassanKhan Date: Thu, 19 Nov 2026 15:26:45 +0500 Subject: [PATCH 74/78] Tests: script_io makes its temp folders by their real paths On macOS the temp folder /var/... is a link to /private/var/.... Kept script file grants hold real paths, and ScriptScope refuses a path by its names alone when they don't start with a granted path, so the 11 grant tests that name their files under the temp folder were refused and asked again. folder() now returns the real path of the folder it makes. ui_inspect_script_report_leaves_out_files_outside_the_read_root failed on macOS for the same reason: the report names the included file by its real path, and the test compared it with the /var spelling. It now compares with the real path. No change outside the tests. Fixes #8693 --- crates/engine/src/tests/script_io.rs | 6 ++++-- crates/ui-egui/src/tests/automation.rs | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/crates/engine/src/tests/script_io.rs b/crates/engine/src/tests/script_io.rs index 7c8c167527..7653dc083d 100644 --- a/crates/engine/src/tests/script_io.rs +++ b/crates/engine/src/tests/script_io.rs @@ -12,12 +12,14 @@ use crate::*; const DENIED: &str = "Script file access denied"; -/// A fresh folder for test `name`, with a `main` folder inside it for the script. +/// A fresh folder for test `name`, with a `main` folder inside it for the script, by its real +/// path: kept grants hold real paths, and a path named through a link (macOS's `/var` is +/// `/private/var`) is refused by its names alone. fn folder(name: &str) -> PathBuf { let base = std::env::temp_dir().join(format!("vc-script-io-{name}-{}", std::process::id())); let _ = std::fs::remove_dir_all(&base); std::fs::create_dir_all(base.join("main")).unwrap(); - base + std::fs::canonicalize(&base).unwrap() } fn write(path: &Path, bytes: &[u8]) { diff --git a/crates/ui-egui/src/tests/automation.rs b/crates/ui-egui/src/tests/automation.rs index 7a904e4646..00505b84cc 100644 --- a/crates/ui-egui/src/tests/automation.rs +++ b/crates/ui-egui/src/tests/automation.rs @@ -1310,7 +1310,9 @@ fn ui_inspect_script_report_leaves_out_files_outside_the_read_root() { std::fs::write(base.join("outside/bad.jsxinc"), "\nthrow new Error('stopped here');\n").unwrap(); finish(&mut app, json!({"path": s(base.join("outside/run.jsx"))})); let person = crate::control::inspect(&app, &ctx); - assert_eq!(person["scriptReport"]["file"], json!(s(base.join("outside/bad.jsxinc"))), "{person}"); + // The report names the file by its real path (on macOS the temp folder is reached through a link). + let bad = std::fs::canonicalize(base.join("outside/bad.jsxinc")).unwrap(); + assert_eq!(person["scriptReport"]["file"], json!(s(bad)), "{person}"); let r = request(&mut app, &tx, "ui.inspect", json!({})); assert_eq!(r["result"]["scriptReport"]["file"], "bad.jsxinc", "{r}"); assert!(r["result"]["scriptReport"]["console"].to_string().contains("bad.jsxinc:2:"), "{r}"); From ce009c54a8f2f0beca6f8118f14e4834b9307104 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Thu, 19 Nov 2026 04:48:11 -0800 Subject: [PATCH 75/78] Print: a Perceptual gradient keeps the ink below across a paper-white stretch Follow-up to #8400. A Perceptual gradient expands each segment into stops on its OKLab curve. Between two stops of the same color the round trip through OKLab rounded the color, so a stretch between two paper-white stops came out as nearly white RGB. On a PostScript plate the separator then saw ink there, and an overprinting gradient painted over the ink below across that stretch. Gradient::expanded now gives a stop between two stops of the same color that color, unchanged, for every method. GradientMethod::mix and Gradient::sample are not changed. --- crates/color/src/gradient.rs | 9 ++++++--- crates/eps/src/print/tests.rs | 28 +++++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/crates/color/src/gradient.rs b/crates/color/src/gradient.rs index 05b7f4839c..b88253b714 100644 --- a/crates/color/src/gradient.rs +++ b/crates/color/src/gradient.rs @@ -621,7 +621,8 @@ impl Gradient { } /// Stops expanded so that midpoints are represented as explicit stops (for renderers without /// midpoints), and a Perceptual gradient's segments as stops on its curve (for renderers that - /// mix linearly; within [`PERCEPTUAL_TOLERANCE`] of it). + /// mix linearly; within [`PERCEPTUAL_TOLERANCE`] of it). A stop between two stops of the same + /// color is that color, as it is, so paper white or a tint stays exact. pub fn expanded_stops(&self) -> Vec<(f32, Color, f32)> { self.expanded().map(|(t, c, o, _)| (t, c, o)).collect() } @@ -638,6 +639,9 @@ impl Gradient { // Otherwise (repeated or unsorted offsets) each midpoint is looked up as `sample` would // find it, but by binary search: a scan of all the stops per midpoint cost their square. let reach = if increasing || !self.method.is_classic() { None } else { Some(StopReach::new(&self.stops)) }; + // Two stops of the same color mix to that color, as it is: a mix through display RGB or + // OKLab would change its model or round its numbers. + let mix = move |a: &Color, b: &Color, v| if a == b { *a } else { self.method.mix(a, b, v) }; self.stops.iter().enumerate().flat_map(move |(i, s)| { let next = self.stops.get(i + 1); let off_centre = (s.midpoint - 0.5).abs() > 1e-3; @@ -646,7 +650,6 @@ impl Gradient { let t = s.offset + (n.offset - s.offset) * s.midpoint; // Mixed from the two stops it lies between, as `sample` would: searching all the // stops again for each midpoint made many stops cost their square. - let mix = |a: &Color, b: &Color, v| self.method.mix(a, b, v); let (c, o) = match &reach { Some(reach) => reach.sample_with(&self.stops, t, &mix), None => between(s, n, t, &mix), @@ -661,7 +664,7 @@ impl Gradient { let mid = v == 0.5; let t = curve_offset(s, n, v); let o = s.opacity + (n.opacity - s.opacity) * v; - (t, self.method.mix(&s.color, &n.color, v), o, (mid && off_centre).then_some(s.midpoint), None) + (t, mix(&s.color, &n.color, v), o, (mid && off_centre).then_some(s.midpoint), None) }) }); std::iter::once((s.offset, s.color, s.opacity, None, Some(i))).chain(classic).chain(perceptual.into_iter().flatten()) diff --git a/crates/eps/src/print/tests.rs b/crates/eps/src/print/tests.rs index 1aaa0866f8..4c922b25e9 100644 --- a/crates/eps/src/print/tests.rs +++ b/crates/eps/src/print/tests.rs @@ -2,7 +2,7 @@ //! reader reads back. use vectorcraft_color::{ - Color, Freeform, FreeformPoint, Gradient, GradientGeom, GradientKind, GradientPaint, GradientSpread, GradientStop, Paint, Swatch, + Color, Freeform, FreeformPoint, Gradient, GradientGeom, GradientKind, GradientMethod, GradientPaint, GradientSpread, GradientStop, Paint, Swatch, }; use vectorcraft_doc::{Appearance, CharStyle, Document, Node, NodeId, NodeKind, StrokeGradientMode, TextObject}; use vectorcraft_geom::{Affine, Point, Rect, Vec2, shapes}; @@ -311,6 +311,32 @@ fn an_overprinting_diamond_gradient_without_a_frame_keeps_the_ink_below_on_a_pos assert_keeps_the_ink_below(&cases); } +#[test] +fn an_overprinting_gradient_with_stops_written_between_its_stops_keeps_the_ink_below_on_a_postscript_plate() { + // None of the cyan from 0.3 to 0.6: the stops written between those two stops (along a + // Perceptual or hue mix, or at a Classic gradient's off-centre midpoint) are paper white too. + let (inked, none) = (Color::cmyk(0.6, 0.3, 0.0, 0.0), Color::cmyk(0.0, 0.3, 0.0, 0.0)); + let stops = [(0.0, inked), (0.3, none), (0.6, none), (1.0, inked)]; + let c = Point::new(100.0, 50.0); + let around = GradientGeom { start: c, end: c + Vec2::new(70.0, -20.0), aspect: 0.7, focal: None }; + let across = GradientGeom { start: Point::new(30.0, 40.0), end: Point::new(170.0, 60.0), aspect: 1.0, focal: None }; + let cyan = Paint::solid(Color::cmyk(1.0, 0.0, 0.0, 0.0)); + let shapes = [(GradientKind::Linear, across, "linear"), (GradientKind::Radial, around, "radial"), (GradientKind::Diamond, around, "diamond")]; + let mut cases = vec![]; + for method in [GradientMethod::Classic, GradientMethod::Perceptual, GradientMethod::HueClockwise, GradientMethod::HueCounterclockwise] { + for (kind, geom, shape) in shapes { + let mut fill = gradient(kind, &stops, geom, GradientSpread::Pad); + if let Paint::Gradient(g) = &mut fill { + g.gradient.method = method; + g.gradient.stops[1].midpoint = 0.3; + } + cases.push((format!("{shape}, {}", method.label()), overprinting(fill, Paint::None), cyan.clone(), "Cyan")); + } + } + let cases: Vec<_> = cases.iter().map(|(name, art, under, ink)| (name.as_str(), art.clone(), under.clone(), *ink)).collect(); + assert_keeps_the_ink_below(&cases); +} + /// [`keeps_the_ink_below`] for each of `cases` (a name, the art, the paint under it and the ink /// of the plate) at Level 3 and Level 2, with every case that fails named. fn assert_keeps_the_ink_below(cases: &[(&str, Node, Paint, &str)]) { From 2b1aa98c6f766f3456bc953577d0096e6c6f1c45 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Thu, 19 Nov 2026 05:12:15 -0800 Subject: [PATCH 76/78] Links: the request to show the selected image applies only in its own document The Control bar label's request to scroll the Links panel to the selected image now carries the document it was made in. A draw of another document drops it and leaves the Show filter as it is, and every draw that reads the request clears it, including one with an empty list. --- crates/ui-egui/src/panels/links.rs | 19 +++++++++++-------- crates/ui-egui/src/panels/tests_links.rs | 24 +++++++++++++++++++++++- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/crates/ui-egui/src/panels/links.rs b/crates/ui-egui/src/panels/links.rs index 49706b4294..14794de987 100644 --- a/crates/ui-egui/src/panels/links.rs +++ b/crates/ui-egui/src/panels/links.rs @@ -89,7 +89,8 @@ fn set_options(ctx: &egui::Context, f: impl FnOnce(&mut Options)) { /// thumbnail size and DCS option keep their settings. pub(crate) fn show_selected_image(app: &mut VectorcraftApp, ctx: &egui::Context) { let first = selected_images(app).first().copied(); - set_pstate(ctx, "links-scroll-to", first); + let request = app.session.active().map(|st| st.uid).zip(first); + set_pstate(ctx, "links-scroll-to", request); // The list drawn next is read after this request, so a row a file change has just brought // into the Show filter is there to scroll to. let mut c: std::sync::Arc = pstate(ctx, "links-cache"); @@ -602,9 +603,15 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) { widgets::dim_label(ui, tl!("No document")); return; }; - // A Show filter that leaves out the row `show_selected_image` asks for goes back to Show All, - // decided from the rows this frame draws and scrolls through. - let scroll_to: Option = pstate(ui.ctx(), "links-scroll-to"); + // The row that `show_selected_image` asks for, used by this draw only and only in the document + // it was asked in. A Show filter that leaves the row out goes back to Show All, decided from the + // rows this frame draws and scrolls through. + let request: Option<(u64, u64)> = pstate(ui.ctx(), "links-scroll-to"); + if request.is_some() { + set_pstate::>(ui.ctx(), "links-scroll-to", None); + } + let uid = app.session.active().map(|st| st.uid); + let scroll_to = request.filter(|(doc, _)| Some(*doc) == uid).map(|(_, id)| id); let listed = |cache: &Cache, id: u64| cache.list["links"].as_array().is_some_and(|rows| rows.iter().any(|r| r["id"].as_u64() == Some(id))); if scroll_to.filter(|id| o.show != "all" && !listed(&cache, *id)).is_some() { set_options(ui.ctx(), |o| o.show = "all"); @@ -630,10 +637,6 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) { super::empty_state(ui, "link", tl!("No images"), detail); return; } - // The row that `show_selected_image` asks the list to scroll to, once. - if scroll_to.is_some() { - set_pstate::>(ui.ctx(), "links-scroll-to", None); - } egui::ScrollArea::vertical().max_height(260.0).auto_shrink([false, true]).show(ui, |ui| { let h = o.thumb.max(16.0) + 6.0; for r in rows { diff --git a/crates/ui-egui/src/panels/tests_links.rs b/crates/ui-egui/src/panels/tests_links.rs index 03d333dc10..12a0c293b1 100644 --- a/crates/ui-egui/src/panels/tests_links.rs +++ b/crates/ui-egui/src/panels/tests_links.rs @@ -263,7 +263,29 @@ fn opening_the_panel_on_the_selected_image_decides_the_filter_from_the_drawn_row super::links::show_selected_image(&mut app, &ctx); std::fs::write(dir.0.join("linked.png"), bytes).unwrap(); assert_eq!(drawn(&mut app, 2.0), 2, "the restored image's row and its Link Info are drawn"); - assert_eq!(super::pstate::>(&ctx, "links-scroll-to"), None, "the scroll request is used on the row"); + assert_eq!(super::pstate::>(&ctx, "links-scroll-to"), None, "the scroll request is used on the row"); +} + +/// A request to show the selected image applies only in the document it was made in: drawn for +/// another document, the panel keeps its Show filter and drops the request. +#[test] +fn opening_the_panel_on_the_selected_image_leaves_another_document_alone() { + let dir = Folder::new("show-selected-other-doc"); + let (mut app, linked, _) = app(&dir); + let ctx = egui::Context::default(); + crate::theme::install_fonts(&ctx); + let text = |app: &mut VectorcraftApp, time: f64| { + let raw = egui::RawInput { time: Some(time), ..Default::default() }; + let texts = super::tests_appearance::frame_raw(&ctx, app, raw, super::links::show); + texts.into_iter().map(|(t, _)| t).collect::>().join("\n") + }; + app.run("select.set", json!({"ids": [linked]})).unwrap(); + click_menu_item(&mut app, &ctx, "Show Missing", 1.0); + super::links::show_selected_image(&mut app, &ctx); + app.run("file.new", json!({"width": 400, "height": 300})).unwrap(); + let other = text(&mut app, 2.0); + assert!(other.contains("Nothing matches the Show filter."), "the other document keeps Show Missing: {other}"); + assert_eq!(super::pstate::>(&ctx, "links-scroll-to"), None, "the request is dropped"); } /// A frame that fetches nothing keeps the stored rows and Link Info as they are, without a copy; the From cb8f5e04057a25d2ae71fc935f64e71423ec0d90 Mon Sep 17 00:00:00 2001 From: FredApps <153173854+FredApps@users.noreply.github.com> Date: Thu, 19 Nov 2026 21:18:36 +0700 Subject: [PATCH 77/78] chore: unify shared craft-libs pin for HPGL and palette (#8703) * 778: align shared dependencies on merged HPGL repair [skip ci] * 778: record Windows-resolved unified shared lock [skip ci] * 778: prepare unified merged palette dependency revision [skip ci] * 778: record Windows-resolved palette revision lock [skip ci] --------- Co-authored-by: Codex --- Cargo.lock | 84 +++++++++++++++++---------------- Cargo.toml | 64 ++++++++++++------------- apps/vectorcraft-web/Cargo.toml | 2 +- crates/text/Cargo.toml | 2 +- 4 files changed, 78 insertions(+), 74 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fa3b9166e7..65cc426291 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1001,7 +1001,7 @@ dependencies = [ [[package]] name = "craft-affinity" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "crc32fast", "flate2", @@ -1012,12 +1012,12 @@ dependencies = [ [[package]] name = "craft-codepage" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" [[package]] name = "craft-dds" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "rayon", ] @@ -1025,12 +1025,12 @@ dependencies = [ [[package]] name = "craft-docpath" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" [[package]] name = "craft-dxf" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "craft-codepage", "encoding_rs", @@ -1042,12 +1042,12 @@ dependencies = [ [[package]] name = "craft-eps" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" [[package]] name = "craft-font-catalog" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=23acc704933a9a5619a5cd1cddc9bb1fb5a9b2d3#23acc704933a9a5619a5cd1cddc9bb1fb5a9b2d3" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "harfrust 0.13.3", "kurbo 0.13.1", @@ -1061,12 +1061,12 @@ dependencies = [ [[package]] name = "craft-fonts-build" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" [[package]] name = "craft-gif" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "gif", ] @@ -1074,7 +1074,7 @@ dependencies = [ [[package]] name = "craft-gzip" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "flate2", ] @@ -1082,7 +1082,7 @@ dependencies = [ [[package]] name = "craft-i18n" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "fixed_decimal", "icu_decimal", @@ -1105,7 +1105,7 @@ dependencies = [ [[package]] name = "craft-image-codecs" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "craft-dds", "craft-jpeg", @@ -1132,7 +1132,7 @@ dependencies = [ [[package]] name = "craft-jpeg" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "thiserror 2.0.21", ] @@ -1140,8 +1140,9 @@ dependencies = [ [[package]] name = "craft-jxl" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ + "brotli-decompressor 5.0.3", "jixel", "jxl-oxide", "thiserror 2.0.21", @@ -1150,7 +1151,7 @@ dependencies = [ [[package]] name = "craft-keymap" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "egui", "serde", @@ -1160,7 +1161,7 @@ dependencies = [ [[package]] name = "craft-metadata" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "brotli-decompressor 6.3.2", "chrono", @@ -1172,7 +1173,7 @@ dependencies = [ [[package]] name = "craft-metafile" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "encoding_rs", "image", @@ -1183,7 +1184,7 @@ dependencies = [ [[package]] name = "craft-mime" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "chrono", "craft-codepage", @@ -1193,7 +1194,7 @@ dependencies = [ [[package]] name = "craft-pdf" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "hayro-interpret", "hayro-syntax", @@ -1204,15 +1205,16 @@ dependencies = [ [[package]] name = "craft-plotter" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=a7fb55eaf9a15c21e8ce0b13cf605dc54fd15f57#a7fb55eaf9a15c21e8ce0b13cf605dc54fd15f57" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ + "kurbo 0.13.1", "thiserror 2.0.21", ] [[package]] name = "craft-print" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "craft-winprint-gdi", "log", @@ -1226,7 +1228,7 @@ dependencies = [ [[package]] name = "craft-proof" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "log", "miniz_oxide 0.9.1", @@ -1237,7 +1239,7 @@ dependencies = [ [[package]] name = "craft-ps" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "flate2", "kurbo 0.13.1", @@ -1246,7 +1248,7 @@ dependencies = [ [[package]] name = "craft-psd" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "encoding_rs", "flate2", @@ -1257,7 +1259,7 @@ dependencies = [ [[package]] name = "craft-stream-codecs" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "fax", "hayro-ccitt", @@ -1268,12 +1270,14 @@ dependencies = [ [[package]] name = "craft-svg" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "craft-image-codecs", "craft-xml", "data-url", "flate2", + "gif", + "image-webp", "kurbo 0.13.1", "quick-xml 0.41.0", "resvg 0.48.1", @@ -1287,7 +1291,7 @@ dependencies = [ [[package]] name = "craft-tiff" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "serde", "thiserror 2.0.21", @@ -1296,7 +1300,7 @@ dependencies = [ [[package]] name = "craft-ui" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "craft-fonts-build", "craft-i18n", @@ -1317,7 +1321,7 @@ dependencies = [ [[package]] name = "craft-update" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "chrono", "dunce", @@ -1344,7 +1348,7 @@ dependencies = [ [[package]] name = "craft-vectorcraft-format" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "flate2", "serde", @@ -1355,7 +1359,7 @@ dependencies = [ [[package]] name = "craft-web-api" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "js-sys", "serde_json", @@ -1366,7 +1370,7 @@ dependencies = [ [[package]] name = "craft-window" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "egui", "objc2 0.6.5", @@ -1385,7 +1389,7 @@ dependencies = [ [[package]] name = "craft-xml" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "quick-xml 0.41.0", "serde", @@ -2492,7 +2496,7 @@ checksum = "9f4d0e94ddd48749f06bbe4e5389fb9799a0c45bcaf00495042076ef05e3241a" [[package]] name = "hayro-cmap" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "brotli", "hayro-postscript", @@ -2501,7 +2505,7 @@ dependencies = [ [[package]] name = "hayro-interpret" version = "0.7.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "bitflags 2.13.2", "hayro-cmap", @@ -2519,7 +2523,7 @@ dependencies = [ [[package]] name = "hayro-jbig2" version = "0.3.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "fearless_simd", "hayro-ccitt", @@ -2537,12 +2541,12 @@ dependencies = [ [[package]] name = "hayro-postscript" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" [[package]] name = "hayro-syntax" version = "0.7.2" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "flate2", "hayro-ccitt", @@ -3342,7 +3346,7 @@ dependencies = [ [[package]] name = "krilla" version = "0.8.2" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "base64 0.22.1", "bumpalo", @@ -3451,7 +3455,7 @@ checksum = "d4a5ff6bcca6c4867b1c4fd4ef63e4db7436ef363e0ad7531d1558856bae64f4" [[package]] name = "linesweeper" version = "0.5.0" -source = "git+https://github.com/storytold/craft-libs?rev=64b181977a0488e4d1e167bc5cc8cfededc2ed4b#64b181977a0488e4d1e167bc5cc8cfededc2ed4b" +source = "git+https://github.com/storytold/craft-libs?rev=50b0ee7bf811e363b5f238382b5c77318cf33e46#50b0ee7bf811e363b5f238382b5c77318cf33e46" dependencies = [ "arrayvec", "kurbo 0.13.1", diff --git a/Cargo.toml b/Cargo.toml index e334f3e9e3..fea9cdda55 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,40 +11,40 @@ rust-version = "1.95" repository = "https://github.com/storytold/vectorcraft" [workspace.dependencies] -craft-pdf = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b", default-features = false, features = ["interpret", "write"] } -craft-print = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } -craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } -craft-ui = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b", features = ["serde"] } -craft-keymap = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } -craft-proof = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } +craft-pdf = { git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46", default-features = false, features = ["interpret", "write"] } +craft-print = { git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46" } +craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46" } +craft-ui = { git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46", features = ["serde"] } +craft-keymap = { git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46" } +craft-proof = { git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46" } # Decides who draws the window frame (desktop vs. app) so the suite shares one native titlebar per # desktop. The `egui` feature adds `craft_window::decorate`. (craft-libs#217.) -craft-window = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b", features = ["egui"] } +craft-window = { git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46", features = ["egui"] } # The `.vectorcraft` envelope: its members, version, embedded images and the data after the JSON. -craft-vectorcraft-format = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } -craft-gzip = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } +craft-vectorcraft-format = { git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46" } +craft-gzip = { git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46" } # craft-update: app-specific pretend versions apply to startup and manual checks. # Native Affinity documents (craft-libs#914). -craft-affinity = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } +craft-affinity = { git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46" } # SVG parsing, limits, SVGZ and writer (craft-libs#778). -craft-svg = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b", features = ["tree"] } -craft-mime = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } +craft-svg = { git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46", features = ["tree"] } +craft-mime = { git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46" } # EPS container, previews, ASCII85 and DSC comments (craft-libs#778). -craft-eps = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } +craft-eps = { git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46" } # DXF tags, reader and writer (craft-libs#778, #926, #927). -craft-plotter = { git = "https://github.com/storytold/craft-libs", rev = "a7fb55eaf9a15c21e8ce0b13cf605dc54fd15f57" } -craft-dxf = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } +craft-plotter = { git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46" } +craft-dxf = { git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46" } # WMF, EMF and EMF+ reader (craft-libs#778). -craft-metafile = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } -craft-xml = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } -craft-image-codecs = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } -craft-gif = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } -craft-tiff = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } -craft-ps = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b", default-features = false, features = ["write"] } -craft-psd = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } -craft-stream-codecs = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } -craft-jxl = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } -craft-update = { git = "https://github.com/storytold/craft-libs", version = "=0.1.0", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b", features = ["egui"] } +craft-metafile = { git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46" } +craft-xml = { git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46" } +craft-image-codecs = { git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46" } +craft-gif = { git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46" } +craft-tiff = { git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46" } +craft-ps = { git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46", default-features = false, features = ["write"] } +craft-psd = { git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46" } +craft-stream-codecs = { git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46" } +craft-jxl = { git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46" } +craft-update = { git = "https://github.com/storytold/craft-libs", version = "=0.1.0", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46", features = ["egui"] } # internal vectorcraft-geom = { path = "crates/geom" } vectorcraft-color = { path = "crates/color" } @@ -185,13 +185,13 @@ lto = "thin" codegen-units = 1 [patch.crates-io] -hayro-syntax = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } -hayro-interpret = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } -hayro-jbig2 = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } -hayro-cmap = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } -hayro-postscript = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } -krilla = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } -linesweeper = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b" } +hayro-syntax = { git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46" } +hayro-interpret = { git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46" } +hayro-jbig2 = { git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46" } +hayro-cmap = { git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46" } +hayro-postscript = { git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46" } +krilla = { git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46" } +linesweeper = { git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46" } ecolor = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" } emath = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" } epaint = { git = "https://github.com/storytold/egui.git", rev = "6d518fc799681571963842f95b55a6b68431b15a" } diff --git a/apps/vectorcraft-web/Cargo.toml b/apps/vectorcraft-web/Cargo.toml index f86996f075..9569d2b3f3 100644 --- a/apps/vectorcraft-web/Cargo.toml +++ b/apps/vectorcraft-web/Cargo.toml @@ -17,7 +17,7 @@ path = "src/main.rs" vectorcraft-engine = { workspace = true, features = ["bundled-fonts", "heif"] } vectorcraft-ui-egui = { workspace = true } # The page command API (storytold/craft-libs#413): the request plumbing behind window.vectorcraft. -craft-web-api = { git = "https://github.com/storytold/craft-libs", rev = "64b181977a0488e4d1e167bc5cc8cfededc2ed4b", version = "0.1.0" } +craft-web-api = { git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46", version = "0.1.0" } vectorcraft-format = { workspace = true } vectorcraft-text = { workspace = true } egui = { workspace = true } diff --git a/crates/text/Cargo.toml b/crates/text/Cargo.toml index c0fc17876a..07695b034c 100644 --- a/crates/text/Cargo.toml +++ b/crates/text/Cargo.toml @@ -10,7 +10,7 @@ workspace = true [dependencies] # The shared font catalog from craft-libs main (it has the outline, bidi and caret helpers used here). -craft-font-catalog = { git = "https://github.com/storytold/craft-libs", rev = "23acc704933a9a5619a5cd1cddc9bb1fb5a9b2d3", default-features = false } +craft-font-catalog = { git = "https://github.com/storytold/craft-libs", rev = "50b0ee7bf811e363b5f238382b5c77318cf33e46", default-features = false } vectorcraft-geom = { workspace = true } vectorcraft-doc = { workspace = true } kurbo = { workspace = true } From ddb9495876a222f1135d12a77f53052ccc28d820 Mon Sep 17 00:00:00 2001 From: FredApps <153173854+FredApps@users.noreply.github.com> Date: Thu, 19 Nov 2026 21:22:05 +0700 Subject: [PATCH 78/78] Reland HP-GL/2 shared byte writer (#8697) * HPGL: delegate encoding to repaired shared byte writer [skip ci] * HPGL: apply hosted rustfmt layout [skip ci] * HPGL: unblock CAD validation with equivalent document condition [skip ci] * HPGL: express duplicate point filter as match guard [skip ci] * 778: simplify baseline CAD dependency predicates [skip ci] * 778: keep baseline lint fixes out of HPGL cutover [skip ci] --------- Co-authored-by: Codex --- crates/cad/src/hpgl/write.rs | 46 ++++-------------------------- crates/cad/src/hpgl/write/tests.rs | 19 ++++++++++++ 2 files changed, 24 insertions(+), 41 deletions(-) diff --git a/crates/cad/src/hpgl/write.rs b/crates/cad/src/hpgl/write.rs index 06ddc09b93..4e08fb3f5e 100644 --- a/crates/cad/src/hpgl/write.rs +++ b/crates/cad/src/hpgl/write.rs @@ -534,47 +534,13 @@ fn plain(by_pen: &[Vec>]) -> Vec { /// HP-GL/2: `IN;`, the palette, each pen's paths as one `PE`, `PU;SP0;`. fn encoded(by_pen: &[Vec>], pens: &[[u8; 3]]) -> Vec { - let mut out = b"IN;".to_vec(); - if !pens.is_empty() { - // Pens 1 to n on a plotter, and on a raster device (whose pens are 0 to NP − 1) too. - let np = (pens.len() + 1).next_power_of_two().max(2); - out.extend(format!("NP{np};").bytes()); - for (i, [r, g, b]) in pens.iter().enumerate() { - out.extend(format!("PC{},{r},{g},{b};", i + 1).bytes()); - } - } - let mut at: Option<(i64, i64)> = None; - for (i, paths) in by_pen.iter().enumerate().filter(|(_, p)| !p.is_empty()) { - out.extend(format!("PU;SP{};PE", i + 1).bytes()); - for path in paths { - for (k, &p) in path.iter().enumerate() { - if k == 0 { - out.push(b'<'); - } - // The first move of the plot is absolute, and so is one longer than the range a - // device takes for each number; every other is relative. - match at.map(|a| (p.0 - a.0, p.1 - a.1)).filter(|d| d.0.abs() <= MAX_COORD && d.1.abs() <= MAX_COORD) { - None => { - out.push(b'='); - pe_number(&mut out, p.0); - pe_number(&mut out, p.1); - } - Some((dx, dy)) => { - pe_number(&mut out, dx); - pe_number(&mut out, dy); - } - } - at = Some(p); - } - } - out.push(b';'); - } - out.extend(b"PU;SP0;"); - out + let pens: Vec<_> = pens.iter().enumerate().map(|(index, &rgb)| craft_plotter::hpgl::write::Pen { number: index + 1, rgb }).collect(); + craft_plotter::hpgl::write::write_hpgl2(&pens, by_pen) } /// `v` as a base-64 PE number: the sign in the low bit, the low digits from 63 up and the last /// digit from 191 up. +#[cfg(test)] fn pe_number(out: &mut Vec, v: i64) { let mut n = (v.unsigned_abs() << 1) | u64::from(v < 0); while n >= 64 { @@ -973,10 +939,8 @@ impl<'a> Walk<'a> { end(&mut cur, &mut out, false); cur.push(p); } - PathEl::LineTo(p) => { - if cur.last() != Some(&p) { - cur.push(p); - } + PathEl::LineTo(p) if cur.last() != Some(&p) => { + cur.push(p); } PathEl::ClosePath => { let s = cur.first().copied(); diff --git a/crates/cad/src/hpgl/write/tests.rs b/crates/cad/src/hpgl/write/tests.rs index 493e53906c..f04b331696 100644 --- a/crates/cad/src/hpgl/write/tests.rs +++ b/crates/cad/src/hpgl/write/tests.rs @@ -1179,6 +1179,25 @@ fn encoded_numbers_follow_the_reference_guide() { assert_eq!(out, [194, 191]); } +/// The app adapter must preserve raw bytes and position across the one-based pen table. +#[test] +fn hpgl2_shared_writer_preserves_raw_bytes_and_pen_indices() { + let paths = vec![vec![vec![(32, -32)]], vec![], vec![vec![(33, -31)], vec![(34, -30)]]]; + let pens = [[1, 2, 3], [4, 5, 6], [7, 8, 9]]; + assert_eq!(encoded(&paths, &pens), b"IN;NP4;PC1,1,2,3;PC2,4,5,6;PC3,7,8,9;PU;SP1;PE<=?\xc0@\xc0;PU;SP3;PE<\xc1\xc1<\xc1\xc1;PU;SP0;"); +} + +#[test] +fn hpgl2_shared_writer_preserves_empty_and_last_admitted_pen() { + assert_eq!(encoded(&[], &[]), b"IN;PU;SP0;"); + let pens = vec![[0, 0, 0]; MAX_PENS]; + let mut paths = vec![vec![]; MAX_PENS]; + paths[MAX_PENS - 1] = vec![vec![(0, 0)]]; + let bytes = encoded(&paths, &pens); + assert!(bytes.starts_with(b"IN;NP256;PC1,0,0,0;")); + assert!(bytes.ends_with(b"PC255,0,0,0;PU;SP255;PE<=\xbf\xbf;PU;SP0;")); +} + #[test] fn hpgl2_writes_the_palette_and_encoded_polylines() { let out = plot(&three(), &HpglOptions { version: Version::Hpgl2, ..opts(&three()) });