From ff3d693abbdd57361d0b32669ff1603dc155a0dd Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Wed, 13 Nov 2024 13:56:56 -0700 Subject: [PATCH] Don't double-localize menu shortcuts (#20623) Release Notes: - Don't have macOS localize our menu shortcuts that we already localized. --- crates/gpui/src/platform/mac/platform.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crates/gpui/src/platform/mac/platform.rs b/crates/gpui/src/platform/mac/platform.rs index 0e0b9e046809f44bbcd46a36f12da329a3a93a71..b744c658cee1bcae9653cb76793eee60cbd767ca 100644 --- a/crates/gpui/src/platform/mac/platform.rs +++ b/crates/gpui/src/platform/mac/platform.rs @@ -19,7 +19,7 @@ use cocoa::{ NSPasteboardTypePNG, NSPasteboardTypeRTF, NSPasteboardTypeRTFD, NSPasteboardTypeString, NSPasteboardTypeTIFF, NSSavePanel, NSWindow, }, - base::{id, nil, selector, BOOL, YES}, + base::{id, nil, selector, BOOL, NO, YES}, foundation::{ NSArray, NSAutoreleasePool, NSBundle, NSData, NSInteger, NSProcessInfo, NSRange, NSString, NSUInteger, NSURL, @@ -343,6 +343,8 @@ impl MacPlatform { ns_string(key_to_native(&keystroke.key).as_ref()), ) .autorelease(); + let _: () = + msg_send![item, setAllowsAutomaticKeyEquivalentLocalization: NO]; item.setKeyEquivalentModifierMask_(mask); } // For multi-keystroke bindings, render the keystroke as part of the title.