From 89eded457c094701a1c4532a546cfe96df50db80 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Aug 2021 14:27:28 +0900
Subject: [PATCH 1/3] Fix weird margins on loading display in lounge

---
 osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
index 122b30b1d2..910afb5540 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
@@ -63,6 +63,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
         {
             OsuScrollContainer scrollContainer;
 
+            Container filterContainer;
+
             InternalChildren = new Drawable[]
             {
                 new Box
@@ -93,7 +95,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
                         {
                             new Drawable[]
                             {
-                                new Container
+                                filterContainer = new Container
                                 {
                                     RelativeSizeAxes = Axes.X,
                                     Height = 70,
@@ -123,13 +125,14 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
                                             ScrollbarOverlapsContent = false,
                                             Child = roomsContainer = new RoomsContainer()
                                         },
-                                        loadingLayer = new LoadingLayer(true),
                                     }
                                 },
                             }
                         }
                     },
-                }
+                },
+                loadingLayer = new LoadingLayer(true),
+                filterContainer.CreateProxy()
             };
 
             // scroll selected room into view on selection.

From a1b72e7f97731b072a3a1fb204fd12310e239bdb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Aug 2021 14:41:07 +0900
Subject: [PATCH 2/3] Remove redundant array type specification

---
 osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
index 910afb5540..fb0b963167 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
 
             Container filterContainer;
 
-            InternalChildren = new Drawable[]
+            InternalChildren = new[]
             {
                 new Box
                 {

From db52549152f56e28cf22bb018ff22f32d19bb8de Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Aug 2021 16:20:53 +0900
Subject: [PATCH 3/3] Move below everything rather than proxying (works better
 with new design)

---
 osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
index 43da62d466..ceec609f6d 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
@@ -75,10 +75,9 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
 
             OsuScrollContainer scrollContainer;
 
-            Container filterContainer;
-
             InternalChildren = new[]
             {
+                loadingLayer = new LoadingLayer(true),
                 new Container
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -159,8 +158,6 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
                         }
                     },
                 },
-                loadingLayer = new LoadingLayer(true),
-                filterContainer.CreateProxy()
             };
 
             // scroll selected room into view on selection.