mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-10 09:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed iconification event for maximized windows.

Browse Source
This commit is contained in:
Camilla Berglund 2015-01-06 15:35:49 +01:00
parent 9ec1a4361b
commit dcc78017b0
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/win32_platform.h
View File

@ -159,6 +159,7 @@ typedef struct _GLFWwindowWin32
DWORD dwExStyle; DWORD dwExStyle;
GLboolean cursorInside; GLboolean cursorInside;
GLboolean iconified;
// The last received cursor position, regardless of source // The last received cursor position, regardless of source
int cursorPosX, cursorPosY; int cursorPosX, cursorPosY;

11
src/win32_window.c
View File

@ -489,10 +489,17 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
updateClipRect(window); updateClipRect(window);
} }
if (wParam == SIZE_MINIMIZED) if (!window->win32.iconified && wParam == SIZE_MINIMIZED)
{
window->win32.iconified = GL_TRUE;
_glfwInputWindowIconify(window, GL_TRUE); _glfwInputWindowIconify(window, GL_TRUE);
else if (wParam == SIZE_RESTORED) }
else if (window->win32.iconified &&
(wParam == SIZE_RESTORED || wParam == SIZE_MAXIMIZED))
{
window->win32.iconified = GL_FALSE;
_glfwInputWindowIconify(window, GL_FALSE); _glfwInputWindowIconify(window, GL_FALSE);
}
_glfwInputFramebufferSize(window, LOWORD(lParam), HIWORD(lParam)); _glfwInputFramebufferSize(window, LOWORD(lParam), HIWORD(lParam));
_glfwInputWindowSize(window, LOWORD(lParam), HIWORD(lParam)); _glfwInputWindowSize(window, LOWORD(lParam), HIWORD(lParam));