h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-28 07:12:12 +08:00
Code Issues Releases Wiki Activity

Expire instead of hiding and disabling visibility state

Browse Source 
Since it's a temporary change until the spectator interface gets
improved, no need to add further logic.
This commit is contained in:
Salman Ahmed
2021-08-13 07:28:57 +03:00
Unverified
parent 1892db7f37
commit 8dc7a925e7
4 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
+1 -3
View File
@@ -4,7 +4,6 @@
using JetBrains.Annotations;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics.Containers;
using osu.Framework.Timing;
using osu.Game.Beatmaps;
using osu.Game.Scoring;
@@ -36,8 +35,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
{
spectatorPlayerClock.WaitingOnFrames.BindTo(waitingOnFrames);
HUDOverlay.PlayerSettingsOverlay.State.Value = Visibility.Hidden;
HUDOverlay.PlayerSettingsOverlay.State.Disabled = true;
HUDOverlay.PlayerSettingsOverlay.Expire();
}
protected override void UpdateAfterChildren()
osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayerLoader.cs
+1 -1
View File
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
[BackgroundDependencyLoader]
private void load()
{
PlayerSettingsGroups.Alpha = 0f;
PlayerSettingsGroups.Expire();
}
protected override void LogoArriving(OsuLogo logo, bool resuming)
osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs
+1 -1
View File
@@ -57,7 +57,7 @@ namespace osu.Game.Screens.Play.HUD
if (e.ControlPressed)
{
if (e.Key == Key.H && ReplayLoaded && !State.Disabled)
if (e.Key == Key.H && ReplayLoaded)
{
ToggleVisibility();
return true;
osu.Game/Screens/Play/HUDOverlay.cs
+2 -6
View File
@@ -240,17 +240,13 @@ namespace osu.Game.Screens.Play
if (e.NewValue)
{
if (!PlayerSettingsOverlay.State.Disabled)
PlayerSettingsOverlay.Show();
PlayerSettingsOverlay.Show();
ModDisplay.FadeIn(200);
KeyCounter.Margin = new MarginPadding(10) { Bottom = 30 };
}
else
{
if (!PlayerSettingsOverlay.State.Disabled)
PlayerSettingsOverlay.Hide();
PlayerSettingsOverlay.Hide();
ModDisplay.Delay(2000).FadeOut(200);
KeyCounter.Margin = new MarginPadding(10);
}