Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-13 14:03:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved to Win32 monitor device string for public name.

Browse Source
This commit is contained in:
Camilla Berglund 2013-02-01 00:52:25 +01:00
parent cbb6d1ad7b
commit b872089fa9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/win32_monitor.c
View File

@ -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),