StyleSpace is no more

Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>

Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml

@@ -1,5 +1,6 @@
 <Control xmlns="https://spacestation14.io"
-         xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client">
+         xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+         Stylesheet="System">
     <PanelContainer MouseFilter="Stop">
         <PanelContainer.PanelOverride>
             <!-- semi-transparent background -->

Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml.cs

@@ -22,8 +22,6 @@ public AdminMessagePopupWindow()
     {
         RobustXamlLoader.Load(this);
 
-        Stylesheet = IoCManager.Resolve<IStylesheetManager>().SheetSpace;
-
         AcceptButton.OnPressed += OnAcceptButtonPressed;
         DismissButton.OnPressed += OnDismissButtonPressed;
     }
@@ -49,7 +47,8 @@ public void SetState(AdminMessageEuiState state)
             MessageContainer.AddChild(new AdminMessagePopupMessage(message));
         }
 
-        Description.SetMessage(FormattedMessage.FromMarkup(Loc.GetString("admin-notes-message-desc", ("count", state.Messages.Length))));
+        Description.SetMessage(
+            FormattedMessage.FromMarkup(Loc.GetString("admin-notes-message-desc", ("count", state.Messages.Length))));
     }
 
     private void OnDismissButtonPressed(BaseButton.ButtonEventArgs obj)

Content.Client/Changelog/ChangelogWindow.xaml

@@ -2,7 +2,8 @@
                     xmlns:ui="clr-namespace:Content.Client.Changelog"
                     Title="{Loc 'changelog-window-title'}"
                     MinSize="500 400"
-                    SetSize="500 400">
+                    SetSize="500 400"
+                    Stylesheet="Interface">
     <PanelContainer StyleClasses="AngleRect" />
     <BoxContainer Orientation="Vertical">
         <TabContainer Name="Tabs" Access="Public" HorizontalExpand="True" VerticalExpand="True" />

Content.Client/Changelog/ChangelogWindow.xaml.cs

@@ -23,7 +23,6 @@ public ChangelogWindow()
         {
             RobustXamlLoader.Load(this);
             WindowTitle.AddStyleClass(StyleClass.LabelHeading);
-            Stylesheet = IoCManager.Resolve<IStylesheetManager>().SheetSpace;
         }
 
         protected override void Opened()

Content.Client/Launcher/LauncherConnectingGui.xaml.cs

@@ -41,7 +41,7 @@ public LauncherConnectingGui(LauncherConnecting state, IRobustRandom random,
 
             LayoutContainer.SetAnchorPreset(this, LayoutContainer.LayoutPreset.Wide);
 
-            Stylesheet = IoCManager.Resolve<IStylesheetManager>().SheetSpace;
+            Stylesheet = IoCManager.Resolve<IStylesheetManager>().SheetSystem;
 
             ChangeLoginTip();
             ReconnectButton.OnPressed += ReconnectButtonPressed;

Content.Client/Stylesheets/IStylesheetManager.cs

@@ -5,9 +5,10 @@ namespace Content.Client.Stylesheets;
 
 public interface IStylesheetManager
 {
-    Stylesheet SheetNano { get; }
-    Stylesheet SheetSpace { get; }
+    Stylesheet SheetNanotransen { get; }
     Stylesheet SheetSystem { get; }
 
+    public Dictionary<string, Stylesheet> Stylesheets { get; }
+
     void Initialize();
 }

Content.Client/Stylesheets/Redux/todo.md

@@ -33,14 +33,17 @@
     - `ColorPalette` / `Palettes` but same thing
 - [x] tooltips being part of another stylesheet is kinda bad
 - [x] rename `InterfaceStylesheet` to `SystemStylesheet`
-- [ ] rename `FancyWindow` to `NanoWindow`
+- [ ] ~~rename `FancyWindow` to `NanoWindow`~~
+  - doesnt work with other stylesheets so `FancyWindow` stays!
+  - [x] add a `Stylesheet` property, so you can like, set the styles of a window
 - [x] Get rid of `NTSheetlets` & `InterfaceSheetlets`
     - Eh, most of it anyway
 - [x] Make all `StyleClass` conform to naming conventions
 - [x] Separate out `FontKind` maybe
 - [x] change `ButtonHovered` and friends to `PseudoHovered`
 - [x] `IPanelPalette` is unnecessary now
-- [ ] What the fuck is `StyleSpace` get rid of it
+- [x] What the fuck is `StyleSpace` get rid of it
+  - Switched to `SystemStylesheet`
 - [x] Fix the codepen
 - [ ] figure out `BaseStylesheet.Fonts`
 
@@ -59,6 +62,7 @@ TL;DR port all of `StyleNano` into sheetlets
 
 ### Another PR:
 
+- [ ] Style classes for window sizes (and yayyy refactor all the windows maybe?)
 - [ ] Admin Message window exit button is basically indistinguishable from the red header
 - [ ] Button text colors / change text color when pressed / disabled?
 - [ ] Resizing windows is like, too precise
@@ -152,13 +156,15 @@ that, ideally, every theme should have a unique implementation of, then you woul
 
 #### `StyleNano` is gone!!
 
+- Well it's not gone, but it is obsolete. If you have messed with it at all, your changes will need to be redone.
 - Style classes defined in `StyleNano` have been moved either to `Content.Client.Stylesheets.Redux.StyleClass` or their
   associated `Control`.
 - Any `StyleRule` additions to `StyleNano` must be rewritten to conform to the new format (See guide (TODO: LINK GUIDE))
 - Some unused / redundant style classes were removed. If you hapenned to be relying on them, either substitute in the
   appropriate style classes defined in `Content.Client.Stylesheets.Redux.StyleClass` or create a new Sheetlet (Again,
   see guide)
 - If you are planning on creating a new UI, there are new conventions you should follow (Yet again, see guide)
+- `StyleSpace` is gone too but that probably doesn't affect you
 
 #### `Content.Client/Stylesheets/Redux`
 

Content.Client/Stylesheets/StylesheetManager.cs

@@ -1,7 +1,6 @@
 using System.Diagnostics;
 using Content.Client.Stylesheets.Redux;
 using Content.Client.Stylesheets.Redux.Stylesheets;
-using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 
 namespace Content.Client.Stylesheets
@@ -10,31 +9,33 @@ public sealed class StylesheetManager : IStylesheetManager
     {
         [Dependency] private readonly ILogManager _logManager = default!;
         [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
-        [Dependency] private readonly IResourceCache _resourceCache = default!;
 
-        public Stylesheet SheetNano { get; private set; } = default!;
+        public Stylesheet SheetNanotransen { get; private set; } = default!;
         public Stylesheet SheetSystem { get; private set; } = default!;
-        public Stylesheet SheetSpace { get; private set; } = default!;
+
+        public Dictionary<string, Stylesheet> Stylesheets { get; private set; } = default!;
 
         public void Initialize()
         {
             var sawmill = _logManager.GetSawmill("style");
             sawmill.Debug("Initializing Stylesheets...");
             var sw = Stopwatch.StartNew();
 
-            SheetNano = Init(new NanotrasenStylesheet(new PalettedStylesheet.NoConfig()));
-            SheetSystem = Init(new SystemStylesheet(new PalettedStylesheet.NoConfig()));
-            SheetSpace = new StyleSpace(_resourceCache).Stylesheet; // TODO: REMOVE
+            Stylesheets = new Dictionary<string, Stylesheet>();
+
+            SheetNanotransen = Init("Nanotransen", new NanotrasenStylesheet(new PalettedStylesheet.NoConfig()));
+            SheetSystem = Init("Interface", new SystemStylesheet(new PalettedStylesheet.NoConfig()));
 
-            _userInterfaceManager.Stylesheet = SheetNano;
+            _userInterfaceManager.Stylesheet = SheetNanotransen;
 
             sawmill.Debug($"Initialized {_styleRuleCount} style rules in {sw.Elapsed}");
         }
 
-        private int _styleRuleCount = 0;
+        private int _styleRuleCount;
 
-        public Stylesheet Init(BaseStylesheet baseSheet)
+        public Stylesheet Init(string name, BaseStylesheet baseSheet)
         {
+            Stylesheets.Add(name, baseSheet.Stylesheet);
             _styleRuleCount += baseSheet.Stylesheet.Rules.Count;
             return baseSheet.Stylesheet;
         }

Content.Client/UserInterface/Controls/FancyWindow.xaml.cs

@@ -1,6 +1,7 @@
 using System.Numerics;
 using Content.Client.Guidebook;
 using Content.Client.Guidebook.Components;
+using Content.Client.Stylesheets;
 using Content.Shared.Guidebook;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
@@ -14,6 +15,7 @@ namespace Content.Client.UserInterface.Controls
     public partial class FancyWindow : BaseWindow
     {
         [Dependency] private readonly IEntitySystemManager _sysMan = default!;
+        [Dependency] private readonly IStylesheetManager _styleMan = default!;
         private GuidebookSystem? _guidebookSystem;
         private const int DRAG_MARGIN_SIZE = 7;
 
@@ -23,6 +25,7 @@ public partial class FancyWindow : BaseWindow
         public FancyWindow()
         {
             RobustXamlLoader.Load(this);
+            IoCManager.InjectDependencies(this);
 
             CloseButton.OnPressed += _ => Close();
             HelpButton.OnPressed += _ => Help();
@@ -35,7 +38,21 @@ public string? Title
             set => WindowTitle.Text = value;
         }
 
+        private string? _stylesheet;
+
+        public new string? Stylesheet
+        {
+            get => _stylesheet;
+            set
+            {
+                _stylesheet = value;
+                if (value is not null && _styleMan.Stylesheets.TryGetValue(value, out var stylesheet))
+                    base.Stylesheet = stylesheet;
+            }
+        }
+
         private List<ProtoId<GuideEntryPrototype>>? _helpGuidebookIds;
+
         public List<ProtoId<GuideEntryPrototype>>? HelpGuidebookIds
         {
             get => _helpGuidebookIds;

Content.Client/Voting/UI/VoteCallMenu.xaml.cs

@@ -39,7 +39,7 @@ public VoteCallMenu()
             IoCManager.InjectDependencies(this);
             RobustXamlLoader.Load(this);
 
-            Stylesheet = IoCManager.Resolve<IStylesheetManager>().SheetSpace;
+            Stylesheet = IoCManager.Resolve<IStylesheetManager>().SheetSystem;
             CloseButton.OnPressed += _ => Close();
 
             for (var i = 0; i < AvailableVoteTypes.Length; i++)

Content.Client/Voting/UI/VotePopup.xaml.cs

@@ -26,7 +26,7 @@ public VotePopup(VoteManager.ActiveVote vote)
             IoCManager.InjectDependencies(this);
             RobustXamlLoader.Load(this);
 
-            Stylesheet = IoCManager.Resolve<IStylesheetManager>().SheetSpace;
+            Stylesheet = IoCManager.Resolve<IStylesheetManager>().SheetSystem;
 
             Modulate = Color.White.WithAlpha(0.75f);
             _voteButtons = new Button[vote.Entries.Length];