Jelajahi Sumber

Merge branch 'master' into multi-monitor

Conflicts:
	src/x11_window.c
Camilla Berglund 13 tahun lalu
induk
melakukan
7aaeb6955b
4 mengubah file dengan 4 tambahan dan 1 penghapusan
  1. 1 0
      src/cocoa_window.m
  2. 1 0
      src/win32_window.c
  3. 1 1
      src/window.c
  4. 1 0
      src/x11_window.c

+ 1 - 0
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];
     }

+ 1 - 0
src/win32_window.c

@@ -965,6 +965,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);
     }

+ 1 - 1
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;

+ 1 - 0
src/x11_window.c

@@ -853,6 +853,7 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
 
     if (wndconfig->mode == GLFW_FULLSCREEN)
     {
+        _glfwPlatformShowWindow(window);
         enterFullscreenMode(window);
     }