Component uses actual colors

Simple-Station · Oct 30, 2023 · 791e9f0 · 791e9f0
1 parent 29fa453
commit 791e9f0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/Content.Client/SimpleStation14/Jukebox/Ui/JukeboxWindow.xaml.cs b/Content.Client/SimpleStation14/Jukebox/Ui/JukeboxWindow.xaml.cs
@@ -54,14 +54,14 @@ public JukeboxWindow(JukeboxComponent jukeboxComp, ISawmill log)
         SkipButton.TexturePath = jukeboxComp.UiButtonSkip;
 
         // Sets up the custom colours of the ui.
-        BG_1.PanelOverride = new StyleBoxFlat { BackgroundColor = Color.FromHex(jukeboxComp.UiColorBG) };
-        Panel_1.PanelOverride = new StyleBoxFlat { BackgroundColor = Color.FromHex(jukeboxComp.UiColorPanel) };
-        Panel_2.PanelOverride = new StyleBoxFlat { BackgroundColor = Color.FromHex(jukeboxComp.UiColorPanel) };
-        Panel_3.PanelOverride = new StyleBoxFlat { BackgroundColor = Color.FromHex(jukeboxComp.UiColorPanel) };
-        // Accent_1.PanelOverride = new StyleBoxFlat { BackgroundColor = Color.FromHex(jukeboxComp.JukeboxUiColorAccent) };
-        // Accent_2.PanelOverride = new StyleBoxFlat { BackgroundColor = Color.FromHex(jukeboxComp.JukeboxUiColorAccent) };
-        Accent_3.PanelOverride = new StyleBoxFlat { BackgroundColor = Color.FromHex(jukeboxComp.UiColorAccent) };
-        Accent_4.PanelOverride = new StyleBoxFlat { BackgroundColor = Color.FromHex(jukeboxComp.UiColorAccent) };
+        BG_1.PanelOverride = new StyleBoxFlat { BackgroundColor = jukeboxComp.UiColorBG };
+        Panel_1.PanelOverride = new StyleBoxFlat { BackgroundColor = jukeboxComp.UiColorPanel };
+        Panel_2.PanelOverride = new StyleBoxFlat { BackgroundColor = jukeboxComp.UiColorPanel };
+        Panel_3.PanelOverride = new StyleBoxFlat { BackgroundColor = jukeboxComp.UiColorPanel };
+        // Accent_1.PanelOverride = new StyleBoxFlat { BackgroundColor = jukeboxComp.JukeboxUiColorAccent };
+        // Accent_2.PanelOverride = new StyleBoxFlat { BackgroundColor = jukeboxComp.JukeboxUiColorAccent };
+        Accent_3.PanelOverride = new StyleBoxFlat { BackgroundColor = jukeboxComp.UiColorAccent };
+        Accent_4.PanelOverride = new StyleBoxFlat { BackgroundColor = jukeboxComp.UiColorAccent };
 
         // Sets up all the fonts.
         SongName.FontOverride = _resourceCache.GetFont("/Fonts/NotoSans/NotoSans-Regular.ttf", 18);

diff --git a/Content.Shared/SimpleStation14/Jukebox/JukeboxComponent.cs b/Content.Shared/SimpleStation14/Jukebox/JukeboxComponent.cs
@@ -52,15 +52,15 @@ public sealed partial class JukeboxComponent : Component
     ///     Should be based on the sprite.
     /// </summary>
     [DataField("uiColorBG")]
-    public string UiColorBG { get; } = "#602C00";
+    public Color UiColorBG { get; } = Color.FromHex("#602C00");
 
     /// <inheritdoc cref="UiColorBG"/>
     [DataField("uiColorPanel")]
-    public string UiColorPanel { get; } = "#480F0F";
+    public Color UiColorPanel { get; } = Color.FromHex("#480F0F");
 
     /// <inheritdoc cref="UiColorBG"/>
     [DataField("uiColorAccent")]
-    public string UiColorAccent { get; } = "#20181B";
+    public Color UiColorAccent { get; } = Color.FromHex("#20181B");
 
     [DataField("uiButtonPlay")]
     public string UiButtonPlay { get; } = "/Textures/SimpleStation14/Interface/MediaControls/play.png";