From 66c359770bb6f0a7135c7a5cd36d71899d4b1909 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Wed, 13 Jan 2021 03:32:39 +0100 Subject: [PATCH] Fix placement of some right click menus with UI scaling. --- Content.Client/UserInterface/ItemSlotManager.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Content.Client/UserInterface/ItemSlotManager.cs b/Content.Client/UserInterface/ItemSlotManager.cs index 19ccaa4977..cbb7b57375 100644 --- a/Content.Client/UserInterface/ItemSlotManager.cs +++ b/Content.Client/UserInterface/ItemSlotManager.cs @@ -7,6 +7,7 @@ using Robust.Client.GameObjects.EntitySystems; using Robust.Client.Interfaces.GameObjects.Components; using Robust.Client.Interfaces.Graphics.ClientEye; using Robust.Client.Interfaces.Input; +using Robust.Client.Interfaces.UserInterface; using Robust.Client.Player; using Robust.Client.UserInterface; using Robust.Shared.Input; @@ -25,6 +26,7 @@ namespace Content.Client.UserInterface [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly IInputManager _inputManager = default!; [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!; + [Dependency] private readonly IUserInterfaceManager _uiMgr = default!; [Dependency] private readonly IEntityManager _entityManager = default!; [Dependency] private readonly IEyeManager _eyeManager = default!; [Dependency] private readonly IMapManager _mapManager = default!; @@ -61,7 +63,7 @@ namespace Content.Client.UserInterface else if (args.Function == ContentKeyFunctions.OpenContextMenu) { _entitySystemManager.GetEntitySystem() - .OpenContextMenu(item, new ScreenCoordinates(args.PointerLocation.Position)); + .OpenContextMenu(item, new ScreenCoordinates(_uiMgr.ScreenToUIPosition(args.PointerLocation))); } else if (args.Function == ContentKeyFunctions.ActivateItemInWorld) {