Jiga228/glfw
0
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-09-19 23:43:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove monitor from _GLFWwndconfig

Browse Source
This commit is contained in:
Camilla Berglund
2016-03-14 15:17:28 +01:00
parent 3a6fe042ea
commit ea888114fa
7 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/window.c
+3 -4
View File
@@ -143,7 +143,6 @@ GLFWAPI GLFWwindow* glfwCreateWindow(int width, int height,
wndconfig.width = width;
wndconfig.height = height;
wndconfig.title = title;
wndconfig.monitor = (_GLFWmonitor*) monitor;
ctxconfig.share = (_GLFWwindow*) share;
if (ctxconfig.share)
@@ -155,7 +154,7 @@ GLFWAPI GLFWwindow* glfwCreateWindow(int width, int height,
}
}
if (wndconfig.monitor)
if (monitor)
{
wndconfig.resizable = GLFW_TRUE;
wndconfig.visible = GLFW_TRUE;
@@ -176,7 +175,7 @@ GLFWAPI GLFWwindow* glfwCreateWindow(int width, int height,
window->videoMode.blueBits = fbconfig.blueBits;
window->videoMode.refreshRate = _glfw.hints.refreshRate;
window->monitor = wndconfig.monitor;
window->monitor = (_GLFWmonitor*) monitor;
window->resizable = wndconfig.resizable;
window->decorated = wndconfig.decorated;
window->autoIconify = wndconfig.autoIconify;
@@ -218,7 +217,7 @@ GLFWAPI GLFWwindow* glfwCreateWindow(int width, int height,
_glfwPlatformMakeContextCurrent(previous);
}
if (wndconfig.monitor)
if (window->monitor)
{
int width, height;
_glfwPlatformGetWindowSize(window, &width, &height);