diff --git a/osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs b/osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
index 436d5c1ea6..3c9647117e 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
@@ -101,7 +101,7 @@ namespace osu.Game.Rulesets.Mania.UI
return null;
}
- protected override Vector2 GetPlayfieldAspectAdjust() => new Vector2(1, 0.8f);
+ protected override Vector2 GetAspectAdjustedSize() => new Vector2(1, 0.8f);
protected override FramedReplayInputHandler CreateReplayInputHandler(Replay replay) => new ManiaFramedReplayInputHandler(replay, this);
diff --git a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
index 17521f8992..7f8cbce78e 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
@@ -27,21 +27,8 @@ namespace osu.Game.Rulesets.Osu.UI
public static readonly Vector2 BASE_SIZE = new Vector2(512, 384);
- public override Vector2 Size
- {
- get
- {
- if (Parent == null)
- return Vector2.Zero;
-
- var parentSize = Parent.DrawSize;
- var aspectSize = parentSize.X * 0.75f < parentSize.Y ? new Vector2(parentSize.X, parentSize.X * 0.75f) : new Vector2(parentSize.Y * 4f / 3f, parentSize.Y);
-
- return new Vector2(aspectSize.X / parentSize.X, aspectSize.Y / parentSize.Y) * base.Size;
- }
- }
-
- public OsuPlayfield() : base(BASE_SIZE.X)
+ public OsuPlayfield()
+ : base(BASE_SIZE.X)
{
Anchor = Anchor.Centre;
Origin = Anchor.Centre;
diff --git a/osu.Game.Rulesets.Osu/UI/OsuRulesetContainer.cs b/osu.Game.Rulesets.Osu/UI/OsuRulesetContainer.cs
index 526348062f..9cb6a13cb2 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuRulesetContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuRulesetContainer.cs
@@ -50,7 +50,11 @@ namespace osu.Game.Rulesets.Osu.UI
protected override FramedReplayInputHandler CreateReplayInputHandler(Replay replay) => new OsuReplayInputHandler(replay);
- protected override Vector2 GetPlayfieldAspectAdjust() => new Vector2(0.75f);
+ protected override Vector2 GetAspectAdjustedSize()
+ {
+ var aspectSize = DrawSize.X * 0.75f < DrawSize.Y ? new Vector2(DrawSize.X, DrawSize.X * 0.75f) : new Vector2(DrawSize.Y * 4f / 3f, DrawSize.Y);
+ return new Vector2(aspectSize.X / DrawSize.X, aspectSize.Y / DrawSize.Y) * 0.75f;
+ }
protected override CursorContainer CreateCursor() => new GameplayCursor();
}
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoRulesetContainer.cs b/osu.Game.Rulesets.Taiko/UI/TaikoRulesetContainer.cs
index 1b9821d698..8342009e80 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoRulesetContainer.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoRulesetContainer.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Rulesets.Taiko.UI
}
}
- protected override Vector2 GetPlayfieldAspectAdjust()
+ protected override Vector2 GetAspectAdjustedSize()
{
const float default_relative_height = TaikoPlayfield.DEFAULT_HEIGHT / 768;
const float default_aspect = 16f / 9f;
diff --git a/osu.Game/Rulesets/UI/RulesetContainer.cs b/osu.Game/Rulesets/UI/RulesetContainer.cs
index 231250e858..f4e700a8eb 100644
--- a/osu.Game/Rulesets/UI/RulesetContainer.cs
+++ b/osu.Game/Rulesets/UI/RulesetContainer.cs
@@ -33,11 +33,6 @@ namespace osu.Game.Rulesets.UI
///
public abstract class RulesetContainer : Container
{
- ///
- /// Whether to apply adjustments to the child based on our own size.
- ///
- public bool AspectAdjust = true;
-
///
/// The selected variant.
///
@@ -324,7 +319,7 @@ namespace osu.Game.Rulesets.UI
{
base.Update();
- Playfield.Size = AspectAdjust ? GetPlayfieldAspectAdjust() : Vector2.One;
+ Playfield.Size = GetAspectAdjustedSize();
}
///
@@ -335,10 +330,11 @@ namespace osu.Game.Rulesets.UI
protected virtual BeatmapProcessor CreateBeatmapProcessor() => new BeatmapProcessor();
///
- /// In some cases we want to apply changes to the relative size of our contained based on custom conditions.
+ /// Computes the final size of the in relative coordinate space after all
+ /// aspect and scale adjustments.
///
- ///
- protected virtual Vector2 GetPlayfieldAspectAdjust() => new Vector2(0.75f); //a sane default
+ /// The aspect-adjusted size.
+ protected virtual Vector2 GetAspectAdjustedSize() => new Vector2(0.75f); // A sane default
///
/// Creates a converter to convert Beatmap to a specific mode.