Merge pull request #2374 from smoogipoo/remove-approachcircle-hax

Remove now unnecessary approachcircle proxy disables

osu-framework

@@ -1 +1 @@
-Subproject commit 16e6a453db9a8f4454238a2911eb5f1444b7ec2a
+Subproject commit f1751c27ffe2c5febece74129368596b5ad3a4e2

osu.Game.Rulesets.Osu/Edit/OsuEditPlayfield.cs

@@ -7,7 +7,6 @@ namespace osu.Game.Rulesets.Osu.Edit
 {
     public class OsuEditPlayfield : OsuPlayfield
     {
-        protected override bool ProxyApproachCircles => false;
         protected override bool DisplayJudgements => false;
     }
 }

osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs

@@ -83,7 +83,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     RelativeSizeAxes = Axes.Y,
-                    Children = new Drawable[]
+                    Children = new[]
                     {
                         Background = new SpinnerBackground
                         {

osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs

@@ -21,9 +21,6 @@ namespace osu.Game.Rulesets.Osu.UI
         private readonly JudgementContainer<DrawableOsuJudgement> judgementLayer;
         private readonly ConnectionRenderer<OsuHitObject> connectionLayer;
 
-        // Todo: This should not be a thing, but is currently required for the editor
-        // https://github.com/ppy/osu-framework/issues/1283
-        protected virtual bool ProxyApproachCircles => true;
         protected virtual bool DisplayJudgements => true;
 
         public static readonly Vector2 BASE_SIZE = new Vector2(512, 384);
@@ -59,7 +56,7 @@ namespace osu.Game.Rulesets.Osu.UI
             h.OnJudgement += onJudgement;
 
             var c = h as IDrawableHitObjectWithProxiedApproach;
-            if (c != null && ProxyApproachCircles)
+            if (c != null)
                 approachCircles.Add(c.ProxiedLayer.CreateProxy());
 
             base.Add(h);

osu.Game/Screens/Edit/Screens/Compose/Layers/HitObjectMaskLayer.cs

@@ -46,7 +46,7 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Layers
             var dragLayer = new DragLayer(maskContainer.Select);
             dragLayer.DragEnd += () => maskSelection.UpdateVisibility();
 
-            InternalChildren = new Drawable[]
+            InternalChildren = new[]
             {
                 dragLayer,
                 maskSelection,