Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-10-04 13:46:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue in windows when autoIconify is enabled the window attempts to enter fullscreen mode twice

Browse Source
This commit is contained in:
Eden Salomon 2015-10-20 20:29:49 +03:00
parent af5b82acf5
commit d030b88c86
1 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/win32_window.c
View File

@ -871,10 +871,15 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
if (window->monitor) if (window->monitor)
{ {
// the following function calls ShowWindow
// which sends WM_SETFOCUS to windowProc()
// Which then enters fullscreen mode if autoIconify is enabled (win32_window.c : line 283)
_glfwPlatformShowWindow(window); _glfwPlatformShowWindow(window);
if (!window->autoIconify) { // add this to prevent entering full screen mode twice when autoIconify == true
if (!enterFullscreenMode(window)) if (!enterFullscreenMode(window))
return GLFW_FALSE; return GLFW_FALSE;
} }
}
return GLFW_TRUE; return GLFW_TRUE;
} }
@ -1030,11 +1035,44 @@ void _glfwPlatformRestoreWindow(_GLFWwindow* window)
void _glfwPlatformShowWindow(_GLFWwindow* window) void _glfwPlatformShowWindow(_GLFWwindow* window)
{ {
ShowWindow(window->win32.handle, SW_SHOW); ShowWindow(window->win32.handle, SW_SHOW);
// Consider separating the following function calls to a different function?
// e.g. RequestFocus(_GLFWwindow* window) (any of these might fail)
BringWindowToTop(window->win32.handle); BringWindowToTop(window->win32.handle);
SetForegroundWindow(window->win32.handle); SetForegroundWindow(window->win32.handle);
SetFocus(window->win32.handle); SetFocus(window->win32.handle);
} }
/* one example of separation */
int _glfwPlatformGrabFocus(_GLFWwindow* window)
{
if (!BringWindowToTop(window->win32.handle))
return GLFW_FALSE;
if (!SetForegroundWindow(window->win32.handle))
return GLFW_FALSE;
if (!SetFocus(window->win32.handle))
return GLFW_FALSE;
return GLFW_FALSE;
}
void _glfwPlatformRequestFocus(_GLFWwindow* window)
{
// The following can be used to flash the taskbar icon
// if any of the focus related functions fail
if (!_glfwPlatformGrabFocus(window)) {
// create a taskbar notification ("flash")
FLASHWINFO info;
info.cbSize = sizeof(FLASHWINFO);
info.hwnd = window->win32.handle;
info.dwFlags = FLASHW_TRAY;
info.uCount = 3;
info.dwTimeout = 0;
FlashWindowEx(&info);
}
}
void _glfwPlatformUnhideWindow(_GLFWwindow* window) void _glfwPlatformUnhideWindow(_GLFWwindow* window)
{ {
ShowWindow(window->win32.handle, SW_SHOW); ShowWindow(window->win32.handle, SW_SHOW);