KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

X11: Fix content scale fallback value on KDE

Browse Source 
From upstream: 75294462b3
This commit is contained in:
Kovid Goyal 2019-10-31 09:10:01 +05:30
parent 82e88b54c7
commit 61a77e19ef
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glfw/x11_init.c vendored
View File

@ -433,12 +433,10 @@ static bool initExtensions(void)
// //
void _glfwGetSystemContentScaleX11(float* xscale, float* yscale, bool bypass_cache) void _glfwGetSystemContentScaleX11(float* xscale, float* yscale, bool bypass_cache)
{ {
// NOTE: Default to the display-wide DPI as we don't currently have a policy // Start by assuming the default X11 DPI
// for which monitor a window is considered to be on // NOTE: Some desktop environments (KDE) may remove the Xft.dpi field when it
float xdpi = DisplayWidth(_glfw.x11.display, _glfw.x11.screen) * // would be set to 96, so assume that is the case if we cannot find it
25.4f / DisplayWidthMM(_glfw.x11.display, _glfw.x11.screen); float xdpi = 96.f, ydpi = 96.f;
float ydpi = DisplayHeight(_glfw.x11.display, _glfw.x11.screen) *
25.4f / DisplayHeightMM(_glfw.x11.display, _glfw.x11.screen);
// NOTE: Basing the scale on Xft.dpi where available should provide the most // NOTE: Basing the scale on Xft.dpi where available should provide the most
// consistent user experience (matches Qt, Gtk, etc), although not // consistent user experience (matches Qt, Gtk, etc), although not