tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes radar UI improperly scaling with ui scaling (#13358)

Browse Source
This commit is contained in:
deathride58
2023-01-06 18:08:26 -05:00
committed by GitHub
parent 774fae813f
commit a2f17d1389
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Shuttles/UI/DockingControl.cs
View File

@@ -22,7 +22,7 @@ public class DockingControl : Control
private int MinimapRadius => (int) Math.Min(Size.X, Size.Y) / 2; private int MinimapRadius => (int) Math.Min(Size.X, Size.Y) / 2;
private Vector2 MidPoint => Size / 2; private Vector2 MidPoint => (Size / 2) * UIScale;
private int SizeFull => (int) (MinimapRadius * 2 * UIScale); private int SizeFull => (int) (MinimapRadius * 2 * UIScale);
private int ScaledMinimapRadius => (int) (MinimapRadius * UIScale); private int ScaledMinimapRadius => (int) (MinimapRadius * UIScale);
private float MinimapScale => _range != 0 ? ScaledMinimapRadius / _range : 0f; private float MinimapScale => _range != 0 ? ScaledMinimapRadius / _range : 0f;

2
Content.Client/Shuttles/UI/RadarControl.cs
View File

@@ -47,7 +47,7 @@ public sealed class RadarControl : Control
public float MaxRadarRange { get; private set; } = 256f * 10f; public float MaxRadarRange { get; private set; } = 256f * 10f;
private int MinimapRadius => (int) Math.Min(Size.X, Size.Y) / 2; private int MinimapRadius => (int) Math.Min(Size.X, Size.Y) / 2;
private Vector2 MidPoint => Size / 2; private Vector2 MidPoint => (Size / 2) * UIScale;
private int SizeFull => (int) (MinimapRadius * 2 * UIScale); private int SizeFull => (int) (MinimapRadius * 2 * UIScale);
private int ScaledMinimapRadius => (int) (MinimapRadius * UIScale); private int ScaledMinimapRadius => (int) (MinimapRadius * UIScale);
private float MinimapScale => RadarRange != 0 ? ScaledMinimapRadius / RadarRange : 0f; private float MinimapScale => RadarRange != 0 ? ScaledMinimapRadius / RadarRange : 0f;