Merge pull request #13455 from bdach/new-style-fill-animation

Add support for animated colour fill in new style legacy health bar

osu.Game/Skinning/LegacyHealthDisplay.cs

@@ -148,9 +148,9 @@ namespace osu.Game.Skinning
             }
         }
 
-        internal class LegacyOldStyleFill : LegacyHealthPiece
+        internal abstract class LegacyFill : LegacyHealthPiece
         {
-            public LegacyOldStyleFill(ISkin skin)
+            protected LegacyFill(ISkin skin)
             {
                 // required for sizing correctly..
                 var firstFrame = getTexture(skin, "colour-0");
@@ -162,27 +162,29 @@ namespace osu.Game.Skinning
                 }
                 else
                 {
-                    InternalChild = skin.GetAnimation("scorebar-colour", true, true, startAtCurrentTime: false, applyConfigFrameRate: true) ?? Drawable.Empty();
+                    InternalChild = skin.GetAnimation("scorebar-colour", true, true, startAtCurrentTime: false, applyConfigFrameRate: true) ?? Empty();
                     Size = new Vector2(firstFrame.DisplayWidth, firstFrame.DisplayHeight);
                 }
 
-                Position = new Vector2(3, 10) * 1.6f;
                 Masking = true;
             }
         }
 
-        internal class LegacyNewStyleFill : LegacyHealthPiece
+        internal class LegacyOldStyleFill : LegacyFill
+        {
+            public LegacyOldStyleFill(ISkin skin)
+                : base(skin)
+            {
+                Position = new Vector2(3, 10) * 1.6f;
+            }
+        }
+
+        internal class LegacyNewStyleFill : LegacyFill
         {
             public LegacyNewStyleFill(ISkin skin)
+                : base(skin)
             {
-                InternalChild = new Sprite
-                {
-                    Texture = getTexture(skin, "colour"),
-                };
-
-                Size = InternalChild.Size;
                 Position = new Vector2(7.5f, 7.8f) * 1.6f;
-                Masking = true;
             }
 
             protected override void Update()