Merge pull request #4533 from peppy/universal-playfield-adjust

Move all playfield adjustments to universal PlayfieldAdjustmentContainer

osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs

@@ -10,7 +10,6 @@ using osu.Game.Rulesets.Catch.Objects.Drawable;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
-using osuTK;
 
 namespace osu.Game.Rulesets.Catch.UI
 {
@@ -24,15 +23,7 @@ namespace osu.Game.Rulesets.Catch.UI
         {
             Container explodingFruitContainer;
 
-            Anchor = Anchor.TopCentre;
+            InternalChildren = new Drawable[]
-            Origin = Anchor.TopCentre;
-
-            Size = new Vector2(0.86f); // matches stable's vertical offset for catcher plate
-
-            InternalChild = new PlayfieldAdjustmentContainer
-            {
-                RelativeSizeAxes = Axes.Both,
-                Children = new Drawable[]
             {
                 explodingFruitContainer = new Container
                 {
@@ -46,7 +37,6 @@ namespace osu.Game.Rulesets.Catch.UI
                     Origin = Anchor.TopLeft,
                 },
                 HitObjectContainer
-                }
             };
         }
 

osu.Game.Rulesets.Catch/UI/CatchPlayfieldAdjustmentContainer.cs

@@ -3,17 +3,23 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.UI;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.UI
 {
-    public class PlayfieldAdjustmentContainer : Container
+    public class CatchPlayfieldAdjustmentContainer : PlayfieldAdjustmentContainer
     {
         protected override Container<Drawable> Content => content;
         private readonly Container content;
 
-        public PlayfieldAdjustmentContainer()
+        public CatchPlayfieldAdjustmentContainer()
         {
+            Anchor = Anchor.TopCentre;
+            Origin = Anchor.TopCentre;
+
+            Size = new Vector2(0.86f); // matches stable's vertical offset for catcher plate
+
             InternalChild = new Container
             {
                 Anchor = Anchor.Centre,

osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs

@@ -36,6 +36,8 @@ namespace osu.Game.Rulesets.Catch.UI
 
         protected override Playfield CreatePlayfield() => new CatchPlayfield(Beatmap.BeatmapInfo.BaseDifficulty, GetVisualRepresentation);
 
+        protected override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new CatchPlayfieldAdjustmentContainer();
+
         protected override PassThroughInputManager CreateInputManager() => new CatchInputManager(Ruleset.RulesetInfo);
 
         public override DrawableHitObject<CatchHitObject> GetVisualRepresentation(CatchHitObject h)

osu.Game.Rulesets.Mania/UI/DrawableManiaRuleset.cs

@@ -6,7 +6,6 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
-using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.MathUtils;
 using osu.Game.Beatmaps;
@@ -89,11 +88,9 @@ namespace osu.Game.Rulesets.Mania.UI
         /// <returns>The column which intersects with <paramref name="screenSpacePosition"/>.</returns>
         public Column GetColumnByPosition(Vector2 screenSpacePosition) => Playfield.GetColumnByPosition(screenSpacePosition);
 
-        protected override Playfield CreatePlayfield() => new ManiaPlayfield(Beatmap.Stages)
+        protected override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new ManiaPlayfieldAdjustmentContainer();
-        {
+
-            Anchor = Anchor.Centre,
+        protected override Playfield CreatePlayfield() => new ManiaPlayfield(Beatmap.Stages);
-            Origin = Anchor.Centre,
-        };
 
         public override ScoreProcessor CreateScoreProcessor() => new ManiaScoreProcessor(this);
 

osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs

@@ -28,8 +28,6 @@ namespace osu.Game.Rulesets.Mania.UI
             if (stageDefinitions.Count <= 0)
                 throw new ArgumentException("Can't have zero or fewer stages.");
 
-            Size = new Vector2(1, 0.8f);
-
             GridContainer playfieldGrid;
             AddInternal(playfieldGrid = new GridContainer
             {

osu.Game.Rulesets.Mania/UI/ManiaPlayfieldAdjustmentContainer.cs

@@ -0,0 +1,20 @@
+// 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 osu.Framework.Graphics;
+using osu.Game.Rulesets.UI;
+using osuTK;
+
+namespace osu.Game.Rulesets.Mania.UI
+{
+    public class ManiaPlayfieldAdjustmentContainer : PlayfieldAdjustmentContainer
+    {
+        public ManiaPlayfieldAdjustmentContainer()
+        {
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+
+            Size = new Vector2(1, 0.8f);
+        }
+    }
+}

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

@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         public override SelectionHandler CreateSelectionHandler() => new OsuSelectionHandler();
 
-        protected override Container CreateLayerContainer() => new PlayfieldAdjustmentContainer { RelativeSizeAxes = Axes.Both };
+        protected override Container CreateLayerContainer() => new OsuPlayfieldAdjustmentContainer { RelativeSizeAxes = Axes.Both };
 
         public override SelectionBlueprint CreateBlueprintFor(DrawableHitObject hitObject)
         {

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

@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// 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.Linq;
@@ -32,6 +32,8 @@ namespace osu.Game.Rulesets.Osu.UI
 
         protected override PassThroughInputManager CreateInputManager() => new OsuInputManager(Ruleset.RulesetInfo);
 
+        protected override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new OsuPlayfieldAdjustmentContainer();
+
         public override DrawableHitObject<OsuHitObject> GetVisualRepresentation(OsuHitObject h)
         {
             switch (h)

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

@@ -23,23 +23,11 @@ namespace osu.Game.Rulesets.Osu.UI
 
         public static readonly Vector2 BASE_SIZE = new Vector2(512, 384);
 
-        private readonly PlayfieldAdjustmentContainer adjustmentContainer;
-
-        protected override Container CursorTargetContainer => adjustmentContainer;
-
         protected override GameplayCursorContainer CreateCursor() => new OsuCursorContainer();
 
         public OsuPlayfield()
         {
-            Anchor = Anchor.Centre;
+            InternalChildren = new Drawable[]
-            Origin = Anchor.Centre;
-
-            Size = new Vector2(0.75f);
-
-            InternalChild = adjustmentContainer = new PlayfieldAdjustmentContainer
-            {
-                RelativeSizeAxes = Axes.Both,
-                Children = new Drawable[]
             {
                 connectionLayer = new FollowPointRenderer
                 {
@@ -57,7 +45,6 @@ namespace osu.Game.Rulesets.Osu.UI
                     RelativeSizeAxes = Axes.Both,
                     Depth = -1,
                 },
-                }
             };
         }
 

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

@@ -3,17 +3,23 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.UI;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.UI
 {
-    public class PlayfieldAdjustmentContainer : Container
+    public class OsuPlayfieldAdjustmentContainer : PlayfieldAdjustmentContainer
     {
         protected override Container<Drawable> Content => content;
         private readonly Container content;
 
-        public PlayfieldAdjustmentContainer()
+        public OsuPlayfieldAdjustmentContainer()
         {
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+
+            Size = new Vector2(0.75f);
+
             InternalChild = new Container
             {
                 Anchor = Anchor.Centre,

osu.Game.Rulesets.Taiko/UI/DrawableTaikoRuleset.cs

@@ -81,6 +81,8 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         public override ScoreProcessor CreateScoreProcessor() => new TaikoScoreProcessor(this);
 
+        protected override PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new TaikoPlayfieldAdjustmentContainer();
+
         protected override PassThroughInputManager CreateInputManager() => new TaikoInputManager(Ruleset.RulesetInfo);
 
         protected override Playfield CreatePlayfield() => new TaikoPlayfield(Beatmap.ControlPointInfo);

osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs

@@ -55,12 +55,7 @@ namespace osu.Game.Rulesets.Taiko.UI
 
         public TaikoPlayfield(ControlPointInfo controlPoints)
         {
-            InternalChild = new PlayfieldAdjustmentContainer
+            InternalChildren = new Drawable[]
-            {
-                Anchor = Anchor.CentreLeft,
-                Origin = Anchor.CentreLeft,
-                RelativeSizeAxes = Axes.Both,
-                Children = new Drawable[]
             {
                 backgroundContainer = new Container
                 {
@@ -192,7 +187,6 @@ namespace osu.Game.Rulesets.Taiko.UI
                     Name = "Top level hit objects",
                     RelativeSizeAxes = Axes.Both,
                 }
-                }
             };
         }
 

osu.Game.Rulesets.Taiko/UI/TaikoPlayfieldAdjustmentContainer.cs

@@ -1,16 +1,23 @@
 // 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 osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics;
+using osu.Game.Rulesets.UI;
 using osuTK;
 
 namespace osu.Game.Rulesets.Taiko.UI
 {
-    public class PlayfieldAdjustmentContainer : Container
+    public class TaikoPlayfieldAdjustmentContainer : PlayfieldAdjustmentContainer
     {
         private const float default_relative_height = TaikoPlayfield.DEFAULT_HEIGHT / 768;
         private const float default_aspect = 16f / 9f;
 
+        public TaikoPlayfieldAdjustmentContainer()
+        {
+            Anchor = Anchor.CentreLeft;
+            Origin = Anchor.CentreLeft;
+        }
+
         protected override void Update()
         {
             base.Update();

osu.Game/Rulesets/UI/DrawableRuleset.cs

@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// 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 osu.Framework.Allocation;
@@ -133,19 +133,19 @@ namespace osu.Game.Rulesets.UI
             return dependencies;
         }
 
+        protected virtual PlayfieldAdjustmentContainer CreatePlayfieldAdjustmentContainer() => new PlayfieldAdjustmentContainer();
+
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
-            KeyBindingInputManager.AddRange(new Drawable[]
-            {
-                Playfield
-            });
-
             InternalChildren = new Drawable[]
             {
                 frameStabilityContainer = new FrameStabilityContainer
                 {
-                    Child = KeyBindingInputManager,
+                    Child = KeyBindingInputManager
+                        .WithChild(CreatePlayfieldAdjustmentContainer()
+                            .WithChild(Playfield)
+                        )
                 },
                 Overlays = new Container { RelativeSizeAxes = Axes.Both }
             };

osu.Game/Rulesets/UI/Playfield.cs

@@ -66,7 +66,7 @@ namespace osu.Game.Rulesets.UI
 
             Cursor = CreateCursor();
             if (Cursor != null)
-                CursorTargetContainer.Add(Cursor);
+                AddInternal(Cursor);
         }
 
         /// <summary>

osu.Game/Rulesets/UI/PlayfieldAdjustmentContainer.cs

@@ -0,0 +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 osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+
+namespace osu.Game.Rulesets.UI
+{
+    /// <summary>
+    /// A container which handles sizing of the <see cref="Playfield"/> and any other components that need to match their size.
+    /// </summary>
+    public class PlayfieldAdjustmentContainer : Container
+    {
+        public PlayfieldAdjustmentContainer()
+        {
+            RelativeSizeAxes = Axes.Both;
+        }
+    }
+}