From 2727f63bf3735f51db3846fb1f0365d97c5ac2ef Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Tue, 14 Nov 2023 20:35:43 -0500
Subject: [PATCH] small action bar fixes (#21655)

---
 .../UserInterface/Systems/Actions/Controls/ActionButton.cs     | 1 +
 .../Systems/Actions/Controls/ActionButtonContainer.cs          | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs b/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
index 6b2033e78c..ded6f77f95 100644
--- a/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
+++ b/Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
@@ -326,6 +326,7 @@ public sealed class ActionButton : Control, IEntityControl
     {
         base.FrameUpdate(args);
 
+        Cooldown.Visible = _action != null && _action.Cooldown != null;
         if (_action == null)
             return;
 
diff --git a/Content.Client/UserInterface/Systems/Actions/Controls/ActionButtonContainer.cs b/Content.Client/UserInterface/Systems/Actions/Controls/ActionButtonContainer.cs
index 5e26c192d7..a2aa972625 100644
--- a/Content.Client/UserInterface/Systems/Actions/Controls/ActionButtonContainer.cs
+++ b/Content.Client/UserInterface/Systems/Actions/Controls/ActionButtonContainer.cs
@@ -57,7 +57,8 @@ public class ActionButtonContainer : GridContainer
     public void SetActionData(ActionsSystem system, params EntityUid?[] actionTypes)
     {
         var uniqueCount = Math.Min(system.GetClientActions().Count(), actionTypes.Length + 1);
-        BuildActionButtons(uniqueCount);
+        if (ChildCount != uniqueCount)
+            BuildActionButtons(uniqueCount);
 
         for (var i = 0; i < uniqueCount; i++)
         {
-- 
2.51.2