From 4032d669596a2031eca223c37bc2cddb9a102725 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Apr 2020 13:17:46 +0900
Subject: [PATCH] Apply same legacy scale adjust logic to TaikoLegacyHitTarget

---
 .../Skinning/TaikoLegacyHitTarget.cs          | 52 ++++++++++++-------
 1 file changed, 34 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyHitTarget.cs b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyHitTarget.cs
index b80f273d24..7c1e65f569 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyHitTarget.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/TaikoLegacyHitTarget.cs
@@ -5,6 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Rulesets.Taiko.UI;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -12,32 +13,47 @@ namespace osu.Game.Rulesets.Taiko.Skinning
 {
     public class TaikoLegacyHitTarget : CompositeDrawable
     {
+        private Container content;
+
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin)
         {
             RelativeSizeAxes = Axes.Both;
 
-            InternalChildren = new Drawable[]
+            InternalChild = content = new Container
             {
-                new Sprite
+                RelativeSizeAxes = Axes.Both,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Children = new Drawable[]
                 {
-                    Texture = skin.GetTexture("approachcircle"),
-                    RelativeSizeAxes = Axes.Both,
-                    Size = new Vector2(0.73f) * 0.625f,
-                    Alpha = 0.7f,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                },
-                new Sprite
-                {
-                    Texture = skin.GetTexture("taikobigcircle"),
-                    RelativeSizeAxes = Axes.Both,
-                    Size = new Vector2(0.7f) * 0.625f,
-                    Alpha = 0.5f,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                },
+                    new Sprite
+                    {
+                        Texture = skin.GetTexture("approachcircle"),
+                        Scale = new Vector2(0.73f),
+                        Alpha = 0.7f,
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    },
+                    new Sprite
+                    {
+                        Texture = skin.GetTexture("taikobigcircle"),
+                        Scale = new Vector2(0.7f),
+                        Alpha = 0.5f,
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    },
+                }
             };
         }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            // Relying on RelativeSizeAxes.Both + FillMode.Fit doesn't work due to the precise pixel layout requirements.
+            // This is a bit ugly but makes the non-legacy implementations a lot cleaner to implement.
+            content.Scale = new Vector2(DrawHeight / TaikoPlayfield.DEFAULT_HEIGHT);
+        }
     }
 }