Jiga228/glfw
0
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-09-19 15:25:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added window focus callback (Cocoa implementation missing).

Browse Source
This commit is contained in:
Camilla Berglund
2010-09-19 02:49:42 +02:00
parent 7ebe76289d
commit bc7a8d48da
6 changed files with 81 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/win32/win32_window.c
+13 -12
View File
@@ -642,12 +642,17 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
BOOL active = LOWORD(wParam) != WA_INACTIVE;
BOOL iconified = HIWORD(wParam) ? TRUE : FALSE;
if ((!active && _glfwLibrary.activeWindow == window) ||
(iconified && !window->iconified))
if (active && iconified)
{
// The window was either deactivated, iconified or both
// This is a workaround for window iconification using the
// taskbar leading to windows being told they're active and
// iconified and then never told they're deactivated
active = FALSE;
}
_glfwInputDeactivation(window);
if (!active && _glfwLibrary.activeWindow == window)
{
// The window was deactivated (or iconified, see above)
if (window == _glfwLibrary.cursorLockWindow)
_glfwPlatformShowMouseCursor(window);
@@ -668,8 +673,10 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
}
}
}
else if (active && !iconified)
else if (active && _glfwLibrary.activeWindow != window)
{
// The window was activated
if (window == _glfwLibrary.cursorLockWindow)
_glfwPlatformHideMouseCursor(window);
@@ -688,13 +695,7 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
}
}
if (active)
_glfwLibrary.activeWindow = window;
else
{
if (window == _glfwLibrary.activeWindow)
_glfwLibrary.activeWindow = NULL;
}
_glfwInputWindowFocus(window, active);
window->iconified = iconified;
return 0;