[macOS] Fix non-global native menu shortcuts.

godotengine · Mar 27, 2024 · 37e0be3 · 37e0be3
1 parent 7d151c8
commit 37e0be3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/platform/macos/display_server_macos.h b/platform/macos/display_server_macos.h
@@ -241,6 +241,8 @@ class DisplayServerMacOS : public DisplayServer {
 	NSImage *_convert_to_nsimg(Ref<Image> &p_image) const;
 	Point2i _get_screens_origin() const;
 
+	void set_menu_delegate(NSMenu *p_menu);
+
 	void send_event(NSEvent *p_event);
 	void send_window_event(const WindowData &p_wd, WindowEvent p_event);
 	void release_pressed_events();

diff --git a/platform/macos/display_server_macos.mm b/platform/macos/display_server_macos.mm
@@ -290,6 +290,10 @@
 	displays_arrangement_dirty = false;
 }
 
+void DisplayServerMacOS::set_menu_delegate(NSMenu *p_menu) {
+	[p_menu setDelegate:menu_delegate];
+}
+
 Point2i DisplayServerMacOS::_get_screens_origin() const {
 	// Returns the native top-left screen coordinate of the smallest rectangle
 	// that encompasses all screens. Needed in get_screen_position(),

diff --git a/platform/macos/native_menu_macos.mm b/platform/macos/native_menu_macos.mm
@@ -223,6 +223,11 @@
 RID NativeMenuMacOS::create_menu() {
 	MenuData *md = memnew(MenuData);
 	md->menu = [[NSMenu alloc] initWithTitle:@""];
+	[md->menu setAutoenablesItems:NO];
+	DisplayServerMacOS *ds = (DisplayServerMacOS *)DisplayServer::get_singleton();
+	if (ds) {
+		ds->set_menu_delegate(md->menu);
+	}
 	RID rid = menus.make_rid(md);
 	menu_lookup[md->menu] = rid;
 	return rid;