mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-22 13:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into multi-monitor

Browse Source 
Conflicts:
	src/x11_window.c
This commit is contained in:
Camilla Berglund 2012-09-23 15:26:53 +02:00
commit 7aaeb6955b
4 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cocoa_window.m
View File

@ -931,6 +931,7 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
return GL_FALSE;
}
_glfwPlatformShowWindow(window);
[[window->NS.object contentView] enterFullScreenMode:[NSScreen mainScreen]
withOptions:nil];
}

1
src/win32_window.c
View File

@ -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);
}

2
src/window.c
View File

@ -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
src/x11_window.c
View File

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