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

Fix progress notifications being able to be flung

Browse Source
This commit is contained in:
Dean Herbert 2022-09-26 14:30:40 +09:00
parent 82d4689716
commit b6dd8168d2
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Overlays/Notifications/Notification.cs
View File

@ -68,6 +68,8 @@ namespace osu.Game.Overlays.Notifications
public virtual bool Read { get; set; } public virtual bool Read { get; set; }
protected virtual bool AllowFlingDismiss => true;
public new bool IsDragged => dragContainer.IsDragged; public new bool IsDragged => dragContainer.IsDragged;
protected virtual IconUsage CloseButtonIcon => FontAwesome.Solid.Check; protected virtual IconUsage CloseButtonIcon => FontAwesome.Solid.Check;
@ -315,7 +317,7 @@ namespace osu.Game.Overlays.Notifications
protected override void OnDragEnd(DragEndEvent e) protected override void OnDragEnd(DragEndEvent e)
{ {
if (Rotation < -10 || velocity.X < -0.3f) if (notification.AllowFlingDismiss && (Rotation < -10 || velocity.X < -0.3f))
notification.Close(true); notification.Close(true);
else if (X > 30 || velocity.X > 0.3f) else if (X > 30 || velocity.X > 0.3f)
notification.ForwardToOverlay?.Invoke(); notification.ForwardToOverlay?.Invoke();

2
osu.Game/Overlays/Notifications/ProgressNotification.cs
View File

@ -25,6 +25,8 @@ namespace osu.Game.Overlays.Notifications
public Func<bool>? CancelRequested { get; set; } public Func<bool>? CancelRequested { get; set; }
protected override bool AllowFlingDismiss => false;
/// <summary> /// <summary>
/// The function to post completion notifications back to. /// The function to post completion notifications back to.
/// </summary> /// </summary>