Moved to Win32 monitor device string for public name.

master
Camilla Berglund ago%!(EXTRA string=12 years)
parent cbb6d1ad7b
commit b872089fa9
  1. 14
      src/win32_monitor.c

@ -140,13 +140,6 @@ _GLFWmonitor** _glfwPlatformGetMonitors(int* count)
&settings, &settings,
EDS_ROTATEDMODE); EDS_ROTATEDMODE);
name = _glfwCreateUTF8FromWideString(adapter.DeviceName);
if (!name)
{
// TODO: wat
return NULL;
}
if (found == size) if (found == size)
{ {
if (size) if (size)
@ -170,6 +163,13 @@ _GLFWmonitor** _glfwPlatformGetMonitors(int* count)
primary = adapter.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE; primary = adapter.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE;
name = _glfwCreateUTF8FromWideString(monitor.DeviceString);
if (!name)
{
// TODO: wat
return NULL;
}
monitors[found] = _glfwCreateMonitor(name, primary, monitors[found] = _glfwCreateMonitor(name, primary,
GetDeviceCaps(dc, HORZSIZE), GetDeviceCaps(dc, HORZSIZE),
GetDeviceCaps(dc, VERTSIZE), GetDeviceCaps(dc, VERTSIZE),

Loading…
Cancel
Save