aleleba/wordcraft
1
0
Fork 0
mirror of https://github.com/storytold/wordcraft.git synced 2026-10-26 19:37:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

A successful native print returns to the document (#3210)

Browse Source 
poll_printing turned a terminal print message into a status-bar line
but never closed the Print backstage page, so it stayed open after a
successful submission (reported on macOS, where printing never shows
a separate OS dialog — WordCraft's own Print page is the whole flow)
until the user clicked Back, even though the job had already gone to
the spooler. Word returns to the document once the job is away, the
same as after Save.

A failed submission still leaves the Print page open, so the error
and the settings to fix it stay visible.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
Michael
2026-10-20 10:56:26 +08:00
co-authored by Claude Sonnet 5
parent 9b4b948c6e
commit 579b2dc6ef
1 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ui-egui/src/lib.rs
+31
View File
@@ -1936,6 +1936,12 @@ impl WordApp {
};
let text = printing::feedback(&message, |label| i18n::t(label).to_owned());
self.status(text);
// Word returns to the document once a print job is away, the same as after Save; a
// failure stays on the Print page so the error (and the settings to fix it) are visible
// (#3210: the Print page used to stay up after a successful submission).
if matches!(message, printing::Feedback::Submitted(_)) && self.ui.backstage && self.ui.backstage_page == "print" {
self.ui.backstage = false;
}
}
/// Per-frame logic before layout: control requests, screenshots, shortcuts, file drops.
@@ -5270,6 +5276,31 @@ mod tests {
}
}
/// #3210: a successful native print submission returns to the document, the same as Word —
/// previously the Print page stayed up until the user clicked Back, even though the job had
/// already gone to the spooler. A failed submission stays up instead, so the error (and the
/// settings to fix it) are still visible.
#[test]
fn a_successful_native_print_returns_to_the_document() {
use printing::Printer;
for ok in [true, false] {
let mut a = app();
a.printing.printers = vec![Printer { name: "Test Printer".into(), default: true }];
a.printing.settings.printer = "Test Printer".into();
a.services.print_native = Some(Box::new(move |_, _, _, _| {
let (tx, rx) = std::sync::mpsc::channel();
let _ = tx.send(if ok { Ok(String::new()) } else { Err("no paper".into()) });
rx
}));
a.run("file.print", json!({})).unwrap();
assert!(a.ui.backstage && a.ui.backstage_page == "print", "the Print page is open");
a.run("ui.print", json!({})).unwrap();
let ctx = egui::Context::default();
ctx.run_ui(egui::RawInput::default(), |ui| a.logic(ui.ctx())).drop_without_applying_deltas();
assert_eq!(a.ui.backstage, !ok, "ok {ok}: whether the Print page is still open");
}
}
/// #1156: the Print page's preview fills the pane beside the settings, zooms from its own
/// bar, scrolls both ways once the page outgrows the pane, and One Page fits it again.
#[test]