Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-10-03 21:30:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 8b042c28e2 into 8f0fd7ecf5

Browse Source
This commit is contained in:
Chi-kwan Chan 2015-05-18 20:58:46 +00:00
commit bb1f41edb7
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cocoa_window.m
View File

@ -1060,12 +1060,16 @@ void _glfwPlatformShowWindow(_GLFWwindow* window)
// should probably not be done every time any window is shown // should probably not be done every time any window is shown
[NSApp activateIgnoringOtherApps:YES]; [NSApp activateIgnoringOtherApps:YES];
_GLFWwindow* previous = _glfwPlatformGetCurrentContext();
[window->ns.object makeKeyAndOrderFront:nil]; [window->ns.object makeKeyAndOrderFront:nil];
_glfwPlatformMakeContextCurrent(previous);
} }
void _glfwPlatformUnhideWindow(_GLFWwindow* window) void _glfwPlatformUnhideWindow(_GLFWwindow* window)
{ {
_GLFWwindow* previous = _glfwPlatformGetCurrentContext();
[window->ns.object orderFront:nil]; [window->ns.object orderFront:nil];
_glfwPlatformMakeContextCurrent(previous);
} }
void _glfwPlatformHideWindow(_GLFWwindow* window) void _glfwPlatformHideWindow(_GLFWwindow* window)