Relintai/sdl2_frt
1
0
Fork 0
mirror of https://github.com/Relintai/sdl2_frt.git synced 2024-12-20 22:16:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

macOS: Fix a new issue in 10.15 where the window decorations don't always get restored after SDL_SetWindowFullscreen(window, 0).

Browse Source
This commit is contained in:
Alex Szpakowski 2019-10-13 12:16:40 -03:00
parent 3b0dcaf474
commit 1773da89f9
1 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -262,13 +262,10 @@ GetHintCtrlClickEmulateRightClick()
} }
static NSUInteger static NSUInteger
GetWindowStyle(SDL_Window * window) GetWindowWindowedStyle(SDL_Window * window)
{ {
NSUInteger style = 0; NSUInteger style = 0;
if (window->flags & SDL_WINDOW_FULLSCREEN) {
style = NSWindowStyleMaskBorderless;
} else {
if (window->flags & SDL_WINDOW_BORDERLESS) { if (window->flags & SDL_WINDOW_BORDERLESS) {
style = NSWindowStyleMaskBorderless; style = NSWindowStyleMaskBorderless;
} else { } else {
@ -277,6 +274,18 @@ GetWindowStyle(SDL_Window * window)
if (window->flags & SDL_WINDOW_RESIZABLE) { if (window->flags & SDL_WINDOW_RESIZABLE) {
style |= NSWindowStyleMaskResizable; style |= NSWindowStyleMaskResizable;
} }
return style;
}
static NSUInteger
GetWindowStyle(SDL_Window * window)
{
NSUInteger style = 0;
if (window->flags & SDL_WINDOW_FULLSCREEN) {
style = NSWindowStyleMaskBorderless;
} else {
style = GetWindowWindowedStyle(window);
} }
return style; return style;
} }
@ -754,10 +763,15 @@ SetWindowStyle(SDL_Window * window, NSUInteger style)
isFullscreenSpace = NO; isFullscreenSpace = NO;
inFullscreenTransition = YES; inFullscreenTransition = YES;
/* As of OS X 10.11, the window seems to need to be resizable when exiting /* As of macOS 10.11, the window seems to need to be resizable when exiting
a Space, in order for it to resize back to its windowed-mode size. a Space, in order for it to resize back to its windowed-mode size.
As of macOS 10.15, the window decorations can go missing sometimes after
certain fullscreen-desktop->exlusive-fullscreen->windowed mode flows
sometimes. Making sure the style mask always uses the windowed mode style
when returning to windowed mode from a space (instead of using a pending
fullscreen mode style mask) seems to work around that issue.
*/ */
SetWindowStyle(window, GetWindowStyle(window) | NSWindowStyleMaskResizable); SetWindowStyle(window, GetWindowWindowedStyle(window) | NSWindowStyleMaskResizable);
} }
- (void)windowDidFailToExitFullScreen:(NSNotification *)aNotification - (void)windowDidFailToExitFullScreen:(NSNotification *)aNotification
@ -783,7 +797,13 @@ SetWindowStyle(SDL_Window * window, NSUInteger style)
inFullscreenTransition = NO; inFullscreenTransition = NO;
SetWindowStyle(window, GetWindowStyle(window)); /* As of macOS 10.15, the window decorations can go missing sometimes after
certain fullscreen-desktop->exlusive-fullscreen->windowed mode flows
sometimes. Making sure the style mask always uses the windowed mode style
when returning to windowed mode from a space (instead of using a pending
fullscreen mode style mask) seems to work around that issue.
*/
SetWindowStyle(window, GetWindowWindowedStyle(window));
[nswindow setLevel:kCGNormalWindowLevel]; [nswindow setLevel:kCGNormalWindowLevel];
@ -1769,7 +1789,13 @@ Cocoa_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display
rect.size.height = window->windowed.h; rect.size.height = window->windowed.h;
ConvertNSRect([nswindow screen], fullscreen, &rect); ConvertNSRect([nswindow screen], fullscreen, &rect);
[nswindow setStyleMask:GetWindowStyle(window)]; /* The window is not meant to be fullscreen, but its flags might have a
* fullscreen bit set if it's scheduled to go fullscreen immediately
* after. Always using the windowed mode style here works around bugs in
* macOS 10.15 where the window doesn't properly restore the windowed
* mode decorations after exiting fullscreen-desktop, when the window
* was created as fullscreen-desktop. */
[nswindow setStyleMask:GetWindowWindowedStyle(window)];
/* Hack to restore window decorations on Mac OS X 10.10 */ /* Hack to restore window decorations on Mac OS X 10.10 */
NSRect frameRect = [nswindow frame]; NSRect frameRect = [nswindow frame];