h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-13 08:32:57 +08:00
Code Issues Releases Wiki Activity

avoid potentially cancelling contract when switching away from GameplayScreen

Browse Source
This commit is contained in:
Dao Heng Liu 2023-07-23 10:39:47 +01:00
parent 647f2b6715
commit 3049d159d8
No known key found for this signature in database
GPG Key ID: 76B315615CDDAFDE
1 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
View File

@ -3,6 +3,7 @@
#nullable disable
using System.Diagnostics.Contracts;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
@ -159,6 +160,25 @@ namespace osu.Game.Tournament.Screens.Gameplay
private TourneyState lastState;
private MatchHeader header;
private void contract()
{
SongBar.Expanded = false;
scoreDisplay.FadeOut(100);
using (chat?.BeginDelayedSequence(500))
chat?.Expand();
}
private void expand()
{
chat?.Contract();
using (BeginDelayedSequence(300))
{
scoreDisplay.FadeIn(100);
SongBar.Expanded = true;
}
}
private void stateChanged(ValueChangedEvent<TourneyState> state)
{
try
@ -175,25 +195,6 @@ namespace osu.Game.Tournament.Screens.Gameplay
scheduledOperation?.Cancel();
void expand()
{
chat?.Contract();
using (BeginDelayedSequence(300))
{
scoreDisplay.FadeIn(100);
SongBar.Expanded = true;
}
}
void contract()
{
SongBar.Expanded = false;
scoreDisplay.FadeOut(100);
using (chat?.BeginDelayedSequence(500))
chat?.Expand();
}
switch (state.NewValue)
{
case TourneyState.Idle:
@ -234,7 +235,14 @@ namespace osu.Game.Tournament.Screens.Gameplay
public override void Hide()
{
scheduledOperation?.Cancel();
if (scheduledOperation != null)
{
scheduledOperation.Cancel();
if (State.Value == TourneyState.Ranking)
contract();
}
base.Hide();
}