Remove GetAspectAdjustedSize() and PlayfieldArea

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

@@ -10,6 +10,7 @@ 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 OpenTK;
 
 namespace osu.Game.Rulesets.Catch.UI
 {
@@ -30,6 +31,8 @@ namespace osu.Game.Rulesets.Catch.UI
             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/CatchRulesetContainer.cs

@@ -13,7 +13,6 @@ using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
-using OpenTK;
 
 namespace osu.Game.Rulesets.Catch.UI
 {
@@ -32,8 +31,6 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public override PassThroughInputManager CreateInputManager() => new CatchInputManager(Ruleset.RulesetInfo);
 
-        protected override Vector2 PlayfieldArea => new Vector2(0.86f); // matches stable's vertical offset for catcher plate
-
         protected override DrawableHitObject<CatchHitObject> GetVisualRepresentation(CatchHitObject h)
         {
             switch (h)

osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs

@@ -20,8 +20,7 @@ namespace osu.Game.Rulesets.Mania.Edit
         {
             Anchor = Anchor.Centre,
             Origin = Anchor.Centre,
+            Size = Vector2.One
         };
-
-        protected override Vector2 PlayfieldArea => Vector2.One;
     }
 }

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

@@ -10,6 +10,7 @@ using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
+using OpenTK;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
@@ -25,6 +26,8 @@ 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/ManiaRulesetContainer.cs

@@ -24,7 +24,6 @@ using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
-using OpenTK;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
@@ -110,8 +109,6 @@ namespace osu.Game.Rulesets.Mania.UI
             }
         }
 
-        protected override Vector2 PlayfieldArea => new Vector2(1, 0.8f);
-
         protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new ManiaFramedReplayInputHandler(replay);
     }
 }

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

@@ -4,6 +4,7 @@
 using osu.Framework.Graphics.Cursor;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Rulesets.UI;
 using OpenTK;
 
 namespace osu.Game.Rulesets.Osu.Edit
@@ -15,8 +16,8 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
         }
 
-        protected override Vector2 PlayfieldArea => Vector2.One;
-
         protected override CursorContainer CreateCursor() => null;
+
+        protected override Playfield CreatePlayfield() => new OsuPlayfield { Size = Vector2.One　};
     }
 }

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

@@ -27,6 +27,8 @@ namespace osu.Game.Rulesets.Osu.UI
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
+            Size = new Vector2(0.75f);
+
             InternalChild = new PlayfieldLayer
             {
                 RelativeSizeAxes = Axes.Both,

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

@@ -0,0 +1,22 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics.Containers;
+using OpenTK;
+
+namespace osu.Game.Rulesets.Taiko.UI
+{
+    public class PlayfieldLayer : Container
+    {
+        private const float default_relative_height = TaikoPlayfield.DEFAULT_HEIGHT / 768;
+        private const float default_aspect = 16f / 9f;
+
+        protected override void Update()
+        {
+            base.Update();
+
+            float aspectAdjust = MathHelper.Clamp(Parent.ChildSize.X / Parent.ChildSize.Y, 0.4f, 4) / default_aspect;
+            Size = new Vector2(1, default_relative_height * aspectAdjust);
+        }
+    }
+}

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

@@ -58,139 +58,145 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             Direction.Value = ScrollingDirection.Left;
 
-            AddRangeInternal(new Drawable[]
+            InternalChild = new PlayfieldLayer
             {
-                backgroundContainer = new Container
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.CentreLeft,
+                RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
                 {
-                    Name = "Transparent playfield background",
+                    backgroundContainer = new Container
-                    RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                    EdgeEffect = new EdgeEffectParameters
                     {
-                        Type = EdgeEffectType.Shadow,
+                        Name = "Transparent playfield background",
-                        Colour = Color4.Black.Opacity(0.2f),
+                        RelativeSizeAxes = Axes.Both,
-                        Radius = 5,
+                        Masking = true,
-                    },
+                        EdgeEffect = new EdgeEffectParameters
-                    Children = new Drawable[]
-                    {
-                        background = new Box
                         {
-                            RelativeSizeAxes = Axes.Both,
+                            Type = EdgeEffectType.Shadow,
-                            Alpha = 0.6f
+                            Colour = Color4.Black.Opacity(0.2f),
+                            Radius = 5,
                         },
-                    }
+                        Children = new Drawable[]
-                },
-                new Container
-                {
-                    Name = "Right area",
-                    RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding { Left = left_area_size },
-                    Children = new Drawable[]
-                    {
-                        new Container
                         {
-                            Name = "Masked elements before hit objects",
+                            background = new Box
-                            RelativeSizeAxes = Axes.Both,
-                            Padding = new MarginPadding { Left = HIT_TARGET_OFFSET },
-                            Masking = true,
-                            Children = new Drawable[]
                             {
-                                hitExplosionContainer = new Container<HitExplosion>
+                                RelativeSizeAxes = Axes.Both,
-                                {
+                                Alpha = 0.6f
-                                    RelativeSizeAxes = Axes.Both,
+                            },
-                                    FillMode = FillMode.Fit,
-                                    Blending = BlendingMode.Additive,
-                                },
-                                new HitTarget
-                                {
-                                    Anchor = Anchor.CentreLeft,
-                                    Origin = Anchor.Centre,
-                                    RelativeSizeAxes = Axes.Both,
-                                    FillMode = FillMode.Fit
-                                }
-                            }
-                        },
-                        barlineContainer = new Container
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Padding = new MarginPadding { Left = HIT_TARGET_OFFSET }
-                        },
-                        new Container
-                        {
-                            Name = "Hit objects",
-                            RelativeSizeAxes = Axes.Both,
-                            Padding = new MarginPadding { Left = HIT_TARGET_OFFSET },
-                            Masking = true,
-                            Child = HitObjectContainer
-                        },
-                        kiaiExplosionContainer = new Container<KiaiHitExplosion>
-                        {
-                            Name = "Kiai hit explosions",
-                            RelativeSizeAxes = Axes.Both,
-                            FillMode = FillMode.Fit,
-                            Margin = new MarginPadding { Left = HIT_TARGET_OFFSET },
-                            Blending = BlendingMode.Additive
-                        },
-                        judgementContainer = new JudgementContainer<DrawableTaikoJudgement>
-                        {
-                            Name = "Judgements",
-                            RelativeSizeAxes = Axes.Y,
-                            Margin = new MarginPadding { Left = HIT_TARGET_OFFSET },
-                            Blending = BlendingMode.Additive
-                        },
-                    }
-                },
-                overlayBackgroundContainer = new Container
-                {
-                    Name = "Left overlay",
-                    RelativeSizeAxes = Axes.Y,
-                    Size = new Vector2(left_area_size, 1),
-                    Children = new Drawable[]
-                    {
-                        overlayBackground = new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                        },
-                        new InputDrum(controlPoints)
-                        {
-                            Anchor = Anchor.CentreRight,
-                            Origin = Anchor.CentreRight,
-                            Scale = new Vector2(0.9f),
-                            Margin = new MarginPadding { Right = 20 }
-                        },
-                        new Box
-                        {
-                            Anchor = Anchor.TopRight,
-                            RelativeSizeAxes = Axes.Y,
-                            Width = 10,
-                            Colour = Framework.Graphics.Colour.ColourInfo.GradientHorizontal(Color4.Black.Opacity(0.6f), Color4.Black.Opacity(0)),
-                        },
-                    }
-                },
-                new Container
-                {
-                    Name = "Border",
-                    RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                    MaskingSmoothness = 0,
-                    BorderThickness = 2,
-                    AlwaysPresent = true,
-                    Children = new[]
-                    {
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Alpha = 0,
-                            AlwaysPresent = true
                         }
+                    },
+                    new Container
+                    {
+                        Name = "Right area",
+                        RelativeSizeAxes = Axes.Both,
+                        Padding = new MarginPadding { Left = left_area_size },
+                        Children = new Drawable[]
+                        {
+                            new Container
+                            {
+                                Name = "Masked elements before hit objects",
+                                RelativeSizeAxes = Axes.Both,
+                                Padding = new MarginPadding { Left = HIT_TARGET_OFFSET },
+                                Masking = true,
+                                Children = new Drawable[]
+                                {
+                                    hitExplosionContainer = new Container<HitExplosion>
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                        FillMode = FillMode.Fit,
+                                        Blending = BlendingMode.Additive,
+                                    },
+                                    new HitTarget
+                                    {
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.Centre,
+                                        RelativeSizeAxes = Axes.Both,
+                                        FillMode = FillMode.Fit
+                                    }
+                                }
+                            },
+                            barlineContainer = new Container
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Padding = new MarginPadding { Left = HIT_TARGET_OFFSET }
+                            },
+                            new Container
+                            {
+                                Name = "Hit objects",
+                                RelativeSizeAxes = Axes.Both,
+                                Padding = new MarginPadding { Left = HIT_TARGET_OFFSET },
+                                Masking = true,
+                                Child = HitObjectContainer
+                            },
+                            kiaiExplosionContainer = new Container<KiaiHitExplosion>
+                            {
+                                Name = "Kiai hit explosions",
+                                RelativeSizeAxes = Axes.Both,
+                                FillMode = FillMode.Fit,
+                                Margin = new MarginPadding { Left = HIT_TARGET_OFFSET },
+                                Blending = BlendingMode.Additive
+                            },
+                            judgementContainer = new JudgementContainer<DrawableTaikoJudgement>
+                            {
+                                Name = "Judgements",
+                                RelativeSizeAxes = Axes.Y,
+                                Margin = new MarginPadding { Left = HIT_TARGET_OFFSET },
+                                Blending = BlendingMode.Additive
+                            },
+                        }
+                    },
+                    overlayBackgroundContainer = new Container
+                    {
+                        Name = "Left overlay",
+                        RelativeSizeAxes = Axes.Y,
+                        Size = new Vector2(left_area_size, 1),
+                        Children = new Drawable[]
+                        {
+                            overlayBackground = new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                            },
+                            new InputDrum(controlPoints)
+                            {
+                                Anchor = Anchor.CentreRight,
+                                Origin = Anchor.CentreRight,
+                                Scale = new Vector2(0.9f),
+                                Margin = new MarginPadding { Right = 20 }
+                            },
+                            new Box
+                            {
+                                Anchor = Anchor.TopRight,
+                                RelativeSizeAxes = Axes.Y,
+                                Width = 10,
+                                Colour = Framework.Graphics.Colour.ColourInfo.GradientHorizontal(Color4.Black.Opacity(0.6f), Color4.Black.Opacity(0)),
+                            },
+                        }
+                    },
+                    new Container
+                    {
+                        Name = "Border",
+                        RelativeSizeAxes = Axes.Both,
+                        Masking = true,
+                        MaskingSmoothness = 0,
+                        BorderThickness = 2,
+                        AlwaysPresent = true,
+                        Children = new[]
+                        {
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Alpha = 0,
+                                AlwaysPresent = true
+                            }
+                        }
+                    },
+                    topLevelHitContainer = new Container
+                    {
+                        Name = "Top level hit objects",
+                        RelativeSizeAxes = Axes.Both,
                     }
-                },
-                topLevelHitContainer = new Container
-                {
-                    Name = "Top level hit objects",
-                    RelativeSizeAxes = Axes.Both,
                 }
-            });
+            };
 
             VisibleTimeRange.Value = 6000;
         }

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

@@ -2,7 +2,6 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Allocation;
-using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
@@ -13,7 +12,6 @@ using osu.Game.Rulesets.Taiko.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.Taiko.Replays;
-using OpenTK;
 using System.Linq;
 using osu.Framework.Input;
 using osu.Game.Input.Handlers;
@@ -74,27 +72,11 @@ namespace osu.Game.Rulesets.Taiko.UI
             }
         }
 
-        protected override Vector2 GetAspectAdjustedSize()
-        {
-            const float default_relative_height = TaikoPlayfield.DEFAULT_HEIGHT / 768;
-            const float default_aspect = 16f / 9f;
-
-            float aspectAdjust = MathHelper.Clamp(DrawWidth / DrawHeight, 0.4f, 4) / default_aspect;
-
-            return new Vector2(1, default_relative_height * aspectAdjust);
-        }
-
-        protected override Vector2 PlayfieldArea => Vector2.One;
-
         public override ScoreProcessor CreateScoreProcessor() => new TaikoScoreProcessor(this);
 
         public override PassThroughInputManager CreateInputManager() => new TaikoInputManager(Ruleset.RulesetInfo);
 
-        protected override Playfield CreatePlayfield() => new TaikoPlayfield(Beatmap.ControlPointInfo)
+        protected override Playfield CreatePlayfield() => new TaikoPlayfield(Beatmap.ControlPointInfo);
-        {
-            Anchor = Anchor.CentreLeft,
-            Origin = Anchor.CentreLeft
-        };
 
         protected override DrawableHitObject<TaikoHitObject> GetVisualRepresentation(TaikoHitObject h)
         {

osu.Game/Rulesets/UI/RulesetContainer.cs

@@ -22,7 +22,6 @@ using osu.Game.Overlays;
 using osu.Game.Rulesets.Configuration;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Scoring;
-using OpenTK;
 
 namespace osu.Game.Rulesets.UI
 {
@@ -309,26 +308,6 @@ namespace osu.Game.Rulesets.UI
                 mod.ApplyToDrawableHitObjects(Playfield.HitObjectContainer.Objects);
         }
 
-        protected override void Update()
-        {
-            base.Update();
-
-            Playfield.Size = GetAspectAdjustedSize() * PlayfieldArea;
-        }
-
-        /// <summary>
-        /// Computes the size of the <see cref="Playfield"/> in relative coordinate space after aspect adjustments.
-        /// </summary>
-        /// <returns>The aspect-adjusted size.</returns>
-        protected virtual Vector2 GetAspectAdjustedSize() => Vector2.One;
-
-        /// <summary>
-        /// The area of this <see cref="RulesetContainer"/> that is available for the <see cref="Playfield"/> to use.
-        /// Must be specified in relative coordinate space to this <see cref="RulesetContainer"/>.
-        /// This affects the final size of the <see cref="Playfield"/> but does not affect the <see cref="Playfield"/>'s scale.
-        /// </summary>
-        protected virtual Vector2 PlayfieldArea => new Vector2(0.75f); // A sane default
-
         /// <summary>
         /// Creates a DrawableHitObject from a HitObject.
         /// </summary>