From 71bb5cd58ee55898d9c882c999c013b1304ddebf Mon Sep 17 00:00:00 2001 From: Jesse Rougeau Date: Sun, 13 Mar 2022 13:05:30 -0700 Subject: [PATCH] Update Robust.Client/UserInterface/UserInterfaceManager.cs Condensing sizing logic Co-authored-by: Paul Ritter --- Robust.Client/UserInterface/UserInterfaceManager.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Robust.Client/UserInterface/UserInterfaceManager.cs b/Robust.Client/UserInterface/UserInterfaceManager.cs index fbd0227623..f3f31b842f 100644 --- a/Robust.Client/UserInterface/UserInterfaceManager.cs +++ b/Robust.Client/UserInterface/UserInterfaceManager.cs @@ -971,8 +971,7 @@ namespace Robust.Client.UserInterface float scaleRatioY; //Calculate the scale ratios and clamp it between the maximums and minimums - scaleRatioX = (windowSize.X > maxScaleRes.X) ? osScale : ((float)windowSize.X-minScaleRes.X)/(maxScaleRes.X-minScaleRes.X)*osScale; - scaleRatioX = (scaleRatioX > autoScaleMin) ? scaleRatioX : autoScaleMin; + scaleRatioX = Math.Clamp(((float)windowSize.X-minScaleRes.X)/(maxScaleRes.X-minScaleRes.X)*osScale, autoScaleMin, osScale) scaleRatioY = (windowSize.Y > maxScaleRes.Y) ? osScale : ((float)windowSize.Y-minScaleRes.Y)/(maxScaleRes.Y-minScaleRes.Y)*osScale; scaleRatioY = (scaleRatioY > autoScaleMin) ? scaleRatioY : autoScaleMin;