From d4225070adcbab38e851b2036de9373832660c11 Mon Sep 17 00:00:00 2001 From: Frank Praznik Date: Mon, 9 Dec 2024 23:31:23 -0500 Subject: [PATCH] cocoa: Toggle the fullscreen menu item to 'leave' when entering a fullscreen space Only return 'NO' during the menu item validation if the window is fullscreen and not in a fullscreen space. --- src/video/cocoa/SDL_cocoawindow.m | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/video/cocoa/SDL_cocoawindow.m b/src/video/cocoa/SDL_cocoawindow.m index 873380bd0..96a5a2a56 100644 --- a/src/video/cocoa/SDL_cocoawindow.m +++ b/src/video/cocoa/SDL_cocoawindow.m @@ -108,7 +108,10 @@ SDL_Window *window = [self findSDLWindow]; if (window == NULL) { return NO; - } else if (window->flags & SDL_WINDOW_FULLSCREEN) { + } + + SDL_CocoaWindowData *data = (__bridge SDL_CocoaWindowData *)window->internal; + if (window->flags & SDL_WINDOW_FULLSCREEN && ![data.listener isInFullscreenSpace]) { return NO; } else if ((window->flags & SDL_WINDOW_RESIZABLE) == 0) { return NO;