Fixed focus for Win+D window restoration.

This commit is contained in:
Camilla Berglund 2013-10-07 16:12:23 +02:00
parent 9c5d9f8614
commit 6e68d89e0f
2 changed files with 17 additions and 4 deletions

View File

@ -208,6 +208,8 @@ See the [GLFW documentation](http://www.glfw.org/docs/latest/).
## Changelog ## Changelog
- [Win32] Bugfix: Restoring windows using the Win+D hot key did not trigger the
focus callback
- [Win32] Bugfix: The disabled cursor mode clip rectangle was updated for - [Win32] Bugfix: The disabled cursor mode clip rectangle was updated for
unfocused windows unfocused windows
- [Cocoa] Bugfix: The `GLFW_KEY_GRAVE_ACCENT` and `GLFW_KEY_WORLD_1` keys had - [Cocoa] Bugfix: The `GLFW_KEY_GRAVE_ACCENT` and `GLFW_KEY_WORLD_1` keys had

View File

@ -388,10 +388,21 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
if (focused && iconified) if (focused && iconified)
{ {
// This is a workaround for window iconification using the if (window->iconified && _glfw.focusedWindow != window)
// taskbar leading to windows being told they're focused and {
// iconified and then never told they're defocused // This is a workaround for window restoration using the
focused = FALSE; // Win+D hot key leading to windows being told they're
// focused and iconified and then never told they're
// restored
iconified = FALSE;
}
else
{
// This is a workaround for window iconification using the
// taskbar leading to windows being told they're focused and
// iconified and then never told they're defocused
focused = FALSE;
}
} }
if (!focused && _glfw.focusedWindow == window) if (!focused && _glfw.focusedWindow == window)