From af1ae935d8dde11cd0e887715d381c9ff9aecc72 Mon Sep 17 00:00:00 2001 From: kappaOne Date: Sun, 17 Feb 2013 15:09:31 +0000 Subject: [PATCH] fix CALayer/Display.setParent driver crash on resize --- src/native/macosx/org_lwjgl_opengl_Display.m | 2 +- src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/native/macosx/org_lwjgl_opengl_Display.m b/src/native/macosx/org_lwjgl_opengl_Display.m index 7a3e5c7b..3a526128 100644 --- a/src/native/macosx/org_lwjgl_opengl_Display.m +++ b/src/native/macosx/org_lwjgl_opengl_Display.m @@ -78,7 +78,7 @@ static MacOSXPeerInfo *peer_info; if (window_info->parented) { if (peer_info->isCALayer) { - window_info->window = [[MacOSXKeyableWindow alloc] initWithContentRect:window_info->display_rect styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO]; + window_info->window = [[MacOSXKeyableWindow alloc] initWithContentRect:[[NSScreen mainScreen] frame] styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO]; [window_info->window setContentView:window_info->view]; } else { diff --git a/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m b/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m index 7e43de43..3056c1a5 100644 --- a/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m +++ b/src/native/macosx/org_lwjgl_opengl_MacOSXCanvasPeerInfo.m @@ -159,7 +159,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_opengl_MacOSXCanvasPeerInfo_nInitHandle // set the size of the offscreen frame buffer window window_info->display_rect = NSMakeRect(0, 0, width, height); - [window_info->window setFrame:window_info->display_rect display:false]; + //[window_info->window setFrame:window_info->display_rect display:false]; // clean up the old fbo and renderBuffers glDeleteFramebuffersEXT(1, &oldFboID);