From 11d58fb7f61ccfd17bd96d080886cd2853feeb53 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 7 Apr 2020 16:53:29 +0900
Subject: [PATCH] Implement column background and light colours

---
 .../Skinning/LegacyColumnBackground.cs                |  9 ++++++++-
 .../Skinning/LegacyManiaSkinConfigurationLookup.cs    |  2 ++
 osu.Game/Skinning/LegacySkin.cs                       | 11 ++++++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
index 8cd0272b52..6504321bb2 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
@@ -50,12 +50,18 @@ namespace osu.Game.Rulesets.Mania.Skinning
             Color4 lineColour = GetManiaSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.ColumnLineColour)?.Value
                                 ?? Color4.White;
 
+            Color4 backgroundColour = GetManiaSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour)?.Value
+                                      ?? Color4.Black;
+
+            Color4 lightColour = GetManiaSkinConfig<Color4>(skin, LegacyManiaSkinConfigurationLookups.ColumnLightColour)?.Value
+                                 ?? Color4.White;
+
             InternalChildren = new Drawable[]
             {
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = Color4.Black
+                    Colour = backgroundColour
                 },
                 new Box
                 {
@@ -82,6 +88,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
                     {
                         Anchor = Anchor.BottomCentre,
                         Origin = Anchor.BottomCentre,
+                        Colour = lightColour,
                         Texture = skin.GetTexture(lightImage),
                         RelativeSizeAxes = Axes.X,
                         Width = 1,
diff --git a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
index ee5db2a77f..7d3614bf83 100644
--- a/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
+++ b/osu.Game/Skinning/LegacyManiaSkinConfigurationLookup.cs
@@ -38,5 +38,7 @@ namespace osu.Game.Skinning
         ExplosionScale,
         ColumnLineColour,
         JudgementLineColour,
+        ColumnBackgroundColour,
+        ColumnLightColour
     }
 }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index f206bc792d..f1a911e652 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -88,7 +88,8 @@ namespace osu.Game.Skinning
 
             // todo: this shouldn't really be duplicated here (from ManiaLegacySkinTransformer). we need to come up with a better solution.
             hasKeyTexture = new Lazy<bool>(() => this.GetAnimation(
-                lookupForMania<string>(new LegacyManiaSkinConfigurationLookup(4, LegacyManiaSkinConfigurationLookups.KeyImage, 0))?.Value ?? "mania-key1", true, true) != null);
+                lookupForMania<string>(new LegacyManiaSkinConfigurationLookup(4, LegacyManiaSkinConfigurationLookups.KeyImage, 0))?.Value ?? "mania-key1", true,
+                true) != null);
         }
 
         protected override void Dispose(bool isDisposing)
@@ -210,6 +211,14 @@ namespace osu.Game.Skinning
 
                 case LegacyManiaSkinConfigurationLookups.JudgementLineColour:
                     return SkinUtils.As<TValue>(getCustomColour(existing, "ColourJudgementLine"));
+
+                case LegacyManiaSkinConfigurationLookups.ColumnBackgroundColour:
+                    Debug.Assert(maniaLookup.TargetColumn != null);
+                    return SkinUtils.As<TValue>(getCustomColour(existing, $"Colour{maniaLookup.TargetColumn}"));
+
+                case LegacyManiaSkinConfigurationLookups.ColumnLightColour:
+                    Debug.Assert(maniaLookup.TargetColumn != null);
+                    return SkinUtils.As<TValue>(getCustomColour(existing, $"ColourLight{maniaLookup.TargetColumn}"));
             }
 
             return null;