Skip to content

DesignCraft: An open-source page and layout design editor written by scratch in pure Rust

Document Setup: read a number without a unit in the document's units (fixes #1247)

Marco Arnulfo526eeda545c2
diff --git a/crates/ui-egui/src/dialogs.rs b/crates/ui-egui/src/dialogs.rs
index 358416a4b..8b4043787 100644
--- a/crates/ui-egui/src/dialogs.rs
+++ b/crates/ui-egui/src/dialogs.rs
@@ -1236,7 +1236,9 @@ pub fn open_document_setup(app: &mut DesignApp) {
}
// The margins as shown: OK applies them to every page only when they were edited.
f["marginsShown"] = json!(SETUP_EDGES.map(|e| f[format!("margin{e}")].clone()));
- app.ui.dialog = Some(Dialog::new("documentSetup", f));
+ let mut d = Dialog::new("documentSetup", f);
+ d.unit = units;
+ app.ui.dialog = Some(d);
}
/// The edges of Document Setup's margins, bleed and slug (field suffixes).
@@ -7076,6 +7078,17 @@ mod tests {
assert!((doc.settings.page_width - 612.0).abs() < 1e-6 && doc.settings.bleed[0] == 0.0, "one undo step");
}
+ #[test]
+ fn document_setup_reads_a_bare_number_in_the_documents_units() {
+ let mut app = document_setup_app("millimeters");
+ setup_fields(&mut app, json!({"bleedTop": "5", "bleedBottom": "5", "bleedInside": "5", "bleedOutside": "5", "width": "210"}));
+ confirm(&mut app).unwrap();
+ let mm = designcraft_geom::units::PT_PER_MM;
+ let settings = &app.session.active().unwrap().doc.settings;
+ assert!(settings.bleed.iter().all(|b| (b - 5.0 * mm).abs() < 1e-6), "5 mm, not 5 picas: {:?}", settings.bleed);
+ assert!((settings.page_width - 210.0 * mm).abs() < 1e-6, "{}", settings.page_width);
+ }
+
#[test]
fn document_setup_keeps_each_pages_margins_unless_they_are_edited() {
let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());