From 88d50b6c4751e7fc87580b8e5bed753052017fa3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 22 Aug 2020 00:15:37 +0900
Subject: [PATCH 01/15] Remove alpha mangling from LegacyDecoder

---
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index 44ef9bcacc..c15240a4f6 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -104,10 +104,6 @@ namespace osu.Game.Beatmaps.Formats
             try
             {
                 byte alpha = split.Length == 4 ? byte.Parse(split[3]) : (byte)255;
-
-                if (alpha == 0)
-                    alpha = 255;
-
                 colour = new Color4(byte.Parse(split[0]), byte.Parse(split[1]), byte.Parse(split[2]), alpha);
             }
             catch

From 2424fa08027ebe105e1102997e8379ec31528c0a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 22 Aug 2020 00:15:58 +0900
Subject: [PATCH 02/15] Add helper methods

---
 osu.Game/Skinning/LegacySkinExtensions.cs | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index bb46dc8b9f..088eae4bce 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using osuTK.Graphics;
 using static osu.Game.Skinning.LegacySkinConfiguration;
 
 namespace osu.Game.Skinning
@@ -62,6 +63,21 @@ namespace osu.Game.Skinning
             }
         }
 
+        public static Color4 ToLegacyColour(this Color4 colour)
+        {
+            if (colour.A == 0)
+                colour.A = 1;
+            return colour;
+        }
+
+        public static T WithInitialColour<T>(this T drawable, Color4 colour)
+            where T : Drawable
+        {
+            drawable.Alpha = colour.A;
+            drawable.Colour = ToLegacyColour(colour);
+            return drawable;
+        }
+
         public class SkinnableTextureAnimation : TextureAnimation
         {
             [Resolved(canBeNull: true)]

From eaba32335327dc0a4f987f8b8f35bb89a01d51cb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 22 Aug 2020 00:17:35 +0900
Subject: [PATCH 03/15] Update catch with legacy colour setters

---
 .../Skinning/CatchLegacySkinTransformer.cs                | 8 +++++++-
 osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs      | 3 +--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
index d929da1a29..5abd87d6f4 100644
--- a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
@@ -6,6 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Skinning;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Skinning
 {
@@ -61,7 +62,12 @@ namespace osu.Game.Rulesets.Catch.Skinning
             switch (lookup)
             {
                 case CatchSkinColour colour:
-                    return Source.GetConfig<SkinCustomColourLookup, TValue>(new SkinCustomColourLookup(colour));
+                    var result = (Bindable<Color4>)Source.GetConfig<SkinCustomColourLookup, TValue>(new SkinCustomColourLookup(colour));
+                    if (result == null)
+                        return null;
+
+                    result.Value = result.Value.ToLegacyColour();
+                    return (IBindable<TValue>)result;
             }
 
             return Source.GetConfig<TLookup, TValue>(lookup);
diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
index 5be54d3882..c9dd1d1f3e 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
@@ -40,7 +40,6 @@ namespace osu.Game.Rulesets.Catch.Skinning
                 colouredSprite = new Sprite
                 {
                     Texture = skin.GetTexture(lookupName),
-                    Colour = drawableObject.AccentColour.Value,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                 },
@@ -76,7 +75,7 @@ namespace osu.Game.Rulesets.Catch.Skinning
         {
             base.LoadComplete();
 
-            accentColour.BindValueChanged(colour => colouredSprite.Colour = colour.NewValue, true);
+            accentColour.BindValueChanged(colour => colouredSprite.Colour = colour.NewValue.ToLegacyColour(), true);
         }
     }
 }

From 454564b18928a17525e12596ca38446844cb0600 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 22 Aug 2020 00:19:15 +0900
Subject: [PATCH 04/15] Update mania with legacy colour setters

---
 .../Skinning/LegacyColumnBackground.cs        | 20 ++++++++-----------
 .../Skinning/LegacyHitTarget.cs               |  2 +-
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
index 64a7641421..b97547bbc6 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
@@ -58,28 +58,24 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
             InternalChildren = new Drawable[]
             {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = backgroundColour
-                },
-                new Box
+                new Box { RelativeSizeAxes = Axes.Both }.WithInitialColour(backgroundColour),
+                new Container
                 {
                     RelativeSizeAxes = Axes.Y,
                     Width = leftLineWidth,
                     Scale = new Vector2(0.740f, 1),
-                    Colour = lineColour,
-                    Alpha = hasLeftLine ? 1 : 0
+                    Alpha = hasLeftLine ? 1 : 0,
+                    Child = new Box { RelativeSizeAxes = Axes.Both }.WithInitialColour(lineColour)
                 },
-                new Box
+                new Container
                 {
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
                     RelativeSizeAxes = Axes.Y,
                     Width = rightLineWidth,
                     Scale = new Vector2(0.740f, 1),
-                    Colour = lineColour,
-                    Alpha = hasRightLine ? 1 : 0
+                    Alpha = hasRightLine ? 1 : 0,
+                    Child = new Box { RelativeSizeAxes = Axes.Both }.WithInitialColour(lineColour)
                 },
                 lightContainer = new Container
                 {
@@ -90,7 +86,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
                     {
                         Anchor = Anchor.BottomCentre,
                         Origin = Anchor.BottomCentre,
-                        Colour = lightColour,
+                        Colour = lightColour.ToLegacyColour(),
                         Texture = skin.GetTexture(lightImage),
                         RelativeSizeAxes = Axes.X,
                         Width = 1,
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
index d055ef3480..2177eaa5e6 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
                         Anchor = Anchor.CentreLeft,
                         RelativeSizeAxes = Axes.X,
                         Height = 1,
-                        Colour = lineColour,
+                        Colour = lineColour.ToLegacyColour(),
                         Alpha = showJudgementLine ? 0.9f : 0
                     }
                 }

From 16a2ab9dea4fd58e56eb00c017e61fce002b7ed2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 22 Aug 2020 00:20:33 +0900
Subject: [PATCH 05/15] Update osu with legacy colour setters

---
 osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs | 3 +--
 osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs      | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
index 0ab3e8825b..8a6beddb51 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
@@ -59,7 +59,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
                         hitCircleSprite = new Sprite
                         {
                             Texture = getTextureWithFallback(string.Empty),
-                            Colour = drawableObject.AccentColour.Value,
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                         },
@@ -107,7 +106,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
             base.LoadComplete();
 
             state.BindValueChanged(updateState, true);
-            accentColour.BindValueChanged(colour => hitCircleSprite.Colour = colour.NewValue, true);
+            accentColour.BindValueChanged(colour => hitCircleSprite.Colour = colour.NewValue.ToLegacyColour(), true);
             indexInCurrentCombo.BindValueChanged(index => hitCircleText.Text = (index.NewValue + 1).ToString(), true);
         }
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs
index 0f586034d5..3b75fcc8a0 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin, DrawableHitObject drawableObject)
         {
-            animationContent.Colour = skin.GetConfig<OsuSkinColour, Color4>(OsuSkinColour.SliderBall)?.Value ?? Color4.White;
+            var ballColour = skin.GetConfig<OsuSkinColour, Color4>(OsuSkinColour.SliderBall)?.Value ?? Color4.White;
 
             InternalChildren = new[]
             {
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     Texture = skin.GetTexture("sliderb-nd"),
                     Colour = new Color4(5, 5, 5, 255),
                 },
-                animationContent.With(d =>
+                animationContent.WithInitialColour(ballColour).With(d =>
                 {
                     d.Anchor = Anchor.Centre;
                     d.Origin = Anchor.Centre;

From 9fbc5f3aeb546fc27572a4c511793d6dd91088ea Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 22 Aug 2020 00:23:08 +0900
Subject: [PATCH 06/15] Update taiko with legacy colour setters

---
 osu.Game.Rulesets.Taiko/Skinning/LegacyCirclePiece.cs | 2 +-
 osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs    | 6 +++---
 osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs         | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyCirclePiece.cs
index bfcf268c3d..ed69b529ed 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyCirclePiece.cs
@@ -90,7 +90,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
         private void updateAccentColour()
         {
-            backgroundLayer.Colour = accentColour;
+            backgroundLayer.Colour = accentColour.ToLegacyColour();
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs
index 8223e3bc01..6bb8f9433e 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs
@@ -76,9 +76,9 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
         private void updateAccentColour()
         {
-            headCircle.AccentColour = accentColour;
-            body.Colour = accentColour;
-            end.Colour = accentColour;
+            headCircle.AccentColour = accentColour.ToLegacyColour();
+            body.Colour = accentColour.ToLegacyColour();
+            end.Colour = accentColour.ToLegacyColour();
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
index 656728f6e4..f36aae205a 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Game.Skinning;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Taiko.Skinning
@@ -18,9 +19,9 @@ namespace osu.Game.Rulesets.Taiko.Skinning
         [BackgroundDependencyLoader]
         private void load()
         {
-            AccentColour = component == TaikoSkinComponents.CentreHit
+            AccentColour = (component == TaikoSkinComponents.CentreHit
                 ? new Color4(235, 69, 44, 255)
-                : new Color4(67, 142, 172, 255);
+                : new Color4(67, 142, 172, 255)).ToLegacyColour();
         }
     }
 }

From f89b6f44653112a86cc5df93be0d6e11ad0ad8d3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 22 Aug 2020 00:52:53 +0900
Subject: [PATCH 07/15] Add xmldocs

---
 osu.Game/Skinning/LegacySkinExtensions.cs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index 088eae4bce..ee7d74d7ec 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -63,6 +63,11 @@ namespace osu.Game.Skinning
             }
         }
 
+        /// <summary>
+        /// The resultant colour after setting a post-constructor colour in osu!stable.
+        /// </summary>
+        /// <param name="colour">The <see cref="Color4"/> to convert.</param>
+        /// <returns>The converted <see cref="Color4"/>.</returns>
         public static Color4 ToLegacyColour(this Color4 colour)
         {
             if (colour.A == 0)
@@ -70,6 +75,16 @@ namespace osu.Game.Skinning
             return colour;
         }
 
+        /// <summary>
+        /// Equivalent of setting a colour in the constructor in osu!stable.
+        /// Doubles the alpha channel into <see cref="Drawable.Alpha"/> and uses <see cref="ToLegacyColour"/> to set <see cref="Drawable.Colour"/>.
+        /// </summary>
+        /// <remarks>
+        /// Beware: Any existing value in <see cref="Drawable.Alpha"/> is overwritten.
+        /// </remarks>
+        /// <param name="drawable">The <see cref="Drawable"/> to set the "InitialColour" of.</param>
+        /// <param name="colour">The <see cref="Color4"/> to set.</param>
+        /// <returns>The given <see cref="Drawable"/>.</returns>
         public static T WithInitialColour<T>(this T drawable, Color4 colour)
             where T : Drawable
         {

From 356c67f00d778e1f6d2535eb534a864d6b04caa4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 22 Aug 2020 00:55:03 +0900
Subject: [PATCH 08/15] Remove outdated/wrong test

---
 osu.Game.Tests/Resources/skin-zero-alpha-colour.ini |  5 -----
 osu.Game.Tests/Skins/LegacySkinDecoderTest.cs       | 10 ----------
 2 files changed, 15 deletions(-)
 delete mode 100644 osu.Game.Tests/Resources/skin-zero-alpha-colour.ini

diff --git a/osu.Game.Tests/Resources/skin-zero-alpha-colour.ini b/osu.Game.Tests/Resources/skin-zero-alpha-colour.ini
deleted file mode 100644
index 3c0dae6b13..0000000000
--- a/osu.Game.Tests/Resources/skin-zero-alpha-colour.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[General]
-Version: latest
-
-[Colours]
-Combo1: 255,255,255,0
\ No newline at end of file
diff --git a/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs b/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs
index c408d2f182..aedf26ee75 100644
--- a/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs
+++ b/osu.Game.Tests/Skins/LegacySkinDecoderTest.cs
@@ -108,15 +108,5 @@ namespace osu.Game.Tests.Skins
             using (var stream = new LineBufferedReader(resStream))
                 Assert.That(decoder.Decode(stream).LegacyVersion, Is.EqualTo(1.0m));
         }
-
-        [Test]
-        public void TestDecodeColourWithZeroAlpha()
-        {
-            var decoder = new LegacySkinDecoder();
-
-            using (var resStream = TestResources.OpenResource("skin-zero-alpha-colour.ini"))
-            using (var stream = new LineBufferedReader(resStream))
-                Assert.That(decoder.Decode(stream).ComboColours[0].A, Is.EqualTo(1.0f));
-        }
     }
 }

From 08078b9513895806f9df2a08922fc7c4bf826fd9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 22 Aug 2020 00:56:29 +0900
Subject: [PATCH 09/15] Rename method to remove "InitialColour" namings

---
 osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs | 6 +++---
 osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs         | 2 +-
 osu.Game/Skinning/LegacySkinExtensions.cs                  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
index b97547bbc6..54a16b840f 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
@@ -58,14 +58,14 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
             InternalChildren = new Drawable[]
             {
-                new Box { RelativeSizeAxes = Axes.Both }.WithInitialColour(backgroundColour),
+                new Box { RelativeSizeAxes = Axes.Both }.WithLegacyColour(backgroundColour),
                 new Container
                 {
                     RelativeSizeAxes = Axes.Y,
                     Width = leftLineWidth,
                     Scale = new Vector2(0.740f, 1),
                     Alpha = hasLeftLine ? 1 : 0,
-                    Child = new Box { RelativeSizeAxes = Axes.Both }.WithInitialColour(lineColour)
+                    Child = new Box { RelativeSizeAxes = Axes.Both }.WithLegacyColour(lineColour)
                 },
                 new Container
                 {
@@ -75,7 +75,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
                     Width = rightLineWidth,
                     Scale = new Vector2(0.740f, 1),
                     Alpha = hasRightLine ? 1 : 0,
-                    Child = new Box { RelativeSizeAxes = Axes.Both }.WithInitialColour(lineColour)
+                    Child = new Box { RelativeSizeAxes = Axes.Both }.WithLegacyColour(lineColour)
                 },
                 lightContainer = new Container
                 {
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs
index 3b75fcc8a0..27dec1b691 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     Texture = skin.GetTexture("sliderb-nd"),
                     Colour = new Color4(5, 5, 5, 255),
                 },
-                animationContent.WithInitialColour(ballColour).With(d =>
+                animationContent.WithLegacyColour(ballColour).With(d =>
                 {
                     d.Anchor = Anchor.Centre;
                     d.Origin = Anchor.Centre;
diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index ee7d74d7ec..7420f82f04 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -82,10 +82,10 @@ namespace osu.Game.Skinning
         /// <remarks>
         /// Beware: Any existing value in <see cref="Drawable.Alpha"/> is overwritten.
         /// </remarks>
-        /// <param name="drawable">The <see cref="Drawable"/> to set the "InitialColour" of.</param>
+        /// <param name="drawable">The <see cref="Drawable"/> to set the colour of.</param>
         /// <param name="colour">The <see cref="Color4"/> to set.</param>
         /// <returns>The given <see cref="Drawable"/>.</returns>
-        public static T WithInitialColour<T>(this T drawable, Color4 colour)
+        public static T WithLegacyColour<T>(this T drawable, Color4 colour)
             where T : Drawable
         {
             drawable.Alpha = colour.A;

From ab8d9be095e4925d67cb1c06be49a2e92f24195f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 25 Aug 2020 15:16:41 +0900
Subject: [PATCH 10/15] Move out into a separate method

---
 .../Skinning/CatchLegacySkinTransformer.cs    |  2 +-
 .../Skinning/LegacyFruitPiece.cs              |  2 +-
 .../Skinning/LegacyColumnBackground.cs        | 17 +++++--
 .../Skinning/LegacyHitTarget.cs               |  2 +-
 .../Skinning/LegacyMainCirclePiece.cs         |  2 +-
 .../Skinning/LegacySliderBall.cs              |  4 +-
 .../Skinning/LegacyCirclePiece.cs             |  2 +-
 .../Skinning/LegacyDrumRoll.cs                |  6 +--
 osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs |  7 +--
 .../Skinning/LegacyColourCompatibility.cs     | 46 +++++++++++++++++++
 osu.Game/Skinning/LegacySkinExtensions.cs     | 31 -------------
 11 files changed, 73 insertions(+), 48 deletions(-)
 create mode 100644 osu.Game/Skinning/LegacyColourCompatibility.cs

diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
index 5abd87d6f4..ea2f031d65 100644
--- a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.Catch.Skinning
                     if (result == null)
                         return null;
 
-                    result.Value = result.Value.ToLegacyColour();
+                    result.Value = LegacyColourCompatibility.DisallowZeroAlpha(result.Value);
                     return (IBindable<TValue>)result;
             }
 
diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
index c9dd1d1f3e..381d066750 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Rulesets.Catch.Skinning
         {
             base.LoadComplete();
 
-            accentColour.BindValueChanged(colour => colouredSprite.Colour = colour.NewValue.ToLegacyColour(), true);
+            accentColour.BindValueChanged(colour => colouredSprite.Colour = LegacyColourCompatibility.DisallowZeroAlpha(colour.NewValue), true);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
index 54a16b840f..da6075248a 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyColumnBackground.cs
@@ -58,14 +58,20 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
             InternalChildren = new Drawable[]
             {
-                new Box { RelativeSizeAxes = Axes.Both }.WithLegacyColour(backgroundColour),
+                LegacyColourCompatibility.ApplyWithDoubledAlpha(new Box
+                {
+                    RelativeSizeAxes = Axes.Both
+                }, backgroundColour),
                 new Container
                 {
                     RelativeSizeAxes = Axes.Y,
                     Width = leftLineWidth,
                     Scale = new Vector2(0.740f, 1),
                     Alpha = hasLeftLine ? 1 : 0,
-                    Child = new Box { RelativeSizeAxes = Axes.Both }.WithLegacyColour(lineColour)
+                    Child = LegacyColourCompatibility.ApplyWithDoubledAlpha(new Box
+                    {
+                        RelativeSizeAxes = Axes.Both
+                    }, lineColour)
                 },
                 new Container
                 {
@@ -75,7 +81,10 @@ namespace osu.Game.Rulesets.Mania.Skinning
                     Width = rightLineWidth,
                     Scale = new Vector2(0.740f, 1),
                     Alpha = hasRightLine ? 1 : 0,
-                    Child = new Box { RelativeSizeAxes = Axes.Both }.WithLegacyColour(lineColour)
+                    Child = LegacyColourCompatibility.ApplyWithDoubledAlpha(new Box
+                    {
+                        RelativeSizeAxes = Axes.Both
+                    }, lineColour)
                 },
                 lightContainer = new Container
                 {
@@ -86,7 +95,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
                     {
                         Anchor = Anchor.BottomCentre,
                         Origin = Anchor.BottomCentre,
-                        Colour = lightColour.ToLegacyColour(),
+                        Colour = LegacyColourCompatibility.DisallowZeroAlpha(lightColour),
                         Texture = skin.GetTexture(lightImage),
                         RelativeSizeAxes = Axes.X,
                         Width = 1,
diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
index 2177eaa5e6..48504e6548 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyHitTarget.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Mania.Skinning
                         Anchor = Anchor.CentreLeft,
                         RelativeSizeAxes = Axes.X,
                         Height = 1,
-                        Colour = lineColour.ToLegacyColour(),
+                        Colour = LegacyColourCompatibility.DisallowZeroAlpha(lineColour),
                         Alpha = showJudgementLine ? 0.9f : 0
                     }
                 }
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
index 8a6beddb51..d15a0a3203 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
@@ -106,7 +106,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
             base.LoadComplete();
 
             state.BindValueChanged(updateState, true);
-            accentColour.BindValueChanged(colour => hitCircleSprite.Colour = colour.NewValue.ToLegacyColour(), true);
+            accentColour.BindValueChanged(colour => hitCircleSprite.Colour = LegacyColourCompatibility.DisallowZeroAlpha(colour.NewValue), true);
             indexInCurrentCombo.BindValueChanged(index => hitCircleText.Text = (index.NewValue + 1).ToString(), true);
         }
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs b/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs
index 27dec1b691..25ab96445a 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacySliderBall.cs
@@ -39,11 +39,11 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     Texture = skin.GetTexture("sliderb-nd"),
                     Colour = new Color4(5, 5, 5, 255),
                 },
-                animationContent.WithLegacyColour(ballColour).With(d =>
+                LegacyColourCompatibility.ApplyWithDoubledAlpha(animationContent.With(d =>
                 {
                     d.Anchor = Anchor.Centre;
                     d.Origin = Anchor.Centre;
-                }),
+                }), ballColour),
                 layerSpec = new Sprite
                 {
                     Anchor = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyCirclePiece.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyCirclePiece.cs
index ed69b529ed..9b73ccd248 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyCirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyCirclePiece.cs
@@ -90,7 +90,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
         private void updateAccentColour()
         {
-            backgroundLayer.Colour = accentColour.ToLegacyColour();
+            backgroundLayer.Colour = LegacyColourCompatibility.DisallowZeroAlpha(accentColour);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs
index 6bb8f9433e..025eff53d5 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs
@@ -76,9 +76,9 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
         private void updateAccentColour()
         {
-            headCircle.AccentColour = accentColour.ToLegacyColour();
-            body.Colour = accentColour.ToLegacyColour();
-            end.Colour = accentColour.ToLegacyColour();
+            headCircle.AccentColour = LegacyColourCompatibility.DisallowZeroAlpha(accentColour);
+            body.Colour = LegacyColourCompatibility.DisallowZeroAlpha(accentColour);
+            end.Colour = LegacyColourCompatibility.DisallowZeroAlpha(accentColour);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
index f36aae205a..b11b64c22c 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
@@ -19,9 +19,10 @@ namespace osu.Game.Rulesets.Taiko.Skinning
         [BackgroundDependencyLoader]
         private void load()
         {
-            AccentColour = (component == TaikoSkinComponents.CentreHit
-                ? new Color4(235, 69, 44, 255)
-                : new Color4(67, 142, 172, 255)).ToLegacyColour();
+            AccentColour = LegacyColourCompatibility.DisallowZeroAlpha(
+                component == TaikoSkinComponents.CentreHit
+                    ? new Color4(235, 69, 44, 255)
+                    : new Color4(67, 142, 172, 255));
         }
     }
 }
diff --git a/osu.Game/Skinning/LegacyColourCompatibility.cs b/osu.Game/Skinning/LegacyColourCompatibility.cs
new file mode 100644
index 0000000000..b842b50426
--- /dev/null
+++ b/osu.Game/Skinning/LegacyColourCompatibility.cs
@@ -0,0 +1,46 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osuTK.Graphics;
+
+namespace osu.Game.Skinning
+{
+    /// <summary>
+    /// Compatibility methods to convert osu!stable colours to osu!lazer-compatible ones. Should be used for legacy skins only.
+    /// </summary>
+    public static class LegacyColourCompatibility
+    {
+        /// <summary>
+        /// Forces an alpha of 1 if a given <see cref="Color4"/> is fully transparent.
+        /// </summary>
+        /// <remarks>
+        /// This is equivalent to setting colour post-constructor in osu!stable.
+        /// </remarks>
+        /// <param name="colour">The <see cref="Color4"/> to disallow zero alpha on.</param>
+        /// <returns>The resultant <see cref="Color4"/>.</returns>
+        public static Color4 DisallowZeroAlpha(Color4 colour)
+        {
+            if (colour.A == 0)
+                colour.A = 1;
+            return colour;
+        }
+
+        /// <summary>
+        /// Applies a <see cref="Color4"/> to a <see cref="Drawable"/>, doubling the alpha value into the <see cref="Drawable.Alpha"/> property.
+        /// </summary>
+        /// <remarks>
+        /// This is equivalent to setting colour in the constructor in osu!stable.
+        /// </remarks>
+        /// <param name="drawable">The <see cref="Drawable"/> to apply the colour to.</param>
+        /// <param name="colour">The <see cref="Color4"/> to apply.</param>
+        /// <returns>The given <paramref name="drawable"/>.</returns>
+        public static T ApplyWithDoubledAlpha<T>(T drawable, Color4 colour)
+            where T : Drawable
+        {
+            drawable.Alpha = colour.A;
+            drawable.Colour = DisallowZeroAlpha(colour);
+            return drawable;
+        }
+    }
+}
diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index 7420f82f04..bb46dc8b9f 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osuTK.Graphics;
 using static osu.Game.Skinning.LegacySkinConfiguration;
 
 namespace osu.Game.Skinning
@@ -63,36 +62,6 @@ namespace osu.Game.Skinning
             }
         }
 
-        /// <summary>
-        /// The resultant colour after setting a post-constructor colour in osu!stable.
-        /// </summary>
-        /// <param name="colour">The <see cref="Color4"/> to convert.</param>
-        /// <returns>The converted <see cref="Color4"/>.</returns>
-        public static Color4 ToLegacyColour(this Color4 colour)
-        {
-            if (colour.A == 0)
-                colour.A = 1;
-            return colour;
-        }
-
-        /// <summary>
-        /// Equivalent of setting a colour in the constructor in osu!stable.
-        /// Doubles the alpha channel into <see cref="Drawable.Alpha"/> and uses <see cref="ToLegacyColour"/> to set <see cref="Drawable.Colour"/>.
-        /// </summary>
-        /// <remarks>
-        /// Beware: Any existing value in <see cref="Drawable.Alpha"/> is overwritten.
-        /// </remarks>
-        /// <param name="drawable">The <see cref="Drawable"/> to set the colour of.</param>
-        /// <param name="colour">The <see cref="Color4"/> to set.</param>
-        /// <returns>The given <see cref="Drawable"/>.</returns>
-        public static T WithLegacyColour<T>(this T drawable, Color4 colour)
-            where T : Drawable
-        {
-            drawable.Alpha = colour.A;
-            drawable.Colour = ToLegacyColour(colour);
-            return drawable;
-        }
-
         public class SkinnableTextureAnimation : TextureAnimation
         {
             [Resolved(canBeNull: true)]

From c09cef4fca2d5264d96958cc388534012aa7ede0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 25 Aug 2020 19:39:03 +0900
Subject: [PATCH 11/15] Apply post-merge fixes to LegacyStageBackground

---
 .../Skinning/LegacyStageBackground.cs         | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs b/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
index 19ec86b1ed..16a6123724 100644
--- a/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
+++ b/osu.Game.Rulesets.Mania/Skinning/LegacyStageBackground.cs
@@ -108,37 +108,38 @@ namespace osu.Game.Rulesets.Mania.Skinning
 
                 InternalChildren = new Drawable[]
                 {
-                    new Container
+                    LegacyColourCompatibility.ApplyWithDoubledAlpha(new Box
                     {
-                        RelativeSizeAxes = Axes.Both,
-                        Child = new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = backgroundColour
-                        },
-                    },
+                        RelativeSizeAxes = Axes.Both
+                    }, backgroundColour),
                     new HitTargetInsetContainer
                     {
                         RelativeSizeAxes = Axes.Both,
                         Children = new[]
                         {
-                            new Box
+                            new Container
                             {
                                 RelativeSizeAxes = Axes.Y,
                                 Width = leftLineWidth,
                                 Scale = new Vector2(0.740f, 1),
-                                Colour = lineColour,
-                                Alpha = hasLeftLine ? 1 : 0
+                                Alpha = hasLeftLine ? 1 : 0,
+                                Child = LegacyColourCompatibility.ApplyWithDoubledAlpha(new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both
+                                }, lineColour)
                             },
-                            new Box
+                            new Container
                             {
                                 Anchor = Anchor.TopRight,
                                 Origin = Anchor.TopRight,
                                 RelativeSizeAxes = Axes.Y,
                                 Width = rightLineWidth,
                                 Scale = new Vector2(0.740f, 1),
-                                Colour = lineColour,
-                                Alpha = hasRightLine ? 1 : 0
+                                Alpha = hasRightLine ? 1 : 0,
+                                Child = LegacyColourCompatibility.ApplyWithDoubledAlpha(new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both
+                                }, lineColour)
                             },
                         }
                     }

From 2cf2ba8fc5cb0e1648756774d99e81b1f045c70b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 26 Aug 2020 14:24:04 +0900
Subject: [PATCH 12/15] Store computed accent colour to local

---
 osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs
index 025eff53d5..5ab8e3a8c8 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyDrumRoll.cs
@@ -76,9 +76,11 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 
         private void updateAccentColour()
         {
-            headCircle.AccentColour = LegacyColourCompatibility.DisallowZeroAlpha(accentColour);
-            body.Colour = LegacyColourCompatibility.DisallowZeroAlpha(accentColour);
-            end.Colour = LegacyColourCompatibility.DisallowZeroAlpha(accentColour);
+            var colour = LegacyColourCompatibility.DisallowZeroAlpha(accentColour);
+
+            headCircle.AccentColour = colour;
+            body.Colour = colour;
+            end.Colour = colour;
         }
     }
 }

From d22768a98cba3c9d312ba2408536905371840668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 29 Aug 2020 23:20:59 +0200
Subject: [PATCH 13/15] Add scale specification to spinner scene for visibility

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
index 47b3926ceb..94d1cb8864 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinner.cs
@@ -9,6 +9,7 @@ using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
@@ -62,7 +63,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             drawableSpinner = new TestDrawableSpinner(spinner, auto)
             {
                 Anchor = Anchor.Centre,
-                Depth = depthIndex++
+                Depth = depthIndex++,
+                Scale = new Vector2(0.75f)
             };
 
             foreach (var mod in SelectedMods.Value.OfType<IApplicableToDrawableHitObjects>())

From c9723e541a464c84b8e3e5c27e94af4f0c3fd32d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 29 Aug 2020 23:21:19 +0200
Subject: [PATCH 14/15] Add metrics skin resources for old style spinner

---
 .../metrics-skin/spinner-background@2x.png      | Bin 0 -> 14515 bytes
 .../metrics-skin/spinner-circle@2x.png          | Bin 0 -> 6561 bytes
 .../Resources/metrics-skin/spinner-metre@2x.png | Bin 0 -> 14516 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/spinner-background@2x.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/spinner-circle@2x.png
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/spinner-metre@2x.png

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/spinner-background@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/spinner-background@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f50f638c5de06d711fc7d09a3a4ee13618cd59e
GIT binary patch
literal 14515
zcmeHNO)G>^6n=(b#_-liY7o6PHa3!?BrnZ0Grp3Pln{j-@{v*u+4u)Seu8Xl*pOm;
z6rvQ$EbPd_Mxi)&ym$V<Y%tHM>7L$?+uU=Wd(Lz2dzRbVf`+Hi1HcG}{2hQ>)Qk~#
zrVQ0L^+z&f4m1b-G6G-M4V|wtW{riqCxGlc^>bi#-6t1ali}8Y>(O1DpIcjAr!JWY
z`x`oEZlCY>4U~EhteVUD)7h#1p{D5F$;S4OL(M7D_0jU90B<tok600{A<d~(uc@^N
z^xJT%zZ@6SvK7FQrd79BYn&3aB|s2?y9W##5}+9`nJ6UXGeeRZkQxY0BsCy45E!tc
zAT<yeu!bZx07wl;4M+{d0)Lts#8zYhGq)=+2iKIg=29zCl1%k8H~kWG0!s_N#gFsn
zlHtn6hoFPGQ>@C|nG~>iHlwyCK|~OdfT^9pPhdQo`P&4{QZSASqk2k3_0NLiL%>(1
zdI7}$^nOZtpB`5+FPR$i_ml!#WwMmsqIiqWMJ&;OLvBKDLT;kAIlmi$EhYbp;`HoJ
zo9P1Wis-|8N#D2}cJ4(K)Z>z#XtK;n^k7z)_Dw!W^Jpj#6xtFXD6}aE3T+93g6YG?
s0<$YQg$)J9N5)6n0;Ja(3XG2_6dx^P)VSK|ID1mw4+q-(n~nX8-{y?j8UO$Q

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/spinner-circle@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/spinner-circle@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..daf28e09cbe6bbb7fc531b4773e4d381054e65cf
GIT binary patch
literal 6561
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
U!O2zVX9|qE*U6@05B=Bw0VYd*8vp<R

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/spinner-metre@2x.png b/osu.Game.Rulesets.Osu.Tests/Resources/metrics-skin/spinner-metre@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ef1068420cf8abb9b12781061801321e3ea298c
GIT binary patch
literal 14516
zcmeHNPbh<N7=AXNZEVXVg-l=6&Mv0qVAEt@B1y@~zZAC>n&Wa)oHgy>;=0`AK-hts
z0}&;PqoOHpc;DH#+pbEUxAuGAw(tA4-aXIrzP~?fBf|s!+Ll@Xek&0l1w0Z~&wE_r
zy03dr#kpn%2jb#^ugln2L3~XzF|i1E8}#MCR<=prbT3&${q84Eu+bY?Zgal?CaidD
zY~}X(_P8FVFTZ>8*|QmWwK|?MZ<!m1+*4?k0fE$zI<+r(<c~$ub_AzkhXK=$($M>h
zX6R2Yni(wxfWv8ro`4<kkzg(bZl(<gf(RgcK-r*PiX^a5fEAJzQkcLB3AP4o4TK47
z4cHp6HINLjHIN)|A%d*|*cu2ExN6YWlS(?_%SYFv@00s?kL?=|AJY})kXHt9v~X^q
zc~+JsAHsDisA_Dq$tHmT*~CU$V8A_#3i>JX`D4^e>ZKrodP%($7*H?&f?n3|1m}RJ
zE<Fn%e;RjLxRfF=;8F@Ff0dR}rt~;aHXM=>+s9Sv)L8Xd^#um3`mCYcj!;4TjT)N1
z&jru)%Y22s!_)CrId$nPpSSEZ^%J$DbkXThRX%yi3+<#ZJp@Gw3*?MV3MvJKw1frf
pBlVH`Sj+&aKq`<5q=IJP-%q8CgOLB?u=&}m*|7SD<GH@6)o)L?*O~wT

literal 0
HcmV?d00001


From 3ab32a5d35ab4768f4ddb71e862de6b9d9b7f182 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 29 Aug 2020 23:29:29 +0200
Subject: [PATCH 15/15] Change structure of old style spinner to be closer to
 stable

---
 .../Skinning/LegacyOldStyleSpinner.cs         | 85 +++++++++++--------
 1 file changed, 51 insertions(+), 34 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
index 81a0df5ea5..e157842fd1 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyOldStyleSpinner.cs
@@ -22,11 +22,11 @@ namespace osu.Game.Rulesets.Osu.Skinning
     {
         private DrawableSpinner drawableSpinner;
         private Sprite disc;
+        private Sprite metreSprite;
         private Container metre;
 
-        private const float background_y_offset = 20;
-
         private const float sprite_scale = 1 / 1.6f;
+        private const float final_metre_height = 692 * sprite_scale;
 
         [BackgroundDependencyLoader]
         private void load(ISkinSource source, DrawableHitObject drawableObject)
@@ -35,50 +35,58 @@ namespace osu.Game.Rulesets.Osu.Skinning
 
             RelativeSizeAxes = Axes.Both;
 
-            InternalChildren = new Drawable[]
+            InternalChild = new Container
             {
-                new Sprite
+                // the old-style spinner relied heavily on absolute screen-space coordinate values.
+                // wrap everything in a container simulating absolute coords to preserve alignment
+                // as there are skins that depend on it.
+                Width = 640,
+                Height = 480,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Children = new Drawable[]
                 {
-                    Anchor = Anchor.BottomCentre,
-                    Origin = Anchor.BottomCentre,
-                    Texture = source.GetTexture("spinner-background"),
-                    Y = background_y_offset,
-                    Scale = new Vector2(sprite_scale)
-                },
-                disc = new Sprite
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Texture = source.GetTexture("spinner-circle"),
-                    Scale = new Vector2(sprite_scale)
-                },
-                metre = new Container
-                {
-                    Anchor = Anchor.BottomCentre,
-                    Origin = Anchor.BottomCentre,
-                    Y = background_y_offset,
-                    Masking = true,
-                    Child = new Sprite
+                    new Sprite
                     {
-                        Texture = source.GetTexture("spinner-metre"),
-                        Anchor = Anchor.BottomCentre,
-                        Origin = Anchor.BottomCentre,
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Texture = source.GetTexture("spinner-background"),
+                        Scale = new Vector2(sprite_scale)
                     },
-                    Scale = new Vector2(0.625f)
+                    disc = new Sprite
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Texture = source.GetTexture("spinner-circle"),
+                        Scale = new Vector2(sprite_scale)
+                    },
+                    metre = new Container
+                    {
+                        AutoSizeAxes = Axes.Both,
+                        // this anchor makes no sense, but that's what stable uses.
+                        Anchor = Anchor.TopLeft,
+                        Origin = Anchor.TopLeft,
+                        // adjustment for stable (metre has additional offset)
+                        Margin = new MarginPadding { Top = 20 },
+                        Masking = true,
+                        Child = metreSprite = new Sprite
+                        {
+                            Texture = source.GetTexture("spinner-metre"),
+                            Anchor = Anchor.TopLeft,
+                            Origin = Anchor.TopLeft,
+                            Scale = new Vector2(0.625f)
+                        }
+                    }
                 }
             };
         }
 
-        private Vector2 metreFinalSize;
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
             this.FadeOut();
             drawableSpinner.State.BindValueChanged(updateStateTransforms, true);
-
-            metreFinalSize = metre.Size = metre.Child.Size;
         }
 
         private void updateStateTransforms(ValueChangedEvent<ArmedState> state)
@@ -93,7 +101,16 @@ namespace osu.Game.Rulesets.Osu.Skinning
         {
             base.Update();
             disc.Rotation = drawableSpinner.RotationTracker.Rotation;
-            metre.Height = getMetreHeight(drawableSpinner.Progress);
+
+            // careful: need to call this exactly once for all calculations in a frame
+            // as the function has a random factor in it
+            var metreHeight = getMetreHeight(drawableSpinner.Progress);
+
+            // hack to make the metre blink up from below than down from above.
+            // move down the container to be able to apply masking for the metre,
+            // and then move the sprite back up the same amount to keep its position absolute.
+            metre.Y = final_metre_height - metreHeight;
+            metreSprite.Y = -metre.Y;
         }
 
         private const int total_bars = 10;
@@ -108,7 +125,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
             if (RNG.NextBool(((int)progress % 10) / 10f))
                 barCount++;
 
-            return (float)barCount / total_bars * metreFinalSize.Y;
+            return (float)barCount / total_bars * final_metre_height;
         }
     }
 }