Merge pull request #112383 from bruvzg/mm_enter_spam

Repiteo · Repiteo · commit a6e7084b4057 · 2025-11-04T16:32:56.000-06:00
[macOS] Fix mouse enter events sent to wrong popup window.
diff --git a/platform/macos/godot_content_view.mm b/platform/macos/godot_content_view.mm
@@ -543,7 +543,7 @@ - (void)mouseMoved:(NSEvent *)event {
 	ds->get_key_modifier_state([event modifierFlags], mm);
 
 	const NSRect contentRect = [wd.window_view frame];
-	if (NSPointInRect([event locationInWindow], contentRect)) {
+	if (NSPointInRect([event locationInWindow], contentRect) && [NSWindow windowNumberAtPoint:[NSEvent mouseLocation] belowWindowWithWindowNumber:0 /*topmost*/] == [wd.window_object windowNumber]) {
 		ds->mouse_enter_window(window_id);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -543,7 +543,7 @@ - (void)mouseMoved:(NSEvent *)event {`
`543`	`543`	`ds->get_key_modifier_state([event modifierFlags], mm);`
`544`	`544`
`545`	`545`	`const NSRect contentRect = [wd.window_view frame];`
`546`		`- if (NSPointInRect([event locationInWindow], contentRect)) {`
	`546`	`+ if (NSPointInRect([event locationInWindow], contentRect) && [NSWindow windowNumberAtPoint:[NSEvent mouseLocation] belowWindowWithWindowNumber:0 /topmost/] == [wd.window_object windowNumber]) {`
`547`	`547`	`ds->mouse_enter_window(window_id);`
`548`	`548`	`}`
`549`	`549`