Leahnaya/SDL
1
0
Fork 0
mirror of https://github.com/yawut/SDL.git synced 2026-08-26 18:55:32 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.

Browse Source 
makeKeyAndOrderFront: was sending three KVO transitions for isVisible,
for false -> true, true -> false, and then false -> true. This was
causing an infinite recursion.

We now suspend monitoring of the KVO before makeKeyAndOrderFront, then
resume afterwards and send any changes in isVisible's state.
This commit is contained in:
Jørgen P. Tjernø
2013-04-22 18:14:26 -07:00
parent f8eb6524ec
commit 80ce87f3a1
1 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,6 +50,8 @@ static __inline__ void ConvertNSRect(NSRect *r)
NSView *view = [window contentView];
_data = data;
observingVisible = YES;
wasVisible = [window isVisible];
center = [NSNotificationCenter defaultCenter];
@@ -90,6 +92,10 @@ static __inline__ void ConvertNSRect(NSRect *r)
change:(NSDictionary *)change
context:(void *)context
{
if (!observingVisible) {
return;
}
if (object == _data->nswindow && [keyPath isEqualToString:@"visible"]) {
int newVisibility = [[change objectForKey:@"new"] intValue];
if (newVisibility) {
@@ -100,6 +106,27 @@ static __inline__ void ConvertNSRect(NSRect *r)
}
}
-(void) pauseVisibleObservation
{
observingVisible = NO;
wasVisible = [_data->nswindow isVisible];
}
-(void) resumeVisibleObservation
{
BOOL isVisible = [_data->nswindow isVisible];
observingVisible = YES;
if (wasVisible != isVisible) {
if (isVisible) {
SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_SHOWN, 0, 0);
} else {
SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_HIDDEN, 0, 0);
}
wasVisible = isVisible;
}
}
- (void)close
{
NSNotificationCenter *center;
@@ -785,10 +812,13 @@ void
Cocoa_ShowWindow(_THIS, SDL_Window * window)
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->nswindow;
SDL_WindowData *windowData = ((SDL_WindowData *) window->driverdata);
NSWindow *nswindow = windowData->nswindow;
if (![nswindow isMiniaturized]) {
[windowData->listener pauseVisibleObservation];
[nswindow makeKeyAndOrderFront:nil];
[windowData->listener resumeVisibleObservation];
}
[pool release];
}
@@ -807,9 +837,13 @@ void
Cocoa_RaiseWindow(_THIS, SDL_Window * window)
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->nswindow;
SDL_WindowData *windowData = ((SDL_WindowData *) window->driverdata);
NSWindow *nswindow = windowData->nswindow;
[windowData->listener pauseVisibleObservation];
[nswindow makeKeyAndOrderFront:nil];
[windowData->listener resumeVisibleObservation];
[pool release];
}
@@ -960,7 +994,10 @@ Cocoa_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display
[nswindow setLevel:kCGNormalWindowLevel];
}
#endif
[data->listener pauseVisibleObservation];
[nswindow makeKeyAndOrderFront:nil];
[data->listener resumeVisibleObservation];
if (window == _this->current_glwin) {
[((NSOpenGLContext *) _this->current_glctx) update];