mirror of
https://github.com/storytold/vectorcraft.git
synced 2026-11-19 03:08:00 +00:00
Save for Web: ui.dialog.set accepts __editColor to open the Color Picker
The color table's __editColor control opens the Color Picker on a source color, as a double-click on its swatch does. ui.dialog.set refused it as a protected field; Save for Web now lists it with its other controls.
This commit is contained in:
@@ -544,8 +544,9 @@ fn hidden_controls(d: &Dialog) -> &'static [&'static str] {
|
||||
}
|
||||
// The selected rows and Randomize's seed.
|
||||
Some(DialogKind::Recolor) => &["__seed", "__sel"],
|
||||
// The view, zoom, download speed, selected color table entries and the preset name being typed.
|
||||
Some(DialogKind::SaveForWeb) => &["__color", "__colors", "__kbps", "__presetName", "__view", "__zoom"],
|
||||
// The view, zoom, download speed, selected color table entries, the color table entry whose
|
||||
// Color Picker opens and the preset name being typed.
|
||||
Some(DialogKind::SaveForWeb) => &["__color", "__colors", "__editColor", "__kbps", "__presetName", "__view", "__zoom"],
|
||||
// The link that keeps width and height in proportion.
|
||||
Some(DialogKind::Shape | DialogKind::TransformEach) => &["__constrain"],
|
||||
// The attention filter, the Keys section, the search text and the key being recorded.
|
||||
|
||||
@@ -884,6 +884,30 @@ fn double_clicking_a_swatch_shifts_its_color() {
|
||||
assert_eq!((remembered.shifted.get("#0000ff").map(String::as_str), remembered.web_shift.len()), (Some("#00ff00"), 0));
|
||||
}
|
||||
|
||||
/// `ui.dialog.set` accepts `__editColor`, and the next frame opens the Color Picker on that color,
|
||||
/// whose OK shifts it.
|
||||
#[test]
|
||||
fn dialog_set_edit_color_opens_the_color_picker() {
|
||||
let dir = vectorcraft_testkit::temp_dir("sfw-edit-color-set");
|
||||
let (mut app, _) = app(&dir, false);
|
||||
app.run("shape.rectangle", json!({"x": 40, "y": 0, "width": 20, "height": 40})).unwrap();
|
||||
app.run("paint.setFill", json!({"color": "#0000ff"})).unwrap();
|
||||
app.run("file.saveForWeb", json!({})).unwrap();
|
||||
set(&mut app, "format", json!("gif"));
|
||||
let ctx = egui::Context::default();
|
||||
crate::theme::install_fonts(&ctx);
|
||||
let (req, _) = crate::control::ControlRequest::new("ui.dialog.set", json!({"field": "__editColor", "value": "#0000ff"}));
|
||||
let crate::control::Outcome::Done(r) = crate::control::handle(&mut app, &ctx, &req) else { panic!("not done") };
|
||||
assert_eq!(r["ok"], true, "{r}");
|
||||
tick(&mut app, &ctx, vec![]);
|
||||
assert_eq!(picker_color(&app).as_deref(), Some("#0000ff"));
|
||||
set(&mut app, "color", json!("#00ff00"));
|
||||
confirm(&mut app).unwrap();
|
||||
tick(&mut app, &ctx, vec![]);
|
||||
let shifted = app.ui.dialog.as_ref().map(|d| d.fields["colorTable"]["shifted"].clone());
|
||||
assert_eq!((kind(&app), shifted), (Some(save_for_web::KIND), Some(json!({"#0000ff": "#00ff00"}))));
|
||||
}
|
||||
|
||||
/// Click the dialog's text `label` with the pointer (frames a quarter second apart).
|
||||
fn click_text(app: &mut VectorcraftApp, label: &str) {
|
||||
let ctx = egui::Context::default();
|
||||
|
||||
Reference in New Issue
Block a user