From 3ed78688012d711fd374f5350b742625cda6f192 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Nov 2020 13:49:14 +0900
Subject: [PATCH 1/2] Scroll editor setup screen to file selector on display

Previously the file selector would potentially display off-screen,
making for confusing UX.

Closes #10942.
---
 osu.Game/Graphics/Containers/SectionsContainer.cs   |  2 ++
 .../Edit/Setup/FileChooserLabelledTextBox.cs        | 13 ++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index f32f8e0c67..81968de304 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Linq;
 using JetBrains.Annotations;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -14,6 +15,7 @@ namespace osu.Game.Graphics.Containers
     /// <summary>
     /// A container that can scroll to each section inside it.
     /// </summary>
+    [Cached]
     public class SectionsContainer<T> : Container<T>
         where T : Drawable
     {
diff --git a/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs b/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs
index b802b3405a..5de6842b50 100644
--- a/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs
+++ b/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs
@@ -3,10 +3,12 @@
 
 using System;
 using System.IO;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
 
@@ -21,6 +23,9 @@ namespace osu.Game.Screens.Edit.Setup
 
         private readonly IBindable<FileInfo> currentFile = new Bindable<FileInfo>();
 
+        [Resolved]
+        private SectionsContainer<SetupSection> sectionsContainer { get; set; }
+
         public FileChooserLabelledTextBox()
         {
             currentFile.BindValueChanged(onFileSelected);
@@ -47,14 +52,16 @@ namespace osu.Game.Screens.Edit.Setup
 
         public void DisplayFileChooser()
         {
-            Target.Child = new FileSelector(validFileExtensions: ResourcesSection.AudioExtensions)
+            FileSelector fileSelector;
+
+            Target.Child = fileSelector = new FileSelector(validFileExtensions: ResourcesSection.AudioExtensions)
             {
                 RelativeSizeAxes = Axes.X,
                 Height = 400,
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
                 CurrentFile = { BindTarget = currentFile }
             };
+
+            sectionsContainer?.ScrollTo(fileSelector);
         }
 
         internal class FileChooserOsuTextBox : OsuTextBox

From bd1dad5477f46c041b176d6644714e5f7f126291 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Nov 2020 15:54:27 +0900
Subject: [PATCH 2/2] Remove null allowance for now

---
 osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs b/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs
index 5de6842b50..6e2737256a 100644
--- a/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs
+++ b/osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Screens.Edit.Setup
                 CurrentFile = { BindTarget = currentFile }
             };
 
-            sectionsContainer?.ScrollTo(fileSelector);
+            sectionsContainer.ScrollTo(fileSelector);
         }
 
         internal class FileChooserOsuTextBox : OsuTextBox