shadps4-emu/ext-SDL
1
0
Fork 0
mirror of https://github.com/shadps4-emu/ext-SDL.git synced 2024-12-27 13:16:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cocoa: When exiting a fullscreen space, wait for window state to normalize.

Browse Source 
A good metric of this is when the titlebar's "minimize" button is reenabled,
which doesn't happen by the time windowDidExitFullscreen triggers.

This fixes minimizing a fullscreen window on macOS.

Fixes Bugzilla #4177.
This commit is contained in:
Ryan C. Gordon 2020-02-21 14:50:09 -05:00
parent 8d14636326
commit 4d9e6e5f70
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/video/cocoa/SDL_cocoawindow.m
View File

@ -794,6 +794,7 @@ SetWindowStyle(SDL_Window * window, NSUInteger style)
{
SDL_Window *window = _data->window;
NSWindow *nswindow = _data->nswindow;
NSButton *button = nil;
inFullscreenTransition = NO;
@ -865,6 +866,22 @@ SetWindowStyle(SDL_Window * window, NSUInteger style)
Cocoa_ShowWindow(SDL_GetVideoDevice(), window);
}
}
/* There's some state that isn't quite back to normal when
windowDidExitFullScreen triggers. For example, the minimize button on
the titlebar doesn't actually enable for another 200 milliseconds or
so on this MacBook. Camp here and wait for that to happen before
going on, in case we're exiting fullscreen to minimize, which need
that window state to be normal before it will work. */
button = [nswindow standardWindowButton:NSWindowMiniaturizeButton];
if (button) {
int iterations = 0;
while (![button isEnabled]) {
SDL_Delay(10);
SDL_PumpEvents();
iterations++;
}
}
}
-(NSApplicationPresentationOptions)window:(NSWindow *)window willUseFullScreenPresentationOptions:(NSApplicationPresentationOptions)proposedOptions
@ -1724,6 +1741,7 @@ Cocoa_MinimizeWindow(_THIS, SDL_Window * window)
SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
NSWindow *nswindow = data->nswindow;
printf("Cocoa_MinimizeWindow begin %u\n", (unsigned int) SDL_GetTicks());
if ([data->listener isInFullscreenSpaceTransition]) {
[data->listener addPendingWindowOperation:PENDING_OPERATION_MINIMIZE];
} else {