h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-13 19:43:22 +08:00
Code Issues Releases Wiki Activity

Resolve LoungeSubScreen from PasswordEntryPopover

Browse Source 
This is preferred over passing down the already-resolved LoungeSubScreen
This commit is contained in:
sh0ckR6 2021-09-12 14:36:11 -04:00
parent e018071be4
commit 447001931c
No known key found for this signature in database
GPG Key ID: 701938030071AF85
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game/Screens/OnlinePlay/Lounge/DrawableLoungeRoom.cs
View File

@ -122,7 +122,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
} }
} }
public Popover GetPopover() => new PasswordEntryPopover(Room) { Lounge = lounge }; public Popover GetPopover() => new PasswordEntryPopover(Room);
public MenuItem[] ContextMenuItems => new MenuItem[] public MenuItem[] ContextMenuItems => new MenuItem[]
{ {
@ -178,7 +178,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
{ {
private readonly Room room; private readonly Room room;
public LoungeSubScreen Lounge; [Resolved(canBeNull: true)]
private LoungeSubScreen lounge { get; set; }
public PasswordEntryPopover(Room room) public PasswordEntryPopover(Room room)
{ {
@ -219,7 +220,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
}; };
Child = shakeContainer; Child = shakeContainer;
joinButton.Action = () => Lounge?.Join(room, passwordTextbox.Text, null, joinFailed); joinButton.Action = () => lounge?.Join(room, passwordTextbox.Text, null, joinFailed);
} }
private void joinFailed(string error) private void joinFailed(string error)
@ -234,7 +235,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
base.LoadComplete(); base.LoadComplete();
Schedule(() => GetContainingInputManager().ChangeFocus(passwordTextbox)); Schedule(() => GetContainingInputManager().ChangeFocus(passwordTextbox));
passwordTextbox.OnCommit += (_, __) => Lounge?.Join(room, passwordTextbox.Text, null, joinFailed); passwordTextbox.OnCommit += (_, __) => lounge?.Join(room, passwordTextbox.Text, null, joinFailed);
} }
} }
} }