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

Merge pull request #13459 from peppy/fix-wave-overlay-sound-on-switch

Browse Source
This commit is contained in:
Bartłomiej Dach 2021-06-11 22:41:23 +02:00 committed by GitHub
commit c644e11e5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
View File

@ -107,10 +107,10 @@ namespace osu.Game.Graphics.Containers
{ {
} }
private bool playedPopInSound;
protected override void UpdateState(ValueChangedEvent<Visibility> state) protected override void UpdateState(ValueChangedEvent<Visibility> state)
{ {
bool didChange = state.NewValue != state.OldValue;
switch (state.NewValue) switch (state.NewValue)
{ {
case Visibility.Visible: case Visibility.Visible:
@ -121,18 +121,15 @@ namespace osu.Game.Graphics.Containers
return; return;
} }
if (didChange)
samplePopIn?.Play(); samplePopIn?.Play();
playedPopInSound = true;
if (BlockScreenWideMouse && DimMainContent) game?.AddBlockingOverlay(this); if (BlockScreenWideMouse && DimMainContent) game?.AddBlockingOverlay(this);
break; break;
case Visibility.Hidden: case Visibility.Hidden:
if (playedPopInSound) if (didChange)
{
samplePopOut?.Play(); samplePopOut?.Play();
playedPopInSound = false;
}
if (BlockScreenWideMouse) game?.RemoveBlockingOverlay(this); if (BlockScreenWideMouse) game?.RemoveBlockingOverlay(this);
break; break;