From 6b4ced2b962b1fac4e3c4a98ad2c37468c5042dd Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sat, 31 Oct 2026 18:03:19 -0700 Subject: [PATCH] Tests: the backtick menu test passes on macOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit menus_and_tooltips_show_the_backtick_key_as_it_types put Edit › Clear on Cmd+~. craft-keymap reserves Cmd+` on macOS, so the override is refused there and the menu kept Delete. The test now uses Alt+~, which no platform reserves. --- crates/ui-egui/src/shortcut_editor.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/crates/ui-egui/src/shortcut_editor.rs b/crates/ui-egui/src/shortcut_editor.rs index c048421c3..f1d5cabb0 100644 --- a/crates/ui-egui/src/shortcut_editor.rs +++ b/crates/ui-egui/src/shortcut_editor.rs @@ -1225,17 +1225,18 @@ mod tests { #[test] fn menus_and_tooltips_show_the_backtick_key_as_it_types() { let mut ui = UiState::default(); - crate::keymap::set_override(&mut ui.shortcut_overrides, "edit.clear", "Cmd+~"); + // Not Cmd+~: macOS reserves it, so the override would leave Edit › Clear on Delete there. + crate::keymap::set_override(&mut ui.shortcut_overrides, "edit.clear", "Alt+~"); crate::keymap::set_override(&mut ui.shortcut_overrides, "tool:measure", "~"); sync(&ui); let measure = vectorcraft_tools::tool_info("measure").unwrap(); let press = |key| egui::Event::Key { key, physical_key: Some(key), pressed: true, repeat: false, modifiers: Modifiers::NONE }; let clear = || menus::shown_shortcut(menus::shortcut_of("edit.clear").unwrap()); note_backtick_text(&[press(Key::Backtick), egui::Event::Text("`".into())]); - assert_eq!(clear(), menus::pretty_shortcut("Cmd+~")); + assert_eq!(clear(), menus::pretty_shortcut("Alt+~")); assert!(crate::toolbar::tip(measure).ends_with("(~)")); note_backtick_text(&[press(Key::Backtick), egui::Event::Text("\"".into())]); - assert_eq!(clear(), menus::pretty_shortcut("Cmd+\"")); + assert_eq!(clear(), menus::pretty_shortcut("Alt+\"")); assert!(crate::toolbar::tip(measure).ends_with("(\")"), "{}", crate::toolbar::tip(measure)); assert_eq!(menus::shown_shortcut("Shift+~"), menus::pretty_shortcut("Shift+~")); sync(&UiState::default());