Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api

osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs

@@ -93,7 +93,7 @@ namespace osu.Game.Rulesets.Catch.Objects
             Scale = 1.0f - 0.7f * (difficulty.CircleSize - 5) / 5;
         }
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 
     public enum FruitVisualRepresentation

osu.Game.Rulesets.Mania/Objects/HoldNote.cs

@@ -101,6 +101,6 @@ namespace osu.Game.Rulesets.Mania.Objects
 
         public override Judgement CreateJudgement() => new HoldNoteJudgement();
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }

osu.Game.Rulesets.Mania/Objects/HoldNoteTick.cs

@@ -14,6 +14,6 @@ namespace osu.Game.Rulesets.Mania.Objects
     {
         public override Judgement CreateJudgement() => new HoldNoteTickJudgement();
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }

osu.Game.Rulesets.Osu/Objects/RepeatPoint.cs

@@ -30,6 +30,6 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public override Judgement CreateJudgement() => new OsuJudgement();
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }

osu.Game.Rulesets.Osu/Objects/Slider.cs

@@ -205,6 +205,6 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public override Judgement CreateJudgement() => new OsuJudgement();
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }

osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs

@@ -25,6 +25,6 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public override Judgement CreateJudgement() => new OsuSliderTailJudgement();
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }

osu.Game.Rulesets.Osu/Objects/SliderTick.cs

@@ -32,6 +32,6 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public override Judgement CreateJudgement() => new OsuJudgement();
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }

osu.Game.Rulesets.Osu/Objects/Spinner.cs

@@ -33,6 +33,6 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public override Judgement CreateJudgement() => new OsuJudgement();
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }

osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs

@@ -88,6 +88,6 @@ namespace osu.Game.Rulesets.Taiko.Objects
 
         public override Judgement CreateJudgement() => new TaikoDrumRollJudgement();
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }

osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs

@@ -27,6 +27,6 @@ namespace osu.Game.Rulesets.Taiko.Objects
 
         public override Judgement CreateJudgement() => new TaikoDrumRollTickJudgement();
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }

osu.Game.Rulesets.Taiko/Objects/StrongHitObject.cs

@@ -11,6 +11,6 @@ namespace osu.Game.Rulesets.Taiko.Objects
     {
         public override Judgement CreateJudgement() => new TaikoStrongJudgement();
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }

osu.Game.Rulesets.Taiko/Objects/Swell.cs

@@ -35,6 +35,6 @@ namespace osu.Game.Rulesets.Taiko.Objects
 
         public override Judgement CreateJudgement() => new TaikoSwellJudgement();
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }

osu.Game.Rulesets.Taiko/Objects/SwellTick.cs

@@ -11,6 +11,6 @@ namespace osu.Game.Rulesets.Taiko.Objects
     {
         public override Judgement CreateJudgement() => new TaikoSwellTickJudgement();
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }

osu.Game.Tests/Visual/Editor/TestSceneComposeScreen.cs

@@ -1,8 +1,6 @@
 // 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 System;
-using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Game.Rulesets.Osu;
@@ -11,10 +9,8 @@ using osu.Game.Screens.Edit.Compose;
 namespace osu.Game.Tests.Visual.Editor
 {
     [TestFixture]
-    public class TestSceneEditorCompose : EditorClockTestScene
+    public class TestSceneComposeScreen : EditorClockTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(ComposeScreen) };
-
         [BackgroundDependencyLoader]
         private void load()
         {

osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs

@@ -173,7 +173,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 {
                     UpdateInitialTransforms();
 
-                    var judgementOffset = Math.Min(HitObject.HitWindows?.WindowFor(HitResult.Miss) ?? double.MaxValue, Result?.TimeOffset ?? 0);
+                    var judgementOffset = Result?.TimeOffset ?? 0;
 
                     using (BeginDelayedSequence(InitialLifetimeOffset + judgementOffset, true))
                     {
@@ -379,7 +379,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
             // Ensure that the judgement is given a valid time offset, because this may not get set by the caller
             var endTime = (HitObject as IHasEndTime)?.EndTime ?? HitObject.StartTime;
-            Result.TimeOffset = Time.Current - endTime;
+
+            Result.TimeOffset = Math.Min(HitObject.HitWindows.WindowFor(HitResult.Miss), Time.Current - endTime);
 
             switch (Result.Type)
             {

osu.Game/Rulesets/Objects/HitObject.cs

@@ -66,7 +66,6 @@ namespace osu.Game.Rulesets.Objects
         /// <summary>
         /// The hit windows for this <see cref="HitObject"/>.
         /// </summary>
-        [CanBeNull]
         public HitWindows HitWindows { get; set; }
 
         private readonly List<HitObject> nestedHitObjects = new List<HitObject>();
@@ -113,11 +112,8 @@ namespace osu.Game.Rulesets.Objects
             nestedHitObjects.Sort((h1, h2) => h1.StartTime.CompareTo(h2.StartTime));
 
             foreach (var h in nestedHitObjects)
-            {
-                h.HitWindows = HitWindows;
                 h.ApplyDefaults(controlPointInfo, difficulty);
         }
-        }
 
         protected virtual void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
         {
@@ -147,7 +143,7 @@ namespace osu.Game.Rulesets.Objects
         /// This will only be invoked if <see cref="HitWindows"/> hasn't been set externally (e.g. from a <see cref="BeatmapConverter{T}"/>.
         /// </para>
         /// </summary>
-        [CanBeNull]
+        [NotNull]
         protected virtual HitWindows CreateHitWindows() => new HitWindows();
     }
 }

osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHit.cs

@@ -13,6 +13,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
     {
         public float X { get; set; }
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }

osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHold.cs

@@ -14,6 +14,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
 
         public double Duration => EndTime - StartTime;
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }

osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSlider.cs

@@ -13,6 +13,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
     {
         public float X { get; set; }
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }

osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs

@@ -17,6 +17,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
 
         public float X { get; set; }
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }

osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHit.cs

@@ -22,6 +22,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
 
         public int ComboOffset { get; set; }
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }

osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSlider.cs

@@ -22,6 +22,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
 
         public int ComboOffset { get; set; }
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }

osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs

@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
 
         public float Y => Position.Y;
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
 
         public bool NewCombo { get; set; }
 

osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHit.cs

@@ -10,6 +10,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko
     /// </summary>
     internal sealed class ConvertHit : HitObject
     {
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }

osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSlider.cs

@@ -10,6 +10,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko
     /// </summary>
     internal sealed class ConvertSlider : Legacy.ConvertSlider
     {
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }

osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs

@@ -15,6 +15,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko
 
         public double Duration => EndTime - StartTime;
 
-        protected override HitWindows CreateHitWindows() => null;
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }

osu.Game/Rulesets/Scoring/HitWindows.cs

@@ -3,6 +3,8 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Objects;
 
@@ -30,6 +32,18 @@ namespace osu.Game.Rulesets.Scoring
         private double meh;
         private double miss;
 
+        /// <summary>
+        /// An empty <see cref="HitWindows"/> with only <see cref="HitResult.Miss"/> and <see cref="HitResult.Perfect"/>.
+        /// No time values are provided (meaning instantaneous hit or miss).
+        /// </summary>
+        public static HitWindows Empty => new EmptyHitWindows();
+
+        public HitWindows()
+        {
+            Debug.Assert(GetRanges().Any(r => r.Result == HitResult.Miss), $"{nameof(GetRanges)} should always contain {nameof(HitResult.Miss)}");
+            Debug.Assert(GetRanges().Any(r => r.Result != HitResult.Miss), $"{nameof(GetRanges)} should always contain at least one result type other than {nameof(HitResult.Miss)}.");
+        }
+
         /// <summary>
         /// Retrieves the <see cref="HitResult"/> with the largest hit window that produces a successful hit.
         /// </summary>
@@ -168,6 +182,29 @@ namespace osu.Game.Rulesets.Scoring
         /// Defaults are provided but can be overridden to customise for a ruleset.
         /// </summary>
         protected virtual DifficultyRange[] GetRanges() => base_ranges;
+
+        public class EmptyHitWindows : HitWindows
+        {
+            private static readonly DifficultyRange[] ranges =
+            {
+                new DifficultyRange(HitResult.Perfect, 0, 0, 0),
+                new DifficultyRange(HitResult.Miss, 0, 0, 0),
+            };
+
+            public override bool IsHitResultAllowed(HitResult result)
+            {
+                switch (result)
+                {
+                    case HitResult.Perfect:
+                    case HitResult.Miss:
+                        return true;
+                }
+
+                return false;
+            }
+
+            protected override DifficultyRange[] GetRanges() => ranges;
+        }
     }
 
     public struct DifficultyRange

osu.Game/Rulesets/UI/DrawableRuleset.cs

@@ -426,11 +426,11 @@ namespace osu.Game.Rulesets.UI
             {
                 foreach (var h in Objects)
                 {
-                    if (h.HitWindows != null)
+                    if (h.HitWindows.WindowFor(HitResult.Miss) > 0)
                         return h.HitWindows;
 
                     foreach (var n in h.NestedHitObjects)
-                        if (n.HitWindows != null)
+                        if (h.HitWindows.WindowFor(HitResult.Miss) > 0)
                             return n.HitWindows;
                 }
 

osu.Game/Screens/Edit/Compose/ComposeScreen.cs

@@ -1,112 +1,19 @@
 // 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 JetBrains.Annotations;
-using osu.Framework.Allocation;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Logging;
-using osu.Game.Screens.Edit.Compose.Components;
-using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osu.Game.Skinning;
-using osuTK.Graphics;
 
 namespace osu.Game.Screens.Edit.Compose
 {
-    public class ComposeScreen : EditorScreen
+    public class ComposeScreen : EditorScreenWithTimeline
     {
-        private const float vertical_margins = 10;
+        protected override Drawable CreateMainContent()
-        private const float horizontal_margins = 20;
-
-        private readonly BindableBeatDivisor beatDivisor = new BindableBeatDivisor();
-
-        [BackgroundDependencyLoader(true)]
-        private void load([CanBeNull] BindableBeatDivisor beatDivisor)
         {
-            if (beatDivisor != null)
-                this.beatDivisor.BindTo(beatDivisor);
-
-            Container composerContainer;
-
-            Children = new Drawable[]
-            {
-                new GridContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Content = new[]
-                    {
-                        new Drawable[]
-                        {
-                            new Container
-                            {
-                                Name = "Timeline",
-                                RelativeSizeAxes = Axes.Both,
-                                Children = new Drawable[]
-                                {
-                                    new Box
-                                    {
-                                        RelativeSizeAxes = Axes.Both,
-                                        Colour = Color4.Black.Opacity(0.5f)
-                                    },
-                                    new Container
-                                    {
-                                        Name = "Timeline content",
-                                        RelativeSizeAxes = Axes.Both,
-                                        Padding = new MarginPadding { Horizontal = horizontal_margins, Vertical = vertical_margins },
-                                        Child = new GridContainer
-                                        {
-                                            RelativeSizeAxes = Axes.Both,
-                                            Content = new[]
-                                            {
-                                                new Drawable[]
-                                                {
-                                                    new Container
-                                                    {
-                                                        RelativeSizeAxes = Axes.Both,
-                                                        Padding = new MarginPadding { Right = 5 },
-                                                        Child = new TimelineArea { RelativeSizeAxes = Axes.Both }
-                                                    },
-                                                    new BeatDivisorControl(beatDivisor) { RelativeSizeAxes = Axes.Both }
-                                                },
-                                            },
-                                            ColumnDimensions = new[]
-                                            {
-                                                new Dimension(),
-                                                new Dimension(GridSizeMode.Absolute, 90),
-                                            }
-                                        },
-                                    }
-                                }
-                            }
-                        },
-                        new Drawable[]
-                        {
-                            composerContainer = new Container
-                            {
-                                Name = "Composer content",
-                                RelativeSizeAxes = Axes.Both,
-                                Padding = new MarginPadding { Horizontal = horizontal_margins, Vertical = vertical_margins },
-                            }
-                        }
-                    },
-                    RowDimensions = new[] { new Dimension(GridSizeMode.Absolute, 110) }
-                },
-            };
-
             var ruleset = Beatmap.Value.BeatmapInfo.Ruleset?.CreateInstance();
 
-            if (ruleset == null)
+            var composer = ruleset?.CreateHitObjectComposer();
-            {
-                Logger.Log("Beatmap doesn't have a ruleset assigned.");
-                // ExitRequested?.Invoke();
-                return;
-            }
-
-            var composer = ruleset.CreateHitObjectComposer();
-
-            Drawable content;
 
             if (composer != null)
             {
@@ -118,18 +25,10 @@ namespace osu.Game.Screens.Edit.Compose
 
                 // load the skinning hierarchy first.
                 // this is intentionally done in two stages to ensure things are in a loaded state before exposing the ruleset to skin sources.
-                content = beatmapSkinProvider.WithChild(rulesetSkinProvider.WithChild(ruleset.CreateHitObjectComposer()));
+                return beatmapSkinProvider.WithChild(rulesetSkinProvider.WithChild(ruleset.CreateHitObjectComposer()));
-            }
-            else
-            {
-                content = new ScreenWhiteBox.UnderConstructionMessage($"{ruleset.Description}'s composer");
             }
 
-            LoadComponentAsync(content, _ =>
+            return new ScreenWhiteBox.UnderConstructionMessage(ruleset == null ? "This beatmap" : $"{ruleset.Description}'s composer");
-            {
-                composerContainer.Add(content);
-                content.FadeInFromZero(300, Easing.OutQuint);
-            });
         }
     }
 }

osu.Game/Screens/Edit/Editor.cs

@@ -19,13 +19,13 @@ using osu.Framework.Timing;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Edit.Components;
 using osu.Game.Screens.Edit.Components.Menus;
-using osu.Game.Screens.Edit.Compose;
 using osu.Game.Screens.Edit.Design;
 using osuTK.Input;
 using System.Collections.Generic;
 using osu.Framework;
 using osu.Framework.Input.Bindings;
 using osu.Game.Input.Bindings;
+using osu.Game.Screens.Edit.Compose;
 using osu.Game.Screens.Edit.Setup;
 using osu.Game.Screens.Edit.Timing;
 using osu.Game.Users;
@@ -275,10 +275,6 @@ namespace osu.Game.Screens.Edit
                 case EditorScreenMode.Timing:
                     currentScreen = new TimingScreen();
                     break;
-
-                default:
-                    currentScreen = new EditorScreen();
-                    break;
             }
 
             LoadComponentAsync(currentScreen, screenContainer.Add);

osu.Game/Screens/Edit/EditorScreen.cs

@@ -10,16 +10,17 @@ using osu.Game.Beatmaps;
 namespace osu.Game.Screens.Edit
 {
     /// <summary>
-    /// TODO: eventually make this inherit Screen and add a local scren stack inside the Editor.
+    /// TODO: eventually make this inherit Screen and add a local screen stack inside the Editor.
     /// </summary>
-    public class EditorScreen : Container
+    public abstract class EditorScreen : Container
     {
-        protected readonly IBindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
+        [Resolved]
+        protected IBindable<WorkingBeatmap> Beatmap { get; private set; }
 
         protected override Container<Drawable> Content => content;
         private readonly Container content;
 
-        public EditorScreen()
+        protected EditorScreen()
         {
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
@@ -28,12 +29,6 @@ namespace osu.Game.Screens.Edit
             InternalChild = content = new Container { RelativeSizeAxes = Axes.Both };
         }
 
-        [BackgroundDependencyLoader]
-        private void load(IBindable<WorkingBeatmap> beatmap)
-        {
-            Beatmap.BindTo(beatmap);
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();

osu.Game/Screens/Edit/EditorScreenWithTimeline.cs

@@ -0,0 +1,107 @@
+// 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 JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Screens.Edit.Compose.Components;
+using osu.Game.Screens.Edit.Compose.Components.Timeline;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Edit
+{
+    public abstract class EditorScreenWithTimeline : EditorScreen
+    {
+        private const float vertical_margins = 10;
+        private const float horizontal_margins = 20;
+
+        private readonly BindableBeatDivisor beatDivisor = new BindableBeatDivisor();
+
+        [BackgroundDependencyLoader(true)]
+        private void load([CanBeNull] BindableBeatDivisor beatDivisor)
+        {
+            if (beatDivisor != null)
+                this.beatDivisor.BindTo(beatDivisor);
+
+            Container mainContent;
+
+            Children = new Drawable[]
+            {
+                new GridContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Content = new[]
+                    {
+                        new Drawable[]
+                        {
+                            new Container
+                            {
+                                Name = "Timeline",
+                                RelativeSizeAxes = Axes.Both,
+                                Children = new Drawable[]
+                                {
+                                    new Box
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                        Colour = Color4.Black.Opacity(0.5f)
+                                    },
+                                    new Container
+                                    {
+                                        Name = "Timeline content",
+                                        RelativeSizeAxes = Axes.Both,
+                                        Padding = new MarginPadding { Horizontal = horizontal_margins, Vertical = vertical_margins },
+                                        Child = new GridContainer
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Content = new[]
+                                            {
+                                                new Drawable[]
+                                                {
+                                                    new Container
+                                                    {
+                                                        RelativeSizeAxes = Axes.Both,
+                                                        Padding = new MarginPadding { Right = 5 },
+                                                        Child = CreateTimeline()
+                                                    },
+                                                    new BeatDivisorControl(beatDivisor) { RelativeSizeAxes = Axes.Both }
+                                                },
+                                            },
+                                            ColumnDimensions = new[]
+                                            {
+                                                new Dimension(),
+                                                new Dimension(GridSizeMode.Absolute, 90),
+                                            }
+                                        },
+                                    }
+                                }
+                            }
+                        },
+                        new Drawable[]
+                        {
+                            mainContent = new Container
+                            {
+                                Name = "Main content",
+                                RelativeSizeAxes = Axes.Both,
+                                Padding = new MarginPadding { Horizontal = horizontal_margins, Vertical = vertical_margins },
+                            }
+                        }
+                    },
+                    RowDimensions = new[] { new Dimension(GridSizeMode.Absolute, 110) }
+                },
+            };
+
+            LoadComponentAsync(CreateMainContent(), content =>
+            {
+                mainContent.Add(content);
+                content.FadeInFromZero(300, Easing.OutQuint);
+            });
+        }
+
+        protected abstract Drawable CreateMainContent();
+
+        protected virtual Drawable CreateTimeline() => new TimelineArea { RelativeSizeAxes = Axes.Both };
+    }
+}

osu.Game/Screens/Play/HUD/HitErrorDisplay.cs

@@ -48,7 +48,7 @@ namespace osu.Game.Screens.Play.HUD
 
         private void onNewJudgement(JudgementResult result)
         {
-            if (result.HitObject.HitWindows == null)
+            if (result.HitObject.HitWindows.WindowFor(HitResult.Miss) == 0)
                 return;
 
             foreach (var c in Children)