From d7e5bcbd3c401a99e5414a25cd5e097c3c6a7836 Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Mon, 17 Oct 2022 13:41:46 +0300
Subject: [PATCH] Add popover containers to overlays

---
 osu.Game/Overlays/BeatmapSetOverlay.cs        | 24 ++++++----
 .../Changelog/ChangelogSingleBuild.cs         | 46 +++++++++++--------
 2 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSetOverlay.cs b/osu.Game/Overlays/BeatmapSetOverlay.cs
index 207dc91ca5..904fd6ead6 100644
--- a/osu.Game/Overlays/BeatmapSetOverlay.cs
+++ b/osu.Game/Overlays/BeatmapSetOverlay.cs
@@ -10,6 +10,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays.BeatmapSet;
@@ -44,20 +45,25 @@ namespace osu.Game.Overlays
             Info info;
             CommentsSection comments;
 
-            Child = new FillFlowContainer
+            Child = new PopoverContainer
             {
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,
-                Direction = FillDirection.Vertical,
-                Spacing = new Vector2(0, 20),
-                Children = new Drawable[]
+                Child = new FillFlowContainer
                 {
-                    info = new Info(),
-                    new ScoresContainer
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(0, 20),
+                    Children = new Drawable[]
                     {
-                        Beatmap = { BindTarget = Header.HeaderContent.Picker.Beatmap }
-                    },
-                    comments = new CommentsSection()
+                        info = new Info(),
+                        new ScoresContainer
+                        {
+                            Beatmap = { BindTarget = Header.HeaderContent.Picker.Beatmap }
+                        },
+                        comments = new CommentsSection()
+                    }
                 }
             };
 
diff --git a/osu.Game/Overlays/Changelog/ChangelogSingleBuild.cs b/osu.Game/Overlays/Changelog/ChangelogSingleBuild.cs
index e4f240f0e7..afdfd0ff68 100644
--- a/osu.Game/Overlays/Changelog/ChangelogSingleBuild.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogSingleBuild.cs
@@ -10,6 +10,7 @@ using osu.Framework.Allocation;
 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;
@@ -63,28 +64,33 @@ namespace osu.Game.Overlays.Changelog
             {
                 CommentsContainer comments;
 
-                Children = new Drawable[]
+                Child = new PopoverContainer
                 {
-                    new ChangelogBuildWithNavigation(build) { SelectBuild = SelectBuild },
-                    new Box
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Children = new Drawable[]
                     {
-                        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()
+                        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()
+                    }
                 };
 
                 comments.ShowComments(CommentableType.Build, build.Id);