michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Elias Naur 2008-04-07 15:33:34 +00:00
parent 12a1f5e3e5
commit 97ebcea9c8
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/java/org/lwjgl/opengl/WindowsDisplay.java
View File

@ -236,13 +236,16 @@ final class WindowsDisplay implements DisplayImplementation {
return; return;
} }
inAppActivate = true; inAppActivate = true;
isFocused = active;
if (active) { if (active) {
if (isFullscreen) { if (isFullscreen) {
restoreDisplayMode(); restoreDisplayMode();
} }
showWindow(getHwnd(), SW_RESTORE); if (parent == null) {
setForegroundWindow(getHwnd()); showWindow(getHwnd(), SW_RESTORE);
setFocus(getHwnd()); setForegroundWindow(getHwnd());
setFocus(getHwnd());
}
did_maximize = true; did_maximize = true;
if (isFullscreen) if (isFullscreen)
updateClipping(); updateClipping();
@ -708,10 +711,10 @@ final class WindowsDisplay implements DisplayImplementation {
} }
return defWindowProc(hwnd, msg, wParam, lParam); return defWindowProc(hwnd, msg, wParam, lParam);
case WM_KILLFOCUS: case WM_KILLFOCUS:
isFocused = false; appActivate(false);
return 0; return 0;
case WM_SETFOCUS: case WM_SETFOCUS:
isFocused = true; appActivate(true);
return 0; return 0;
case WM_MOUSEMOVE: case WM_MOUSEMOVE:
int xPos = (int)(short)(lParam & 0xFFFF); int xPos = (int)(short)(lParam & 0xFFFF);