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

Fix dialog overlay playing double samples on show/hide

Browse Source
This commit is contained in:
Dean Herbert
2018-06-21 16:47:05 +09:00
parent 4c14f547dd
commit a2fa55c426
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,8 @@ namespace osu.Game.Graphics.Containers
private SampleChannel samplePopIn; private SampleChannel samplePopIn;
private SampleChannel samplePopOut; private SampleChannel samplePopOut;
protected virtual bool PlaySamplesOnStateChange => true;
protected readonly Bindable<OverlayActivation> OverlayActivationMode = new Bindable<OverlayActivation>(OverlayActivation.All); protected readonly Bindable<OverlayActivation> OverlayActivationMode = new Bindable<OverlayActivation>(OverlayActivation.All);
[BackgroundDependencyLoader(true)] [BackgroundDependencyLoader(true)]
@ -28,7 +30,7 @@ namespace osu.Game.Graphics.Containers
samplePopIn = audio.Sample.Get(@"UI/overlay-pop-in"); samplePopIn = audio.Sample.Get(@"UI/overlay-pop-in");
samplePopOut = audio.Sample.Get(@"UI/overlay-pop-out"); samplePopOut = audio.Sample.Get(@"UI/overlay-pop-out");
StateChanged += onStateChanged; StateChanged += OnStateChanged;
} }
/// <summary> /// <summary>
@ -51,18 +53,20 @@ namespace osu.Game.Graphics.Containers
return base.OnClick(state); return base.OnClick(state);
} }
private void onStateChanged(Visibility visibility) protected virtual void OnStateChanged(Visibility visibility)
{ {
switch (visibility) switch (visibility)
{ {
case Visibility.Visible: case Visibility.Visible:
if (OverlayActivationMode != OverlayActivation.Disabled) if (OverlayActivationMode != OverlayActivation.Disabled)
samplePopIn?.Play(); {
if (PlaySamplesOnStateChange) samplePopIn?.Play();
}
else else
State = Visibility.Hidden; State = Visibility.Hidden;
break; break;
case Visibility.Hidden: case Visibility.Hidden:
samplePopOut?.Play(); if (PlaySamplesOnStateChange) samplePopOut?.Play();
break; break;
} }
} }

2
osu.Game/Overlays/DialogOverlay.cs
View File

@ -30,6 +30,8 @@ namespace osu.Game.Overlays
State = Visibility.Visible; State = Visibility.Visible;
} }
protected override bool PlaySamplesOnStateChange => false;
private void onDialogOnStateChanged(VisibilityContainer dialog, Visibility v) private void onDialogOnStateChanged(VisibilityContainer dialog, Visibility v)
{ {
if (v != Visibility.Hidden) return; if (v != Visibility.Hidden) return;