gwm17/glfw
1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-27 04:28:52 -05:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:elmindreda/glfw

Browse Source
This commit is contained in:
Camilla Berglund 2013-01-04 00:08:49 +01:00
parent dad152b3f6 7049f73b7d
commit 0d7c2f73fc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/cocoa_monitor.m
View File

@ -146,7 +146,7 @@ GLboolean _glfwSetVideoMode(_GLFWmonitor* monitor, int* width, int* height, int*
CFIndex count, i; CFIndex count, i;
unsigned int leastSizeDiff = UINT_MAX; unsigned int leastSizeDiff = UINT_MAX;
modes = CGDisplayCopyAllDisplayModes(CGMainDisplayID(), NULL); modes = CGDisplayCopyAllDisplayModes(monitor->ns.displayID, NULL);
count = CFArrayGetCount(modes); count = CFArrayGetCount(modes);
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
@ -190,10 +190,10 @@ GLboolean _glfwSetVideoMode(_GLFWmonitor* monitor, int* width, int* height, int*
return GL_FALSE; return GL_FALSE;
} }
monitor->ns.previousMode = CGDisplayCopyDisplayMode(CGMainDisplayID()); monitor->ns.previousMode = CGDisplayCopyDisplayMode(monitor->ns.displayID);
CGDisplayCapture(CGMainDisplayID()); CGDisplayCapture(monitor->ns.displayID);
CGDisplaySetDisplayMode(CGMainDisplayID(), bestMode, NULL); CGDisplaySetDisplayMode(monitor->ns.displayID, bestMode, NULL);
CFRelease(modes); CFRelease(modes);
return GL_TRUE; return GL_TRUE;
@ -206,8 +206,8 @@ GLboolean _glfwSetVideoMode(_GLFWmonitor* monitor, int* width, int* height, int*
void _glfwRestoreVideoMode(_GLFWmonitor* monitor) void _glfwRestoreVideoMode(_GLFWmonitor* monitor)
{ {
CGDisplaySetDisplayMode(CGMainDisplayID(), monitor->ns.previousMode, NULL); CGDisplaySetDisplayMode(monitor->ns.displayID, monitor->ns.previousMode, NULL);
CGDisplayRelease(CGMainDisplayID()); CGDisplayRelease(monitor->ns.displayID);
} }