sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 07:06:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

Don't add rooms to lounge until they're actually created

Browse Source
This commit is contained in:
smoogipoo
2018-12-10 18:35:08 +09:00
parent ca544ef3fe
commit 3f64cfc1c6
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
osu.Game/Screens/Multi/Screens/Lounge/Lounge.cs
View File

@ -2,6 +2,7 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Collections.Generic;
using osu.Framework.Configuration;
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
@ -26,6 +27,9 @@ namespace osu.Game.Screens.Multi.Screens.Lounge
public override string Title => "Lounge";
private Room roomBeingCreated;
private readonly IBindable<bool> roomCreated = new Bindable<bool>();
protected override Drawable TransitionContent => content;
public Lounge()
@ -74,6 +78,12 @@ namespace osu.Game.Screens.Multi.Screens.Lounge
Filter.Search.Current.ValueChanged += s => filterRooms();
Filter.Tabs.Current.ValueChanged += t => filterRooms();
Filter.Search.Exit += Exit;
roomCreated.BindValueChanged(v =>
{
if (v)
addRoom(roomBeingCreated);
});
}
protected override void UpdateAfterChildren()
@ -147,8 +157,14 @@ namespace osu.Game.Screens.Multi.Screens.Lounge
{
if (Filter.Tabs.Current.Value == LoungeTab.Create)
{
roomBeingCreated = new Room();
roomCreated.UnbindBindings();
roomCreated.BindTo(roomBeingCreated.Created);
Filter.Tabs.Current.Value = LoungeTab.Public;
createRoom(new Room());
Push(new Match.Match(roomBeingCreated));
}
search.SearchTerm = Filter.Search.Current.Value ?? string.Empty;
@ -181,12 +197,6 @@ namespace osu.Game.Screens.Multi.Screens.Lounge
Push(new Match.Match(room.Room));
}
private void createRoom(Room room)
{
openRoom(addRoom(room));
Filter.Tabs.Current.Value = LoungeTab.Public;
}
private class RoomsFilterContainer : FillFlowContainer<DrawableRoom>, IHasFilterableChildren
{
public IEnumerable<string> FilterTerms => new string[] { };