From 7c2dac8ebde2b48e954883ae5d0dc91c8b50d88c Mon Sep 17 00:00:00 2001 From: Brian Matzon Date: Sat, 8 Feb 2003 19:30:53 +0000 Subject: [PATCH] fix: make mouse actually behave! --- src/native/win32/org_lwjgl_Display.cpp | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/native/win32/org_lwjgl_Display.cpp b/src/native/win32/org_lwjgl_Display.cpp index fd6c44b5..3a5820c7 100644 --- a/src/native/win32/org_lwjgl_Display.cpp +++ b/src/native/win32/org_lwjgl_Display.cpp @@ -141,21 +141,31 @@ LRESULT CALLBACK WindowProc(HWND hWnd, case SC_MONITORPOWER: return 0L; break; + case SC_MINIMIZE: + isMinimized = true; + appActivate(true); + break; + case SC_RESTORE: + isMinimized = false; + appActivate(false); default: break; } } case WM_ACTIVATE: { - int fActive, fMinimized; - fActive = LOWORD(wParam); - fMinimized = (BOOL) HIWORD(wParam); - - appActivate(fActive != WA_INACTIVE && !fMinimized); - isMinimized = fMinimized == TRUE || (fActive == WA_INACTIVE && isFullscreen); + switch(LOWORD(wParam)) { + case WA_ACTIVE: + case WA_CLICKACTIVE: + isMinimized = false; + break; + case WA_INACTIVE: + isMinimized = true; + break; + } + appActivate(!isMinimized); } - } // default action