mirror of
https://github.com/storytold/pdfcraft.git
synced 2026-11-01 14:08:23 -06:00
* feat(ui): menus from craft-menu, native on macOS One menu definition (crates/ui-egui/src/menus.rs) built from the command registry drives the native macOS menu bar (craft-menu's muda backend) and an in-window egui bar on Windows, Linux and the web, which takes the place of the "Menu" button at the start of the top bar. - File, Edit, View, Sign, Window and Help, with separators and submenus. Edit gains Cut, Paste, Delete and Select All (they act as their keys do) and a Pages submenu; View gains a Tools submenu built from the All tools groups; Sign holds Fill & Sign and the certificate commands; Window lists the open documents. - Toggles are check items and the page layouts, side panels and themes radio items, with their state from the app. - File > Open Recent lists the recent files (file.open_recent with an index). - A menu click and its shortcut run the same dispatch, including the form-field deferral (#166) and macOS Cmd+W closing the window (#869). Dialogs and the palette grey the menus through craft-menu's gate. - Quit goes through craft-quit, so the unsaved-changes prompt runs. - craft-ui, craft-quit, craft-menu and craft-keymap pinned to storytold/craft-libs 70ade1fb. Menu state and dispatch follow #2610 by @hajdukste; the menu tree and the view and panel items follow #3870 by @RivanJarjes. * test(ui): the menu model, native dispatch and the in-window bar - Unit tests for the menu definition: every registry menu command is listed once with its registry shortcut; check and radio items follow the app; a dialog greys document commands and drops their clicks; the recent files and open documents are listed once each; a native menu click (through a fake craft-menu backend) runs its command once. - The kittests that opened the old "Menu" button use the menu bar, and the ones that look up a label the bar's titles share (Edit, File, Sign) skip the bar. - The in-window bar takes its titles' width, so the mode tabs, search and buttons keep their place in the top bar. - Edit menu clicks that stand for keys (Copy, Cut, Delete, Select All) reach this frame's input from `logic`, where test hosts see them too. * test(ui): the language switch test opens File in the menu bar Translated titles and rows carry their mnemonic ("ファイル(F)", "開く(O)…"). * feat(ui): the menu bars run Quit themselves, the bar shrinks to its titles, and AppKit's window list stays off craft-libs main edc41f6 (craft-libs#354): MenuBarUi runs Quit and Minimize, shrink_to_fit sizes the in-window bar, Key::parse reads the registry's arrow and minus glyphs, and mac::install_with(.., window_list(false)) keeps the Window menu to PdfCraft's own document list. * fix(ui): the menu command filter is an if, for clippy * test(ui): drop a needless borrow in the edit-tab helper * test(ui): two tests follow the menu bar The tests were wrong, not the app. The Preferences language test clicked the old Menu button; it opens Edit in the menu bar and its Preferences row. The prepare Actions test counted the Edit labels: the narrower menu bar leaves room for the Edit tab, so the rows' Edit buttons come third and fourth.
106 lines
5.0 KiB
Rust
106 lines
5.0 KiB
Rust
//! State-based waits for native preparation, which completes between UI frames, and pointer
|
|
//! input in the frames the platform delivers it in ([`input`]), and the skip for tests whose text
|
|
//! the interface fonts cannot draw ([`skip_without_glyphs`]).
|
|
use std::collections::BTreeSet;
|
|
|
|
use egui::FontId;
|
|
use egui::epaint::text::{Fonts, TextOptions};
|
|
use egui_kittest::Harness;
|
|
use pdfcraft_ui_egui::{PdfCraftApp, i18n, theme};
|
|
|
|
pub mod input;
|
|
|
|
/// Step frames until `ready` holds or 30 seconds pass, and say whether it held. For background work
|
|
/// (a worker-thread open, page text arriving) that a test then asserts on itself: a frame count is
|
|
/// not a time, and a busy runner may not have finished the work within one. Sleeps briefly between
|
|
/// frames so the worker threads get the CPU.
|
|
#[must_use]
|
|
pub fn step_until(h: &mut Harness<'static, PdfCraftApp>, mut ready: impl FnMut(&mut Harness<'static, PdfCraftApp>) -> bool) -> bool {
|
|
let deadline = std::time::Instant::now() + std::time::Duration::from_secs(30);
|
|
loop {
|
|
h.step();
|
|
if ready(h) {
|
|
return true;
|
|
}
|
|
if std::time::Instant::now() >= deadline {
|
|
return false;
|
|
}
|
|
std::thread::sleep(std::time::Duration::from_millis(5));
|
|
}
|
|
}
|
|
|
|
/// Step frames until nothing is waiting to be rendered, and fail the test if that takes over 30
|
|
/// seconds: what a test checks next is on the rendered page.
|
|
pub fn settle(h: &mut Harness<'static, PdfCraftApp>) {
|
|
let settled = step_until(h, |h| {
|
|
h.run_steps(1);
|
|
!h.state().render_pending()
|
|
});
|
|
assert!(settled, "pages rendered");
|
|
}
|
|
|
|
pub fn wait_until(h: &mut Harness<'static, PdfCraftApp>, what: &str, ready: impl Fn(&PdfCraftApp) -> bool) {
|
|
let held = step_until(h, |h| ready(h.state()));
|
|
assert!(
|
|
held,
|
|
"timed out waiting for {what}: views={}, active={:?}, password={:?}, toast={:?}",
|
|
h.state().views.len(),
|
|
h.state().active,
|
|
h.state().password_prompt.as_ref().map(|p| (&p.name, &p.error)),
|
|
h.state().toast
|
|
);
|
|
}
|
|
|
|
/// Open the in-window menu bar's `title` menu (File, Edit, View…).
|
|
pub fn open_menu(h: &mut Harness<'static, PdfCraftApp>, title: &str) {
|
|
use egui_kittest::kittest::Queryable;
|
|
h.get_by(|n| n.role() == egui::accesskit::Role::MenuItem && n.label().as_deref() == Some(title)).click();
|
|
h.run_steps(2);
|
|
}
|
|
|
|
/// The menu row labelled `label` in an open menu.
|
|
pub fn menu_row<'h>(h: &'h Harness<'static, PdfCraftApp>, label: &str) -> egui_kittest::Node<'h> {
|
|
use egui_kittest::kittest::Queryable;
|
|
let label = label.to_owned();
|
|
h.get_by(move |n| n.role() == egui::accesskit::Role::MenuItem && n.label().as_deref() == Some(label.as_str()))
|
|
}
|
|
|
|
/// The widget labelled `label` outside the menu bar, whose titles (File, Edit, Sign…) may share it.
|
|
pub fn outside_menus<'h>(h: &'h Harness<'static, PdfCraftApp>, label: &str) -> egui_kittest::Node<'h> {
|
|
use egui_kittest::kittest::Queryable;
|
|
let label = label.to_owned();
|
|
h.get_by(move |n| n.role() != egui::accesskit::Role::MenuItem && n.label().as_deref() == Some(label.as_str()))
|
|
}
|
|
|
|
/// Whether the test `name` must skip because the interface fonts lack a glyph for a character it
|
|
/// draws: one in `text` or in the catalog of the interface `language`. egui 0.37 test harnesses
|
|
/// panic on a missing glyph, and Japanese, Chinese and Thai faces come only from the optional
|
|
/// craft-fonts build input or a face installed on this machine. Prints the skip line.
|
|
///
|
|
/// The fonts are those the app installs for `language` and for the default CJK preference: a
|
|
/// switch to Chinese installs its fonts for the next frame, so the first frame in Chinese draws
|
|
/// with the fonts of the language before it.
|
|
///
|
|
/// A build that requires craft-fonts (`CRAFT_FONTS_REQUIRED=1`, as the CI gate sets) never skips:
|
|
/// a missing glyph there is a failure.
|
|
pub fn skip_without_glyphs(name: &str, language: &str, text: &str) -> bool {
|
|
if std::env::var("CRAFT_FONTS_REQUIRED").as_deref() == Ok("1") {
|
|
return false;
|
|
}
|
|
let catalog = i18n::LANGUAGES.iter().find(|l| l.code == language).map_or("", |l| l.source);
|
|
let translations = catalog.lines().filter(|l| !l.starts_with('#')).filter_map(|l| l.split('\t').nth(2));
|
|
let chars: BTreeSet<char> = std::iter::once(text).chain(translations).flat_map(str::chars).filter(|c| !c.is_control()).collect();
|
|
let cjk = theme::CjkPreference::for_language(language);
|
|
let missing = [theme::CjkPreference::Default, cjk].into_iter().find_map(|cjk| {
|
|
let defs = theme::installed_font_definitions(cjk);
|
|
let families: Vec<FontId> = defs.families.keys().map(|f| FontId::new(13.0, f.clone())).collect();
|
|
let mut fonts = Fonts::new(TextOptions::default(), defs);
|
|
chars.iter().copied().find(|c| families.iter().any(|id| !fonts.has_glyphs(id, &c.to_string())))
|
|
});
|
|
let Some(missing) = missing else {
|
|
return false;
|
|
};
|
|
eprintln!("skipping {name}: no interface font draws {missing:?} (set CRAFT_FONTS_DIR to a craft-fonts checkout with a face for it)");
|
|
true
|
|
}
|