From b6b9a696017ca41dd9befb1ca5b63c2fa129f008 Mon Sep 17 00:00:00 2001
From: Denrage <denrage@gmail.com>
Date: Wed, 5 May 2021 18:50:49 +0200
Subject: [PATCH] Removed unnecessary class for wrapping

---
 .../SongSelect/TestSceneBeatmapInfoWedge.cs   |  7 +--
 osu.Game/Screens/Select/BeatmapInfoWedge.cs   | 43 +++++--------------
 2 files changed, 14 insertions(+), 36 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
index ec19f00087..b9e92cba62 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
@@ -7,6 +7,7 @@ using JetBrains.Annotations;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Sprites;
@@ -135,7 +136,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private void selectBeatmap([CanBeNull] IBeatmap b)
         {
-            BeatmapInfoWedge.BeatmapInfoWedgeContainer containerBefore = null;
+            Container containerBefore = null;
 
             AddStep($"select {b?.Metadata.Title ?? "null"} beatmap", () =>
             {
@@ -193,9 +194,9 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private class TestBeatmapInfoWedge : BeatmapInfoWedge
         {
-            public new BeatmapInfoWedgeContainer Container => base.Container;
+            public new Container Container => base.Container;
 
-            public WedgeInfoText Info => base.Container.Info;
+            public new WedgeInfoText Info => base.Info;
         }
 
         private class TestHitObject : ConvertHitObject, IHasPosition
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 4be7d3b0f4..53ac97cc7d 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -48,7 +48,8 @@ namespace osu.Game.Screens.Select
 
         private IBindable<StarDifficulty?> beatmapDifficulty;
 
-        protected BeatmapInfoWedgeContainer Container;
+        protected Container Container;
+        protected WedgeInfoText Info;
 
         public BeatmapInfoWedge()
         {
@@ -111,7 +112,7 @@ namespace osu.Game.Screens.Select
 
         public override bool IsPresent => base.IsPresent || Container == null; // Visibility is updated in the LoadComponentAsync callback
 
-        private BeatmapInfoWedgeContainer loadingInfo;
+        private Container loadingInfo;
 
         private void updateDisplay()
         {
@@ -134,10 +135,16 @@ namespace osu.Game.Screens.Select
                     return;
                 }
 
-                LoadComponentAsync(loadingInfo = new BeatmapInfoWedgeContainer(beatmap, ruleset.Value, mods.Value, beatmapDifficulty.Value ?? new StarDifficulty())
+                LoadComponentAsync(loadingInfo = new Container
                 {
+                    RelativeSizeAxes = Axes.Both,
                     Shear = -Shear,
                     Depth = Container?.Depth + 1 ?? 0,
+                    Children = new Drawable[]
+                    {
+                        new BeatmapInfoWedgeBackground(beatmap),
+                        Info = new WedgeInfoText(beatmap, ruleset.Value, mods.Value, beatmapDifficulty.Value ?? new StarDifficulty()),
+                    }
                 }, loaded =>
                 {
                     // ensure we are the most recent loaded wedge.
@@ -520,35 +527,5 @@ namespace osu.Game.Screens.Select
                 }
             }
         }
-
-        public class BeatmapInfoWedgeContainer : Container
-        {
-            private readonly WorkingBeatmap beatmap;
-            private readonly RulesetInfo ruleset;
-            private readonly StarDifficulty starDifficulty;
-            private readonly IReadOnlyList<Mod> mods;
-
-            internal WedgeInfoText Info;
-
-            public BeatmapInfoWedgeContainer(WorkingBeatmap beatmap, RulesetInfo ruleset, IReadOnlyList<Mod> mods, StarDifficulty difficulty)
-            {
-                this.beatmap = beatmap;
-                this.ruleset = ruleset;
-                this.mods = mods;
-                starDifficulty = difficulty;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                RelativeSizeAxes = Axes.Both;
-
-                Children = new Drawable[]
-                {
-                    new BeatmapInfoWedgeBackground(beatmap),
-                    Info = new WedgeInfoText(beatmap, ruleset, mods, starDifficulty),
-                };
-            }
-        }
     }
 }