From 6e0b50a819ca24ac21808753d7656aafa971dbd1 Mon Sep 17 00:00:00 2001
From: MarekSpodBiedry <73122968+MarekSpodBiedry@users.noreply.github.com>
Date: Sun, 18 Oct 2026 23:35:57 +0200
Subject: [PATCH] Show New Document preset sizes in the selected units (#1260)

---
 crates/ui-egui/src/new_document.rs | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/crates/ui-egui/src/new_document.rs b/crates/ui-egui/src/new_document.rs
index ad415c83..ee59de80 100644
--- a/crates/ui-egui/src/new_document.rs
+++ b/crates/ui-egui/src/new_document.rs
@@ -360,9 +360,8 @@ fn cards(app: &DesignApp, tab: &str) -> Vec<Card> {
     }
 }
 
-/// `210 × 297 mm`, `51p0 × 66p0`.
-fn size_text(nd: &NewDocument) -> String {
-    let u = nd.units;
+/// `210 × 297 mm`, `51p0 × 66p0`: the size of `nd` in the dialog's units `u`.
+fn size_text(nd: &NewDocument, u: Unit) -> String {
     let (w, h) = (format_measure(nd.width, u), format_measure(nd.height, u));
     let suffix = u.suffix();
     if suffix.starts_with(' ')
@@ -391,7 +390,7 @@ fn paint_page(p: &egui::Painter, area: Rect, nd: &NewDocument, custom: bool, col
     }
 }
 
-fn card(ui: &mut Ui, c: &Card, selected: bool) -> egui::Response {
+fn card(ui: &mut Ui, c: &Card, units: Unit, selected: bool) -> egui::Response {
     let t = Tokens::get(ui.ctx());
     let (r, resp) = ui.allocate_exact_size(CARD, Sense::click());
     if selected {
@@ -406,7 +405,7 @@ fn card(ui: &mut Ui, c: &Card, selected: bool) -> egui::Response {
         ui.painter(),
         pos2(r.center().x, r.top() + 132.0),
         Align2::CENTER_CENTER,
-        &size_text(&c.nd),
+        &size_text(&c.nd, units),
         FontId::proportional(11.0),
         t.text_dim,
     );
@@ -494,13 +493,14 @@ fn presets(app: &mut DesignApp, ui: &mut Ui, d: &mut Dialog) -> bool {
     });
     ui.add_space(10.0);
     let current = d.s("preset");
+    let card_units = units(d);
     let mut create = false;
     let mut delete = None;
     let layout = if rtl { Layout::right_to_left(Align::TOP) } else { Layout::left_to_right(Align::TOP) }.with_main_wrap(true);
     ui.with_layout(layout, |ui| {
         ui.spacing_mut().item_spacing = vec2(10.0, 10.0);
         for c in &list {
-            let resp = card(ui, c, current == c.key);
+            let resp = card(ui, c, card_units, current == c.key);
             if resp.clicked() || resp.double_clicked() {
                 select(d, c);
             }
@@ -1031,6 +1031,13 @@ mod tests {
         assert!(!doc.settings.facing_pages);
     }
 
+    #[test]
+    fn card_sizes_follow_the_dialog_units() {
+        let card = NewDocument::from_preset("Business Card").unwrap();
+        assert_eq!(size_text(&card, Unit::Millimeters), "88.9 × 50.8 mm");
+        assert_ne!(size_text(&card, Unit::Millimeters), size_text(&card, Unit::Picas));
+    }
+
     #[test]
     fn units_reformat_the_measures_and_linked_edges_follow() {
         // InDesign's Units list.