Skip to content

VectorCraft: An open-source, vector art tool written by scratch in pure Rust

M3: rustfmt eyedropper and brush key-color UI

Cursor Agentb13072b77c40
diff --git a/crates/tools/src/xform/eyedropper.rs b/crates/tools/src/xform/eyedropper.rs
index 190c2af3f..5356452ed 100644
--- a/crates/tools/src/xform/eyedropper.rs
+++ b/crates/tools/src/xform/eyedropper.rs
@@ -99,10 +99,7 @@ impl Tool for EyedropperTool {
let back = self.stop.clone().unwrap_or_else(|| "selection".to_string());
self.brush_key_color = false;
self.stop = None;
- return vec![
- Action::Dialog("brushKeyColor".into(), json!({ "color": color_json(&c) })),
- Action::SwitchTool(back),
- ];
+ return vec![Action::Dialog("brushKeyColor".into(), json!({ "color": color_json(&c) })), Action::SwitchTool(back)];
}
let stop = self.stop.as_ref().zip(cx.gradient_stop);
// Reading a source is independent of its editability. Only Alt's reverse operation
@@ -228,10 +225,7 @@ mod tests {
let a = t.pointer(&cx, &PointerEvent::new(PointerKind::Down, 150.0, 150.0));
assert_eq!(
a,
- vec![
- Action::Dialog("brushKeyColor".into(), json!({ "color": color_json(&Color::WHITE) })),
- Action::SwitchTool("selection".into())
- ]
+ vec![Action::Dialog("brushKeyColor".into(), json!({ "color": color_json(&Color::WHITE) })), Action::SwitchTool("selection".into())]
);
assert_eq!(t.options(), json!({ "stop": null, "brushKeyColor": false }));
}
diff --git a/crates/ui-egui/src/dialogs/brush_art_options.rs b/crates/ui-egui/src/dialogs/brush_art_options.rs
index f300b8ba6..29a664679 100644
--- a/crates/ui-egui/src/dialogs/brush_art_options.rs
+++ b/crates/ui-egui/src/dialogs/brush_art_options.rs
@@ -25,10 +25,10 @@ use vectorcraft_color::{Color, Paint};
use vectorcraft_doc::{Appearance, Document, Node, NodeId};
use super::brush_options::{clamped, mode_key, stroke_preview};
+use crate::VectorcraftApp;
use crate::state::Dialog;
use crate::theme::Tokens;
use crate::widgets;
-use crate::VectorcraftApp;
/// Scatter values: (field, suffix), in [`Scatter::RANGES`] order.
const SCATTER: [(&str, &str); 4] = [("size", "%"), ("spacing", "%"), ("scatter", "%"), ("rotation", "°")];
diff --git a/crates/ui-egui/src/panels/gradient.rs b/crates/ui-egui/src/panels/gradient.rs
index 624a0d8a9..909a292b2 100644
--- a/crates/ui-egui/src/panels/gradient.rs
+++ b/crates/ui-egui/src/panels/gradient.rs
@@ -1119,9 +1119,6 @@ mod tests {
let texts = Panel::new().frame(&mut app, vec![], Modifiers::NONE);
assert!(texts.iter().any(|(t, _)| t == "#FFFFFF"), "the stop's colour row: {texts:?}");
stop_eyedropper(&mut app);
- assert_eq!(
- (app.session.tool_id(), app.session.tool_options()),
- ("eyedropper", json!({"stop": "gradient", "brushKeyColor": false}))
- );
+ assert_eq!((app.session.tool_id(), app.session.tool_options()), ("eyedropper", json!({"stop": "gradient", "brushKeyColor": false})));
}
}