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

Hide and disable player settings overlay on multi-spectator player

Browse Source
This commit is contained in:
Salman Ahmed 2021-08-13 06:28:07 +03:00
parent 2b86416cb2
commit c10320f239
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
View File

@ -4,6 +4,7 @@
using JetBrains.Annotations; using JetBrains.Annotations;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics.Containers;
using osu.Framework.Timing; using osu.Framework.Timing;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Scoring; using osu.Game.Scoring;
@ -34,6 +35,9 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
private void load() private void load()
{ {
spectatorPlayerClock.WaitingOnFrames.BindTo(waitingOnFrames); spectatorPlayerClock.WaitingOnFrames.BindTo(waitingOnFrames);
HUDOverlay.PlayerSettingsOverlay.State.Value = Visibility.Hidden;
HUDOverlay.PlayerSettingsOverlay.State.Disabled = true;
} }
protected override void UpdateAfterChildren() protected override void UpdateAfterChildren()

2
osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs
View File

@ -57,7 +57,7 @@ namespace osu.Game.Screens.Play.HUD
if (e.ControlPressed) if (e.ControlPressed)
{ {
if (e.Key == Key.H && ReplayLoaded) if (e.Key == Key.H && ReplayLoaded && !State.Disabled)
{ {
ToggleVisibility(); ToggleVisibility();
return true; return true;

8
osu.Game/Screens/Play/HUDOverlay.cs
View File

@ -240,13 +240,17 @@ namespace osu.Game.Screens.Play
if (e.NewValue) if (e.NewValue)
{ {
PlayerSettingsOverlay.Show(); if (!PlayerSettingsOverlay.State.Disabled)
PlayerSettingsOverlay.Show();
ModDisplay.FadeIn(200); ModDisplay.FadeIn(200);
KeyCounter.Margin = new MarginPadding(10) { Bottom = 30 }; KeyCounter.Margin = new MarginPadding(10) { Bottom = 30 };
} }
else else
{ {
PlayerSettingsOverlay.Hide(); if (!PlayerSettingsOverlay.State.Disabled)
PlayerSettingsOverlay.Hide();
ModDisplay.Delay(2000).FadeOut(200); ModDisplay.Delay(2000).FadeOut(200);
KeyCounter.Margin = new MarginPadding(10); KeyCounter.Margin = new MarginPadding(10);
} }