From 8f8070db42bafc8edbd217d1908a438b145d2a67 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Mon, 11 Nov 2013 21:38:11 -0800 Subject: [PATCH] Fixed window resizing when entering and leaving fullscreen mode --- src/video/cocoa/SDL_cocoawindow.m | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/video/cocoa/SDL_cocoawindow.m b/src/video/cocoa/SDL_cocoawindow.m index 1e5c24fdf5..be6f6cf29d 100644 --- a/src/video/cocoa/SDL_cocoawindow.m +++ b/src/video/cocoa/SDL_cocoawindow.m @@ -451,12 +451,6 @@ GetWindowStyle(SDL_Window * window) } - (void)windowWillExitFullScreen:(NSNotification *)aNotification -{ - isFullscreen = NO; - inFullscreenTransition = YES; -} - -- (void)windowDidExitFullScreen:(NSNotification *)aNotification { SDL_Window *window = _data->window; NSWindow *nswindow = _data->nswindow; @@ -464,6 +458,15 @@ GetWindowStyle(SDL_Window * window) if (!(window->flags & SDL_WINDOW_RESIZABLE)) { [nswindow setStyleMask:GetWindowStyle(window)]; } + + isFullscreen = NO; + inFullscreenTransition = YES; +} + +- (void)windowDidExitFullScreen:(NSNotification *)aNotification +{ + NSWindow *nswindow = _data->nswindow; + inFullscreenTransition = NO; if (pendingWindowOperation == PENDING_OPERATION_ENTER_FULLSCREEN) {