From 06a51297a3f2b20d40a99e31d9ee024dea020261 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Oct 2020 19:26:57 +0900
Subject: [PATCH] Use content instead of exposing the flow container

---
 osu.Game/Screens/Edit/Setup/MetadataSection.cs  | 4 ++--
 osu.Game/Screens/Edit/Setup/ResourcesSection.cs | 2 +-
 osu.Game/Screens/Edit/Setup/SetupSection.cs     | 7 +++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Edit/Setup/MetadataSection.cs b/osu.Game/Screens/Edit/Setup/MetadataSection.cs
index 31a2c2ce1a..4ddee2acc6 100644
--- a/osu.Game/Screens/Edit/Setup/MetadataSection.cs
+++ b/osu.Game/Screens/Edit/Setup/MetadataSection.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Screens.Edit.Setup
         [BackgroundDependencyLoader]
         private void load()
         {
-            Flow.Children = new Drawable[]
+            Children = new Drawable[]
             {
                 new OsuSpriteText
                 {
@@ -52,7 +52,7 @@ namespace osu.Game.Screens.Edit.Setup
                 },
             };
 
-            foreach (var item in Flow.OfType<LabelledTextBox>())
+            foreach (var item in Children.OfType<LabelledTextBox>())
                 item.OnCommit += onCommit;
         }
 
diff --git a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
index 86d7968856..17ecfdd52e 100644
--- a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Screens.Edit.Setup
                 AutoSizeAxes = Axes.Y,
             };
 
-            Flow.Children = new Drawable[]
+            Children = new Drawable[]
             {
                 backgroundSpriteContainer = new Container
                 {
diff --git a/osu.Game/Screens/Edit/Setup/SetupSection.cs b/osu.Game/Screens/Edit/Setup/SetupSection.cs
index 54e383a4d8..cdf17d355e 100644
--- a/osu.Game/Screens/Edit/Setup/SetupSection.cs
+++ b/osu.Game/Screens/Edit/Setup/SetupSection.cs
@@ -1,7 +1,6 @@
 // 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;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -14,7 +13,7 @@ namespace osu.Game.Screens.Edit.Setup
 {
     internal class SetupSection : Container
     {
-        protected FillFlowContainer Flow;
+        private readonly FillFlowContainer flow;
 
         [Resolved]
         protected OsuColour Colours { get; private set; }
@@ -22,7 +21,7 @@ namespace osu.Game.Screens.Edit.Setup
         [Resolved]
         protected IBindable<WorkingBeatmap> Beatmap { get; private set; }
 
-        public override void Add(Drawable drawable) => throw new InvalidOperationException("Use Flow.Add instead");
+        protected override Container<Drawable> Content => flow;
 
         public SetupSection()
         {
@@ -31,7 +30,7 @@ namespace osu.Game.Screens.Edit.Setup
 
             Padding = new MarginPadding(10);
 
-            InternalChild = Flow = new FillFlowContainer
+            InternalChild = flow = new FillFlowContainer
             {
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,