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

[<eli...@us...>]

Revision: 2978
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=2978&view=rev
Author:   elias_naur
Date:     2008-04-07 08:33:34 -0700 (Mon, 07 Apr 2008)

Log Message:
-----------
Windows: Improved focus handling when Display.getParent() != null

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

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2008-04-07 13:34:20 UTC (rev 2977)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2008-04-07 15:33:34 UTC (rev 2978)
@@ -236,13 +236,16 @@
 			return;
 		}
 		inAppActivate = true;
+		isFocused = active;
 		if (active) {
 			if (isFullscreen) {
 				restoreDisplayMode();
 			}
-			showWindow(getHwnd(), SW_RESTORE);
-			setForegroundWindow(getHwnd());
-			setFocus(getHwnd());
+			if (parent == null) {
+				showWindow(getHwnd(), SW_RESTORE);
+				setForegroundWindow(getHwnd());
+				setFocus(getHwnd());
+			}
 			did_maximize = true;
 			if (isFullscreen)
 				updateClipping();
@@ -708,10 +711,10 @@
 				}
 				return defWindowProc(hwnd, msg, wParam, lParam);
 			case WM_KILLFOCUS:
-				isFocused = false;
+				appActivate(false);
 				return 0;
 			case WM_SETFOCUS:
-				isFocused = true;
+				appActivate(true);
 				return 0;
 			case WM_MOUSEMOVE:
 				int xPos = (int)(short)(lParam & 0xFFFF);


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