mirror of
https://github.com/gwm17/glfw.git
synced 2024-11-23 02:38:52 -05:00
Fixed fullscreen regressions.
This commit is contained in:
parent
718af531a3
commit
c0dcb5a056
|
@ -931,6 +931,7 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
|
||||||
return GL_FALSE;
|
return GL_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_glfwPlatformShowWindow(window);
|
||||||
[[window->NS.object contentView] enterFullScreenMode:[NSScreen mainScreen]
|
[[window->NS.object contentView] enterFullScreenMode:[NSScreen mainScreen]
|
||||||
withOptions:nil];
|
withOptions:nil];
|
||||||
}
|
}
|
||||||
|
|
|
@ -956,6 +956,7 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
|
||||||
if (window->mode == GLFW_FULLSCREEN)
|
if (window->mode == GLFW_FULLSCREEN)
|
||||||
{
|
{
|
||||||
// Place the window above all topmost windows
|
// Place the window above all topmost windows
|
||||||
|
_glfwPlatformShowWindow(window);
|
||||||
SetWindowPos(window->Win32.handle, HWND_TOPMOST, 0,0,0,0,
|
SetWindowPos(window->Win32.handle, HWND_TOPMOST, 0,0,0,0,
|
||||||
SWP_NOMOVE | SWP_NOSIZE);
|
SWP_NOMOVE | SWP_NOSIZE);
|
||||||
}
|
}
|
||||||
|
|
|
@ -367,7 +367,7 @@ GLFWAPI GLFWwindow glfwCreateWindow(int width, int height,
|
||||||
if (mode == GLFW_FULLSCREEN)
|
if (mode == GLFW_FULLSCREEN)
|
||||||
glfwSetInputMode(window, GLFW_CURSOR_MODE, GLFW_CURSOR_CAPTURED);
|
glfwSetInputMode(window, GLFW_CURSOR_MODE, GLFW_CURSOR_CAPTURED);
|
||||||
|
|
||||||
if (mode == GLFW_FULLSCREEN || wndconfig.visible)
|
if (mode == GLFW_WINDOWED && wndconfig.visible)
|
||||||
glfwShowWindow(window);
|
glfwShowWindow(window);
|
||||||
|
|
||||||
return window;
|
return window;
|
||||||
|
|
|
@ -852,6 +852,7 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
|
||||||
}
|
}
|
||||||
#endif /*_GLFW_HAS_XRANDR*/
|
#endif /*_GLFW_HAS_XRANDR*/
|
||||||
|
|
||||||
|
_glfwPlatformShowWindow(window);
|
||||||
enterFullscreenMode(window);
|
enterFullscreenMode(window);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user