Merge pull request godotengine#97678 from bruvzg/fix_nd_menu

akien-mga · akien-mga · commit dedb2ff21772 · 2024-10-04T11:21:54.000+02:00
[macOS] Fix menu crash when used from opened native dialog.
diff --git a/platform/macos/godot_menu_delegate.mm b/platform/macos/godot_menu_delegate.mm
@@ -102,7 +102,11 @@ - (BOOL)menuHasKeyEquivalent:(NSMenu *)menu forEvent:(NSEvent *)event target:(id
 					} else {
 						// Otherwise redirect event to the engine.
 						if (DisplayServer::get_singleton()) {
-							[[[NSApplication sharedApplication] keyWindow] sendEvent:event];
+							if ([[NSApplication sharedApplication] keyWindow].sheet) {
+								[[[[NSApplication sharedApplication] keyWindow] sheetParent] sendEvent:event];
+							} else {
+								[[[NSApplication sharedApplication] keyWindow] sendEvent:event];
+							}
 						}
 					}
 

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,11 @@ - (BOOL)menuHasKeyEquivalent:(NSMenu )menu forEvent:(NSEvent )event target:(id`
`102`	`102`	`} else {`
`103`	`103`	`// Otherwise redirect event to the engine.`
`104`	`104`	`if (DisplayServer::get_singleton()) {`
`105`		`- [[[NSApplication sharedApplication] keyWindow] sendEvent:event];`
	`105`	`+ if ([[NSApplication sharedApplication] keyWindow].sheet) {`
	`106`	`+ [[[[NSApplication sharedApplication] keyWindow] sheetParent] sendEvent:event];`
	`107`	`+ } else {`
	`108`	`+ [[[NSApplication sharedApplication] keyWindow] sendEvent:event];`
	`109`	`+ }`
`106`	`110`	`}`
`107`	`111`	`}`
`108`	`112`