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

Open -> Push

Browse Source
This commit is contained in:
Dean Herbert
2018-12-26 20:21:30 +09:00
parent 692f5c289d
commit 869081ce9c
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,7 +78,7 @@ namespace osu.Game.Screens.Multi.Lounge
private void load() private void load()
{ {
if (roomManager != null) if (roomManager != null)
roomManager.RoomJoined += Open; roomManager.RoomJoined += Push;
} }
protected override void UpdateAfterChildren() protected override void UpdateAfterChildren()
@ -123,7 +123,10 @@ namespace osu.Game.Screens.Multi.Lounge
roomManager?.Filter(Filter.CreateCriteria()); roomManager?.Filter(Filter.CreateCriteria());
} }
public void Open(Room room) /// <summary>
/// Push a room as a new subscreen.
/// </summary>
public void Push(Room room)
{ {
// Handles the case where a room is clicked 3 times in quick succession // Handles the case where a room is clicked 3 times in quick succession
if (!IsCurrentScreen) if (!IsCurrentScreen)
@ -137,7 +140,7 @@ namespace osu.Game.Screens.Multi.Lounge
base.Dispose(isDisposing); base.Dispose(isDisposing);
if (roomManager != null) if (roomManager != null)
roomManager.RoomJoined -= Open; roomManager.RoomJoined -= Push;
} }
} }
} }

2
osu.Game/Screens/Multi/Multiplayer.cs
View File

@ -86,7 +86,7 @@ namespace osu.Game.Screens.Multi
Right = 10, Right = 10,
}, },
Text = "Create room", Text = "Create room",
Action = () => loungeSubScreen.Open(new Room Action = () => loungeSubScreen.Push(new Room
{ {
Name = { Value = $"{api.LocalUser}'s awesome room" } Name = { Value = $"{api.LocalUser}'s awesome room" }
}), }),