From bea3981ae96ca28a31a24e6994e249b2e2453a18 Mon Sep 17 00:00:00 2001
From: DEATHB4DEFEAT <zachcaffee@outlook.com>
Date: Mon, 25 Nov 2024 19:00:31 -0800
Subject: [PATCH 1/4] update stylegroup if different

---
 .../Controls/StyledButtonGroup.cs             | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/Content.Client/UserInterface/Controls/StyledButtonGroup.cs b/Content.Client/UserInterface/Controls/StyledButtonGroup.cs
index ad7e75902ce..e05eb3f7005 100644
--- a/Content.Client/UserInterface/Controls/StyledButtonGroup.cs
+++ b/Content.Client/UserInterface/Controls/StyledButtonGroup.cs
@@ -23,21 +23,35 @@ public StyledButtonGroup()
     public void UpdateStyles()
     {
         var children = Children.Where(c => c.Visible && c is Button).ToArray();
-        for (var i = 0; i < children.Length; i++)
+        var len = children.Length;
+
+        for (var i = 0; i < len; i++)
         {
             var child = children[i];
             var button = (child as Button)!;
 
-            button.RemoveStyleClass(ButtonOpenRight);
-            button.RemoveStyleClass(ButtonOpenLeft);
-            button.RemoveStyleClass(ButtonOpenBoth);
-
             if (i == 0)
-                button.AddStyleClass(children.Length == 1 ? "" : ButtonOpenRight);
-            else if (i == children.Length - 1)
-                button.AddStyleClass(ButtonOpenLeft);
+                TryUpdateStyle(button, len == 1 ? "" : ButtonOpenRight);
+            else if (i == len - 1)
+                TryUpdateStyle(button, ButtonOpenLeft);
             else
-                button.AddStyleClass(ButtonOpenBoth);
+                TryUpdateStyle(button, ButtonOpenBoth);
         }
     }
+
+    private bool TryUpdateStyle(Control control, string style)
+    {
+        if (control.HasStyleClass(style))
+            return false;
+
+        control.RemoveStyleClass(ButtonOpenRight);
+        control.RemoveStyleClass(ButtonOpenLeft);
+        control.RemoveStyleClass(ButtonOpenBoth);
+
+        if (!string.IsNullOrEmpty(style))
+            control.AddStyleClass(style);
+        else
+            return false;
+        return true;
+    }
 }

From e54b9286fed53fb1a8d3953e1a673e61609b05dc Mon Sep 17 00:00:00 2001
From: DEATHB4DEFEAT <zachcaffee@outlook.com>
Date: Mon, 25 Nov 2024 19:08:47 -0800
Subject: [PATCH 2/4] preset loadout selector styles

---
 .../Lobby/UI/LoadoutPreferenceSelector.xaml     | 10 ++++++----
 .../Lobby/UI/LoadoutPreferenceSelector.xaml.cs  | 17 ++++++++---------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/Content.Client/Lobby/UI/LoadoutPreferenceSelector.xaml b/Content.Client/Lobby/UI/LoadoutPreferenceSelector.xaml
index e04fdc1c69b..d77fdb66057 100644
--- a/Content.Client/Lobby/UI/LoadoutPreferenceSelector.xaml
+++ b/Content.Client/Lobby/UI/LoadoutPreferenceSelector.xaml
@@ -8,7 +8,8 @@
                 Name="PreferenceButton"
                 Access="Public"
                 ToggleMode="True"
-                VerticalAlignment="Center" />
+                VerticalAlignment="Center"
+                StyleClasses="OpenRight" />
 
             <Button
                 Name="HeirloomButton"
@@ -16,9 +17,10 @@
                 Text="{Loc 'humanoid-profile-editor-loadouts-heirloom'}"
                 ToolTip="{Loc 'humanoid-profile-editor-loadouts-heirloom-tooltip'}"
                 ToggleMode="True"
-                VerticalAlignment="Center" />
+                VerticalAlignment="Center"
+                StyleClasses="OpenBoth" />
 
-            <!-- Yes I know I can use a TextureButton, but I'm doing this for style -->
+            <!-- Yes I know I can use a TextureButton, but that doesn't have styling -->
             <Button
                 Name="GuidebookButton"
                 ToolTip="{Loc 'humanoid-profile-editor-loadouts-guidebook-button-tooltip'}"
@@ -35,7 +37,7 @@
 
 
         <Collapsible Name="SpecialMenu" HorizontalExpand="True">
-            <Button Name="HeadingButton" Text="{Loc 'humanoid-profile-editor-loadouts-customize'}" ToggleMode="True" />
+            <Button Name="HeadingButton" Text="{Loc 'humanoid-profile-editor-loadouts-customize'}" ToggleMode="True" StyleClasses="OpenLeft" />
 
             <CollapsibleBody HorizontalExpand="True" Margin="0 0 0 5">
                 <PanelContainer HorizontalExpand="True">
diff --git a/Content.Client/Lobby/UI/LoadoutPreferenceSelector.xaml.cs b/Content.Client/Lobby/UI/LoadoutPreferenceSelector.xaml.cs
index 659fbbbfa3c..feb313beb26 100644
--- a/Content.Client/Lobby/UI/LoadoutPreferenceSelector.xaml.cs
+++ b/Content.Client/Lobby/UI/LoadoutPreferenceSelector.xaml.cs
@@ -2,7 +2,6 @@
 using System.Numerics;
 using System.Text;
 using Content.Client.Guidebook;
-using Content.Client.Paint;
 using Content.Client.Players.PlayTimeTracking;
 using Content.Client.Stylesheets;
 using Content.Client.UserInterface.Systems.Guidebook;
@@ -110,9 +109,9 @@ public LoadoutPreferenceSelector(LoadoutPrototype loadout, JobPrototype highJob,
             entities.Add(loadout.ID + 0, dummyLoadoutItem);
 
             // Create a sprite preview of the loadout item
-            previewLoadout = new SpriteView
+            previewLoadout = new()
             {
-                Scale = new Vector2(1, 1),
+                Scale = new(1, 1),
                 OverrideDirection = Direction.South,
                 VerticalAlignment = VAlignment.Center,
                 SizeFlagsStretchRatio = 1,
@@ -122,9 +121,9 @@ public LoadoutPreferenceSelector(LoadoutPrototype loadout, JobPrototype highJob,
         else
         {
             // Create a sprite preview of the loadout item
-            previewLoadout = new SpriteView
+            previewLoadout = new()
             {
-                Scale = new Vector2(1, 1),
+                Scale = new(1, 1),
                 OverrideDirection = Direction.South,
                 VerticalAlignment = VAlignment.Center,
                 SizeFlagsStretchRatio = 1,
@@ -177,7 +176,7 @@ void UpdateGuidebook() => GuidebookButton.Visible =
                     MinWidth = 32,
                     MaxWidth = 32,
                     ClipText = true,
-                    Margin = new Thickness(0, 0, 8, 0),
+                    Margin = new(0, 0, 8, 0),
                 },
                 new PanelContainer
                 {
@@ -190,7 +189,7 @@ void UpdateGuidebook() => GuidebookButton.Visible =
                 new Label
                 {
                     Text = loadoutName,
-                    Margin = new Thickness(8, 0, 0, 0),
+                    Margin = new(8, 0, 0, 0),
                 },
             },
         });
@@ -221,7 +220,7 @@ void UpdateGuidebook() => GuidebookButton.Visible =
         ColorEdit.OnColorChanged += _ =>
         {
             _preference.CustomColorTint = SpecialColorTintToggle.Pressed ? ColorEdit.Color.ToHex() : null;
-            UpdatePaint(new Entity<PaintedComponent>(dummyLoadoutItem, paint), entityManager);
+            UpdatePaint(new(dummyLoadoutItem, paint), entityManager);
         };
 
         NameEdit.PlaceHolder = loadoutName;
@@ -235,7 +234,7 @@ void UpdateGuidebook() => GuidebookButton.Visible =
 
         // Get requirement reasons
         characterRequirementsSystem.CheckRequirementsValid(
-            loadout.Requirements, highJob, profile, new Dictionary<string, TimeSpan>(),
+            loadout.Requirements, highJob, profile, new(),
             jobRequirementsManager.IsWhitelisted(), loadout,
             entityManager, prototypeManager, configManager,
             out var reasons);

From a3b4b344df92f3020cba48829d29d88c0be263f8 Mon Sep 17 00:00:00 2001
From: DEATHB4DEFEAT <zachcaffee@outlook.com>
Date: Mon, 25 Nov 2024 21:53:16 -0800
Subject: [PATCH 3/4] NeoTabContainer uses StyledButtonGroup and some cleanup

---
 .../Lobby/UI/HumanoidProfileEditor.xaml.cs    |   4 +-
 .../UI/LoadoutPreferenceSelector.xaml.cs      |   4 +-
 .../Controls/NeoTabContainer.Props.xaml.cs    |  44 +++----
 .../Controls/NeoTabContainer.xaml             |   3 +-
 .../Controls/NeoTabContainer.xaml.cs          | 106 ++---------------
 .../Controls/StyledButtonGroup.cs             | 109 ++++++++++++++----
 6 files changed, 119 insertions(+), 151 deletions(-)

diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
index f23fd6b4a0d..4ea144f5dca 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -1678,7 +1678,7 @@ public void UpdateTraits(bool? showUnusable = null, bool reload = false)
             // Reset the whole UI and delete caches
             if (reload)
             {
-                foreach (var tab in TraitsTabs.Tabs)
+                foreach (var tab in TraitsTabs.TabContainer.Children)
                     TraitsTabs.RemoveTab(tab);
                 _loadoutPreferences.Clear();
             }
@@ -2004,7 +2004,7 @@ public void UpdateLoadouts(bool? showUnusable = null, bool reload = false)
             // Reset the whole UI and delete caches
             if (reload)
             {
-                foreach (var tab in LoadoutsTabs.Tabs)
+                foreach (var tab in LoadoutsTabs.TabContainer.Children)
                     LoadoutsTabs.RemoveTab(tab);
                 foreach (var uid in _dummyLoadouts)
                     _entManager.QueueDeleteEntity(uid.Value);
diff --git a/Content.Client/Lobby/UI/LoadoutPreferenceSelector.xaml.cs b/Content.Client/Lobby/UI/LoadoutPreferenceSelector.xaml.cs
index feb313beb26..83bdacf5641 100644
--- a/Content.Client/Lobby/UI/LoadoutPreferenceSelector.xaml.cs
+++ b/Content.Client/Lobby/UI/LoadoutPreferenceSelector.xaml.cs
@@ -261,9 +261,9 @@ protected override void FrameUpdate(FrameEventArgs args)
         // Move the special editor
         var heading = SpecialMenu.Heading;
         heading.Orphan();
-        ButtonGroup.AddChild(heading);
+        ButtonGroup.AddButton(heading, false);
         GuidebookButton.Orphan();
-        ButtonGroup.AddChild(GuidebookButton);
+        ButtonGroup.AddButton(GuidebookButton);
 
         // These guys are here too for reasons
         HeadingButton.SetHeight = HeirloomButton.SetHeight = GuidebookButton.SetHeight = PreferenceButton.Size.Y;
diff --git a/Content.Client/UserInterface/Controls/NeoTabContainer.Props.xaml.cs b/Content.Client/UserInterface/Controls/NeoTabContainer.Props.xaml.cs
index 318dd060140..8f44af0ba45 100644
--- a/Content.Client/UserInterface/Controls/NeoTabContainer.Props.xaml.cs
+++ b/Content.Client/UserInterface/Controls/NeoTabContainer.Props.xaml.cs
@@ -8,9 +8,9 @@ public sealed partial class NeoTabContainer
     // Too many computed properties...
 
     /// <summary>
-    ///     Where to place the tabs in relation to the contents
+    ///     Where to place the tabs in relation to the contents.
     ///     <br />
-    ///     If <see cref="Direction.North"/>, the tabs will be above the contents
+    ///     If <see cref="Direction.North"/>, the tabs will be above the contents.
     /// </summary>
     private Direction _tabLocation = North;
     public Direction TabLocation
@@ -53,18 +53,16 @@ public Thickness SeparatorMargin
         set => Separator.Margin = value;
     }
 
-    private bool _firstTabOpenBoth;
     public bool FirstTabOpenBoth
     {
-        get => _firstTabOpenBoth;
-        set => TabStyleChanged(value, LastTabOpenBoth);
+        get => TabContainer.FirstTabOpenBoth;
+        set => TabContainer.FirstTabOpenBoth = value;
     }
 
-    private bool _lastTabOpenBoth;
     public bool LastTabOpenBoth
     {
-        get => _lastTabOpenBoth;
-        set => TabStyleChanged(FirstTabOpenBoth, value);
+        get => TabContainer.LastTabOpenBoth;
+        set => TabContainer.LastTabOpenBoth = value;
     }
 
 
@@ -75,9 +73,8 @@ private void LayoutChanged(Direction direction)
         _tabLocation = direction;
 
         LayoutOrientation DirectionalOrientation(Direction direction, LayoutOrientation north, LayoutOrientation south,
-            LayoutOrientation east, LayoutOrientation west)
-        {
-            return direction switch
+            LayoutOrientation east, LayoutOrientation west) =>
+            direction switch
             {
                 North => north,
                 South => south,
@@ -85,24 +82,23 @@ LayoutOrientation DirectionalOrientation(Direction direction, LayoutOrientation
                 West => west,
                 _ => Vertical,
             };
-        }
+
         TabContainer.Orientation = DirectionalOrientation(direction, Horizontal, Horizontal, Vertical, Vertical);
         Container.Orientation = DirectionalOrientation(direction, Vertical, Vertical, Horizontal, Horizontal);
 
         var containerMargin = direction switch
         {
-            North => new Thickness(_containerMargin.Left, 0, _containerMargin.Right, _containerMargin.Bottom),
-            South => new Thickness(_containerMargin.Left, _containerMargin.Top, _containerMargin.Right, 0),
-            East => new Thickness(_containerMargin.Left, _containerMargin.Top, 0, _containerMargin.Bottom),
-            West => new Thickness(0, _containerMargin.Top, _containerMargin.Right, _containerMargin.Bottom),
+            North => new(_containerMargin.Left, 0, _containerMargin.Right, _containerMargin.Bottom),
+            South => new(_containerMargin.Left, _containerMargin.Top, _containerMargin.Right, 0),
+            East => new(_containerMargin.Left, _containerMargin.Top, 0, _containerMargin.Bottom),
+            West => new(0, _containerMargin.Top, _containerMargin.Right, _containerMargin.Bottom),
             _ => _containerMargin,
         };
         TabScrollContainer.Margin = containerMargin;
         ContentScrollContainer.Margin = containerMargin;
 
-        bool DirectionalBool(Direction direction, bool north, bool south, bool east, bool west)
-        {
-            return direction switch
+        bool DirectionalBool(Direction direction, bool north, bool south, bool east, bool west) =>
+            direction switch
             {
                 North => north,
                 South => south,
@@ -110,7 +106,7 @@ bool DirectionalBool(Direction direction, bool north, bool south, bool east, boo
                 West => west,
                 _ => false,
             };
-        }
+
         TabScrollContainer.HorizontalExpand = DirectionalBool(direction, true, true, false, false);
         TabScrollContainer.VerticalExpand = DirectionalBool(direction, false, false, true, true);
         TabScrollContainer.HScrollEnabled = DirectionalBool(direction, true, true, false, false);
@@ -152,12 +148,4 @@ private void ContainerMarginChanged(Thickness value)
         _containerMargin = value;
         LayoutChanged(TabLocation);
     }
-
-    private void TabStyleChanged(bool firstTabOpenBoth, bool lastTabOpenBoth)
-    {
-        _firstTabOpenBoth = firstTabOpenBoth;
-        _lastTabOpenBoth = lastTabOpenBoth;
-
-        UpdateTabMerging();
-    }
 }
diff --git a/Content.Client/UserInterface/Controls/NeoTabContainer.xaml b/Content.Client/UserInterface/Controls/NeoTabContainer.xaml
index 21ee79a6caf..f2277a5e598 100644
--- a/Content.Client/UserInterface/Controls/NeoTabContainer.xaml
+++ b/Content.Client/UserInterface/Controls/NeoTabContainer.xaml
@@ -3,12 +3,13 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
     xmlns:style="clr-namespace:Content.Client.Stylesheets"
+    xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     MouseFilter="Pass"
     HorizontalExpand="True"
     VerticalExpand="True">
     <BoxContainer Name="Container" HorizontalExpand="True" VerticalExpand="True">
         <ScrollContainer Name="TabScrollContainer" MinSize="42 42" ReserveScrollbarSpace="True" ReturnMeasure="True">
-            <BoxContainer Name="TabContainer" />
+            <controls:StyledButtonGroup Access="Public" Name="TabContainer" />
         </ScrollContainer>
 
         <PanelContainer Name="Separator" MinSize="2 2">
diff --git a/Content.Client/UserInterface/Controls/NeoTabContainer.xaml.cs b/Content.Client/UserInterface/Controls/NeoTabContainer.xaml.cs
index fc148cc634f..c37c6aa4cb3 100644
--- a/Content.Client/UserInterface/Controls/NeoTabContainer.xaml.cs
+++ b/Content.Client/UserInterface/Controls/NeoTabContainer.xaml.cs
@@ -10,11 +10,7 @@
 
 namespace Content.Client.UserInterface.Controls;
 
-/// <summary>
-///     A simple yet good-looking tab container using normal UI elements with multiple styles
-///     <br />
-///     Because nobody else could do it better.
-/// </summary>
+/// A simple yet good-looking configurable tab container using normal UI elements
 [GenerateTypedNameReferences]
 public sealed partial class NeoTabContainer : BoxContainer
 {
@@ -24,20 +20,14 @@ public sealed partial class NeoTabContainer : BoxContainer
 
     /// All children within the <see cref="ContentContainer"/>
     public OrderedChildCollection Contents => ContentContainer.Children;
-    /// All children within the <see cref="ContentContainer"/> that are visible
-    public List<Control> VisibleContents => Contents.Where(c => c == CurrentControl).ToList();
-
-    /// All children within the <see cref="TabContainer"/>
-    public OrderedChildCollection Tabs => TabContainer.Children;
-    /// All children within the <see cref="TabContainer"/> that are visible
-    public List<Control> VisibleTabs => Tabs.Where(c => c.Visible).ToList();
 
     public Control? CurrentControl { get; private set; }
-    public int? CurrentTab => _controls.FirstOrDefault(control => control == CurrentControl) switch
-    {
-        { } control => _controls.IndexOf(control),
-        _ => null,
-    };
+    public int? CurrentTab =>
+        _controls.FirstOrDefault(control => control == CurrentControl) switch
+        {
+            { } control => _controls.IndexOf(control),
+            _ => null,
+        };
 
 
     /// <inheritdoc cref="NeoTabContainer"/>
@@ -116,7 +106,7 @@ public int AddTab(Control control, string? title, bool updateTabMerging = true)
         if (!string.IsNullOrEmpty(title))
             button.Text = title;
 
-        TabContainer.AddChild(button);
+        TabContainer.AddButton(button);
         ContentContainer.AddChild(control);
         _controls.Add(control);
         _tabs.Add(control, button);
@@ -134,7 +124,7 @@ public int AddTab(Control control, string? title, bool updateTabMerging = true)
     }
 
     /// <summary>
-    ///     Removes/Disposes the tab associated with the given index
+    ///     Disposes the tab associated with the given index
     /// </summary>
     /// <param name="index">The index of the tab to remove</param>
     /// <param name="updateTabMerging">Whether the tabs should fix their styling automatically. Useful if you're doing tons of updates at once</param>
@@ -150,7 +140,7 @@ public bool RemoveTab(int index, bool updateTabMerging = true)
     }
 
     /// <summary>
-    ///     Removes/Disposes the tab associated with the given control
+    ///     Disposes the tab associated with the given control
     /// </summary>
     /// <param name="control">The control to remove</param>
     /// <param name="updateTabMerging">Whether the tabs should fix their styling automatically. Useful if you're doing tons of updates at once</param>
@@ -221,79 +211,5 @@ public void SelectTab(Control control)
     }
 
     /// Sets the style of every visible tab's Button to be Open to Right, Both, or Left depending on position
-    public void UpdateTabMerging()
-    {
-        var visibleTabs = VisibleTabs;
-
-        if (visibleTabs.Count == 0)
-            return;
-
-        if (visibleTabs.Count == 1)
-        {
-            var button = visibleTabs[0];
-            button.RemoveStyleClass(ButtonOpenRight);
-            button.RemoveStyleClass(ButtonOpenBoth);
-            button.RemoveStyleClass(ButtonOpenLeft);
-
-            if (FirstTabOpenBoth)
-                button.AddStyleClass(ButtonOpenBoth);
-
-            return;
-        }
-
-        string GetDirection(Direction direction, int position)
-        {
-            return position switch
-            {
-                // First
-                0 => direction switch
-                {
-                    North => ButtonOpenRight,
-                    South => ButtonOpenRight,
-                    East => ButtonOpenLeft,
-                    West => ButtonOpenLeft,
-                    _ => ButtonOpenRight,
-                },
-                // Middle
-                1 => ButtonOpenBoth,
-                // Last
-                2 => direction switch
-                {
-                    North => ButtonOpenLeft,
-                    South => ButtonOpenLeft,
-                    East => ButtonOpenRight,
-                    West => ButtonOpenRight,
-                    _ => ButtonOpenLeft,
-                },
-                _ => ButtonOpenBoth,
-            };
-        }
-
-        for (var i = 0; i < visibleTabs.Count; i++)
-        {
-            var button = visibleTabs[i];
-            button.RemoveStyleClass(ButtonOpenRight);
-            button.RemoveStyleClass(ButtonOpenBoth);
-            button.RemoveStyleClass(ButtonOpenLeft);
-
-            if (FirstTabOpenBoth && i == 0)
-            {
-                button.AddStyleClass(ButtonOpenBoth);
-                continue;
-            }
-            if (LastTabOpenBoth && i == visibleTabs.Count - 1)
-            {
-                button.AddStyleClass(ButtonOpenBoth);
-                continue;
-            }
-
-            var position = i switch
-            {
-                0 => 0,
-                _ when i == visibleTabs.Count - 1 => 2,
-                _ => 1,
-            };
-            button.AddStyleClass(GetDirection(TabLocation, position));
-        }
-    }
+    public void UpdateTabMerging() => TabContainer.UpdateStyles();
 }
diff --git a/Content.Client/UserInterface/Controls/StyledButtonGroup.cs b/Content.Client/UserInterface/Controls/StyledButtonGroup.cs
index e05eb3f7005..658d6db2967 100644
--- a/Content.Client/UserInterface/Controls/StyledButtonGroup.cs
+++ b/Content.Client/UserInterface/Controls/StyledButtonGroup.cs
@@ -4,45 +4,111 @@
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using static Content.Client.Stylesheets.StyleBase;
+using static Robust.Shared.Maths.Direction;
+
 
 namespace Content.Client.UserInterface.Controls;
 
-/// Automatically styles a group of HORIZONTAL buttons based on visibility, count, and position
+/// Automatically styles a group of buttons based on visibility, count, and index
 [GenerateTypedNameReferences]
 public sealed partial class StyledButtonGroup : BoxContainer
 {
-    public StyledButtonGroup()
+    /// <summary>
+    ///     Where to place the tabs in relation to the contents.
+    ///     <br />
+    ///     If <see cref="Direction.North"/>, the tabs will be above the contents.
+    /// </summary>
+    private Direction _direction = North;
+    public Direction Direction
+    {
+        get => _direction;
+        set
+        {
+            if (_direction == value)
+                return;
+            _direction = value;
+            UpdateStyles();
+        }
+    }
+
+    private bool _firstTabOpenBoth;
+    public bool FirstTabOpenBoth
+    {
+        get => _firstTabOpenBoth;
+        set => TabStyleChanged(value, LastTabOpenBoth);
+    }
+
+    private bool _lastTabOpenBoth;
+    public bool LastTabOpenBoth
     {
-        RobustXamlLoader.Load(this);
+        get => _lastTabOpenBoth;
+        set => TabStyleChanged(FirstTabOpenBoth, value);
+    }
+
 
-        OnChildAdded += _ => UpdateStyles();
-        OnChildMoved += _ => UpdateStyles();
-        OnChildRemoved += _ => UpdateStyles();
+    public IEnumerable<BaseButton> Buttons => Children.OfType<BaseButton>();
+    public IEnumerable<BaseButton> VisibleButtons => Buttons.Where(c => c.Visible);
+
+
+    public void AddButton(BaseButton button, bool updateStyles = true)
+    {
+        AddChild(button);
+        if (updateStyles)
+            UpdateStyles();
     }
 
     public void UpdateStyles()
     {
-        var children = Children.Where(c => c.Visible && c is Button).ToArray();
-        var len = children.Length;
+        var children = VisibleButtons;
+        var enumerable = children as BaseButton[] ?? children.ToArray();
 
-        for (var i = 0; i < len; i++)
+        for (var i = 0; i < enumerable.Length; i++)
+            TryUpdateStyle(enumerable[i], GetDirectionStyle(Direction, i, enumerable.Length));
+    }
+
+    private void TabStyleChanged(bool firstTabOpenBoth, bool lastTabOpenBoth)
+    {
+        _firstTabOpenBoth = firstTabOpenBoth;
+        _lastTabOpenBoth = lastTabOpenBoth;
+
+        UpdateStyles();
+    }
+
+    private string GetDirectionStyle(Direction direction, int position, int length)
+    {
+        if (position == 0)
         {
-            var child = children[i];
-            var button = (child as Button)!;
-
-            if (i == 0)
-                TryUpdateStyle(button, len == 1 ? "" : ButtonOpenRight);
-            else if (i == len - 1)
-                TryUpdateStyle(button, ButtonOpenLeft);
-            else
-                TryUpdateStyle(button, ButtonOpenBoth);
+            if (_firstTabOpenBoth)
+                return ButtonOpenBoth;
+
+            return direction switch
+            {
+                North or South => ButtonOpenRight,
+                East or West => ButtonOpenLeft,
+                _ => ButtonOpenRight,
+            };
+        }
+
+        if (position == length - 1)
+        {
+            if (_lastTabOpenBoth)
+                return ButtonOpenBoth;
+
+            return direction switch
+            {
+                North or South => ButtonOpenLeft,
+                East or West => ButtonOpenRight,
+                _ => ButtonOpenLeft,
+            };
         }
+
+        return ButtonOpenBoth;
     }
 
-    private bool TryUpdateStyle(Control control, string style)
+    private void TryUpdateStyle(Control control, string style)
     {
         if (control.HasStyleClass(style))
-            return false;
+            return;
 
         control.RemoveStyleClass(ButtonOpenRight);
         control.RemoveStyleClass(ButtonOpenLeft);
@@ -50,8 +116,5 @@ private bool TryUpdateStyle(Control control, string style)
 
         if (!string.IsNullOrEmpty(style))
             control.AddStyleClass(style);
-        else
-            return false;
-        return true;
     }
 }

From 37d12e86b2b657d1eacded5509088a251e43b341 Mon Sep 17 00:00:00 2001
From: DEATHB4DEFEAT <zachcaffee@outlook.com>
Date: Sun, 1 Dec 2024 19:54:58 -0800
Subject: [PATCH 4/4] why doesn't this work?

---
 .../Lobby/UI/HumanoidProfileEditor.xaml.cs    | 142 ++++++++----------
 .../Controls/NeoTabContainer.xaml.cs          |  58 ++++---
 .../Controls/StyledButtonGroup.cs             |   6 +
 3 files changed, 112 insertions(+), 94 deletions(-)

diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
index 4ea144f5dca..056643422a6 100644
--- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -2011,7 +2011,6 @@ public void UpdateLoadouts(bool? showUnusable = null, bool reload = false)
                 _loadoutPreferences.Clear();
             }
 
-
             // Get the highest priority job to use for loadout filtering
             var highJob = _controller.GetPreferredJob(Profile ?? HumanoidCharacterProfile.DefaultWithSpecies());
 
@@ -2031,13 +2030,6 @@ public void UpdateLoadouts(bool? showUnusable = null, bool reload = false)
                     out _
                 );
                 _loadouts.Add(loadout, usable);
-
-                var list = _loadoutPreferences.ToList();
-                if (list.FindIndex(lps => lps.Loadout.ID == loadout.ID) is not (not -1 and var i))
-                    continue;
-
-                var selector = list[i];
-                UpdateSelector(selector, usable);
             }
 
             if (_loadouts.Count == 0)
@@ -2047,7 +2039,6 @@ out _
                 return;
             }
 
-
             var uncategorized = LoadoutsTabs.Contents.FirstOrDefault(c => c.Name == "Uncategorized");
             if (uncategorized == null)
             {
@@ -2091,76 +2082,18 @@ out _
                 categories.Add(key, value);
 
             // Create the UI elements for the category tree
-            CreateCategoryUI(categories, LoadoutsTabs);
-
-            // Fill categories with loadouts
-            foreach (var (loadout, usable) in _loadouts
+            var sortedLoadouts = _loadouts
                 .OrderBy(l => l.Key.ID)
                 .ThenBy(l => Loc.GetString($"loadout-name-{l.Key.ID}"))
-                .ThenBy(l => l.Key.Cost))
-            {
-                if (_loadoutPreferences.Select(lps => lps.Loadout.ID).Contains(loadout.ID))
-                {
-                    var first = _loadoutPreferences.First(lps => lps.Loadout.ID == loadout.ID);
-                    var prof = Profile?.LoadoutPreferences.FirstOrDefault(lp => lp.LoadoutName == loadout.ID);
-                    first.Preference = new(loadout.ID, prof?.CustomName, prof?.CustomDescription, prof?.CustomColorTint, prof?.CustomHeirloom);
-                    UpdateSelector(first, usable);
-                    continue;
-                }
-
-                var selector = new LoadoutPreferenceSelector(
-                    loadout, highJob ?? new JobPrototype(),
-                    Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(), ref _dummyLoadouts,
-                    _entManager, _prototypeManager, _cfgManager, _characterRequirementsSystem, _requirements)
-                    { Preference = new(loadout.ID) };
-                UpdateSelector(selector, usable);
-                AddSelector(selector);
-
-                // Look for an existing category tab
-                var match = FindCategory(loadout.Category, LoadoutsTabs);
-
-                // If there is no category put it in Uncategorized (this shouldn't happen)
-                (match ?? uncategorized).Children.First().Children.First().AddChild(selector);
-            }
+                .ThenBy(l => l.Key.Cost);
+            CreateCategoryUI(categories, LoadoutsTabs);
 
-            // Hide any empty tabs
-            HideEmptyTabs(_prototypeManager.EnumeratePrototypes<LoadoutCategoryPrototype>().ToList());
+            // Hide any empty tabs //TODO: This is broken
+            // HideEmptyTabs(_prototypeManager.EnumeratePrototypes<LoadoutCategoryPrototype>().ToList());
 
             UpdateLoadoutPreferences();
             return;
 
-
-            void UpdateSelector(LoadoutPreferenceSelector selector, bool usable)
-            {
-                selector.Valid = usable;
-                selector.ShowUnusable = showUnusable.Value;
-
-                foreach (var item in selector.Loadout.Items)
-                {
-                    if (_dummyLoadouts.TryGetValue(selector.Loadout.ID + selector.Loadout.Items.IndexOf(item), out var entity)
-                        && _entManager.GetComponent<MetaDataComponent>(entity).EntityPrototype!.ID == item)
-                    {
-                        if (!_entManager.HasComponent<ClothingComponent>(entity))
-                        {
-                            selector.Wearable = true;
-                            continue;
-                        }
-                        selector.Wearable = _characterRequirementsSystem.CanEntityWearItem(PreviewDummy, entity);
-                        continue;
-                    }
-
-                    entity = _entManager.SpawnEntity(item, MapCoordinates.Nullspace);
-                    _dummyLoadouts[selector.Loadout.ID + selector.Loadout.Items.IndexOf(item)] = entity;
-
-                    if (!_entManager.HasComponent<ClothingComponent>(entity))
-                    {
-                        selector.Wearable = true;
-                        continue;
-                    }
-                    selector.Wearable = _characterRequirementsSystem.CanEntityWearItem(PreviewDummy, entity);
-                }
-            }
-
             void CreateCategoryUI(Dictionary<string, object> tree, NeoTabContainer parent)
             {
                 foreach (var (key, value) in tree)
@@ -2198,7 +2131,8 @@ void CreateCategoryUI(Dictionary<string, object> tree, NeoTabContainer parent)
                             },
                         };
 
-                        parent.AddTab(category, Loc.GetString($"loadout-category-{key}"));
+                        var i = parent.AddTab(category, Loc.GetString($"loadout-category-{key}"));
+                        parent.GetTabInfo(i).Initialize = () => LoadCategoryLoadouts(category, key);
                     }
                     // If the value is a dictionary, create a new tab for it and recursively call this function to fill it
                     else
@@ -2208,12 +2142,68 @@ void CreateCategoryUI(Dictionary<string, object> tree, NeoTabContainer parent)
                             Name = key,
                             HorizontalExpand = true,
                             VerticalExpand = true,
-                            SeparatorMargin = new Thickness(0),
+                            SeparatorMargin = new(0),
                         };
 
-                        parent.AddTab(category, Loc.GetString($"loadout-category-{key}"));
-                        CreateCategoryUI((Dictionary<string, object>) value, category);
+                        var i = parent.AddTab(category, Loc.GetString($"loadout-category-{key}"));
+                        parent.GetTabInfo(i).Initialize = () => CreateCategoryUI((Dictionary<string, object>) value, category);
+                    }
+                }
+            }
+
+            void LoadCategoryLoadouts(BoxContainer category, string key)
+            {
+                foreach (var (loadout, usable) in sortedLoadouts.Where(l => l.Key.Category == key))
+                {
+                    if (_loadoutPreferences.Select(lps => lps.Loadout.ID).Contains(loadout.ID))
+                    {
+                        var first = _loadoutPreferences.First(lps => lps.Loadout.ID == loadout.ID);
+                        var prof = Profile?.LoadoutPreferences.FirstOrDefault(lp => lp.LoadoutName == loadout.ID);
+                        first.Preference = new(loadout.ID, prof?.CustomName, prof?.CustomDescription, prof?.CustomColorTint, prof?.CustomHeirloom);
+                        UpdateSelector(first, usable);
+                        continue;
+                    }
+
+                    var selector = new LoadoutPreferenceSelector(
+                        loadout, highJob ?? new JobPrototype(),
+                        Profile ?? HumanoidCharacterProfile.DefaultWithSpecies(), ref _dummyLoadouts,
+                        _entManager, _prototypeManager, _cfgManager, _characterRequirementsSystem, _requirements)
+                        { Preference = new(loadout.ID), };
+                    UpdateSelector(selector, usable);
+                    AddSelector(selector);
+
+                    category.Children.First().Children.First().AddChild(selector);
+                }
+            }
+
+            void UpdateSelector(LoadoutPreferenceSelector selector, bool usable)
+            {
+                selector.Valid = usable;
+                selector.ShowUnusable = showUnusable.Value;
+
+                foreach (var item in selector.Loadout.Items)
+                {
+                    if (_dummyLoadouts.TryGetValue(selector.Loadout.ID + selector.Loadout.Items.IndexOf(item), out var entity)
+                        && _entManager.GetComponent<MetaDataComponent>(entity).EntityPrototype!.ID == item)
+                    {
+                        if (!_entManager.HasComponent<ClothingComponent>(entity))
+                        {
+                            selector.Wearable = true;
+                            continue;
+                        }
+                        selector.Wearable = _characterRequirementsSystem.CanEntityWearItem(PreviewDummy, entity);
+                        continue;
+                    }
+
+                    entity = _entManager.SpawnEntity(item, MapCoordinates.Nullspace);
+                    _dummyLoadouts[selector.Loadout.ID + selector.Loadout.Items.IndexOf(item)] = entity;
+
+                    if (!_entManager.HasComponent<ClothingComponent>(entity))
+                    {
+                        selector.Wearable = true;
+                        continue;
                     }
+                    selector.Wearable = _characterRequirementsSystem.CanEntityWearItem(PreviewDummy, entity);
                 }
             }
 
diff --git a/Content.Client/UserInterface/Controls/NeoTabContainer.xaml.cs b/Content.Client/UserInterface/Controls/NeoTabContainer.xaml.cs
index c37c6aa4cb3..a8ed12aa5af 100644
--- a/Content.Client/UserInterface/Controls/NeoTabContainer.xaml.cs
+++ b/Content.Client/UserInterface/Controls/NeoTabContainer.xaml.cs
@@ -14,7 +14,7 @@ namespace Content.Client.UserInterface.Controls;
 [GenerateTypedNameReferences]
 public sealed partial class NeoTabContainer : BoxContainer
 {
-    private readonly Dictionary<Control, BaseButton> _tabs = new();
+    private readonly Dictionary<Control, TabInfo> _tabs = new();
     private readonly List<Control> _controls = new();
     private readonly ButtonGroup _tabGroup = new(false);
 
@@ -22,12 +22,10 @@ public sealed partial class NeoTabContainer : BoxContainer
     public OrderedChildCollection Contents => ContentContainer.Children;
 
     public Control? CurrentControl { get; private set; }
-    public int? CurrentTab =>
-        _controls.FirstOrDefault(control => control == CurrentControl) switch
-        {
-            { } control => _controls.IndexOf(control),
-            _ => null,
-        };
+    public TabInfo? CurrentTab => _tabs!.GetValueOrDefault(CurrentControl);
+
+    /// Calls an init event on the current tab when switching to it if not done before
+    public bool LazyLoading { get; set; } = true;
 
 
     /// <inheritdoc cref="NeoTabContainer"/>
@@ -41,8 +39,8 @@ public NeoTabContainer()
 
     protected override void ChildRemoved(Control child)
     {
-        if (_tabs.Remove(child, out var button))
-            button.Dispose();
+        if (_tabs.Remove(child, out var info))
+            info.Button.Dispose();
 
         // Set the current tab to a different control
         if (CurrentControl == child)
@@ -109,7 +107,7 @@ public int AddTab(Control control, string? title, bool updateTabMerging = true)
         TabContainer.AddButton(button);
         ContentContainer.AddChild(control);
         _controls.Add(control);
-        _tabs.Add(control, button);
+        _tabs.Add(control, new(control, button));
 
         // Show it if it has content
         if (ContentContainer.ChildCount > 1)
@@ -118,8 +116,12 @@ public int AddTab(Control control, string? title, bool updateTabMerging = true)
             // Select it if it's the only tab
             SelectTab(control);
 
+        if (!LazyLoading)
+            _tabs[control].Initialize?.Invoke();
+
         if (updateTabMerging)
             UpdateTabMerging();
+
         return ChildCount - 1;
     }
 
@@ -147,16 +149,22 @@ public bool RemoveTab(int index, bool updateTabMerging = true)
     /// <returns>True if the tab was removed, false otherwise</returns>
     public bool RemoveTab(Control control, bool updateTabMerging = true)
     {
-        if (!_tabs.TryGetValue(control, out var button))
+        if (!_tabs.TryGetValue(control, out var info))
             return false;
 
-        button.Dispose();
+        info.Button.Dispose();
         control.Dispose();
+        _controls.Remove(control);
+        _tabs.Remove(control);
         if (updateTabMerging)
             UpdateTabMerging();
         return true;
     }
 
+    public TabInfo GetTabInfo(int index) => _tabs[_controls[index]];
+
+    public TabInfo GetTabInfo(Control control) => _tabs[control];
+
 
     /// Sets the title of the tab associated with the given index
     public void SetTabTitle(int index, string title)
@@ -171,10 +179,10 @@ public void SetTabTitle(int index, string title)
     /// Sets the title of the tab associated with the given control
     public void SetTabTitle(Control control, string title)
     {
-        if (!_tabs.TryGetValue(control, out var button))
+        if (!_tabs.TryGetValue(control, out var info))
             return;
 
-        if (button is Button b)
+        if (info.Button is Button b)
             b.Text = title;
     }
 
@@ -191,10 +199,10 @@ public void SetTabVisible(int index, bool visible)
     /// Shows or hides the tab associated with the given control
     public void SetTabVisible(Control control, bool visible)
     {
-        if (!_tabs.TryGetValue(control, out var button))
+        if (!_tabs.TryGetValue(control, out var info))
             return;
 
-        button.Visible = visible;
+        info.Button.Visible = visible;
         UpdateTabMerging();
     }
 
@@ -204,8 +212,14 @@ public void SelectTab(Control control)
         if (CurrentControl != null)
             CurrentControl.Visible = false;
 
-        var button = _tabs[control];
-        button.Pressed = true;
+        var info = _tabs[control];
+        if (!info.Initialized)
+        {
+            info.Initialize?.Invoke();
+            info.Initialized = true;
+        }
+
+        info.Button.Pressed = true;
         control.Visible = true;
         CurrentControl = control;
     }
@@ -213,3 +227,11 @@ public void SelectTab(Control control)
     /// Sets the style of every visible tab's Button to be Open to Right, Both, or Left depending on position
     public void UpdateTabMerging() => TabContainer.UpdateStyles();
 }
+
+public sealed class TabInfo(Control control, BaseButton button)
+{
+    public Control Control { get; } = control;
+    public BaseButton Button { get; } = button;
+    public bool Initialized { get; set; }
+    public Action? Initialize { get; set; }
+}
diff --git a/Content.Client/UserInterface/Controls/StyledButtonGroup.cs b/Content.Client/UserInterface/Controls/StyledButtonGroup.cs
index 658d6db2967..956b1b00776 100644
--- a/Content.Client/UserInterface/Controls/StyledButtonGroup.cs
+++ b/Content.Client/UserInterface/Controls/StyledButtonGroup.cs
@@ -50,6 +50,12 @@ public bool LastTabOpenBoth
     public IEnumerable<BaseButton> VisibleButtons => Buttons.Where(c => c.Visible);
 
 
+    public StyledButtonGroup()
+    {
+        RobustXamlLoader.Load(this);
+    }
+
+
     public void AddButton(BaseButton button, bool updateStyles = true)
     {
         AddChild(button);