Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-12-16 20:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

macOS: Fallback to first NSScreen when no match found

Browse Source 
On macOS, [NSScreen screens] may return only a single logical screen when
displays are set to mirroring mode. In this case, matching by display ID or
unit number can fail, leaving `screen` as nil. Add a fallback to use the
first available NSScreen to ensure a valid screen object is always returned.
This commit is contained in:
halx99 2025-12-06 17:24:23 +08:00 committed by GitHub
parent dbadda2683
commit 74c2ca04d7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cocoa_monitor.m
View File

@ -314,6 +314,7 @@ void _glfwPollMonitorsCocoa(void)
_glfw.monitorCount * sizeof(_GLFWmonitor*)); _glfw.monitorCount * sizeof(_GLFWmonitor*));
} }
NSArray* screens = [NSScreen screens];
for (uint32_t i = 0; i < displayCount; i++) for (uint32_t i = 0; i < displayCount; i++)
{ {
if (CGDisplayIsAsleep(displays[i])) if (CGDisplayIsAsleep(displays[i]))
@ -322,7 +323,7 @@ void _glfwPollMonitorsCocoa(void)
const uint32_t unitNumber = CGDisplayUnitNumber(displays[i]); const uint32_t unitNumber = CGDisplayUnitNumber(displays[i]);
NSScreen* screen = nil; NSScreen* screen = nil;
for (screen in [NSScreen screens]) for (screen in screens)
{ {
NSNumber* screenNumber = [screen deviceDescription][@"NSScreenNumber"]; NSNumber* screenNumber = [screen deviceDescription][@"NSScreenNumber"];
@ -332,6 +333,9 @@ void _glfwPollMonitorsCocoa(void)
if (CGDisplayUnitNumber([screenNumber unsignedIntValue]) == unitNumber) if (CGDisplayUnitNumber([screenNumber unsignedIntValue]) == unitNumber)
break; break;
} }
// fallback: when displays are in mirroring mode, only one NSScreen exists
if(screen == nil)
screen = [[NSScreen screens] firstObject];
// HACK: Compare unit numbers instead of display IDs to work around // HACK: Compare unit numbers instead of display IDs to work around
// display replacement on machines with automatic graphics // display replacement on machines with automatic graphics