h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 04:02:57 +08:00
Code Issues Releases Wiki Activity

Revert "Use the client.RoomUpdated action instead of binding the value of the settings overlay visibility and creating an event from it based on its ValueChanged action."

Browse Source 
This reverts commit cbfb999c28.
This commit is contained in:
Mysfit 2021-01-19 08:24:14 -05:00
parent 9b7187e3c8
commit 6d1d488831
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
View File

@ -39,6 +39,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
private MultiplayerMatchSettingsOverlay settingsOverlay; private MultiplayerMatchSettingsOverlay settingsOverlay;
private readonly Bindable<Visibility> settingsOverlayVisibility = new Bindable<Visibility>();
private GridContainer subScreenContainer; private GridContainer subScreenContainer;
private IBindable<bool> isConnected; private IBindable<bool> isConnected;
@ -182,7 +184,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
}; };
subScreenContainer.Hide(); subScreenContainer.Hide();
client.RoomUpdated += roomUpdated; settingsOverlayVisibility.BindTo(settingsOverlay.State);
settingsOverlayVisibility.ValueChanged += settingsOverlayVisibilityChanged;
} }
protected override void LoadComplete() protected override void LoadComplete()
@ -263,13 +266,19 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
readyClickOperation = null; readyClickOperation = null;
} }
private void roomUpdated() private void settingsOverlayVisibilityChanged(ValueChangedEvent<Visibility> settingsOverlayVisibilityChangedEvent)
{ {
if (client.Room != null) if (client.Room != null)
{ {
// If the room is updated and is not null, show the room sub screen container and unsubscribe.
subScreenContainer.Show(); subScreenContainer.Show();
client.RoomUpdated -= roomUpdated; settingsOverlayVisibility.ValueChanged -= settingsOverlayVisibilityChanged;
}
else
{
if (settingsOverlayVisibilityChangedEvent.NewValue == Visibility.Visible)
subScreenContainer.Hide();
else
subScreenContainer.Show();
} }
} }