From 7fa3ceb635b2475e9208df772265f32d095a01df Mon Sep 17 00:00:00 2001 From: el-j Date: Mon, 16 Nov 2026 11:33:39 +0100 Subject: [PATCH 1/4] Save PDF: show rasterization DPI and prompt confirmation when flattening transparency (#8097) --- crates/ui-egui/src/dialogs.rs | 1 + crates/ui-egui/src/dialogs/save_pdf.rs | 77 +++++++++++++++++++- crates/ui-egui/src/dialogs/save_pdf/tests.rs | 46 ++++++++++++ 3 files changed, 123 insertions(+), 1 deletion(-) diff --git a/crates/ui-egui/src/dialogs.rs b/crates/ui-egui/src/dialogs.rs index da1062838f..89b10f12c5 100644 --- a/crates/ui-egui/src/dialogs.rs +++ b/crates/ui-egui/src/dialogs.rs @@ -378,6 +378,7 @@ registry! { WarichuSettings: [warichu::KIND] => warichu::SPEC, CompositeFonts: [composite_fonts::KIND] => composite_fonts::SPEC, SavePdf: [save_pdf::KIND] => save_pdf::SPEC, + ConfirmFlattenPdf: [save_pdf::CONFIRM_FLATTEN] => save_pdf::CONFIRM_FLATTEN_SPEC, SvgOptions: [svg_options::KIND] => svg_options::SPEC, JavaScriptFiles: [javascript_files::KIND] => javascript_files::SPEC, SvgFilter: [svg_filter::KIND] => svg_filter::SPEC, diff --git a/crates/ui-egui/src/dialogs/save_pdf.rs b/crates/ui-egui/src/dialogs/save_pdf.rs index 4f8bdf7667..ef9bf097a6 100644 --- a/crates/ui-egui/src/dialogs/save_pdf.rs +++ b/crates/ui-egui/src/dialogs/save_pdf.rs @@ -44,6 +44,61 @@ pub(super) const PRESET_SPEC: DialogSpec = DialogSpec { ..DialogSpec::FORM }; +/// The dialog kind of the confirmation prompt when saving with transparency reduction. +pub(crate) const CONFIRM_FLATTEN: &str = "confirmFlattenPdf"; + +pub(crate) const CONFIRM_FLATTEN_SPEC: DialogSpec = DialogSpec { + heading: |d| d.str("message"), + body: |_, ui, d| { + let detail = d.str("detail"); + if !detail.is_empty() { + ui.label(egui::RichText::new(detail).color(Tokens::get(ui.ctx()).text_dim)); + } + false + }, + confirm: confirm_flatten, + ok: Some("Continue"), + max_width: Some(440.0), + ..DialogSpec::FORM +}; + +fn confirm_flatten(app: &mut VectorcraftApp, d: &Dialog) -> Result { + let mut parent = super::parent(d).filter(|p| p.kind == KIND).ok_or("the Save PDF dialog is no longer open")?; + parent.fields.insert("__confirmed_flatten".into(), json!(true)); + app.ui.dialog = Some(parent.clone()); + confirm(app, &parent) +} + +fn ask_confirm_flatten(app: &mut VectorcraftApp, d: &Dialog) { + let name = get(d, "flattenerPreset").as_str().map(str::trim).filter(|n| !n.is_empty()).unwrap_or(pdf::DEFAULT_FLATTENER); + let preset_opts = FlattenOptions::preset(name) + .or_else(|| app.session.prefs.flattener_presets.iter().find(|p| p.name.eq_ignore_ascii_case(name)).map(|p| p.options.clone())) + .unwrap_or_default(); + let line_ppi = preset_opts.line_art_ppi.round() as u32; + let grad_ppi = preset_opts.gradient_ppi.round() as u32; + let message = tl!("The document contains transparency which will be flattened. Do you want to continue?"); + let detail = crate::i18n::fmt( + tl!( + "Transparent objects will be reduced into opaque paths and images at {line_ppi} ppi (line art and text) and {grad_ppi} ppi (gradients and meshes). Reopening the PDF may not restore separate transparent objects." + ), + &[("line_ppi", &line_ppi.to_string()), ("grad_ppi", &grad_ppi.to_string())], + ); + let under = serde_json::to_value(d).ok(); + let fields = json!({ + "message": message, + "detail": detail, + super::PARENT: under, + }); + app.ui.dialog = Some(Dialog::new(CONFIRM_FLATTEN, fields)); +} + +fn doc_has_transparency(doc: &vectorcraft_doc::Document) -> bool { + fn check_node(n: &vectorcraft_doc::Node) -> bool { + !n.has_default_transparency() || n.shows_transparency() || n.children().into_iter().flatten().any(|c| check_node(c)) + } + doc.layers.iter().any(|l| check_node(l)) +} + /// The preset editor's field holding the name of the saved preset it edits (empty: a new one). const EDITING: &str = "__editing"; /// Save PDF's field holding the name typed for Save Preset… (present while that row shows). @@ -153,6 +208,13 @@ fn confirm(app: &mut VectorcraftApp, d: &Dialog) -> Result { app.ui.dialog = Some(d); return r; } + let flat = choice::(d, "compatibility") == Some(Compatibility::Pdf13) + || choice::(d, "standard").is_some_and(Standard::flattens); + let has_transparency = app.session.active().is_some_and(|st| doc_has_transparency(&st.doc)); + if flat && has_transparency && !d.bool("__confirmed_flatten") { + ask_confirm_flatten(app, d); + return Ok(Value::Null); + } let r = match SaveMode::of(&d.str("__save")) { Some(mode) => io::save_pdf(app, mode, params(d)), None if d.bool(ART_BOUNDS) => export_art(app, d), @@ -732,7 +794,20 @@ fn advanced(app: &VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) { } }); }); - if !flat { + if flat { + let name = get(d, "flattenerPreset").as_str().map(str::trim).filter(|n| !n.is_empty()).unwrap_or(pdf::DEFAULT_FLATTENER); + let preset_opts = FlattenOptions::preset(name) + .or_else(|| app.session.prefs.flattener_presets.iter().find(|p| p.name.eq_ignore_ascii_case(name)).map(|p| p.options.clone())) + .unwrap_or_default(); + let line_ppi = preset_opts.line_art_ppi.round() as u32; + let grad_ppi = preset_opts.gradient_ppi.round() as u32; + note( + ui, + &crate::i18n::fmt( + tl!("Raster resolution: {line_ppi} ppi line art and text, {grad_ppi} ppi gradient and mesh"), + &[("line_ppi", &line_ppi.to_string()), ("grad_ppi", &grad_ppi.to_string())], + ), + ); note(ui, tl!("PDF 1.3 files have no transparency: the preset flattens it.")); } } diff --git a/crates/ui-egui/src/dialogs/save_pdf/tests.rs b/crates/ui-egui/src/dialogs/save_pdf/tests.rs index dbceed5881..c758b8bae8 100644 --- a/crates/ui-egui/src/dialogs/save_pdf/tests.rs +++ b/crates/ui-egui/src/dialogs/save_pdf/tests.rs @@ -507,3 +507,49 @@ fn pdf_1_3_takes_a_flattener_preset_in_advanced() { let saved = app.session.prefs.pdf_presets.iter().find(|p| p.name == "Old").unwrap(); assert_eq!((saved.settings.compatibility, saved.settings.flattener_preset.as_str()), (Compatibility::Pdf13, "Low Resolution")); } + +#[test] +fn save_pdf_prompts_confirmation_when_document_has_transparency_and_is_flattened() { + let (mut app, written, _) = app(); + // Add transparent artwork to the document + app.run("transparency.set", json!({"opacity": 50})).unwrap(); + + app.run("ui.savePdfDialog", json!({"path": "/tmp/transparent.pdf", "compatibility": "1.3"})).unwrap(); + assert_eq!(app.ui.dialog.as_ref().unwrap().kind, KIND); + + // Clicking Save PDF triggers the confirmFlattenPdf modal prompt + super::super::confirm(&mut app).unwrap(); + let prompt = app.ui.dialog.as_ref().expect("confirm dialog open"); + assert_eq!(prompt.kind, CONFIRM_FLATTEN); + assert!(prompt.str("message").contains("transparency which will be flattened")); + assert!(prompt.str("detail").contains("1200 ppi")); + assert!(prompt.str("detail").contains("300 ppi")); + + // Cancel on confirmation modal restores the Save PDF dialog + crate::dialogs::cancel(&mut app); + assert_eq!(app.ui.dialog.as_ref().expect("Save PDF restored").kind, KIND); + assert!(written.borrow().is_empty(), "nothing written on cancel"); + + // Click Save PDF again, then confirm the prompt + super::super::confirm(&mut app).unwrap(); + assert_eq!(app.ui.dialog.as_ref().unwrap().kind, CONFIRM_FLATTEN); + super::super::confirm(&mut app).unwrap(); + assert!(app.ui.dialog.is_none(), "dialog closed after save"); + assert_eq!(written.borrow().len(), 1); + assert!(written.borrow()[0].1.starts_with(b"%PDF-1.3")); +} + +#[test] +fn save_pdf_does_not_prompt_when_compatibility_is_not_flattened() { + let (mut app, written, _) = app(); + app.run("transparency.set", json!({"opacity": 50})).unwrap(); + + app.run("ui.savePdfDialog", json!({"path": "/tmp/live.pdf", "compatibility": "1.7"})).unwrap(); + assert_eq!(app.ui.dialog.as_ref().unwrap().kind, KIND); + + // Saving with PDF 1.7 (supports live transparency) does not prompt confirmation + super::super::confirm(&mut app).unwrap(); + assert!(app.ui.dialog.is_none()); + assert_eq!(written.borrow().len(), 1); + assert!(written.borrow()[0].1.starts_with(b"%PDF-1.7")); +} From 6a9b61e7585753fb71aaf938681a3d2efc1ee1dd Mon Sep 17 00:00:00 2001 From: el-j Date: Mon, 16 Nov 2026 11:57:38 +0100 Subject: [PATCH 2/4] Address review comments: detect see-through images and clear flatten approval on write failure --- crates/engine/src/cmd/flatten.rs | 3 +- crates/engine/src/cmd/flatten/analysis.rs | 4 +- crates/ui-egui/src/dialogs/save_pdf.rs | 25 ++++++-- crates/ui-egui/src/dialogs/save_pdf/tests.rs | 66 ++++++++++++++++++++ 4 files changed, 90 insertions(+), 8 deletions(-) diff --git a/crates/engine/src/cmd/flatten.rs b/crates/engine/src/cmd/flatten.rs index 399f2ec4bd..773b9cb992 100644 --- a/crates/engine/src/cmd/flatten.rs +++ b/crates/engine/src/cmd/flatten.rs @@ -51,7 +51,8 @@ mod options; mod presets; mod report; -pub(crate) use analysis::{carry, outlined_text, see_through_images}; +pub(crate) use analysis::{carry, outlined_text}; +pub use analysis::{draws_image, see_through_images}; pub(crate) use apply::{expand_transparent_tile_images, flatten_document, flatten_expanded, has_transparent_tile_images}; #[cfg(test)] pub(crate) use apply::{with_clips_ignored, with_every_region}; diff --git a/crates/engine/src/cmd/flatten/analysis.rs b/crates/engine/src/cmd/flatten/analysis.rs index 9771d18ef9..da8f33f3d5 100644 --- a/crates/engine/src/cmd/flatten/analysis.rs +++ b/crates/engine/src/cmd/flatten/analysis.rs @@ -69,7 +69,7 @@ pub(crate) fn carry(from: &Node, mut to: Node) -> Node { /// The keys of `doc`'s images that have see-through pixels (an alpha channel that isn't opaque /// everywhere). -pub(crate) fn see_through_images(doc: &Document) -> BTreeSet { +pub fn see_through_images(doc: &Document) -> BTreeSet { let see_through = |b: &ImageBlob| { b.mime != "image/jpeg" && image::load_from_memory(&b.bytes).is_ok_and(|i| i.color().has_alpha() && i.to_rgba8().pixels().any(|p| p[3] < 255)) }; @@ -78,7 +78,7 @@ pub(crate) fn see_through_images(doc: &Document) -> BTreeSet { /// `n` shows an image of `keys` (itself or inside), a color-masked image's masked pixels counted as /// what it shows. -pub(super) fn draws_image(n: &Node, keys: &BTreeSet) -> bool { +pub fn draws_image(n: &Node, keys: &BTreeSet) -> bool { !keys.is_empty() && n.visible && match &n.kind { diff --git a/crates/ui-egui/src/dialogs/save_pdf.rs b/crates/ui-egui/src/dialogs/save_pdf.rs index ef9bf097a6..85d63e2189 100644 --- a/crates/ui-egui/src/dialogs/save_pdf.rs +++ b/crates/ui-egui/src/dialogs/save_pdf.rs @@ -92,11 +92,21 @@ fn ask_confirm_flatten(app: &mut VectorcraftApp, d: &Dialog) { app.ui.dialog = Some(Dialog::new(CONFIRM_FLATTEN, fields)); } -fn doc_has_transparency(doc: &vectorcraft_doc::Document) -> bool { - fn check_node(n: &vectorcraft_doc::Node) -> bool { - !n.has_default_transparency() || n.shows_transparency() || n.children().into_iter().flatten().any(|c| check_node(c)) +fn doc_has_transparency(doc: &vectorcraft_doc::Document, include_non_printing: bool) -> bool { + let see_through = vectorcraft_engine::cmd::flatten::see_through_images(doc); + fn check_node(n: &vectorcraft_doc::Node, see_through: &std::collections::BTreeSet, include_non_printing: bool) -> bool { + if !n.visible { + return false; + } + if matches!(n.kind, vectorcraft_doc::NodeKind::Layer { printable: false, .. }) && !include_non_printing { + return false; + } + !n.has_default_transparency() + || n.shows_transparency() + || vectorcraft_engine::cmd::flatten::draws_image(n, see_through) + || n.children().into_iter().flatten().any(|c| check_node(c, see_through, include_non_printing)) } - doc.layers.iter().any(|l| check_node(l)) + doc.layers.iter().any(|l| check_node(l, &see_through, include_non_printing)) } /// The preset editor's field holding the name of the saved preset it edits (empty: a new one). @@ -210,7 +220,8 @@ fn confirm(app: &mut VectorcraftApp, d: &Dialog) -> Result { } let flat = choice::(d, "compatibility") == Some(Compatibility::Pdf13) || choice::(d, "standard").is_some_and(Standard::flattens); - let has_transparency = app.session.active().is_some_and(|st| doc_has_transparency(&st.doc)); + let include_non_printing = d.bool("includeNonPrinting") || d.bool("createLayers"); + let has_transparency = app.session.active().is_some_and(|st| doc_has_transparency(&st.doc, include_non_printing)); if flat && has_transparency && !d.bool("__confirmed_flatten") { ask_confirm_flatten(app, d); return Ok(Value::Null); @@ -224,6 +235,10 @@ fn confirm(app: &mut VectorcraftApp, d: &Dialog) -> Result { if r.is_ok() && app.ui.dialog.as_ref().is_some_and(|o| o.kind == KIND) { app.ui.dialog = None; } + // A failed write keeps the dialog open. Drop the approval so the next OK asks again. + if let Some(open) = app.ui.dialog.as_mut().filter(|o| o.kind == KIND && r.is_err()) { + open.fields.remove("__confirmed_flatten"); + } r } diff --git a/crates/ui-egui/src/dialogs/save_pdf/tests.rs b/crates/ui-egui/src/dialogs/save_pdf/tests.rs index c758b8bae8..9b0007242b 100644 --- a/crates/ui-egui/src/dialogs/save_pdf/tests.rs +++ b/crates/ui-egui/src/dialogs/save_pdf/tests.rs @@ -553,3 +553,69 @@ fn save_pdf_does_not_prompt_when_compatibility_is_not_flattened() { assert_eq!(written.borrow().len(), 1); assert!(written.borrow()[0].1.starts_with(b"%PDF-1.7")); } + +#[test] +fn save_pdf_clears_confirmed_flatten_when_save_fails() { + let (mut app, _, _) = app(); + app.services.write = Some(Box::new(|_, _| Err("disk full".into()))); + app.run("transparency.set", json!({"opacity": 50})).unwrap(); + app.run("ui.savePdfDialog", json!({"path": "/tmp/fail.pdf", "compatibility": "1.3"})).unwrap(); + super::super::confirm(&mut app).unwrap(); + assert_eq!(app.ui.dialog.as_ref().unwrap().kind, CONFIRM_FLATTEN); + + // Confirming write when disk write fails keeps Save PDF dialog open without confirmed marker + let err = super::super::confirm(&mut app); + assert!(err.is_err()); + let open = app.ui.dialog.as_ref().expect("Save PDF dialog stays open on failure"); + assert_eq!(open.kind, KIND); + assert!(!open.bool("__confirmed_flatten")); +} + +#[test] +fn save_pdf_prompts_confirmation_for_see_through_image() { + let (mut app, written, _) = app(); + let img_bytes = { + let mut buf = std::io::Cursor::new(Vec::new()); + image::RgbaImage::from_pixel(2, 2, image::Rgba([255, 0, 0, 128])).write_to(&mut buf, image::ImageFormat::Png).unwrap(); + buf.into_inner() + }; + let blob = vectorcraft_doc::ImageBlob::png(img_bytes); + let key = "see_through_img".to_string(); + app.session + .edit("add see-through image", |d, _| { + d.images.insert(key.clone(), blob); + let id = d.alloc_id(); + let im = vectorcraft_doc::ImageObject { + key, + width: 2, + height: 2, + xf: vectorcraft_geom::Affine::IDENTITY, + link: None, + placement: Default::default(), + pixels: None, + }; + d.insert(d.default_layer(), 0, vectorcraft_doc::Node::new(id, vectorcraft_doc::NodeKind::Image(Box::new(im))))?; + Ok(()) + }) + .unwrap(); + + app.run("ui.savePdfDialog", json!({"path": "/tmp/img.pdf", "compatibility": "1.3"})).unwrap(); + super::super::confirm(&mut app).unwrap(); + assert_eq!(app.ui.dialog.as_ref().unwrap().kind, CONFIRM_FLATTEN); + super::super::confirm(&mut app).unwrap(); + assert!(app.ui.dialog.is_none()); + assert_eq!(written.borrow().len(), 1); +} + +#[test] +fn save_pdf_does_not_prompt_for_non_printing_layer_transparency() { + let (mut app, written, _) = app(); + let layer_id = app.session.active().unwrap().doc.layers[0].id; + app.run("transparency.set", json!({"opacity": 50})).unwrap(); + app.run("layer.setProps", json!({"id": layer_id.0, "printable": false})).unwrap(); + + app.run("ui.savePdfDialog", json!({"path": "/tmp/nonprint.pdf", "compatibility": "1.3"})).unwrap(); + super::super::confirm(&mut app).unwrap(); + assert!(app.ui.dialog.is_none()); + assert_eq!(written.borrow().len(), 1); +} From 7234b26ec69baa991e0a2c586f0f05dae3aea3f1 Mon Sep 17 00:00:00 2001 From: el-j Date: Tue, 17 Nov 2026 12:21:37 +0100 Subject: [PATCH 3/4] Address review comments: check pattern tile transparency and skip image scan when unflattened --- crates/engine/src/cmd/flatten.rs | 3 +- crates/engine/src/cmd/flatten/apply.rs | 2 +- crates/ui-egui/src/dialogs/save_pdf.rs | 45 +++++++++++++------- crates/ui-egui/src/dialogs/save_pdf/tests.rs | 22 ++++++++++ 4 files changed, 55 insertions(+), 17 deletions(-) diff --git a/crates/engine/src/cmd/flatten.rs b/crates/engine/src/cmd/flatten.rs index 773b9cb992..b9cec002c6 100644 --- a/crates/engine/src/cmd/flatten.rs +++ b/crates/engine/src/cmd/flatten.rs @@ -53,7 +53,8 @@ mod report; pub(crate) use analysis::{carry, outlined_text}; pub use analysis::{draws_image, see_through_images}; -pub(crate) use apply::{expand_transparent_tile_images, flatten_document, flatten_expanded, has_transparent_tile_images}; +pub use apply::has_transparent_tile_images; +pub(crate) use apply::{expand_transparent_tile_images, flatten_document, flatten_expanded}; #[cfg(test)] pub(crate) use apply::{with_clips_ignored, with_every_region}; pub use commands::specs; diff --git a/crates/engine/src/cmd/flatten/apply.rs b/crates/engine/src/cmd/flatten/apply.rs index b8aebf8324..67fff9b0ff 100644 --- a/crates/engine/src/cmd/flatten/apply.rs +++ b/crates/engine/src/cmd/flatten/apply.rs @@ -723,7 +723,7 @@ pub(super) fn opaque(n: &mut Node) { /// Whether `doc` has pattern fills whose image tiles need transparency flattening with `o` /// ([`expand_transparent_tile_images`]). -pub(crate) fn has_transparent_tile_images(doc: &Document, o: &FlattenOptions) -> bool { +pub fn has_transparent_tile_images(doc: &Document, o: &FlattenOptions) -> bool { let keys = o.no_transparency.clone().unwrap_or_default(); let colorize = |d: &Document, n: &Node| o.counts_colorize(d, n); !doc.patterns.is_empty() && crate::cmd::expand::has_transparent_image_patterns(doc, &keys, &colorize) diff --git a/crates/ui-egui/src/dialogs/save_pdf.rs b/crates/ui-egui/src/dialogs/save_pdf.rs index 85d63e2189..dd5d33ed9d 100644 --- a/crates/ui-egui/src/dialogs/save_pdf.rs +++ b/crates/ui-egui/src/dialogs/save_pdf.rs @@ -69,13 +69,9 @@ fn confirm_flatten(app: &mut VectorcraftApp, d: &Dialog) -> Result bool { - let see_through = vectorcraft_engine::cmd::flatten::see_through_images(doc); +fn doc_has_transparency(doc: &vectorcraft_doc::Document, include_non_printing: bool, o: &vectorcraft_engine::cmd::flatten::FlattenOptions) -> bool { + let mut with_images; + let o = match &o.no_transparency { + Some(_) => o, + None => { + with_images = o.clone(); + with_images.no_transparency = Some(vectorcraft_engine::cmd::flatten::see_through_images(doc)); + &with_images + } + }; + if vectorcraft_engine::cmd::flatten::has_transparent_tile_images(doc, o) { + return true; + } + let empty = std::collections::BTreeSet::new(); + let see_through = o.no_transparency.as_ref().unwrap_or(&empty); fn check_node(n: &vectorcraft_doc::Node, see_through: &std::collections::BTreeSet, include_non_printing: bool) -> bool { if !n.visible { return false; @@ -106,7 +115,7 @@ fn doc_has_transparency(doc: &vectorcraft_doc::Document, include_non_printing: b || vectorcraft_engine::cmd::flatten::draws_image(n, see_through) || n.children().into_iter().flatten().any(|c| check_node(c, see_through, include_non_printing)) } - doc.layers.iter().any(|l| check_node(l, &see_through, include_non_printing)) + doc.layers.iter().any(|l| check_node(l, see_through, include_non_printing)) } /// The preset editor's field holding the name of the saved preset it edits (empty: a new one). @@ -220,11 +229,17 @@ fn confirm(app: &mut VectorcraftApp, d: &Dialog) -> Result { } let flat = choice::(d, "compatibility") == Some(Compatibility::Pdf13) || choice::(d, "standard").is_some_and(Standard::flattens); - let include_non_printing = d.bool("includeNonPrinting") || d.bool("createLayers"); - let has_transparency = app.session.active().is_some_and(|st| doc_has_transparency(&st.doc, include_non_printing)); - if flat && has_transparency && !d.bool("__confirmed_flatten") { - ask_confirm_flatten(app, d); - return Ok(Value::Null); + if flat && !d.bool("__confirmed_flatten") { + let include_non_printing = d.bool("includeNonPrinting") || d.bool("createLayers"); + let name = get(d, "flattenerPreset").as_str().map(str::trim).filter(|n| !n.is_empty()).unwrap_or(pdf::DEFAULT_FLATTENER); + let mut o = FlattenOptions::for_export(Some(name), d.fields.get("flattener"), &app.session.prefs.flattener_presets).unwrap_or_default(); + if let Some(st) = app.session.active() { + o.no_transparency = Some(vectorcraft_engine::cmd::flatten::see_through_images(&st.doc)); + if doc_has_transparency(&st.doc, include_non_printing, &o) { + ask_confirm_flatten(app, d, &o); + return Ok(Value::Null); + } + } } let r = match SaveMode::of(&d.str("__save")) { Some(mode) => io::save_pdf(app, mode, params(d)), diff --git a/crates/ui-egui/src/dialogs/save_pdf/tests.rs b/crates/ui-egui/src/dialogs/save_pdf/tests.rs index c7c8939da6..3564a4d601 100644 --- a/crates/ui-egui/src/dialogs/save_pdf/tests.rs +++ b/crates/ui-egui/src/dialogs/save_pdf/tests.rs @@ -651,3 +651,25 @@ fn save_pdf_does_not_prompt_for_non_printing_layer_transparency() { assert!(app.ui.dialog.is_none()); assert_eq!(written.borrow().len(), 1); } + +#[test] +fn save_pdf_prompts_confirmation_for_transparent_pattern_tile_image() { + let (mut app, written, _) = app(); + let img_bytes = { + let mut buf = std::io::Cursor::new(Vec::new()); + image::RgbaImage::from_pixel(2, 2, image::Rgba([255, 0, 0, 128])).write_to(&mut buf, image::ImageFormat::Png).unwrap(); + buf.into_inner() + }; + let href = format!("data:image/png;base64,{}", vectorcraft_format::base64_encode(&img_bytes)); + let svg = format!( + r##""## + ); + app.run("document.open", json!({"name": "pat.svg", "dataBase64": vectorcraft_format::base64_encode(svg.as_bytes())})).unwrap(); + + app.run("ui.savePdfDialog", json!({"path": "/tmp/pat.pdf", "compatibility": "1.3"})).unwrap(); + super::super::confirm(&mut app).unwrap(); + assert_eq!(app.ui.dialog.as_ref().unwrap().kind, CONFIRM_FLATTEN); + super::super::confirm(&mut app).unwrap(); + assert!(app.ui.dialog.is_none()); + assert_eq!(written.borrow().len(), 1); +} From 5665114718fc421d854563b52b25b90937665988 Mon Sep 17 00:00:00 2001 From: el-j Date: Tue, 17 Nov 2026 15:00:11 +0100 Subject: [PATCH 4/4] Save PDF: include flattener resolutions in Summary warning and Advanced section --- crates/engine/src/cmd/fileio/pdf.rs | 16 +- crates/engine/src/cmd/flatten.rs | 6 +- crates/engine/src/cmd/flatten/analysis.rs | 4 +- crates/engine/src/cmd/flatten/apply.rs | 2 +- crates/ui-egui/src/dialogs.rs | 1 - crates/ui-egui/src/dialogs/save_pdf.rs | 96 +----------- crates/ui-egui/src/dialogs/save_pdf/tests.rs | 152 +++++-------------- 7 files changed, 55 insertions(+), 222 deletions(-) diff --git a/crates/engine/src/cmd/fileio/pdf.rs b/crates/engine/src/cmd/fileio/pdf.rs index 75e2dba02b..36b0845aa1 100644 --- a/crates/engine/src/cmd/fileio/pdf.rs +++ b/crates/engine/src/cmd/fileio/pdf.rs @@ -417,9 +417,13 @@ fn encode_carrying_at( } let (flat, flattened) = flatten_for(cmd, doc, set, p)?; vectorcraft_doc::cancel::check()?; - if flattened { + if let Some(o) = flattened { let kind = if set.standard.flattens() { set.standard.label() } else { set.compatibility.label() }; - notes.push(Note::loss(format!("transparency is flattened into opaque art and images ({kind} files have none): see the flattener preset"))); + let line_ppi = o.line_art_ppi.round() as u32; + let grad_ppi = o.gradient_ppi.round() as u32; + notes.push(Note::loss(format!( + "transparency is flattened into opaque art and images ({kind} files have none) at {line_ppi} ppi line art and text, {grad_ppi} ppi gradients and meshes: see the flattener preset" + ))); } let r = super::super::rasterfx::export_pdf_with_report(flat.as_ref().unwrap_or(doc), &opts).map_err(|e| pdf_error(cmd, e))?; notes.extend(r.warnings.into_iter().map(Note::loss)); @@ -438,9 +442,9 @@ pub const DEFAULT_FLATTENER: &str = "High Resolution"; /// discarded overprints are dropped. Layers the pages leave out (non-printing ones, unless asked /// for) are left out of the flattening, hidden. → the document to write (`None`: `doc` as it is) /// and whether its transparency was flattened. -fn flatten_for(cmd: &str, doc: &Document, set: &PdfSettings, p: &Value) -> Result<(Option, bool)> { +fn flatten_for(cmd: &str, doc: &Document, set: &PdfSettings, p: &Value) -> Result<(Option, Option)> { if !set.pdf13() { - return Ok((None, false)); + return Ok((None, None)); } let printed = if set.include_non_printing || set.create_layers { None } else { without_non_printing(&doc.layers) }; let shown = printed.map(|layers| { @@ -456,8 +460,8 @@ fn flatten_for(cmd: &str, doc: &Document, set: &PdfSettings, p: &Value) -> Resul // its art: it is clipped to its regions (opaque inside them). o.clip_complex_regions = true; Ok(match flatten_document(shown.as_ref().unwrap_or(doc), &o)? { - Some(flat) => (Some(flat), true), - None => (shown, false), + Some(flat) => (Some(flat), Some(o)), + None => (shown, None), }) } diff --git a/crates/engine/src/cmd/flatten.rs b/crates/engine/src/cmd/flatten.rs index b9cec002c6..399f2ec4bd 100644 --- a/crates/engine/src/cmd/flatten.rs +++ b/crates/engine/src/cmd/flatten.rs @@ -51,10 +51,8 @@ mod options; mod presets; mod report; -pub(crate) use analysis::{carry, outlined_text}; -pub use analysis::{draws_image, see_through_images}; -pub use apply::has_transparent_tile_images; -pub(crate) use apply::{expand_transparent_tile_images, flatten_document, flatten_expanded}; +pub(crate) use analysis::{carry, outlined_text, see_through_images}; +pub(crate) use apply::{expand_transparent_tile_images, flatten_document, flatten_expanded, has_transparent_tile_images}; #[cfg(test)] pub(crate) use apply::{with_clips_ignored, with_every_region}; pub use commands::specs; diff --git a/crates/engine/src/cmd/flatten/analysis.rs b/crates/engine/src/cmd/flatten/analysis.rs index ea6e350eda..70eab3c3e5 100644 --- a/crates/engine/src/cmd/flatten/analysis.rs +++ b/crates/engine/src/cmd/flatten/analysis.rs @@ -69,14 +69,14 @@ pub(crate) fn carry(from: &Node, mut to: Node) -> Node { /// The keys of `doc`'s images that have see-through pixels (an alpha channel that isn't opaque /// everywhere). -pub fn see_through_images(doc: &Document) -> BTreeSet { +pub(crate) fn see_through_images(doc: &Document) -> BTreeSet { let see_through = |b: &ImageBlob| b.mime != "image/jpeg" && b.has_transparency(); doc.images.iter().filter(|(_, b)| see_through(b)).map(|(k, _)| k.clone()).collect() } /// `n` shows an image of `keys` (itself or inside), a color-masked image's masked pixels counted as /// what it shows. -pub fn draws_image(n: &Node, keys: &BTreeSet) -> bool { +pub(super) fn draws_image(n: &Node, keys: &BTreeSet) -> bool { !keys.is_empty() && n.visible && match &n.kind { diff --git a/crates/engine/src/cmd/flatten/apply.rs b/crates/engine/src/cmd/flatten/apply.rs index 67fff9b0ff..b8aebf8324 100644 --- a/crates/engine/src/cmd/flatten/apply.rs +++ b/crates/engine/src/cmd/flatten/apply.rs @@ -723,7 +723,7 @@ pub(super) fn opaque(n: &mut Node) { /// Whether `doc` has pattern fills whose image tiles need transparency flattening with `o` /// ([`expand_transparent_tile_images`]). -pub fn has_transparent_tile_images(doc: &Document, o: &FlattenOptions) -> bool { +pub(crate) fn has_transparent_tile_images(doc: &Document, o: &FlattenOptions) -> bool { let keys = o.no_transparency.clone().unwrap_or_default(); let colorize = |d: &Document, n: &Node| o.counts_colorize(d, n); !doc.patterns.is_empty() && crate::cmd::expand::has_transparent_image_patterns(doc, &keys, &colorize) diff --git a/crates/ui-egui/src/dialogs.rs b/crates/ui-egui/src/dialogs.rs index df2016241a..30b02e4380 100644 --- a/crates/ui-egui/src/dialogs.rs +++ b/crates/ui-egui/src/dialogs.rs @@ -379,7 +379,6 @@ registry! { WarichuSettings: [warichu::KIND] => warichu::SPEC, CompositeFonts: [composite_fonts::KIND] => composite_fonts::SPEC, SavePdf: [save_pdf::KIND] => save_pdf::SPEC, - ConfirmFlattenPdf: [save_pdf::CONFIRM_FLATTEN] => save_pdf::CONFIRM_FLATTEN_SPEC, SvgOptions: [svg_options::KIND] => svg_options::SPEC, JavaScriptFiles: [javascript_files::KIND] => javascript_files::SPEC, SvgFilter: [svg_filter::KIND] => svg_filter::SPEC, diff --git a/crates/ui-egui/src/dialogs/save_pdf.rs b/crates/ui-egui/src/dialogs/save_pdf.rs index dd5d33ed9d..d8d73c79eb 100644 --- a/crates/ui-egui/src/dialogs/save_pdf.rs +++ b/crates/ui-egui/src/dialogs/save_pdf.rs @@ -44,80 +44,6 @@ pub(super) const PRESET_SPEC: DialogSpec = DialogSpec { ..DialogSpec::FORM }; -/// The dialog kind of the confirmation prompt when saving with transparency reduction. -pub(crate) const CONFIRM_FLATTEN: &str = "confirmFlattenPdf"; - -pub(crate) const CONFIRM_FLATTEN_SPEC: DialogSpec = DialogSpec { - heading: |d| d.str("message"), - body: |_, ui, d| { - let detail = d.str("detail"); - if !detail.is_empty() { - ui.label(egui::RichText::new(detail).color(Tokens::get(ui.ctx()).text_dim)); - } - false - }, - confirm: confirm_flatten, - ok: Some("Continue"), - max_width: Some(440.0), - ..DialogSpec::FORM -}; - -fn confirm_flatten(app: &mut VectorcraftApp, d: &Dialog) -> Result { - let mut parent = super::parent(d).filter(|p| p.kind == KIND).ok_or("the Save PDF dialog is no longer open")?; - parent.fields.insert("__confirmed_flatten".into(), json!(true)); - app.ui.dialog = Some(parent.clone()); - confirm(app, &parent) -} - -fn ask_confirm_flatten(app: &mut VectorcraftApp, d: &Dialog, o: &FlattenOptions) { - let line_ppi = o.line_art_ppi.round() as u32; - let grad_ppi = o.gradient_ppi.round() as u32; - let message = tl!("The document contains transparency which will be flattened. Do you want to continue?"); - let detail = crate::i18n::fmt( - tl!( - "Transparent objects will be reduced into opaque paths and images at {line_ppi} ppi (line art and text) and {grad_ppi} ppi (gradients and meshes). Reopening the PDF may not restore separate transparent objects." - ), - &[("line_ppi", &line_ppi.to_string()), ("grad_ppi", &grad_ppi.to_string())], - ); - let under = serde_json::to_value(d).ok(); - let fields = json!({ - "message": message, - "detail": detail, - super::PARENT: under, - }); - app.ui.dialog = Some(Dialog::new(CONFIRM_FLATTEN, fields)); -} - -fn doc_has_transparency(doc: &vectorcraft_doc::Document, include_non_printing: bool, o: &vectorcraft_engine::cmd::flatten::FlattenOptions) -> bool { - let mut with_images; - let o = match &o.no_transparency { - Some(_) => o, - None => { - with_images = o.clone(); - with_images.no_transparency = Some(vectorcraft_engine::cmd::flatten::see_through_images(doc)); - &with_images - } - }; - if vectorcraft_engine::cmd::flatten::has_transparent_tile_images(doc, o) { - return true; - } - let empty = std::collections::BTreeSet::new(); - let see_through = o.no_transparency.as_ref().unwrap_or(&empty); - fn check_node(n: &vectorcraft_doc::Node, see_through: &std::collections::BTreeSet, include_non_printing: bool) -> bool { - if !n.visible { - return false; - } - if matches!(n.kind, vectorcraft_doc::NodeKind::Layer { printable: false, .. }) && !include_non_printing { - return false; - } - !n.has_default_transparency() - || n.shows_transparency() - || vectorcraft_engine::cmd::flatten::draws_image(n, see_through) - || n.children().into_iter().flatten().any(|c| check_node(c, see_through, include_non_printing)) - } - doc.layers.iter().any(|l| check_node(l, see_through, include_non_printing)) -} - /// The preset editor's field holding the name of the saved preset it edits (empty: a new one). const EDITING: &str = "__editing"; /// Save PDF's field holding the name typed for Save Preset… (present while that row shows). @@ -227,20 +153,6 @@ fn confirm(app: &mut VectorcraftApp, d: &Dialog) -> Result { app.ui.dialog = Some(d); return r; } - let flat = choice::(d, "compatibility") == Some(Compatibility::Pdf13) - || choice::(d, "standard").is_some_and(Standard::flattens); - if flat && !d.bool("__confirmed_flatten") { - let include_non_printing = d.bool("includeNonPrinting") || d.bool("createLayers"); - let name = get(d, "flattenerPreset").as_str().map(str::trim).filter(|n| !n.is_empty()).unwrap_or(pdf::DEFAULT_FLATTENER); - let mut o = FlattenOptions::for_export(Some(name), d.fields.get("flattener"), &app.session.prefs.flattener_presets).unwrap_or_default(); - if let Some(st) = app.session.active() { - o.no_transparency = Some(vectorcraft_engine::cmd::flatten::see_through_images(&st.doc)); - if doc_has_transparency(&st.doc, include_non_printing, &o) { - ask_confirm_flatten(app, d, &o); - return Ok(Value::Null); - } - } - } let r = match SaveMode::of(&d.str("__save")) { Some(mode) => io::save_pdf(app, mode, params(d)), None if d.bool(ART_BOUNDS) => export_art(app, d), @@ -250,10 +162,6 @@ fn confirm(app: &mut VectorcraftApp, d: &Dialog) -> Result { if r.is_ok() && app.ui.dialog.as_ref().is_some_and(|o| o.kind == KIND) { app.ui.dialog = None; } - // A failed write keeps the dialog open. Drop the approval so the next OK asks again. - if let Some(open) = app.ui.dialog.as_mut().filter(|o| o.kind == KIND && r.is_err()) { - open.fields.remove("__confirmed_flatten"); - } r } @@ -826,9 +734,7 @@ fn advanced(app: &VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) { }); if flat { let name = get(d, "flattenerPreset").as_str().map(str::trim).filter(|n| !n.is_empty()).unwrap_or(pdf::DEFAULT_FLATTENER); - let preset_opts = FlattenOptions::preset(name) - .or_else(|| app.session.prefs.flattener_presets.iter().find(|p| p.name.eq_ignore_ascii_case(name)).map(|p| p.options.clone())) - .unwrap_or_default(); + let preset_opts = FlattenOptions::for_export(Some(name), d.fields.get("flattener"), &app.session.prefs.flattener_presets).unwrap_or_default(); let line_ppi = preset_opts.line_art_ppi.round() as u32; let grad_ppi = preset_opts.gradient_ppi.round() as u32; note( diff --git a/crates/ui-egui/src/dialogs/save_pdf/tests.rs b/crates/ui-egui/src/dialogs/save_pdf/tests.rs index 3564a4d601..b8a0704e28 100644 --- a/crates/ui-egui/src/dialogs/save_pdf/tests.rs +++ b/crates/ui-egui/src/dialogs/save_pdf/tests.rs @@ -541,7 +541,7 @@ fn pdf_1_3_takes_a_flattener_preset_in_advanced() { } #[test] -fn save_pdf_prompts_confirmation_when_document_has_transparency_and_is_flattened() { +fn save_pdf_flattens_transparent_document_without_modal_prompt() { let (mut app, written, _) = app(); // Add transparent artwork to the document app.run("transparency.set", json!({"opacity": 50})).unwrap(); @@ -549,127 +549,53 @@ fn save_pdf_prompts_confirmation_when_document_has_transparency_and_is_flattened app.run("ui.savePdfDialog", json!({"path": "/tmp/transparent.pdf", "compatibility": "1.3"})).unwrap(); assert_eq!(app.ui.dialog.as_ref().unwrap().kind, KIND); - // Clicking Save PDF triggers the confirmFlattenPdf modal prompt + // Clicking Save PDF goes ahead without stopping at a confirmation prompt super::super::confirm(&mut app).unwrap(); - let prompt = app.ui.dialog.as_ref().expect("confirm dialog open"); - assert_eq!(prompt.kind, CONFIRM_FLATTEN); - assert!(prompt.str("message").contains("transparency which will be flattened")); - assert!(prompt.str("detail").contains("1200 ppi")); - assert!(prompt.str("detail").contains("300 ppi")); - - // Cancel on confirmation modal restores the Save PDF dialog - crate::dialogs::cancel(&mut app); - assert_eq!(app.ui.dialog.as_ref().expect("Save PDF restored").kind, KIND); - assert!(written.borrow().is_empty(), "nothing written on cancel"); - - // Click Save PDF again, then confirm the prompt - super::super::confirm(&mut app).unwrap(); - assert_eq!(app.ui.dialog.as_ref().unwrap().kind, CONFIRM_FLATTEN); - super::super::confirm(&mut app).unwrap(); - assert!(app.ui.dialog.is_none(), "dialog closed after save"); + assert!(app.ui.dialog.is_none(), "Save PDF closes without a modal prompt"); assert_eq!(written.borrow().len(), 1); assert!(written.borrow()[0].1.starts_with(b"%PDF-1.3")); } #[test] -fn save_pdf_does_not_prompt_when_compatibility_is_not_flattened() { - let (mut app, written, _) = app(); - app.run("transparency.set", json!({"opacity": 50})).unwrap(); - - app.run("ui.savePdfDialog", json!({"path": "/tmp/live.pdf", "compatibility": "1.7"})).unwrap(); - assert_eq!(app.ui.dialog.as_ref().unwrap().kind, KIND); - - // Saving with PDF 1.7 (supports live transparency) does not prompt confirmation - super::super::confirm(&mut app).unwrap(); - assert!(app.ui.dialog.is_none()); - assert_eq!(written.borrow().len(), 1); - assert!(written.borrow()[0].1.starts_with(b"%PDF-1.7")); -} - -#[test] -fn save_pdf_clears_confirmed_flatten_when_save_fails() { +fn summary_warnings_include_flattener_resolutions_when_flattening_transparency() { let (mut app, _, _) = app(); - app.services.write = Some(Box::new(|_, _| Err("disk full".into()))); app.run("transparency.set", json!({"opacity": 50})).unwrap(); - app.run("ui.savePdfDialog", json!({"path": "/tmp/fail.pdf", "compatibility": "1.3"})).unwrap(); - super::super::confirm(&mut app).unwrap(); - assert_eq!(app.ui.dialog.as_ref().unwrap().kind, CONFIRM_FLATTEN); - // Confirming write when disk write fails keeps Save PDF dialog open without confirmed marker - let err = super::super::confirm(&mut app); - assert!(err.is_err()); - let open = app.ui.dialog.as_ref().expect("Save PDF dialog stays open on failure"); - assert_eq!(open.kind, KIND); - assert!(!open.bool("__confirmed_flatten")); -} - -#[test] -fn save_pdf_prompts_confirmation_for_see_through_image() { - let (mut app, written, _) = app(); - let img_bytes = { - let mut buf = std::io::Cursor::new(Vec::new()); - image::RgbaImage::from_pixel(2, 2, image::Rgba([255, 0, 0, 128])).write_to(&mut buf, image::ImageFormat::Png).unwrap(); - buf.into_inner() - }; - let blob = vectorcraft_doc::ImageBlob::png(img_bytes); - let key = "see_through_img".to_string(); - app.session - .edit("add see-through image", |d, _| { - d.images.insert(key.clone(), blob); - let id = d.alloc_id(); - let im = vectorcraft_doc::ImageObject { - key, - width: 2, - height: 2, - xf: vectorcraft_geom::Affine::IDENTITY, - link: None, - placement: Default::default(), - pixels: None, - }; - d.insert(d.default_layer(), 0, vectorcraft_doc::Node::new(id, vectorcraft_doc::NodeKind::Image(Box::new(im))))?; - Ok(()) - }) - .unwrap(); - - app.run("ui.savePdfDialog", json!({"path": "/tmp/img.pdf", "compatibility": "1.3"})).unwrap(); - super::super::confirm(&mut app).unwrap(); - assert_eq!(app.ui.dialog.as_ref().unwrap().kind, CONFIRM_FLATTEN); - super::super::confirm(&mut app).unwrap(); - assert!(app.ui.dialog.is_none()); - assert_eq!(written.borrow().len(), 1); -} - -#[test] -fn save_pdf_does_not_prompt_for_non_printing_layer_transparency() { - let (mut app, written, _) = app(); - let layer_id = app.session.active().unwrap().doc.layers[0].id; - app.run("transparency.set", json!({"opacity": 50})).unwrap(); - app.run("layer.setProps", json!({"id": layer_id.0, "printable": false})).unwrap(); - - app.run("ui.savePdfDialog", json!({"path": "/tmp/nonprint.pdf", "compatibility": "1.3"})).unwrap(); - super::super::confirm(&mut app).unwrap(); - assert!(app.ui.dialog.is_none()); - assert_eq!(written.borrow().len(), 1); -} - -#[test] -fn save_pdf_prompts_confirmation_for_transparent_pattern_tile_image() { - let (mut app, written, _) = app(); - let img_bytes = { - let mut buf = std::io::Cursor::new(Vec::new()); - image::RgbaImage::from_pixel(2, 2, image::Rgba([255, 0, 0, 128])).write_to(&mut buf, image::ImageFormat::Png).unwrap(); - buf.into_inner() - }; - let href = format!("data:image/png;base64,{}", vectorcraft_format::base64_encode(&img_bytes)); - let svg = format!( - r##""## + app.run("ui.savePdfDialog", json!({"path": "/tmp/out.pdf", "compatibility": "1.3"})).unwrap(); + let p = params(app.ui.dialog.as_ref().unwrap()); + let v = summary_of(&mut app, &egui::Context::default(), &p).unwrap(); + let warnings = v["warnings"].as_array().unwrap(); + assert!( + warnings.iter().any(|w| { + let s = w.as_str().unwrap(); + s.contains("transparency is flattened into opaque art and images") + && s.contains("at 1200 ppi line art and text, 300 ppi gradients and meshes") + }), + "{warnings:?}" ); - app.run("document.open", json!({"name": "pat.svg", "dataBase64": vectorcraft_format::base64_encode(svg.as_bytes())})).unwrap(); - app.run("ui.savePdfDialog", json!({"path": "/tmp/pat.pdf", "compatibility": "1.3"})).unwrap(); - super::super::confirm(&mut app).unwrap(); - assert_eq!(app.ui.dialog.as_ref().unwrap().kind, CONFIRM_FLATTEN); - super::super::confirm(&mut app).unwrap(); - assert!(app.ui.dialog.is_none()); - assert_eq!(written.borrow().len(), 1); + // With a custom flattener override, the resolution in the warning reflects the options + set_field(&mut app, "flattener.lineArtPpi", json!(600)); + set_field(&mut app, "flattener.gradientPpi", json!(200)); + let p2 = params(app.ui.dialog.as_ref().unwrap()); + let v2 = summary_of(&mut app, &egui::Context::default(), &p2).unwrap(); + let warnings2 = v2["warnings"].as_array().unwrap(); + assert!( + warnings2.iter().any(|w| { + let s = w.as_str().unwrap(); + s.contains("at 600 ppi line art and text, 200 ppi gradients and meshes") + }), + "{warnings2:?}" + ); +} + +#[test] +fn advanced_section_shows_raster_resolution_note() { + let (mut app, _, _) = app(); + app.run("ui.savePdfDialog", json!({"path": "/tmp/out.pdf", "compatibility": "1.3"})).unwrap(); + set_field(&mut app, "__section", json!("Advanced")); + set_field(&mut app, "flattener.lineArtPpi", json!(600)); + set_field(&mut app, "flattener.gradientPpi", json!(200)); + frame(&mut app); + assert!(app.ui.dialog.is_some()); }