Fix shuttle console UI scaling (#25807)

diff --git a/Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs b/Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs
index 961ec35cdb35e37fa66393e391bb45d6e96aab5f..f03c440295250df32bebe45f10407cd3f23ed05a 100644 (file)
--- a/Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs
+++ b/Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs
@@ -114,7 +114,7 @@ public sealed partial class ShuttleDockControl : BaseShuttleControl
         offsetMatrix = offsetMatrix.Invert();
 
         // Draw nearby grids
-        var controlBounds = SizeBox.Scale(1.25f);
+        var controlBounds = PixelSizeBox;
         _grids.Clear();
         _mapManager.FindGridsIntersecting(gridXform.MapID, new Box2(mapPos.Position - WorldRangeVector, mapPos.Position + WorldRangeVector), ref _grids);
 
@@ -297,7 +297,7 @@ public sealed partial class ShuttleDockControl : BaseShuttleControl
                 {
                     // Because it's being layed out top-down we have to arrange for first frame.
                     container.Arrange(PixelRect);
-                    var containerPos = scaledPos - container.DesiredSize / 2 - new Vector2(0f, 0.75f) * MinimapScale;
+                    var containerPos = scaledPos / UIScale - container.DesiredSize / 2 - new Vector2(0f, 0.75f) * MinimapScale;
                     SetPosition(container, containerPos);
                 }
 

diff --git a/Content.Client/UserInterface/Controls/MapGridControl.xaml.cs b/Content.Client/UserInterface/Controls/MapGridControl.xaml.cs
index adefd3c1aef8660abae71bde3ea95665c558f2e3..f6b0929f3b23bdc5b74f26cda26947da5928b0f7 100644 (file)
--- a/Content.Client/UserInterface/Controls/MapGridControl.xaml.cs
+++ b/Content.Client/UserInterface/Controls/MapGridControl.xaml.cs
@@ -203,7 +203,7 @@ public partial class MapGridControl : LayoutContainer
     protected void DrawBacking(DrawingHandleScreen handle)
     {
         var backing = BackingColor;
-        handle.DrawRect(new UIBox2(0f, Height, Width, 0f), backing);
+        handle.DrawRect(PixelSizeBox, backing);
     }
 
     protected void DrawNoSignal(DrawingHandleScreen handle)