Merge branch 'blender-v4.2-release'

This commit is contained in:
Campbell Barton 2024-07-05 20:49:38 +10:00
commit 2b88bcdd3a

@ -1542,17 +1542,22 @@ uint16_t GHOST_WindowX11::getDPIHint()
if (resMan) {
XrmDatabase xrdb = XrmGetStringDatabase(resMan);
if (xrdb) {
int dpi = -1;
char *type = nullptr;
XrmValue val;
int success = XrmGetResource(xrdb, "Xft.dpi", "Xft.Dpi", &type, &val);
if (success && type) {
if (STREQ(type, "String")) {
return atoi((char *)val.addr);
dpi = atoi((const char *)val.addr);
}
}
XrmDestroyDatabase(xrdb);
if (dpi != -1) {
return dpi;
}
}
XrmDestroyDatabase(xrdb);
}
/* Fallback to calculating DPI using X reported DPI, set using `xrandr --dpi`. */