Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 05:43:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove cruft on the win side and live with a crappy ppiDesktop

Browse source
This commit is contained in:
Samuel Gateau 2019-07-05 15:02:51 +02:00
parent 0c26d3ef66
commit 9d9b80dec0
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libraries/platform/src/platform/backend/WINPlatform.cpp
View file

@ -123,11 +123,14 @@ void WINInstance::enumerateGpusAndDisplays() {
UINT dpiYScaled{ 0 }; UINT dpiYScaled{ 0 };
GetDpiForMonitor(outputDesc.Monitor, MDT_EFFECTIVE_DPI, &dpiXScaled, &dpiYScaled); GetDpiForMonitor(outputDesc.Monitor, MDT_EFFECTIVE_DPI, &dpiXScaled, &dpiYScaled);
// CUrrent display mode // Current display mode
DEVMODEW devMode; DEVMODEW devMode;
devMode.dmSize = sizeof(DEVMODEW); devMode.dmSize = sizeof(DEVMODEW);
EnumDisplaySettingsW(outputDesc.DeviceName, ENUM_CURRENT_SETTINGS, &devMode); EnumDisplaySettingsW(outputDesc.DeviceName, ENUM_CURRENT_SETTINGS, &devMode);
auto physicalWidth = devMode.dmPelsWidth / (float)dpiX;
auto physicalHeight = devMode.dmPelsHeight / (float)dpiY;
json display = {}; json display = {};
// Display name // Display name
@ -144,8 +147,8 @@ void WINInstance::enumerateGpusAndDisplays() {
display[keys::display::boundsTop] = outputDesc.DesktopCoordinates.top; display[keys::display::boundsTop] = outputDesc.DesktopCoordinates.top;
// PPI & resolution // PPI & resolution
display[keys::display::physicalWidth] = devMode.dmPelsWidth / (float) dpiX; display[keys::display::physicalWidth] = physicalWidth;
display[keys::display::physicalHeight] = devMode.dmPelsHeight / (float) dpiY; display[keys::display::physicalHeight] = physicalHeight;
display[keys::display::modeWidth] = devMode.dmPelsWidth; display[keys::display::modeWidth] = devMode.dmPelsWidth;
display[keys::display::modeHeight] = devMode.dmPelsHeight; display[keys::display::modeHeight] = devMode.dmPelsHeight;
@ -166,14 +169,7 @@ void WINInstance::enumerateGpusAndDisplays() {
display[keys::display::gpu] = (int) _gpus.size(); display[keys::display::gpu] = (int) _gpus.size();
// WIN specific // WIN specific
display["win_workLeft"] = monitorInfo.rcWork.left;
display["win_workRight"] = monitorInfo.rcWork.right;
display["win_workTop"] = monitorInfo.rcWork.top;
display["win_workBottom"] = monitorInfo.rcWork.bottom;
display["win_monLeft"] = monitorInfo.rcMonitor.left;
display["win_monRight"] = monitorInfo.rcMonitor.right;
display["win_monTop"] = monitorInfo.rcMonitor.top;
display["win_monBottom"] = monitorInfo.rcMonitor.bottom;
// One more display desc // One more display desc
_displays.push_back(display); _displays.push_back(display);