GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'CalculateDPI' of git://github.com/nothingTVatYT/FlaxEngine into nothingTVatYT-CalculateDPI

Browse Source
This commit is contained in:
Wojtek Figat
2021-10-21 18:49:40 +02:00
parent 14ab99595d 78eab24c68
commit 3194e58fb9
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Engine/Platform/Linux/LinuxPlatform.cpp
View File

@@ -836,13 +836,15 @@ int X11ErrorHandler(X11::Display* display, X11::XErrorEvent* event)
int32 CalculateDpi() int32 CalculateDpi()
{ {
Vector2 size = Platform::GetDesktopSize(); //Vector2 size = Platform::GetDesktopSize();
// in X11 a screen is not necessarily identical to a desktop
// so we need to stick to one type for pixel and physical size query
int screenIdx = 0; int screenIdx = 0;
int widthMM = X11_DisplayWidthMM(xDisplay, screenIdx); int widthMM = X11_DisplayWidthMM(xDisplay, screenIdx);
int heightMM = X11_DisplayHeightMM(xDisplay, screenIdx); int heightMM = X11_DisplayHeightMM(xDisplay, screenIdx);
double xdpi = (widthMM ? size.X / (double)widthMM * 25.4 : 0); double xdpi = (widthMM ? X11_DisplayWidth(xDisplay, screenIdx) / (double)widthMM * 25.4 : 0);
double ydpi = (heightMM ? size.Y / (double)heightMM * 25.4 : 0); double ydpi = (heightMM ? X11_DisplayHeight(xDisplay, screenIdx) / (double)heightMM * 25.4 : 0);
if (xdpi || ydpi) if (xdpi || ydpi)
return (int32)Math::Ceil((xdpi + ydpi) / (xdpi && ydpi ? 2 : 1)); return (int32)Math::Ceil((xdpi + ydpi) / (xdpi && ydpi ? 2 : 1));