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

small action bar fixes (#21655)

Browse Source
This commit is contained in:
Nemanja
2023-11-14 20:35:43 -05:00
committed by GitHub
parent a43ebc45ba
commit 2727f63bf3
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
View File

@@ -326,6 +326,7 @@ public sealed class ActionButton : Control, IEntityControl
{ {
base.FrameUpdate(args); base.FrameUpdate(args);
Cooldown.Visible = _action != null && _action.Cooldown != null;
if (_action == null) if (_action == null)
return; return;

1
Content.Client/UserInterface/Systems/Actions/Controls/ActionButtonContainer.cs
View File

@@ -57,6 +57,7 @@ public class ActionButtonContainer : GridContainer
public void SetActionData(ActionsSystem system, params EntityUid?[] actionTypes) public void SetActionData(ActionsSystem system, params EntityUid?[] actionTypes)
{ {
var uniqueCount = Math.Min(system.GetClientActions().Count(), actionTypes.Length + 1); var uniqueCount = Math.Min(system.GetClientActions().Count(), actionTypes.Length + 1);
if (ChildCount != uniqueCount)
BuildActionButtons(uniqueCount); BuildActionButtons(uniqueCount);
for (var i = 0; i < uniqueCount; i++) for (var i = 0; i < uniqueCount; i++)