Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

More minor UI refactor stuff (#11287)

Browse Source
This commit is contained in:
wrexbe
2022-09-14 20:42:35 -07:00
committed by GitHub
parent 82eff53a91
commit dc8cc81137
12 changed files with 190 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/Administration/Systems/AdminSystem.Menu.cs
View File

@@ -24,10 +24,6 @@ namespace Content.Client.Administration.Systems
[Dependency] private readonly IGameHud _gameHud = default!;
[Dependency] private readonly IClientAdminManager _clientAdminManager = default!;
[Dependency] private readonly IClientConGroupController _clientConGroupController = default!;
[Dependency] private readonly IOverlayManager _overlayManager = default!;
[Dependency] private readonly IResourceCache _resourceCache = default!;
[Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly EntityLookupSystem _entityLookup = default!;
[Dependency] private readonly IClientConsoleHost _clientConsoleHost = default!;
[Dependency] private readonly VerbSystem _verbSystem = default!;

6
Content.Client/Administration/Systems/AdminSystem.Overlay.cs
View File

@@ -1,12 +1,16 @@
using Content.Client.Administration.Managers;
using Robust.Client.Graphics;
using Robust.Client.ResourceManagement;
namespace Content.Client.Administration.Systems
{
public sealed partial class AdminSystem
{
[Dependency] private readonly IOverlayManager _overlayManager = default!;
[Dependency] private readonly IResourceCache _resourceCache = default!;
[Dependency] private readonly IClientAdminManager _adminManager = default!;
[Dependency] private readonly IEyeManager _eyeManager = default!;
[Dependency] private readonly EntityLookupSystem _entityLookup = default!;
private AdminNameOverlay _adminNameOverlay = default!;
@@ -15,7 +19,7 @@ namespace Content.Client.Administration.Systems
private void InitializeOverlay()
{
_adminNameOverlay = new AdminNameOverlay(this, _entityManager, _eyeManager, _resourceCache, _entityLookup);
_adminNameOverlay = new AdminNameOverlay(this, EntityManager, _eyeManager, _resourceCache, _entityLookup);
_adminManager.AdminStatusUpdated += OnAdminStatusUpdated;
}

11
Content.Client/Administration/Systems/BwoinkSystem.cs
View File

@@ -29,6 +29,9 @@ namespace Content.Client.Administration.Systems
public bool IsOpen => (_adminWindow?.IsOpen ?? false) || (_plainWindow?.IsOpen ?? false);
public event Action? AdminReceivedAHelp;
public event Action? AdminOpenedAHelp;
protected override void OnBwoinkTextMessage(BwoinkTextMessage message, EntitySessionEventArgs eventArgs)
{
base.OnBwoinkTextMessage(message, eventArgs);
@@ -52,8 +55,10 @@ namespace Content.Client.Administration.Systems
{
_adminWindow?.OnBwoink(message.UserId);
if (_adminWindow?.IsOpen != true)
_hud.SetInfoRed(true);
if (_adminWindow?.IsOpen == true)
return;
AdminReceivedAHelp?.Invoke();
_hud.SetInfoRed(true);
}
}
@@ -117,6 +122,7 @@ namespace Content.Client.Administration.Systems
}
_hud.SetInfoRed(false);
AdminOpenedAHelp?.Invoke();
if (_adminManager.HasFlag(AdminFlags.Adminhelp))
{
@@ -149,4 +155,3 @@ namespace Content.Client.Administration.Systems
}
}
}

15
Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml.cs
View File

@@ -1,7 +1,6 @@
using System.IO;
using Content.Client.Administration.Commands;
using Content.Client.Administration.Managers;
using Content.Client.Sandbox;
using Content.Client.UserInterface.Systems.DecalPlacer;
using Content.Shared.Administration;
using Robust.Client.AutoGenerated;
@@ -15,11 +14,19 @@ namespace Content.Client.Administration.UI.Tabs.AdminbusTab
[GenerateTypedNameReferences]
public sealed partial class AdminbusTab : Control
{
private readonly EntitySpawningUIController _entitySpawningController;
private readonly TileSpawningUIController _tileSpawningController;
private readonly DecalPlacerUIController _decalPlacerController;
public AdminbusTab()
{
RobustXamlLoader.Load(this);
IoCManager.InjectDependencies(this);
_entitySpawningController = UserInterfaceManager.GetUIController<EntitySpawningUIController>();
_tileSpawningController = UserInterfaceManager.GetUIController<TileSpawningUIController>();
_decalPlacerController = UserInterfaceManager.GetUIController<DecalPlacerUIController>();
var adminManager = IoCManager.Resolve<IClientAdminManager>();
// For the SpawnEntitiesButton and SpawnTilesButton we need to do the press manually
@@ -39,17 +46,17 @@ namespace Content.Client.Administration.UI.Tabs.AdminbusTab
private void SpawnEntitiesButtonOnPressed(BaseButton.ButtonEventArgs obj)
{
IoCManager.Resolve<IUserInterfaceManager>().GetUIController<EntitySpawningUIController>().ToggleWindow();
_entitySpawningController.ToggleWindow();
}
private void SpawnTilesButtonOnOnPressed(BaseButton.ButtonEventArgs obj)
{
IoCManager.Resolve<IUserInterfaceManager>().GetUIController<TileSpawningUIController>().ToggleWindow();
_tileSpawningController.ToggleWindow();
}
private void SpawnDecalsButtonOnPressed(BaseButton.ButtonEventArgs obj)
{
IoCManager.Resolve<IUserInterfaceManager>().GetUIController<DecalPlacerUIController>().ToggleWindow();
_decalPlacerController.ToggleWindow();
}
}
}