From c0dcb5a056eb0433cc6dc4a9d22c0d00eb4b1bd0 Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Sun, 23 Sep 2012 15:08:43 +0200 Subject: [PATCH] Fixed fullscreen regressions. --- src/cocoa_window.m | 1 + src/win32_window.c | 1 + src/window.c | 2 +- src/x11_window.c | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/cocoa_window.m b/src/cocoa_window.m index 477a1fad..efdc0c6b 100644 --- a/src/cocoa_window.m +++ b/src/cocoa_window.m @@ -931,6 +931,7 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window, return GL_FALSE; } + _glfwPlatformShowWindow(window); [[window->NS.object contentView] enterFullScreenMode:[NSScreen mainScreen] withOptions:nil]; } diff --git a/src/win32_window.c b/src/win32_window.c index 636fab07..6b275476 100644 --- a/src/win32_window.c +++ b/src/win32_window.c @@ -956,6 +956,7 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window, if (window->mode == GLFW_FULLSCREEN) { // Place the window above all topmost windows + _glfwPlatformShowWindow(window); SetWindowPos(window->Win32.handle, HWND_TOPMOST, 0,0,0,0, SWP_NOMOVE | SWP_NOSIZE); } diff --git a/src/window.c b/src/window.c index 383662af..e9da2367 100644 --- a/src/window.c +++ b/src/window.c @@ -367,7 +367,7 @@ GLFWAPI GLFWwindow glfwCreateWindow(int width, int height, if (mode == GLFW_FULLSCREEN) glfwSetInputMode(window, GLFW_CURSOR_MODE, GLFW_CURSOR_CAPTURED); - if (mode == GLFW_FULLSCREEN || wndconfig.visible) + if (mode == GLFW_WINDOWED && wndconfig.visible) glfwShowWindow(window); return window; diff --git a/src/x11_window.c b/src/x11_window.c index 8a0449a6..9cadaeac 100644 --- a/src/x11_window.c +++ b/src/x11_window.c @@ -852,6 +852,7 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window, } #endif /*_GLFW_HAS_XRANDR*/ + _glfwPlatformShowWindow(window); enterFullscreenMode(window); }