Merge branch 'master' into multiplayer-test-simplify

2026-05-25 19:50:22 +08:00 · 2020-07-10 09:58:58 +09:00
parent 43624381bf 0f91e41764
commit 58de7a2e74
1 changed files with 3 additions and 8 deletions
@@ -34,7 +34,7 @@ namespace osu.Game.Screens.Multi.Lounge

        public LoungeSubScreen()
        {
-            SearchContainer searchContainer;
+            RoomsContainer roomsContainer;

            InternalChildren = new Drawable[]
            {
@@ -55,14 +55,9 @@ namespace osu.Game.Screens.Multi.Lounge
                                    RelativeSizeAxes = Axes.Both,
                                    ScrollbarOverlapsContent = false,
                                    Padding = new MarginPadding(10),
-                                    Child = searchContainer = new SearchContainer
-                                    {
-                                        RelativeSizeAxes = Axes.X,
-                                        AutoSizeAxes = Axes.Y,
-                                        Child = new RoomsContainer { JoinRequested = joinRequested }
-                                    },
+                                    Child = roomsContainer = new RoomsContainer { JoinRequested = joinRequested }
                                },
-                                loadingLayer = new LoadingLayer(searchContainer),
+                                loadingLayer = new LoadingLayer(roomsContainer),
                            }
                        },
                        new RoomInspector