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

Fix having to reopen ahelp and popped-out ahelp windows after rounds (#19102)

Browse Source
This commit is contained in:
DrSmugleaf
2023-08-14 14:03:35 -07:00
committed by GitHub
parent ec02907446
commit 9315a0fe81
1 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
View File

@@ -4,7 +4,6 @@ using System.Numerics;
using Content.Client.Administration.Managers; using Content.Client.Administration.Managers;
using Content.Client.Administration.Systems; using Content.Client.Administration.Systems;
using Content.Client.Administration.UI.Bwoink; using Content.Client.Administration.UI.Bwoink;
using Content.Client.Gameplay;
using Content.Client.UserInterface.Controls; using Content.Client.UserInterface.Controls;
using Content.Shared.Administration; using Content.Shared.Administration;
using Content.Shared.Input; using Content.Shared.Input;
@@ -24,7 +23,7 @@ using Robust.Shared.Utility;
namespace Content.Client.UserInterface.Systems.Bwoink; namespace Content.Client.UserInterface.Systems.Bwoink;
[UsedImplicitly] [UsedImplicitly]
public sealed class AHelpUIController: UIController, IOnStateChanged<GameplayState>, IOnSystemChanged<BwoinkSystem> public sealed class AHelpUIController: UIController, IOnSystemChanged<BwoinkSystem>
{ {
[Dependency] private readonly IClientAdminManager _adminManager = default!; [Dependency] private readonly IClientAdminManager _adminManager = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!; [Dependency] private readonly IPlayerManager _playerManager = default!;
@@ -42,16 +41,8 @@ public sealed class AHelpUIController: UIController, IOnStateChanged<GameplaySta
SubscribeNetworkEvent<BwoinkDiscordRelayUpdated>(DiscordRelayUpdated); SubscribeNetworkEvent<BwoinkDiscordRelayUpdated>(DiscordRelayUpdated);
SubscribeNetworkEvent<BwoinkPlayerTypingUpdated>(PeopleTypingUpdated); SubscribeNetworkEvent<BwoinkPlayerTypingUpdated>(PeopleTypingUpdated);
}
public void OnStateEntered(GameplayState state)
{
_adminManager.AdminStatusUpdated += OnAdminStatusUpdated; _adminManager.AdminStatusUpdated += OnAdminStatusUpdated;
CommandBinds.Builder
.Bind(ContentKeyFunctions.OpenAHelp,
InputCmdHandler.FromDelegate(_ => ToggleWindow()))
.Register<AHelpUIController>();
} }
public void UnloadButton() public void UnloadButton()
@@ -87,22 +78,21 @@ public sealed class AHelpUIController: UIController, IOnStateChanged<GameplaySta
UIHelper!.ToggleWindow(); UIHelper!.ToggleWindow();
} }
public void OnStateExited(GameplayState state)
{
SetAHelpPressed(false);
_adminManager.AdminStatusUpdated -= OnAdminStatusUpdated;
UIHelper?.Dispose();
UIHelper = null;
CommandBinds.Unregister<AHelpUIController>();
}
public void OnSystemLoaded(BwoinkSystem system) public void OnSystemLoaded(BwoinkSystem system)
{ {
_bwoinkSystem = system; _bwoinkSystem = system;
_bwoinkSystem.OnBwoinkTextMessageRecieved += RecievedBwoink; _bwoinkSystem.OnBwoinkTextMessageRecieved += RecievedBwoink;
CommandBinds.Builder
.Bind(ContentKeyFunctions.OpenAHelp,
InputCmdHandler.FromDelegate(_ => ToggleWindow()))
.Register<AHelpUIController>();
} }
public void OnSystemUnloaded(BwoinkSystem system) public void OnSystemUnloaded(BwoinkSystem system)
{ {
CommandBinds.Unregister<AHelpUIController>();
DebugTools.Assert(_bwoinkSystem != null); DebugTools.Assert(_bwoinkSystem != null);
_bwoinkSystem!.OnBwoinkTextMessageRecieved -= RecievedBwoink; _bwoinkSystem!.OnBwoinkTextMessageRecieved -= RecievedBwoink;
_bwoinkSystem = null; _bwoinkSystem = null;