space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-09-15 06:42:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removing debug and fixing indentation

Browse Source
This commit is contained in:
Jezithyr
2022-03-12 20:36:23 -07:00
parent 26e1474179
commit 71c6e437fa
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Robust.Client/UserInterface/UserInterfaceManager.cs
+9 -17
View File
@@ -963,29 +963,21 @@ namespace Robust.Client.UserInterface
osScale = osScale == 0f ? root.Window.ContentScale.X : osScale;
var windowSize = root.Window.RenderTarget.Size;
//Only run autoscale if it is enabled, otherwise default to just use OS UIScale
if (!root.AutoScale && (windowSize.X <= 0 || windowSize.Y <= 0))
{
Logger.DebugS("DEBG", windowSize.ToString());
return osScale;
}
if (!root.AutoScale && (windowSize.X <= 0 || windowSize.Y <= 0)) return osScale;
var maxScaleRes = root.AutoScaleUpperCutoff;
var minScaleRes = root.AutoScaleLowerCutoff;
var autoScaleMin = root.AutoScaleMinimum;
float scaleRatioX;
float scaleRatioY;
//Calculate the scale ratios and clamp it between the maximums and minimums
//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 = (windowSize.X > maxScaleRes.X) ? osScale : ((float)windowSize.X-minScaleRes.X)/(maxScaleRes.X-minScaleRes.X)*osScale;
scaleRatioX = (scaleRatioX > autoScaleMin) ? scaleRatioX : autoScaleMin;
scaleRatioY = (windowSize.Y > maxScaleRes.Y) ? osScale : ((float)windowSize.Y-minScaleRes.Y)/(maxScaleRes.Y-minScaleRes.Y)*osScale;
scaleRatioY = (scaleRatioY > autoScaleMin) ? scaleRatioY : autoScaleMin;
Logger.DebugS("DEBG", windowSize.ToString());
Logger.DebugS("DEBG", scaleRatioX.ToString());
Logger.DebugS("DEBG", scaleRatioY.ToString());
//Take the smallest UIScale value and use it for UI scaling
return (scaleRatioX < scaleRatioY) ? scaleRatioX : scaleRatioY;
scaleRatioY = (windowSize.Y > maxScaleRes.Y) ? osScale : ((float)windowSize.Y-minScaleRes.Y)/(maxScaleRes.Y-minScaleRes.Y)*osScale;
scaleRatioY = (scaleRatioY > autoScaleMin) ? scaleRatioY : autoScaleMin;
//Take the smallest UIScale value and use it for UI scaling
return (scaleRatioX < scaleRatioY) ? scaleRatioX : scaleRatioY;
}
private void UpdateUIScale(WindowRoot root)