[Port] Cherry Pick Fixes

Content.Client/Eui/BaseEui.cs

@@ -55,7 +55,7 @@ public virtual void HandleMessage(EuiMessageBase msg)
         /// </summary>
         protected void SendMessage(EuiMessageBase msg)
         {
-            var netMsg = _netManager.CreateNetMessage<MsgEuiMessage>();
+            var netMsg = new MsgEuiMessage();
             netMsg.Id = Id;
             netMsg.Message = msg;
 

Content.Client/Inventory/StrippableBoundUserInterface.cs

@@ -187,9 +187,15 @@ private void SlotPressed(GUIBoundKeyEventArgs ev, SlotControl slot)
                 return;
 
             if (ev.Function == ContentKeyFunctions.ExamineEntity)
+            {
                 _examine.DoExamine(slot.Entity.Value);
+                ev.Handle();
+            }
             else if (ev.Function == EngineKeyFunctions.UseSecondary)
+            {
                 _ui.GetUIController<VerbMenuUIController>().OpenVerbMenu(slot.Entity.Value);
+                ev.Handle();
+            }
         }
 
         private void AddInventoryButton(EntityUid invUid, string slotId, InventoryComponent inv)

Content.Client/Light/HandheldLightSystem.cs

@@ -21,6 +21,22 @@ public override void Initialize()
         SubscribeLocalEvent<HandheldLightComponent, AppearanceChangeEvent>(OnAppearanceChange);
     }
 
+    /// <remarks>
+    ///     TODO: Not properly predicted yet. Don't call this function if you want a the actual return value!
+    /// </remarks>
+    public override bool TurnOff(Entity<HandheldLightComponent> ent, bool makeNoise = true)
+    {
+        return true;
+    }
+
+    /// <remarks>
+    ///     TODO: Not properly predicted yet. Don't call this function if you want a the actual return value!
+    /// </remarks>
+    public override bool TurnOn(EntityUid user, Entity<HandheldLightComponent> uid)
+    {
+        return true;
+    }
+
     private void OnAppearanceChange(EntityUid uid, HandheldLightComponent? component, ref AppearanceChangeEvent args)
     {
         if (!Resolve(uid, ref component))

Content.Client/SensorMonitoring/SensorMonitoringWindow.xaml.cs

@@ -28,6 +28,7 @@ public sealed partial class SensorMonitoringWindow : FancyWindow, IComputerWindo
     public SensorMonitoringWindow()
     {
         RobustXamlLoader.Load(this);
+        IoCManager.InjectDependencies(this);
     }
 
     public void UpdateState(ConsoleUIState state)

Content.Client/Store/Ui/StoreMenu.xaml.cs

@@ -57,7 +57,7 @@ public void UpdateBalance(Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> ba
         foreach (var ((_, amount), proto) in currency)
         {
             balanceStr += Loc.GetString("store-ui-balance-display", ("amount", amount),
-                ("currency", Loc.GetString(proto.DisplayName, ("amount", 1))));
+                ("currency", Loc.GetString(proto.DisplayName, ("amount", 1)))) + "\n";
         }
 
         BalanceInfo.SetMarkup(balanceStr.TrimEnd());
@@ -66,7 +66,10 @@ public void UpdateBalance(Dictionary<ProtoId<CurrencyPrototype>, FixedPoint2> ba
         foreach (var type in currency)
         {
             if (type.Value.CanWithdraw && type.Value.Cash != null && type.Key.Item2 > 0)
+            {
                 disabled = false;
+                break;
+            }
         }
 
         WithdrawButton.Disabled = disabled;

Content.Client/Store/Ui/StoreWithdrawWindow.xaml.cs

@@ -18,7 +18,7 @@ public sealed partial class StoreWithdrawWindow : DefaultWindow
 {
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
-    private Dictionary<FixedPoint2, CurrencyPrototype> _validCurrencies = new();
+    private Dictionary<CurrencyPrototype, FixedPoint2> _validCurrencies = new();
     private HashSet<CurrencyWithdrawButton> _buttons = new();
     public event Action<BaseButton.ButtonEventArgs, string, int>? OnWithdrawAttempt;
 
@@ -36,7 +36,7 @@ public void CreateCurrencyButtons(Dictionary<ProtoId<CurrencyPrototype>, FixedPo
             if (!_prototypeManager.TryIndex(currency.Key, out var proto))
                 continue;
 
-            _validCurrencies.Add(currency.Value, proto);
+            _validCurrencies.Add(proto, currency.Value);
         }
 
         //this shouldn't ever happen but w/e
@@ -47,14 +47,17 @@ public void CreateCurrencyButtons(Dictionary<ProtoId<CurrencyPrototype>, FixedPo
         _buttons.Clear();
         foreach (var currency in _validCurrencies)
         {
+            if (!currency.Key.CanWithdraw)
+                continue;
+
             var button = new CurrencyWithdrawButton()
             {
-                Id = currency.Value.ID,
-                Amount = currency.Key,
+                Id = currency.Key.ID,
+                Amount = currency.Value,
                 MinHeight = 20,
-                Text = Loc.GetString("store-withdraw-button-ui", ("currency",Loc.GetString(currency.Value.DisplayName, ("amount", currency.Key)))),
+                Text = Loc.GetString("store-withdraw-button-ui", ("currency",Loc.GetString(currency.Key.DisplayName, ("amount", currency.Value)))),
+                Disabled = false,
             };
-            button.Disabled = false;
             button.OnPressed += args =>
             {
                 OnWithdrawAttempt?.Invoke(args, button.Id, WithdrawSlider.Value);
@@ -65,7 +68,7 @@ public void CreateCurrencyButtons(Dictionary<ProtoId<CurrencyPrototype>, FixedPo
             ButtonContainer.AddChild(button);
         }
 
-        var maxWithdrawAmount = _validCurrencies.Keys.Max().Int();
+        var maxWithdrawAmount = _validCurrencies.Values.Max().Int();
 
         // setup withdraw slider
         WithdrawSlider.MinValue = 1;

Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs

@@ -16,9 +16,8 @@
 namespace Content.Client.UserInterface.Systems.Chat.Widgets;
 
 [GenerateTypedNameReferences]
-#pragma warning disable RA0003
+[Virtual]
 public partial class ChatBox : UIWidget
-#pragma warning restore RA0003
 {
     private readonly ChatUIController _controller;
     private readonly IEntityManager _entManager;

Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleButtonsBox.xaml

@@ -0,0 +1,9 @@
+<BoxContainer xmlns="https://spacestation14.io"
+              Orientation="Vertical"
+              Margin="8 0 8 0">
+    <BoxContainer Name="Buttons"
+                  Orientation="Vertical"
+                  SeparationOverride="5">
+        <!-- Buttons are added here by code -->
+    </BoxContainer>
+</BoxContainer>

Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEntry.xaml.cs → Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleButtonsBox.xaml.cs

@@ -10,20 +10,17 @@
 namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
 {
     [GenerateTypedNameReferences]
-    public sealed partial class GhostRolesEntry : BoxContainer
+    public sealed partial class GhostRoleButtonsBox : BoxContainer
     {
         private SpriteSystem _spriteSystem;
         public event Action<GhostRoleInfo>? OnRoleSelected;
         public event Action<GhostRoleInfo>? OnRoleFollow;
 
-        public GhostRolesEntry(string name, string description, bool hasAccess, FormattedMessage? reason, IEnumerable<GhostRoleInfo> roles, SpriteSystem spriteSystem)
+        public GhostRoleButtonsBox(bool hasAccess, FormattedMessage? reason, IEnumerable<GhostRoleInfo> roles, SpriteSystem spriteSystem)
         {
             RobustXamlLoader.Load(this);
             _spriteSystem = spriteSystem;
 
-            Title.Text = name;
-            Description.SetMessage(description);
-
             foreach (var role in roles)
             {
                 var button = new GhostRoleEntryButtons(role);

Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml

@@ -1,15 +1,15 @@
 <BoxContainer xmlns="https://spacestation14.io"
-              Orientation="Horizontal">
+              Orientation="Horizontal"
+              HorizontalAlignment="Stretch">
     <Button Name="RequestButton"
             Access="Public"
             Text="{Loc 'ghost-roles-window-request-role-button'}"
             StyleClasses="OpenRight"
-            HorizontalAlignment="Left"
-            SetWidth="300"/>
+            HorizontalExpand="True"
+            SizeFlagsStretchRatio="3"/>
     <Button Name="FollowButton"
             Access="Public"
             Text="{Loc 'ghost-roles-window-follow-role-button'}"
             StyleClasses="OpenLeft"
-            HorizontalAlignment="Right"
-            SetWidth="150"/>
+            HorizontalExpand="True"/>
 </BoxContainer>

Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleInfoBox.xaml

@@ -0,0 +1,8 @@
+<BoxContainer xmlns="https://spacestation14.io"
+              Orientation="Vertical">
+    <Label Name="Title"
+           StyleClasses="LabelKeyText"/>
+    <PanelContainer StyleClasses="HighDivider" />
+    <RichTextLabel Name="Description"
+                   Margin="0 4"/>
+</BoxContainer>

Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleInfoBox.xaml.cs

@@ -0,0 +1,18 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
+{
+    [GenerateTypedNameReferences]
+    public sealed partial class GhostRoleInfoBox : BoxContainer
+    {
+        public GhostRoleInfoBox(string name, string description)
+        {
+            RobustXamlLoader.Load(this);
+
+            Title.Text = name;
+            Description.SetMessage(description);
+        }
+    }
+}

Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs

@@ -1,16 +1,10 @@
 using System.Linq;
 using Content.Client.Eui;
-using Content.Client.Lobby;
 using Content.Client.Players.PlayTimeTracking;
-using Content.Shared.Clothing.Loadouts.Prototypes;
-using Content.Shared.Customization.Systems;
 using Content.Shared.Eui;
 using Content.Shared.Ghost.Roles;
-using Content.Shared.Preferences;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
-using Robust.Shared.Configuration;
-using Robust.Shared.Prototypes;
 
 namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
 {
@@ -82,47 +76,46 @@ public override void HandleState(EuiStateBase state)
 
             if (state is not GhostRolesEuiState ghostState)
                 return;
+
+            // We must save BodyVisible state, so all Collapsible boxes will not close
+            // on adding new ghost role.
+            // Save the current state of each Collapsible box being visible or not
+            _window.SaveCollapsibleBoxesStates();
+
+            // Clearing the container before adding new roles
             _window.ClearEntries();
 
             var entityManager = IoCManager.Resolve<IEntityManager>();
             var sysManager = entityManager.EntitySysManager;
             var spriteSystem = sysManager.GetEntitySystem<SpriteSystem>();
             var requirementsManager = IoCManager.Resolve<JobRequirementsManager>();
-            var characterReqs = entityManager.System<CharacterRequirementsSystem>();
-            var prefs = IoCManager.Resolve<IClientPreferencesManager>();
-            var protoMan = IoCManager.Resolve<IPrototypeManager>();
-            var configManager = IoCManager.Resolve<IConfigurationManager>();
 
+            // TODO: role.Requirements value doesn't work at all as an equality key, this must be fixed
+            // Grouping roles
             var groupedRoles = ghostState.GhostRoles.GroupBy(
                 role => (role.Name, role.Description, role.Requirements));
+
+            // Add a new entry for each role group
             foreach (var group in groupedRoles)
             {
                 var name = group.Key.Name;
                 var description = group.Key.Description;
-                // ReSharper disable once ReplaceWithSingleAssignment.True
-                var hasAccess = true;
-
-                if (!characterReqs.CheckRequirementsValid(
-                    group.Key.Requirements ?? new(),
-                    new(),
-                    (HumanoidCharacterProfile) (prefs.Preferences?.SelectedCharacter ?? HumanoidCharacterProfile.DefaultWithSpecies()),
-                    requirementsManager.GetRawPlayTimeTrackers(),
-                    requirementsManager.IsWhitelisted(),
-                    new LoadoutPrototype(), // idk
-                    entityManager,
-                    protoMan,
-                    configManager,
-                    out var reasons))
-                    hasAccess = false;
-
-                _window.AddEntry(name, description, hasAccess, characterReqs.GetRequirementsText(reasons), group, spriteSystem);
+                var hasAccess = requirementsManager.CheckRoleRequirements(
+                    group.Key.Requirements,
+                    null,
+                    out var reason);
+
+                // Adding a new role
+                _window.AddEntry(name, description, hasAccess, reason, group, spriteSystem);
             }
 
+            // Restore the Collapsible box state if it is saved
+            _window.RestoreCollapsibleBoxesStates();
+
+            // Close the rules window if it is no longer needed
             var closeRulesWindow = ghostState.GhostRoles.All(role => role.Identifier != _windowRulesId);
             if (closeRulesWindow)
-            {
                 _windowRules?.Close();
-            }
         }
     }
 }