hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-07 19:05:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

renderer: use 120 as the denominator in scale checks

Browse source
This commit is contained in:
Vaxry 2023-12-27 23:46:56 +01:00
parent e5eb11ad04
commit 07132741bc
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/render/Renderer.cpp
View file

@ -1961,18 +1961,18 @@ bool CHyprRenderer::applyMonitorRule(CMonitor* pMonitor, SMonitorRule* pMonitorR
// invalid scale, will produce fractional pixels. // invalid scale, will produce fractional pixels.
// find the nearest valid. // find the nearest valid.
float searchScale = std::round(pMonitor->scale * 360.0); float searchScale = std::round(pMonitor->scale * 120.0);
bool found = false; bool found = false;
double scaleZero = searchScale / 360.0; double scaleZero = searchScale / 120.0;
Vector2D logicalZero = pMonitor->vecPixelSize / scaleZero; Vector2D logicalZero = pMonitor->vecPixelSize / scaleZero;
if (logicalZero == logicalZero.round()) { if (logicalZero == logicalZero.round()) {
pMonitor->scale = scaleZero; pMonitor->scale = scaleZero;
} else { } else {
for (size_t i = 1; i < 90; ++i) { for (size_t i = 1; i < 90; ++i) {
double scaleUp = (searchScale + i) / 360.0; double scaleUp = (searchScale + i) / 120.0;
double scaleDown = (searchScale - i) / 360.0; double scaleDown = (searchScale - i) / 120.0;
Vector2D logicalUp = pMonitor->vecPixelSize / scaleUp; Vector2D logicalUp = pMonitor->vecPixelSize / scaleUp;
Vector2D logicalDown = pMonitor->vecPixelSize / scaleDown; Vector2D logicalDown = pMonitor->vecPixelSize / scaleDown;
@ -1995,7 +1995,7 @@ bool CHyprRenderer::applyMonitorRule(CMonitor* pMonitor, SMonitorRule* pMonitorR
} else { } else {
Debug::log(ERR, "Invalid scale passed to monitor, {} found suggestion {}", pMonitor->scale, searchScale); Debug::log(ERR, "Invalid scale passed to monitor, {} found suggestion {}", pMonitor->scale, searchScale);
g_pConfigManager->addParseError( g_pConfigManager->addParseError(
std::format("Invalid scale passed to monitor {}, failed to find a clean divisor. Suggested nearest scale: {:4f}", pMonitor->szName, searchScale)); std::format("Invalid scale passed to monitor {}, failed to find a clean divisor. Suggested nearest scale: {:5f}", pMonitor->szName, searchScale));
} }
pMonitor->scale = pMonitor->getDefaultScale(); pMonitor->scale = pMonitor->getDefaultScale();