From 57320074a0f6140bdd17423e416af3db200361c8 Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Thu, 20 Oct 2022 01:24:36 +0300
Subject: [PATCH] Fix accidental breakage of changelog layout

---
 .../Overlays/Changelog/ChangelogContent.cs    | 13 +++++-
 .../Changelog/ChangelogSingleBuild.cs         | 46 ++++++++-----------
 2 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Overlays/Changelog/ChangelogContent.cs b/osu.Game/Overlays/Changelog/ChangelogContent.cs
index 1e49efb10e..dca2f3b1b0 100644
--- a/osu.Game/Overlays/Changelog/ChangelogContent.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogContent.cs
@@ -7,20 +7,29 @@
 using osu.Framework.Graphics.Containers;
 using osu.Game.Online.API.Requests.Responses;
 using System;
+using osu.Framework.Graphics.Cursor;
 
 namespace osu.Game.Overlays.Changelog
 {
-    public class ChangelogContent : FillFlowContainer
+    public class ChangelogContent : PopoverContainer
     {
         public Action<APIChangelogBuild> BuildSelected;
 
         public void SelectBuild(APIChangelogBuild build) => BuildSelected?.Invoke(build);
 
+        protected override Container<Drawable> Content { get; }
+
         public ChangelogContent()
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
-            Direction = FillDirection.Vertical;
+            Content = new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical
+            };
+            base.Content.Add(Content);
         }
     }
 }
diff --git a/osu.Game/Overlays/Changelog/ChangelogSingleBuild.cs b/osu.Game/Overlays/Changelog/ChangelogSingleBuild.cs
index afdfd0ff68..e4f240f0e7 100644
--- a/osu.Game/Overlays/Changelog/ChangelogSingleBuild.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogSingleBuild.cs
@@ -10,7 +10,6 @@
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
@@ -64,33 +63,28 @@ private void load(CancellationToken? cancellation, IAPIProvider api, OverlayColo
             {
                 CommentsContainer comments;
 
-                Child = new PopoverContainer
+                Children = new Drawable[]
                 {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Children = new Drawable[]
+                    new ChangelogBuildWithNavigation(build) { SelectBuild = SelectBuild },
+                    new Box
                     {
-                        new ChangelogBuildWithNavigation(build) { SelectBuild = SelectBuild },
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            Height = 2,
-                            Colour = colourProvider.Background6,
-                            Margin = new MarginPadding { Top = 30 },
-                        },
-                        new ChangelogSupporterPromo
-                        {
-                            Alpha = api.LocalUser.Value.IsSupporter ? 0 : 1,
-                        },
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            Height = 2,
-                            Colour = colourProvider.Background6,
-                            Alpha = api.LocalUser.Value.IsSupporter ? 0 : 1,
-                        },
-                        comments = new CommentsContainer()
-                    }
+                        RelativeSizeAxes = Axes.X,
+                        Height = 2,
+                        Colour = colourProvider.Background6,
+                        Margin = new MarginPadding { Top = 30 },
+                    },
+                    new ChangelogSupporterPromo
+                    {
+                        Alpha = api.LocalUser.Value.IsSupporter ? 0 : 1,
+                    },
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Height = 2,
+                        Colour = colourProvider.Background6,
+                        Alpha = api.LocalUser.Value.IsSupporter ? 0 : 1,
+                    },
+                    comments = new CommentsContainer()
                 };
 
                 comments.ShowComments(CommentableType.Build, build.Id);