From fc6178d0214f4c238d941d9dd2407ccf18429b83 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sun, 1 Nov 2026 05:26:35 -0800 Subject: [PATCH] Recolor Artwork: spell color the American way in the new comments and test names --- crates/engine/src/cmd/recolor.rs | 4 ++-- crates/ui-egui/src/dialogs/recolor.rs | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/crates/engine/src/cmd/recolor.rs b/crates/engine/src/cmd/recolor.rs index 37ed6edd5..b1fd2489e 100644 --- a/crates/engine/src/cmd/recolor.rs +++ b/crates/engine/src/cmd/recolor.rs @@ -580,8 +580,8 @@ fn randomize(_: &mut Session, p: &Value) -> Result { let rows = parse_rows(p, C)?; let mut rng = Rng::new(super::menucmds::whole_or(p, "seed", 0, C)?); let (order, saturation_brightness) = (switch_or(p, "order", true, C)?, switch_or(p, "saturationBrightness", false, C)?); - // Each new colour with its row's tint and model: a tint moves with its colour, and goes when - // the colour changes; a model moves with its colour. + // Each new color with its row's tint and model: a tint moves with its color, and goes when + // the color changes; a model moves with its color. let mut news: Vec<(Color, f32, Option)> = rows.iter().filter_map(|r| r.new_color().map(|c| (c, r.tint, r.model))).collect(); if order { rng.shuffle(&mut news); diff --git a/crates/ui-egui/src/dialogs/recolor.rs b/crates/ui-egui/src/dialogs/recolor.rs index 1a3c8eab8..76f3a15e8 100644 --- a/crates/ui-egui/src/dialogs/recolor.rs +++ b/crates/ui-egui/src/dialogs/recolor.rs @@ -743,10 +743,10 @@ fn sliders(app: &VectorcraftApp, ui: &mut Ui, d: &mut Dialog, rows: &mut [Value] // Nothing to edit: the mode's sliders, disabled. let mode = mode.unwrap_or(Mode::Hsb); let input = Tokens::get(ui.ctx()).input; - let grey = move |_: f32| input; + let gray = move |_: f32| input; for (n, lbl) in mode.labels().iter().enumerate() { let shown = widgets::SliderValue::field(0.0, f64::from(mode.min(n))..=f64::from(mode.max(n)), mode.suffix(n), 0); - slider_cell(ui, n, lbl, shown, mode.suffix(n), &grey); + slider_cell(ui, n, lbl, shown, mode.suffix(n), &gray); if n % 2 == 1 { ui.end_row(); } @@ -922,7 +922,7 @@ fn edit_tab(ui: &mut Ui, d: &mut Dialog, rows: &mut [Value]) -> bool { /// Give the rows `active` the colours of `rule` from the base colour `b` of row `base` (the base row /// first, then the others in order, the rule's colours repeating), each in its row's model. A row -/// whose new colour changes loses its tint. +/// whose new color changes loses its tint. fn apply_rule(rows: &mut [Value], rule: Harmony, base: usize, b: Color, active: &[usize]) { let colors = rule.apply(b); let order = std::iter::once(base).chain(active.iter().copied().filter(|i| *i != base)); @@ -994,10 +994,10 @@ 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"]); } - /// A rule or a wheel move that gives a row a new colour drops the row's tint; a row whose - /// colour stays keeps it. + /// 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] - fn a_new_colour_from_the_edit_tab_drops_the_rows_tint() { + fn a_new_color_from_the_edit_tab_drops_the_rows_tint() { let tinted = || { let mut r = rows(); for row in &mut r { @@ -1007,7 +1007,7 @@ mod tests { }; let mut r = tinted(); apply_rule(&mut r, Harmony::Triad, 0, Color::rgb(1.0, 0.0, 0.0), &[0, 1, 2]); - assert_eq!(r[0]["tint"], json!(40.0), "the base row's colour stays"); + assert_eq!(r[0]["tint"], json!(40.0), "the base row's color stays"); assert!(r[1].get("tint").is_none() && r[2].get("tint").is_none(), "{r:?}"); let mut r = tinted(); move_color(&mut r, 0, [120.0, 1.0, 1.0], false);