encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

macOS: Fix the initial window background not being black since macOS 10.14.2 or so, when OpenGL is used (bug #4810). Also fixes "CGContext: invalid context 0x0" errors when an OpenGL window is created (bug #4470).

This commit is contained in:
Alex Szpakowski 2019-10-14 00:51:53 -03:00
parent 009226c61e
commit 074f6a512d
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1266,14 +1266,22 @@ SetWindowStyle(SDL_Window * window, NSUInteger style)
_sdlWindow = window; _sdlWindow = window;
} }
/* this is used on older macOS revisions. 10.8 and later use updateLayer. */ /* this is used on older macOS revisions, and newer ones which emulate old
NSOpenGLContext behaviour while still using a layer under the hood. 10.8 and
later use updateLayer, up until 10.14.2 or so, which uses drawRect without
a GraphicsContext and with a layer active instead (for OpenGL contexts). */
- (void)drawRect:(NSRect)dirtyRect - (void)drawRect:(NSRect)dirtyRect
{ {
/* Force the graphics context to clear to black so we don't get a flash of /* Force the graphics context to clear to black so we don't get a flash of
white until the app is ready to draw. In practice on modern macOS, this white until the app is ready to draw. In practice on modern macOS, this
only gets called for window creation and other extraordinary events. */ only gets called for window creation and other extraordinary events. */
if ([NSGraphicsContext currentContext]) {
[[NSColor blackColor] setFill]; [[NSColor blackColor] setFill];
NSRectFill(dirtyRect); NSRectFill(dirtyRect);
} else if (self.layer) {
self.layer.backgroundColor = CGColorGetConstantColor(kCGColorBlack);
}
SDL_SendWindowEvent(_sdlWindow, SDL_WINDOWEVENT_EXPOSED, 0, 0); SDL_SendWindowEvent(_sdlWindow, SDL_WINDOWEVENT_EXPOSED, 0, 0);
} }
@ -1282,6 +1290,7 @@ SetWindowStyle(SDL_Window * window, NSUInteger style)
return YES; return YES;
} }
/* This is also called when a Metal layer is active. */
- (void)updateLayer - (void)updateLayer
{ {
/* Force the graphics context to clear to black so we don't get a flash of /* Force the graphics context to clear to black so we don't get a flash of