Navy.gif/glfw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Camilla Berglund 2013-06-19 13:46:18 +02:00
parent e11a5e3973
commit 3be3f58a92
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/x11_window.c
View File

@ -1010,6 +1010,20 @@ void _glfwPlatformGetWindowSize(_GLFWwindow* window, int* width, int* height)
void _glfwPlatformSetWindowSize(_GLFWwindow* window, int width, int height) void _glfwPlatformSetWindowSize(_GLFWwindow* window, int width, int height)
{ {
if (window->monitor)
{
_glfwSetVideoMode(window->monitor, &window->videoMode);
if (window->x11.overrideRedirect)
{
GLFWvidmode mode;
_glfwPlatformGetVideoMode(window->monitor, &mode);
XResizeWindow(_glfw.x11.display, window->x11.handle,
mode.width, mode.height);
}
}
else
{
if (!window->resizable) if (!window->resizable)
{ {
// Update window size restrictions to match new window size // Update window size restrictions to match new window size
@ -1024,20 +1038,8 @@ void _glfwPlatformSetWindowSize(_GLFWwindow* window, int width, int height)
XFree(hints); XFree(hints);
} }
if (window->monitor)
{
_glfwSetVideoMode(window->monitor, &window->videoMode);
if (window->x11.overrideRedirect)
{
GLFWvidmode mode;
_glfwPlatformGetVideoMode(window->monitor, &mode);
XResizeWindow(_glfw.x11.display, window->x11.handle,
mode.width, mode.height);
}
}
else
XResizeWindow(_glfw.x11.display, window->x11.handle, width, height); XResizeWindow(_glfw.x11.display, window->x11.handle, width, height);
}
XFlush(_glfw.x11.display); XFlush(_glfw.x11.display);
} }