refactor: max coords to vector

This commit is contained in:
drendog 2024-06-27 21:10:56 +02:00
parent d26128c705
commit 712916a450
1 changed files with 3 additions and 4 deletions

View File

@ -637,11 +637,10 @@ Vector2D CPointerManager::closestValid(const Vector2D& pos) {
for (auto& b : currentMonitorLayout.monitorBoxes) { for (auto& b : currentMonitorLayout.monitorBoxes) {
auto p = b.closestPoint(vec); auto p = b.closestPoint(vec);
auto max_x = std::nextafter(b.x + b.w, b.x + b.w - 1); auto maxPoint = Vector2D{std::nextafter(b.x + b.w, -INFINITY), std::nextafter(b.y + b.h, -INFINITY)};
auto max_y = std::nextafter(b.y + b.h, b.y + b.h - 1);
// because closestPoint does clamp up to x + w and y + h // because closestPoint clamps up to x + w and y + h
p = Vector2D{std::clamp(p.x, b.x, max_x), std::clamp(p.y, b.y, max_y)}; p = Vector2D{std::clamp(p.x, b.x, maxPoint.x), std::clamp(p.y, b.y, maxPoint.y)};
auto distSq = p.distanceSq(vec); auto distSq = p.distanceSq(vec);