From 023b816bcc3ce638bbab63fad38404d5632e5be2 Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Tue, 11 Sep 2012 23:51:45 +0200 Subject: [PATCH] Disallowed hiding of fullscreen windows. --- src/window.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/window.c b/src/window.c index ab29725d..04e4f762 100644 --- a/src/window.c +++ b/src/window.c @@ -366,7 +366,7 @@ GLFWAPI GLFWwindow glfwCreateWindow(int width, int height, glClear(GL_COLOR_BUFFER_BIT); _glfwPlatformSwapBuffers(window); - if (wndconfig.visible) + if (wndconfig.visible || mode == GLFW_FULLSCREEN) glfwShowWindow(window); return window; @@ -649,15 +649,20 @@ GLFWAPI void glfwIconifyWindow(GLFWwindow handle) // Window show //======================================================================== -GLFWAPI void glfwShowWindow(GLFWwindow window) +GLFWAPI void glfwShowWindow(GLFWwindow handle) { + _GLFWwindow* window = (_GLFWwindow*) handle; + if (!_glfwInitialized) { _glfwSetError(GLFW_NOT_INITIALIZED, NULL); return; } - _glfwPlatformShowWindow((_GLFWwindow*)window); + if (window->mode == GLFW_FULLSCREEN) + return; + + _glfwPlatformShowWindow(window); } @@ -665,15 +670,20 @@ GLFWAPI void glfwShowWindow(GLFWwindow window) // Window hide //======================================================================== -GLFWAPI void glfwHideWindow(GLFWwindow window) +GLFWAPI void glfwHideWindow(GLFWwindow handle) { + _GLFWwindow* window = (_GLFWwindow*) handle; + if (!_glfwInitialized) { _glfwSetError(GLFW_NOT_INITIALIZED, NULL); return; } - _glfwPlatformHideWindow((_GLFWwindow*)window); + if (window->mode == GLFW_FULLSCREEN) + return; + + _glfwPlatformHideWindow(window); }