From b4e86741e0543261ff55e6c1001ed9d7c6ca6613 Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Sat, 6 Jul 2019 01:13:38 +0200 Subject: [PATCH] Adress typo in gpuident and add extra checks on the recommended scale value --- interface/src/PerformanceManager.cpp | 9 ++++++--- libraries/shared/src/GPUIdent.cpp | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/interface/src/PerformanceManager.cpp b/interface/src/PerformanceManager.cpp index 58fb5674ff..ec12ab0404 100644 --- a/interface/src/PerformanceManager.cpp +++ b/interface/src/PerformanceManager.cpp @@ -70,12 +70,15 @@ void PerformanceManager::applyPerformancePreset(PerformanceManager::PerformanceP auto masterDisplay = platform::getDisplay(platform::getMasterDisplay()); // eval recommanded PPI and Scale - float ppi{96}; float recommandedPpiScale = 1.0f; const float RECOMMANDED_PPI[] = { 200.0f, 120.f, 160.f, 250.f}; if (!masterDisplay.empty() && masterDisplay.count(platform::keys::display::ppi)) { - ppi = masterDisplay[platform::keys::display::ppi]; - recommandedPpiScale = std::min(1.0f, RECOMMANDED_PPI[preset] / (float) ppi); + float ppi = masterDisplay[platform::keys::display::ppi]; + // only scale if the actual ppi is higher than the recommended ppi + if (ppi > RECOMMANDED_PPI[preset]) { + // make sure the scale is no less than a quarter + recommandedPpiScale = std::max(0.25f, RECOMMANDED_PPI[preset] / (float) ppi); + } } switch (preset) { diff --git a/libraries/shared/src/GPUIdent.cpp b/libraries/shared/src/GPUIdent.cpp index 6f2b5600ee..c195b2ec3a 100644 --- a/libraries/shared/src/GPUIdent.cpp +++ b/libraries/shared/src/GPUIdent.cpp @@ -289,7 +289,7 @@ GPUIdent* GPUIdent::ensureQuery(const QString& vendor, const QString& renderer) nlohmann::json output = {}; output["model"] = deviceName; - output["coordsinatesleft"] = test->DesktopCoordinates.left; + output["coordinatesleft"] = test->DesktopCoordinates.left; output["coordinatesright"] = test->DesktopCoordinates.right; output["coordinatestop"] = test->DesktopCoordinates.top; output["coordinatesbottom"] = test->DesktopCoordinates.bottom;