From d062810ff2b4c04019f2523faa58e2d3cecca758 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Mar 2022 23:30:46 +0900
Subject: [PATCH] Add basic scene selector

---
 .../Visual/Gameplay/TestSceneSkinEditor.cs    |  2 +-
 osu.Game/Skinning/Editor/SkinEditor.cs        | 53 +++++++++++++++++++
 osu.Game/Skinning/Editor/SkinEditorOverlay.cs |  2 +-
 3 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
index a0602e21b9..9012492028 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("reload skin editor", () =>
             {
                 skinEditor?.Expire();
-                Player.ScaleTo(SkinEditorOverlay.VISIBLE_TARGET_SCALE);
+                Player.ScaleTo(0.8f);
                 LoadComponentAsync(skinEditor = new SkinEditor(Player), Add);
             });
         }
diff --git a/osu.Game/Skinning/Editor/SkinEditor.cs b/osu.Game/Skinning/Editor/SkinEditor.cs
index 19c39d23d5..37900d9920 100644
--- a/osu.Game/Skinning/Editor/SkinEditor.cs
+++ b/osu.Game/Skinning/Editor/SkinEditor.cs
@@ -10,14 +10,20 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
+using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit.Components.Menus;
+using osu.Game.Screens.OnlinePlay.Match.Components;
+using osu.Game.Screens.Play;
+using osu.Game.Screens.Select;
+using osuTK;
 
 namespace osu.Game.Skinning.Editor
 {
@@ -42,6 +48,12 @@ namespace osu.Game.Skinning.Editor
         [Resolved]
         private OsuColour colours { get; set; }
 
+        [Resolved]
+        private IBindable<RulesetInfo> ruleset { get; set; }
+
+        [Resolved(canBeNull: true)]
+        private OsuGame game { get; set; }
+
         private bool hasBegunMutating;
 
         private Container content;
@@ -105,6 +117,47 @@ namespace osu.Game.Skinning.Editor
                             },
                         },
                     },
+                    new FillFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Y = 45,
+                        Height = 30,
+                        Name = "Scene library",
+                        Spacing = new Vector2(10),
+                        Padding = new MarginPadding(10),
+                        Direction = FillDirection.Horizontal,
+                        Children = new Drawable[]
+                        {
+                            new PurpleTriangleButton
+                            {
+                                Text = "Song Select",
+                                Width = 100,
+                                Height = 30,
+                                Action = () => game?.PerformFromScreen(screen =>
+                                {
+                                    if (screen is SongSelect)
+                                        return;
+
+                                    screen.Push(new PlaySongSelect());
+                                }, new[] { typeof(SongSelect) })
+                            },
+                            new PurpleTriangleButton
+                            {
+                                Text = "Gameplay",
+                                Width = 100,
+                                Height = 30,
+                                Action = () => game?.PerformFromScreen(screen =>
+                                {
+                                    if (screen is Player)
+                                        return;
+
+                                    var replayGeneratingMod = ruleset.Value.CreateInstance().GetAutoplayMod();
+                                    if (replayGeneratingMod != null)
+                                        screen.Push(new ReplayPlayer((beatmap, mods) => replayGeneratingMod.CreateReplayScore(beatmap, mods)));
+                                }, new[] { typeof(Player) })
+                            },
+                        }
+                    },
                     new GridContainer
                     {
                         RelativeSizeAxes = Axes.Both,
diff --git a/osu.Game/Skinning/Editor/SkinEditorOverlay.cs b/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
index 780e3d5b67..9fc233d3e3 100644
--- a/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
+++ b/osu.Game/Skinning/Editor/SkinEditorOverlay.cs
@@ -114,7 +114,7 @@ namespace osu.Game.Skinning.Editor
 
             if (skinEditor.State.Value == Visibility.Visible)
             {
-                scalingContainer.SetCustomRect(new RectangleF(toolbar_padding_requirement, 0.1f, 0.8f - toolbar_padding_requirement, 0.7f), true);
+                scalingContainer.SetCustomRect(new RectangleF(toolbar_padding_requirement, 0.2f, 0.8f - toolbar_padding_requirement, 0.7f), true);
 
                 game?.Toolbar.Hide();
                 game?.CloseAllOverlays();