From 96bf86099c89444e5328adaa3c169a60d47854c6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 11 Apr 2020 14:43:57 +0900
Subject: [PATCH] Fix scaling of strong hits

---
 .../TestSceneDrawableHit.cs                      | 16 +++++++++++++++-
 osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs    | 16 +++++++++++++++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrawableHit.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrawableHit.cs
index f2198031db..301295253d 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneDrawableHit.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneDrawableHit.cs
@@ -34,17 +34,31 @@ namespace osu.Game.Rulesets.Taiko.Tests
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
             }));
+
+            AddStep("Centre hit (strong)", () => SetContents(() => new DrawableCentreHit(createHitAtCurrentTime(true))
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            }));
+
             AddStep("Rim hit", () => SetContents(() => new DrawableRimHit(createHitAtCurrentTime())
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
             }));
+
+            AddStep("Rim hit (strong)", () => SetContents(() => new DrawableRimHit(createHitAtCurrentTime(true))
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            }));
         }
 
-        private Hit createHitAtCurrentTime()
+        private Hit createHitAtCurrentTime(bool strong = false)
         {
             var hit = new Hit
             {
+                IsStrong = strong,
                 StartTime = Time.Current + 3000,
             };
 
diff --git a/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs b/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
index bb76eac865..af10944ee9 100644
--- a/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
+++ b/osu.Game.Rulesets.Taiko/Skinning/LegacyHit.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Skinning;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Taiko.Skinning
@@ -20,12 +21,14 @@ namespace osu.Game.Rulesets.Taiko.Skinning
         public LegacyHit(TaikoSkinComponents component)
         {
             this.component = component;
+
+            RelativeSizeAxes = Axes.Both;
         }
 
         [BackgroundDependencyLoader]
         private void load(ISkinSource skin)
         {
-            InternalChildren = new Drawable[]
+            InternalChildren = new[]
             {
                 backgroundLayer = skin.GetAnimation("taikohitcircle", true, false),
                 skin.GetAnimation("taikohitcircleoverlay", true, false),
@@ -36,6 +39,7 @@ namespace osu.Game.Rulesets.Taiko.Skinning
             foreach (var c in InternalChildren)
             {
                 (c as IFramedAnimation)?.Stop();
+
                 c.Anchor = Anchor.Centre;
                 c.Origin = Anchor.Centre;
             }
@@ -45,6 +49,16 @@ namespace osu.Game.Rulesets.Taiko.Skinning
                 : new Color4(67, 142, 172, 255);
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            // not all skins (including the default osu-stable) have similar sizes for hitcircle and hitcircleoverlay.
+            // this ensures they are scaled relative to each other but also match the expected DrawableHit size.
+            foreach (var c in InternalChildren)
+                c.Scale = new Vector2(DrawWidth / 128);
+        }
+
         private Color4 accentColour;
 
         public Color4 AccentColour