Fix cursor popups (#10016)

space-wizards · Jul 25, 2022 · 9eec226 · 9eec226
1 parent 59aedb1
commit 9eec226
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/Content.Client/Popups/PopupSystem.cs b/Content.Client/Popups/PopupSystem.cs
@@ -157,7 +157,8 @@ private static string GetStyleClass(PopupType type) =>
 
         public override void FrameUpdate(float frameTime)
         {
-            if (_aliveWorldLabels.Count == 0) return;
+            if (_aliveWorldLabels.Count == 0 && _aliveCursorLabels.Count == 0)
+                return;
 
             var player = _playerManager.LocalPlayer?.ControlledEntity;
             var playerPos = player != null ? Transform(player.Value).MapPosition : MapCoordinates.Nullspace;
@@ -234,13 +235,13 @@ private sealed class CursorPopupLabel : PopupLabel
 
             public CursorPopupLabel(ScreenCoordinates screenCoords) : base()
             {
-                InitialPos = screenCoords.Position / UIScale - DesiredSize / 2;
+                InitialPos = screenCoords.Position - DesiredSize / 2;
             }
 
             protected override void FrameUpdate(FrameEventArgs eventArgs)
             {
                 base.FrameUpdate(eventArgs);
-                LayoutContainer.SetPosition(this, InitialPos - (0, 20 * (TotalTime * TotalTime + TotalTime)));
+                LayoutContainer.SetPosition(this, InitialPos / UIScale - (0, 20 * (TotalTime * TotalTime + TotalTime)));
             }
         }