From e1a28bc16fea9f3d7316c6c1803ab3e70e53f57a Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Sun, 21 May 2023 08:17:06 -0700
Subject: [PATCH] Popups don't accept first focus clicks
I'm not sure if this is is what we want, but it matches Windows behavior
---
src/video/cocoa/SDL_cocoawindow.m | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/video/cocoa/SDL_cocoawindow.m b/src/video/cocoa/SDL_cocoawindow.m
index 28236dbf98d8..f4e929a6b8d7 100644
--- a/src/video/cocoa/SDL_cocoawindow.m
+++ b/src/video/cocoa/SDL_cocoawindow.m
@@ -1646,11 +1646,10 @@ - (BOOL)mouseDownCanMoveWindow
- (BOOL)acceptsFirstMouse:(NSEvent *)theEvent
{
- if (SDL_GetHint(SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH)) {
- return SDL_GetHintBoolean(SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH, SDL_FALSE);
- } else {
- return SDL_GetHintBoolean("SDL_MAC_MOUSE_FOCUS_CLICKTHROUGH", SDL_FALSE);
+ if (SDL_WINDOW_IS_POPUP(data->window)) {
+ return NO;
}
+ return SDL_GetHintBoolean(SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH, SDL_FALSE);
}
@end