From d7a56b93d5977e21ea17f8419ec560a2ba6f0cc3 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sun, 21 May 2023 08:18:46 -0700 Subject: [PATCH] Revert "Popups don't accept first focus clicks" This reverts commit 9d40d619709ce830372835ca29f516b73a685317. --- src/video/cocoa/SDL_cocoawindow.m | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/video/cocoa/SDL_cocoawindow.m b/src/video/cocoa/SDL_cocoawindow.m index f4e929a6b8..28236dbf98 100644 --- a/src/video/cocoa/SDL_cocoawindow.m +++ b/src/video/cocoa/SDL_cocoawindow.m @@ -1646,10 +1646,11 @@ static int Cocoa_SendMouseButtonClicks(SDL_Mouse *mouse, NSEvent *theEvent, SDL_ - (BOOL)acceptsFirstMouse:(NSEvent *)theEvent { - if (SDL_WINDOW_IS_POPUP(data->window)) { - return NO; + 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); } - return SDL_GetHintBoolean(SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH, SDL_FALSE); } @end