Merge pull request #8327 from dotCooCoo/fix/raster-supplied-options

Fix #8324: retain supplied raster export controls
This commit is contained in:
BFlat
2026-11-18 12:58:09 +07:00
committed by GitHub
8 changed files with 81 additions and 4 deletions
+6 -1
View File
@@ -143,7 +143,12 @@ pub const UI_COMMANDS: &[(&str, &str, &str, &str)] = &[
"",
"{} opens SVG Options; with params = document.export {path?, svg?: {…SVG options}, range?…} (a .svgz path writes it gzipped)",
),
("file.export.png", "Export As PNG…", "", "{path?, …document.export options}; no path: pick the file, then PNG Options"),
(
"file.export.png",
"Export As PNG…",
"",
"{path?, …document.export options}; no path: pick the file, then PNG Options with supplied options retained and defaults for omitted options",
),
(
"file.exportForScreens",
"Export for Screens…",
+2
View File
@@ -1018,6 +1018,8 @@ mod tests_plugin_import;
#[cfg(test)]
mod tests_raster_formats;
#[cfg(test)]
mod tests_raster_supplied_options;
#[cfg(test)]
mod tests_svg_options_range;
#[cfg(test)]
+7 -2
View File
@@ -63,8 +63,13 @@ pub fn open(app: &mut VectorcraftApp, f: &Format, mut params: Value) {
false => export_size(&st.doc, &params),
});
if let Some(o) = params.as_object_mut() {
o.insert("ppi".into(), json!(72));
o.extend(defaults(app, f));
let mut initial = defaults(app, f);
initial.insert("ppi".into(), json!(72));
for (key, value) in initial {
if o.get(&key).is_none_or(Value::is_null) {
o.insert(key, value);
}
}
if let Some((w, h)) = size {
o.insert("__size".into(), json!([w, h]));
}
@@ -0,0 +1,54 @@
use serde_json::json;
use vectorcraft_engine::cmd::fileio;
use super::tests_export::{app, frame, kind};
use super::{confirm, png_options};
#[test]
fn raster_options_preserve_supplied_values_through_the_png_command() {
let (mut app, written) = app(1);
app.run("file.export.png", json!({"ppi": 300, "background": "#204080", "antiAlias": "type", "interlaced": true})).unwrap();
assert_eq!(kind(&app), Some("pngOptions"));
let fields = &app.ui.dialog.as_ref().unwrap().fields;
assert_eq!(fields["ppi"], 300);
assert_eq!(fields["background"], "#204080");
assert_eq!(fields["antiAlias"], "type");
assert_eq!(fields["interlaced"], true);
frame(&mut app);
confirm(&mut app).unwrap();
{
let output = written.borrow();
assert_eq!(output.len(), 1);
let png = &output[0].1;
assert_eq!(png[28], 1);
let physical = png.windows(4).position(|w| w == b"pHYs").unwrap();
assert_eq!(&png[physical + 4..physical + 8], ((300.0f64 / 0.0254).round() as u32).to_be_bytes());
let decoded = craft_image_codecs::decode(png).unwrap();
assert_eq!(decoded.dimensions(), (250, 167));
assert_eq!(&decoded.to_rgba8()[..4], &[0x20, 0x40, 0x80, 255]);
}
png_options::open(&mut app, fileio::format("jpg").unwrap(), json!({"format": "jpg", "path": "/out/supplied.jpg", "ppi": 144, "quality": 40}));
let fields = &app.ui.dialog.as_ref().unwrap().fields;
assert_eq!(fields["quality"], 40);
assert_eq!(fields["ppi"], 144);
assert_eq!(fields["background"], "white");
frame(&mut app);
confirm(&mut app).unwrap();
assert_eq!(written.borrow().len(), 2);
for omitted in [json!({}), json!({"ppi": null, "background": null, "antiAlias": null, "interlaced": null})] {
app.run("file.export.png", omitted).unwrap();
let fields = &app.ui.dialog.as_ref().unwrap().fields;
assert_eq!(fields["ppi"], 72);
assert_eq!(fields["background"], "transparent");
assert_eq!(fields["antiAlias"], "art");
assert_eq!(fields["interlaced"], false);
app.ui.dialog = None;
}
app.run("file.export.png", json!({"ppi": 0})).unwrap();
assert_eq!(app.ui.dialog.as_ref().unwrap().fields["ppi"], 0);
assert!(confirm(&mut app).unwrap_err().contains("ppi must be a positive number"));
assert_eq!(written.borrow().len(), 2);
}
+6 -1
View File
@@ -144,7 +144,12 @@ pub const UI_COMMANDS: &[(&str, &str, &str, &str)] = &[
"",
"{} opens SVG Options; with params = document.export {path?, svg?: {…SVG options}, range?…} (a .svgz path writes it gzipped)",
),
("file.export.png", "Export As PNG…", "", "{path?, …document.export options}; no path: pick the file, then PNG Options"),
(
"file.export.png",
"Export As PNG…",
"",
"{path?, …document.export options}; no path: pick the file, then PNG Options with supplied options retained and defaults for omitted options",
),
(
"file.exportForScreens",
"Export for Screens…",