From 2600518b1bfdfc39809dc5221a7b2e783e7fd0bb Mon Sep 17 00:00:00 2001
From: Tim Oliver <me@timoliver.com.au>
Date: Wed, 22 Apr 2020 22:50:00 +0800
Subject: [PATCH] Moved drumroll container and removed rewound notes

---
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs | 31 ++++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index e947795fe5..70839ce806 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -119,7 +119,14 @@ namespace osu.Game.Rulesets.Taiko.UI
                             RelativeSizeAxes = Axes.Both,
                             Padding = new MarginPadding { Left = HIT_TARGET_OFFSET },
                             Masking = true,
-                            Child = HitObjectContainer
+                            Children = new Drawable[]
+                            {
+                                HitObjectContainer,
+                                drumRollHitContainer = new ScrollingHitObjectContainer
+                                {
+                                    Name = "Drumroll hit"
+                                }
+                            }
                         },
                         kiaiExplosionContainer = new Container<KiaiHitExplosion>
                         {
@@ -135,14 +142,6 @@ namespace osu.Game.Rulesets.Taiko.UI
                             RelativeSizeAxes = Axes.Y,
                             Margin = new MarginPadding { Left = HIT_TARGET_OFFSET },
                             Blending = BlendingParameters.Additive
-                        },
-                        drumRollHitContainer = new ScrollingHitObjectContainer
-                        {
-                            Name = "Drumroll hit",
-                            RelativeSizeAxes = Axes.Both,
-                            FillMode = FillMode.Stretch,
-                            Margin = new MarginPadding { Left = HIT_TARGET_OFFSET },
-                            Width = 1.0f
                         }
                     }
                 },
@@ -282,6 +281,20 @@ namespace osu.Game.Rulesets.Taiko.UI
             }
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            if (Time.Elapsed < 0)
+            {
+                foreach (DrawableHit taikoHit in drumRollHitContainer.Objects)
+                {
+                    taikoHit.RemoveProxiedContent();
+                    drumRollHitContainer.Remove(taikoHit);
+                }
+            }
+        }
+
         private class ProxyContainer : LifetimeManagementContainer
         {
             public new MarginPadding Padding