From 54668a0decb075f257c55e4d7e87ddc0a71b334f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 7 Nov 2018 16:43:34 +0900
Subject: [PATCH] Simplify construction of ScrollingInfo

---
 .../Edit/ManiaEditRulesetContainer.cs         |  3 +++
 .../Edit/ManiaHitObjectComposer.cs            | 22 +++++++++----------
 .../UI/Scrolling/ScrollingRulesetContainer.cs | 22 ++++++-------------
 3 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs
index 138a2c0273..2404297cc3 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs
@@ -6,11 +6,14 @@ using OpenTK;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.UI;
+using osu.Game.Rulesets.UI.Scrolling;
 
 namespace osu.Game.Rulesets.Mania.Edit
 {
     public class ManiaEditRulesetContainer : ManiaRulesetContainer
     {
+        public new IScrollingInfo ScrollingInfo => base.ScrollingInfo;
+
         public ManiaEditRulesetContainer(Ruleset ruleset, WorkingBeatmap beatmap)
             : base(ruleset, beatmap)
         {
diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
index 7cbf6495f5..837f940a62 100644
--- a/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
@@ -24,15 +24,20 @@ namespace osu.Game.Rulesets.Mania.Edit
         {
         }
 
+        private DependencyContainer dependencies;
+
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
-        {
-            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
-            dependencies.CacheAs<IScrollingInfo>(new ScrollingInfo());
-            return dependencies;
-        }
+            => dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
 
         protected override RulesetContainer<ManiaHitObject> CreateRulesetContainer(Ruleset ruleset, WorkingBeatmap beatmap)
-            => new ManiaEditRulesetContainer(ruleset, beatmap);
+        {
+            var rulesetContainer = new ManiaEditRulesetContainer(ruleset, beatmap);
+
+            // This is the earliest we can cache the scrolling info to ourselves, before masks are added to the hierarchy and inject it
+            dependencies.CacheAs(rulesetContainer.ScrollingInfo);
+
+            return rulesetContainer;
+        }
 
         protected override IReadOnlyList<HitObjectCompositionTool> CompositionTools => Array.Empty<HitObjectCompositionTool>();
 
@@ -48,10 +53,5 @@ namespace osu.Game.Rulesets.Mania.Edit
 
             return base.CreateBlueprintFor(hitObject);
         }
-
-        private class ScrollingInfo : IScrollingInfo
-        {
-            public IBindable<ScrollingDirection> Direction { get; } = new Bindable<ScrollingDirection>();
-        }
     }
 }
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingRulesetContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingRulesetContainer.cs
index 73fb9591da..e0e21f8990 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingRulesetContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingRulesetContainer.cs
@@ -35,7 +35,8 @@ namespace osu.Game.Rulesets.UI.Scrolling
         /// <returns></returns>
         private readonly SortedList<MultiplierControlPoint> controlPoints = new SortedList<MultiplierControlPoint>(Comparer<MultiplierControlPoint>.Default);
 
-        private IScrollingInfo scrollingInfo;
+        [Cached(Type = typeof(IScrollingInfo))]
+        protected readonly IScrollingInfo ScrollingInfo;
 
         [Cached(Type = typeof(IScrollAlgorithm))]
         private readonly IScrollAlgorithm algorithm;
@@ -55,13 +56,14 @@ namespace osu.Game.Rulesets.UI.Scrolling
                     algorithm = new ConstantScrollAlgorithm();
                     break;
             }
+
+            ScrollingInfo = CreateScrollingInfo();
+            ScrollingInfo.Direction.BindTo(Direction);
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            scrollingInfo.Direction.BindTo(Direction);
-
             // Calculate default multiplier control points
             var lastTimingPoint = new TimingControlPoint();
             var lastDifficultyPoint = new DifficultyControlPoint();
@@ -107,19 +109,9 @@ namespace osu.Game.Rulesets.UI.Scrolling
                 controlPoints.Add(new MultiplierControlPoint { Velocity = Beatmap.BeatmapInfo.BaseDifficulty.SliderMultiplier });
         }
 
-        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
-        {
-            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+        protected virtual IScrollingInfo CreateScrollingInfo() => new LocalScrollingInfo();
 
-            if ((scrollingInfo = dependencies.Get<IScrollingInfo>()) == null)
-                dependencies.CacheAs(scrollingInfo = CreateScrollingInfo());
-
-            return dependencies;
-        }
-
-        protected virtual IScrollingInfo CreateScrollingInfo() => new ScrollingInfo();
-
-        private class ScrollingInfo : IScrollingInfo
+        private class LocalScrollingInfo : IScrollingInfo
         {
             public IBindable<ScrollingDirection> Direction { get; } = new Bindable<ScrollingDirection>();
         }