h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 18:52:55 +08:00
Code Issues Releases Wiki Activity

Make AbortConfirm() virtual and override with filter logic

Browse Source
This commit is contained in:
Joseph Madamba 2023-02-11 12:54:16 -08:00
parent 94d6ab1ec7
commit 8d9245c1d4
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Graphics/Containers/HoldToConfirmContainer.cs
View File

@ -100,7 +100,7 @@ namespace osu.Game.Graphics.Containers
/// <summary> /// <summary>
/// Abort any ongoing confirmation. Should be called when the container's interaction is no longer valid (ie. the user releases a key). /// Abort any ongoing confirmation. Should be called when the container's interaction is no longer valid (ie. the user releases a key).
/// </summary> /// </summary>
protected void AbortConfirm() protected virtual void AbortConfirm()
{ {
if (!confirming || (!AllowMultipleFires && Fired)) return; if (!confirming || (!AllowMultipleFires && Fired)) return;

8
osu.Game/Overlays/Dialog/PopupDialogDangerousButton.cs
View File

@ -74,6 +74,12 @@ namespace osu.Game.Overlays.Dialog
Progress.BindValueChanged(progressChanged); Progress.BindValueChanged(progressChanged);
} }
protected override void AbortConfirm()
{
lowPassFilter.CutoffTo(AudioFilter.MAX_LOWPASS_CUTOFF);
base.AbortConfirm();
}
protected override void Confirm() protected override void Confirm()
{ {
lowPassFilter.CutoffTo(AudioFilter.MAX_LOWPASS_CUTOFF); lowPassFilter.CutoffTo(AudioFilter.MAX_LOWPASS_CUTOFF);
@ -92,7 +98,6 @@ namespace osu.Game.Overlays.Dialog
{ {
if (!e.HasAnyButtonPressed) if (!e.HasAnyButtonPressed)
{ {
lowPassFilter.CutoffTo(AudioFilter.MAX_LOWPASS_CUTOFF);
AbortConfirm(); AbortConfirm();
mouseDown = false; mouseDown = false;
} }
@ -112,7 +117,6 @@ namespace osu.Game.Overlays.Dialog
if (!mouseDown) return; if (!mouseDown) return;
lowPassFilter.CutoffTo(AudioFilter.MAX_LOWPASS_CUTOFF);
AbortConfirm(); AbortConfirm();
} }