From 17b669fdf74c456515dbd1daca4d0a1a86625c75 Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Thu, 20 Feb 2020 14:32:16 +0900 Subject: [PATCH] Refactor to detail the sizing mode setting --- .../Screens/Multi/Components/OverlinedDisplay.cs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs b/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs index 600fa99a9a..71cabd8b50 100644 --- a/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs +++ b/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs @@ -104,15 +104,13 @@ namespace osu.Game.Screens.Multi.Components new Dimension(AutoSizeAxes.HasFlag(Axes.Y) ? GridSizeMode.AutoSize : GridSizeMode.Distributed), }; - grid.AutoSizeAxes = Axes.None; - grid.RelativeSizeAxes = Axes.None; - grid.AutoSizeAxes = AutoSizeAxes; - grid.RelativeSizeAxes = ~AutoSizeAxes; + // Assigning to none is done so that setting auto and relative size modes doesn't cause exceptions to be thrown + grid.AutoSizeAxes = Content.AutoSizeAxes = Axes.None; + grid.RelativeSizeAxes = Content.RelativeSizeAxes = Axes.None; - Content.AutoSizeAxes = Axes.None; - Content.RelativeSizeAxes = Axes.None; - Content.AutoSizeAxes = grid.AutoSizeAxes; - Content.RelativeSizeAxes = grid.RelativeSizeAxes; + // Auto-size when required, otherwise eagerly relative-size + grid.AutoSizeAxes = Content.AutoSizeAxes = AutoSizeAxes; + grid.RelativeSizeAxes = Content.RelativeSizeAxes = ~AutoSizeAxes; } } }