[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3661] trunk/LWJGL/src/java/org/lwjgl/opengl

[<ka...@us...>]

Revision: 3661
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3661&view=rev
Author:   kappa1
Date:     2011-10-11 22:39:32 +0000 (Tue, 11 Oct 2011)
Log Message:
-----------
minor tweak to the order in which CALayer support is detected.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java
    trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java	2011-10-11 22:30:55 UTC (rev 3660)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTSurfaceLock.java	2011-10-11 22:39:32 UTC (rev 3661)
@@ -80,8 +80,8 @@
 		// It is only needed on first call, so we avoid it on all subsequent calls
 		// due to performance..
         
-		// Allow the use of a Core Animation Layer only when using Display.setParent() or AWTGLCanvas and when not in fullscreen
-		final boolean allowCALayer = (Display.getParent() != null || component instanceof AWTGLCanvas) && !Display.isFullscreen();
+		// Allow the use of a Core Animation Layer only when using non fullscreen Display.setParent() or AWTGLCanvas
+		final boolean allowCALayer = (Display.getParent() != null && !Display.isFullscreen()) || component instanceof AWTGLCanvas;
 		
 		if (firstLockSucceeded)
 			return lockAndInitHandle(lock_buffer, component, allowCALayer);

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java	2011-10-11 22:30:55 UTC (rev 3660)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/MacOSXCanvasPeerInfo.java	2011-10-11 22:39:32 UTC (rev 3661)
@@ -50,8 +50,8 @@
 	}
 
 	protected void initHandle(Canvas component) throws LWJGLException {
-		// Allow the use of a Core Animation Layer only when using Display.setParent() or AWTGLCanvas and when not in fullscreen
-		final boolean allowCALayer = (Display.getParent() != null || component instanceof AWTGLCanvas) && !Display.isFullscreen();
+		// Allow the use of a Core Animation Layer only when using non fullscreen Display.setParent() or AWTGLCanvas
+		final boolean allowCALayer = (Display.getParent() != null && !Display.isFullscreen()) || component instanceof AWTGLCanvas;
 		
 		nInitHandle(awt_surface.lockAndGetHandle(component), getHandle(), allowCALayer);
 	}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.