Open source Loom alternative. Beautiful, shareable screen recordings.
Rust appcapcossloommacnextjsnextjs15open-sourceossreactrecordrustscreen-capturescreen-recorderscreenshotsolidjstauritauri-apptypescriptvite
menus: Ensure patching standard menu items respects Cap's translations while keeping proper menu symbols
Ilya7fcd9be92b4d
diff --git a/apps/desktop-gpui/locales/de.toml b/apps/desktop-gpui/locales/de.tomlindex c9e0a86b7..ea20dfc88 100644--- a/apps/desktop-gpui/locales/de.toml+++ b/apps/desktop-gpui/locales/de.toml@@ -21,7 +21,6 @@ about = "Über Cap"hide = "Cap ausblenden"hide_others = "Andere ausblenden"quit = "Cap beenden"-preferences = "Einstellungen…"services = "Dienste"settings = "Einstellungen…"diff --git a/apps/desktop-gpui/locales/en.toml b/apps/desktop-gpui/locales/en.tomlindex bb2e02dda..22bb75c55 100644--- a/apps/desktop-gpui/locales/en.toml+++ b/apps/desktop-gpui/locales/en.toml@@ -21,7 +21,6 @@ about = "About Cap"hide = "Hide Cap"hide_others = "Hide Others"quit = "Quit Cap"-preferences = "Preferences…"services = "Services"settings = "Settings…"diff --git a/apps/desktop-gpui/locales/es.toml b/apps/desktop-gpui/locales/es.tomlindex 9902bdbf4..0f8676adf 100644--- a/apps/desktop-gpui/locales/es.toml+++ b/apps/desktop-gpui/locales/es.toml@@ -21,7 +21,6 @@ about = "Acerca de Cap"hide = "Ocultar Cap"hide_others = "Ocultar otros"quit = "Salir de Cap"-preferences = "Preferencias…"services = "Servicios"settings = "Ajustes…"diff --git a/apps/desktop-gpui/locales/fr.toml b/apps/desktop-gpui/locales/fr.tomlindex 52bda480d..bd998a09e 100644--- a/apps/desktop-gpui/locales/fr.toml+++ b/apps/desktop-gpui/locales/fr.toml@@ -21,7 +21,6 @@ about = "À propos de Cap"hide = "Masquer Cap"hide_others = "Masquer les autres"quit = "Quitter Cap"-preferences = "Préférences…"services = "Services"settings = "Paramètres…"diff --git a/apps/desktop-gpui/locales/hi.toml b/apps/desktop-gpui/locales/hi.tomlindex 715ae5ada..6ac18a8e1 100644--- a/apps/desktop-gpui/locales/hi.toml+++ b/apps/desktop-gpui/locales/hi.toml@@ -21,7 +21,6 @@ about = "Cap के बारे में"hide = "Cap छिपाएँ"hide_others = "अन्य छिपाएँ"quit = "Cap से बाहर निकलें"-preferences = "प्राथमिकताएँ…"services = "सेवाएँ"settings = "सेटिंग्स…"diff --git a/apps/desktop-gpui/locales/ja.toml b/apps/desktop-gpui/locales/ja.tomlindex f1981a814..3dbbbe8b1 100644--- a/apps/desktop-gpui/locales/ja.toml+++ b/apps/desktop-gpui/locales/ja.toml@@ -21,7 +21,6 @@ about = "Capについて"hide = "Capを非表示"hide_others = "ほかを非表示"quit = "Capを終了"-preferences = "環境設定…"services = "サービス"settings = "設定…"diff --git a/apps/desktop-gpui/locales/zh-CN.toml b/apps/desktop-gpui/locales/zh-CN.tomlindex 4e0405648..b3b0e0e5b 100644--- a/apps/desktop-gpui/locales/zh-CN.toml+++ b/apps/desktop-gpui/locales/zh-CN.toml@@ -21,7 +21,6 @@ about = "关于 Cap"hide = "隐藏 Cap"hide_others = "隐藏其他"quit = "退出 Cap"-preferences = "偏好设置…"services = "服务"settings = "设置…"diff --git a/apps/desktop-gpui/src/i18n/tests.rs b/apps/desktop-gpui/src/i18n/tests.rsindex 204b555af..62d3f2359 100644--- a/apps/desktop-gpui/src/i18n/tests.rs+++ b/apps/desktop-gpui/src/i18n/tests.rs@@ -23,7 +23,6 @@ fn english_matches_the_literals_it_replaced() {(tr::menu::app::quit(), format!("Quit {app_name}")),(tr::menu::app::services(), "Services".into()),(tr::menu::app::settings(), "Settings…".into()),- (tr::menu::app::preferences(), "Preferences…".into()),(tr::menu::file::close_window(), "Close Window".into()),(tr::menu::file::open_file(), "Open File…".into()),(tr::menu::file::open_recent(), "Open Recent".into()),diff --git a/apps/desktop-gpui/src/menus.rs b/apps/desktop-gpui/src/menus.rsindex 1f5873813..a967ac073 100644--- a/apps/desktop-gpui/src/menus.rs+++ b/apps/desktop-gpui/src/menus.rs@@ -58,14 +58,6 @@ struct UpdateRow {badge: Option<String>,}-fn settings_label() -> &'static str {- if cfg!(target_os = "macos") {- tr::menu::app::preferences()- } else {- tr::menu::app::settings()- }-}-impl UpdateRow {fn of(status: &updates::UpdateStatus) -> Self {use updates::UpdateStatus;@@ -357,7 +349,7 @@ pub fn build_menus(update_status: &updates::UpdateStatus) -> Vec<Menu> {MenuItem::action(tr::menu::app::about(), About),MenuItem::action(update_row.title, CheckForUpdate).disabled(!update_row.enabled),MenuItem::separator(),- MenuItem::action(settings_label(), OpenSettings),+ MenuItem::action(tr::menu::app::settings(), OpenSettings),MenuItem::separator(),MenuItem::os_submenu(tr::menu::app::services(), SystemMenuType::Services),MenuItem::separator(),@@ -1243,7 +1235,7 @@ mod tests {"About Cap".to_string(),"Check for Update".into(),"-".into(),- settings_label().into(),+ tr::menu::app::settings().into(),"-".into(),"Services".into(),"-".into(),diff --git a/apps/desktop-gpui/src/platform.rs b/apps/desktop-gpui/src/platform.rsindex 14f042966..6f4f9cfac 100644--- a/apps/desktop-gpui/src/platform.rs+++ b/apps/desktop-gpui/src/platform.rs@@ -691,7 +691,7 @@ mod mac {NSApplication, NSDocumentController, NSMenu, NSMenuItem, NSView, NSWindow,NSWindowCollectionBehavior,};- use objc2_foundation::{NSObjectNSKeyValueCoding, NSString};+ use objc2_foundation::{NSObjectNSKeyValueCoding, NSString, ns_string};use raw_window_handle::{HasWindowHandle, RawWindowHandle};use super::{ForcedAppearance, MaterialKind, PanelBehavior};@@ -704,13 +704,12 @@ mod mac {const APP_MENU: isize = 0;const ABOUT_ROW: isize = 0;const UPDATE_ROW: isize = 1;- const PREFERENCES_ROW: isize = 3;+ const SETTINGS_ROW: isize = 3;const FILE_MENU: isize = 1;const OPEN_RECENT_ROW: isize = 1;pub fn patch_standard_application_menu() {use objc2::{exception, msg_send, runtime::AnyObject, sel};- use std::panic::AssertUnwindSafe;let Some(main_thread) = objc2_foundation::MainThreadMarker::new() else {tracing::error!("Cannot patch the application menu off the main thread");@@ -727,6 +726,7 @@ mod mac {else {return;};+// gpui's `validateMenuItem:` answers only "is this action available?",// which is always yes for Cap's global listeners -- so AppKit's// auto-enable pass overwrites `MenuItem::Action`'s `disabled` every@@ -735,25 +735,20 @@ mod mac {// muda.app_menu.setAutoenablesItems(false);- if let Some(about) = app_menu.itemAtIndex(ABOUT_ROW) {- unsafe {- about.setAction(Some(sel!(orderFrontStandardAboutPanel:)));- about.setTarget(None);- about.setAllowsAutomaticKeyEquivalentLocalization(true);+ if objc2::available!(macos = 15.0) {+ if let Some(about) = app_menu.itemAtIndex(ABOUT_ROW) {+ set_nsmenu_system_symbol(&about, "info.icon");}- }- if let Some(preferences) = app_menu.itemAtIndex(PREFERENCES_ROW) {- preferences.setAllowsAutomaticKeyEquivalentLocalization(true);- }- if let Some(quit) = app_menu- .numberOfItems()- .checked_sub(1)- .and_then(|index| app_menu.itemAtIndex(index))- {- unsafe {- quit.setAction(Some(sel!(terminate:)));- quit.setTarget(None);- quit.setAllowsAutomaticKeyEquivalentLocalization(true);+ if let Some(settings) = app_menu.itemAtIndex(SETTINGS_ROW) {+ set_nsmenu_system_symbol(&settings, "gear");+ set_nsmenu_item_prefers_visible_image(&settings);+ }+ if let Some(quit) = &app_menu+ .numberOfItems()+ .checked_sub(1)+ .and_then(|index| app_menu.itemAtIndex(index))+ {+ set_nsmenu_system_symbol(quit, "xmark.rectangle");}}@@ -763,6 +758,7 @@ mod mac {else {return;};+let has_recent_menu = file_menu.itemAtIndex(OPEN_RECENT_ROW).is_some_and(|item| {item.title().isEqualToString(&NSString::from_str(crate::i18n::tr::menu::file::open_recent(),@@ -778,7 +774,7 @@ mod mac {));let name = NSString::from_str("NSRecentDocumentsMenu");let key = NSString::from_str("menuName");- let registered = exception::catch(AssertUnwindSafe(|| {+ let registered = exception::catch(std::panic::AssertUnwindSafe(|| {unsafe { recent_menu.setValue_forKey(Some(&*name as &AnyObject), &key) };}));if let Err(error) = registered {@@ -2748,6 +2744,21 @@ mod mac {w.windowNumber(),))}++ pub fn set_nsmenu_item_prefers_visible_image(item: &NSMenuItem) {+ if objc2::available!(macos = 27.0) {+ // NSMenuItemImageVisibility: automatic = 0, visible = 1, hidden = 2+ let _: () = unsafe { objc2::msg_send![&*item, setPreferredImageVisibility: 1isize] };+ }+ }++ fn set_nsmenu_system_symbol(item: &NSMenuItem, symbol: &str) {+ let image = objc2_app_kit::NSImage::imageWithSystemSymbolName_accessibilityDescription(+ &objc2_foundation::NSString::from_str(symbol),+ None,+ );+ item.setImage(image.as_deref());+ }}#[cfg(target_os = "windows")]diff --git a/apps/desktop-gpui/src/tray.rs b/apps/desktop-gpui/src/tray.rsindex 5ba463636..db131a103 100644--- a/apps/desktop-gpui/src/tray.rs+++ b/apps/desktop-gpui/src/tray.rs@@ -1006,6 +1006,7 @@ mod mac {stop_recording,};use crate::main_window::{Mode, TargetType};+ use crate::platform;/// `NSVariableStatusItemLength`.const NS_VARIABLE_STATUS_ITEM_LENGTH: f64 = -1.0;@@ -1500,9 +1501,7 @@ mod mac {};image.setTemplate(true);item.setImage(Some(&image));- if objc2::available!(macos = 27.0) {- let _: () = unsafe { msg_send![item, setPreferredImageVisibility: 1isize] };- }+ crate::platform::set_nsmenu_item_prefers_visible_image(&*item);}pub(super) fn start_option_tracking() {@@ -1623,12 +1622,7 @@ mod mac {if let Some(image) = image {image.setTemplate(!photo);menu_item.setImage(Some(&image));-- if objc2::available!(macos = 27.0) {- // NSMenuItemImageVisibility: automatic = 0, visible = 1, hidden = 2- let _: () =- unsafe { msg_send![&*menu_item, setPreferredImageVisibility: 1isize] };- }+ crate::platform::set_nsmenu_item_prefers_visible_image(&*menu_item);}menu_item}