Navy.gif/glfw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cocoa: Fix work area retrieval on missing screen

Browse Source 
Closes #1322.
This commit is contained in:
Doug Binks 2018-09-08 18:49:19 +02:00 committed by Camilla Löwy
parent ba4e78e57f
commit 68fd4e8bb3
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/cocoa_monitor.m
View File

@ -413,13 +413,7 @@ void _glfwPlatformGetMonitorWorkarea(_GLFWmonitor* monitor, int* xpos, int* ypos
NSScreen *resultScreen; NSScreen *resultScreen;
for (NSScreen *screen in [NSScreen screens]) { for (NSScreen *screen in [NSScreen screens]) {
if ([[[screen deviceDescription] valueForKey:@"NSScreenNumber"] intValue] == monitor->ns.displayID) { if ([[[screen deviceDescription] valueForKey:@"NSScreenNumber"] intValue] == monitor->ns.displayID) {
resultScreen = screen; NSRect frameRect = [screen visibleFrame];
break;
}
}
NSRect frameRect = [[NSScreen resultScreen] visibleFrame];
if (xpos) if (xpos)
*xpos = NSMinX(frameRect); *xpos = NSMinX(frameRect);
if (ypos) if (ypos)
@ -428,6 +422,9 @@ void _glfwPlatformGetMonitorWorkarea(_GLFWmonitor* monitor, int* xpos, int* ypos
*width = NSWidth(frameRect); *width = NSWidth(frameRect);
if (height) if (height)
*height = NSHeight(frameRect); *height = NSHeight(frameRect);
break;
}
}
} }
GLFWvidmode* _glfwPlatformGetVideoModes(_GLFWmonitor* monitor, int* count) GLFWvidmode* _glfwPlatformGetVideoModes(_GLFWmonitor* monitor, int* count)