Context menu UI backend refactor & better UX (#13318)

closes https://github.com/space-wizards/space-station-14/issues/9209
2023-01-07 21:24:52 -06:00
parent 17be16f1b1
commit 45da85fec6
14 changed files with 218 additions and 187 deletions
--- a/Content.Client/CombatMode/CombatModeComponent.cs
+++ b/Content.Client/CombatMode/CombatModeComponent.cs
@@ -1,7 +1,9 @@
+using Content.Client.ContextMenu.UI;
 using Content.Client.Verbs;
 using Content.Shared.CombatMode;
 using Content.Shared.Targeting;
 using Robust.Client.Player;
+using Robust.Client.UserInterface;

 namespace Content.Client.CombatMode
 {
@@ -38,8 +40,7 @@ namespace Content.Client.CombatMode
                return;
            }

-            var verbs = IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<VerbSystem>();
-            verbs.CloseAllMenus();
+            IoCManager.Resolve<IUserInterfaceManager>().GetUIController<ContextMenuUIController>().Close();
        }
    }
 }