h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 14:12:54 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into multiplayer-test-simplify

Browse Source
This commit is contained in:
Dan Balasescu 2020-07-10 09:58:58 +09:00 committed by GitHub
commit 58de7a2e74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
View File

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