Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-10-01 04:10:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge e0b301337c into 8e15281d34

Browse Source
This commit is contained in:
adamsepp 2025-09-07 20:33:40 +02:00 committed by GitHub
commit 85b554ed5e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 50 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/win32_monitor.c
View File

@ -374,7 +374,47 @@ void _glfwGetMonitorPosWin32(_GLFWmonitor* monitor, int* xpos, int* ypos)
void _glfwGetMonitorContentScaleWin32(_GLFWmonitor* monitor, void _glfwGetMonitorContentScaleWin32(_GLFWmonitor* monitor,
float* xscale, float* yscale) float* xscale, float* yscale)
{ {
_glfwGetHMONITORContentScaleWin32(monitor->win32.handle, xscale, yscale); UINT xdpi = USER_DEFAULT_SCREEN_DPI, ydpi = USER_DEFAULT_SCREEN_DPI;
if (IsWindows8Point1OrGreater())
{
HRESULT hr = GetDpiForMonitor(monitor->win32.handle,
MDT_EFFECTIVE_DPI, &xdpi, &ydpi);
if (FAILED(hr) || xdpi == 0 || ydpi == 0)
{
_glfwInputError(GLFW_PLATFORM_ERROR,
"Win32: Failed to query monitor DPI, retrying with refreshed handle");
// Try to refresh the monitor handle and query again
EnumDisplayMonitors(NULL, NULL, monitorCallback, (LPARAM) monitor);
if (monitor->win32.handle)
{
hr = GetDpiForMonitor(monitor->win32.handle,
MDT_EFFECTIVE_DPI, &xdpi, &ydpi);
if (FAILED(hr) || xdpi == 0 || ydpi == 0)
{
_glfwInputError(GLFW_PLATFORM_ERROR,
"Win32: Failed to query monitor DPI, using fallback");
xdpi = ydpi = USER_DEFAULT_SCREEN_DPI;
}
}
}
}
else
{
HDC dc = GetDC(NULL);
if (dc)
{
xdpi = GetDeviceCaps(dc, LOGPIXELSX);
ydpi = GetDeviceCaps(dc, LOGPIXELSY);
ReleaseDC(NULL, dc);
}
}
if (xscale)
*xscale = xdpi / (float) USER_DEFAULT_SCREEN_DPI;
if (yscale)
*yscale = ydpi / (float) USER_DEFAULT_SCREEN_DPI;
} }
void _glfwGetMonitorWorkareaWin32(_GLFWmonitor* monitor, void _glfwGetMonitorWorkareaWin32(_GLFWmonitor* monitor,
@ -479,8 +519,15 @@ GLFWbool _glfwGetVideoModeWin32(_GLFWmonitor* monitor, GLFWvidmode* mode)
if (!EnumDisplaySettingsW(monitor->win32.adapterName, ENUM_CURRENT_SETTINGS, &dm)) if (!EnumDisplaySettingsW(monitor->win32.adapterName, ENUM_CURRENT_SETTINGS, &dm))
{ {
_glfwInputError(GLFW_PLATFORM_ERROR, "Win32: Failed to query display settings"); _glfwInputError(GLFW_PLATFORM_ERROR,
return GLFW_FALSE; "Win32: Failed to query display settings, using fallback");
mode->width = GetSystemMetrics(SM_CXSCREEN);
mode->height = GetSystemMetrics(SM_CYSCREEN);
mode->refreshRate = 60;
mode->redBits = mode->greenBits = mode->blueBits = 8;
return GLFW_TRUE;
} }
mode->width = dm.dmPelsWidth; mode->width = dm.dmPelsWidth;