mirror of
https://github.com/storytold/gridcraft.git
synced 2026-11-09 12:00:01 -06:00
Aimar Mendez
1d38a25c8d
e6df6f42 removed the #[allow(unused_imports, dead_code)] on the
native_menu module that tests/mac_menu_appkit.rs builds in. That test
only compiles on macOS, so `cargo xtask ci` has failed at clippy on
every Mac since, while the Linux gate stayed green:
- the test called only `install`, leaving `poll`, `sync_windows`,
`select_theme`, `WINDOW_ITEM` and most `NativeMenu` fields unused;
- the harness = false build has cfg(test) but drops #[test] functions,
so the unit tests' `use super::*` was an unused import.
The test now also polls the menu with a one-workbook session and checks
that the Window menu lists that workbook (#716), which uses the rest of
the module. The unit tests name `super::` items instead of a glob import.
Verified on macOS 27 (arm64): `cargo xtask ci` passes all 10 steps (with
CRAFT_FONTS_DIR at the gate's craft-fonts commit), and the new check
fails when the poll is removed (Window menu's last item "" vs "Book1").
45 lines
2.1 KiB
Rust
45 lines
2.1 KiB
Rust
//! The macOS menu bar as AppKit sees it, on the main thread (`harness = false`): install it through
|
|
//! the real muda backend (`src/native_menu.rs`) and read NSApp back. The Window menu must be NSApp's
|
|
//! `windowsMenu`: that is where macOS adds Move & Resize, Fill and Center, the targets of the system
|
|
//! window tiling shortcuts (Fn+Ctrl+arrows, Fn+F), and lists the open windows (#716).
|
|
|
|
// The app's own module, built into this test (cargo builds harness = false tests with cfg(test), so its
|
|
// unit tests compile here too without a harness to run them).
|
|
#[cfg(target_os = "macos")]
|
|
#[path = "../src/native_menu.rs"]
|
|
mod native_menu;
|
|
|
|
#[cfg(target_os = "macos")]
|
|
fn main() {
|
|
use objc2::MainThreadMarker;
|
|
use objc2_app_kit::NSApplication;
|
|
|
|
let mtm = MainThreadMarker::new().expect("harness = false runs on the main thread");
|
|
let nsapp = NSApplication::sharedApplication(mtm);
|
|
nsapp.finishLaunching();
|
|
|
|
let ctx = egui::Context::default();
|
|
let mut menu = native_menu::NativeMenu::install(&ctx);
|
|
|
|
let bar = nsapp.mainMenu().expect("a main menu");
|
|
let tops: Vec<String> = (0..bar.numberOfItems()).filter_map(|i| bar.itemAtIndex(i)?.submenu()).map(|m| m.title().to_string()).collect();
|
|
assert_eq!(tops, ["GridCraft", "File", "Edit", "View", "Insert", "Format", "Tools", "Data", "Window", "Help"]);
|
|
let windows_menu = nsapp.windowsMenu().expect("AppKit knows the Window menu");
|
|
assert_eq!(windows_menu.title().to_string(), "Window");
|
|
|
|
// A poll lists the open workbook windows at the end of the Window menu (#716).
|
|
let mut session = gridcraft_engine::Session::new();
|
|
session.new_workbook();
|
|
let mut app = gridcraft_ui_egui::SheetApp::new(session, Default::default());
|
|
menu.poll(&mut app, &ctx, egui::ViewportId::ROOT);
|
|
let open = app.open_windows();
|
|
assert_eq!(open.len(), 1, "one workbook window");
|
|
let last = windows_menu.itemAtIndex(windows_menu.numberOfItems() - 1).expect("a Window menu item");
|
|
assert_eq!(last.title().to_string(), open[0].label(), "the Window menu lists the open workbook");
|
|
|
|
println!("mac_menu_appkit: ok");
|
|
}
|
|
|
|
#[cfg(not(target_os = "macos"))]
|
|
fn main() {}
|