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

Don't trigger fling animation when Close is triggered by non-user action

Browse Source
This commit is contained in:
Dean Herbert 2022-09-12 16:54:25 +09:00
parent 5a02e1e713
commit d561fcb126
6 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Online/TestSceneBeatmapDownloading.cs
View File

@ -91,7 +91,7 @@ namespace osu.Game.Tests.Online
{
AddStep("download beatmap", () => beatmaps.Download(test_db_model));
AddStep("cancel download from notification", () => recentNotification.Close());
AddStep("cancel download from notification", () => recentNotification.Close(true));
AddUntilStep("is removed from download list", () => beatmaps.GetExistingDownload(test_db_model) == null);
AddAssert("is notification cancelled", () => recentNotification.State == ProgressNotificationState.Cancelled);

2
osu.Game/Database/ModelDownloader.cs
View File

@ -111,7 +111,7 @@ namespace osu.Game.Database
{
if (error is WebException webException && webException.Message == @"TooManyRequests")
{
notification.Close();
notification.Close(false);
PostNotification?.Invoke(new TooManyDownloadsNotification());
}
else

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

@ -168,7 +168,7 @@ namespace osu.Game.Overlays.Notifications
},
new CloseButton(CloseButtonIcon)
{
Action = Close,
Action = () => Close(true),
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
}
@ -214,7 +214,7 @@ namespace osu.Game.Overlays.Notifications
// right click doesn't trigger OnClick so we need to handle here until that changes.
if (e.Button != MouseButton.Left)
{
Close();
Close(true);
return true;
}
@ -227,7 +227,7 @@ namespace osu.Game.Overlays.Notifications
if (e.Button == MouseButton.Left)
Activated?.Invoke();
Close();
Close(true);
return true;
}
@ -245,13 +245,13 @@ namespace osu.Game.Overlays.Notifications
public bool WasClosed;
public virtual void Close()
public virtual void Close(bool userTriggered)
{
if (WasClosed) return;
WasClosed = true;
if (dragContainer.FlingLeft())
if (userTriggered && dragContainer.FlingLeft())
this.FadeOut(600, Easing.In);
else
{
@ -272,7 +272,6 @@ namespace osu.Game.Overlays.Notifications
public DragContainer(Notification notification)
{
this.notification = notification;
notification.Closed += () => FlingLeft();
}
public override RectangleF BoundingBox
@ -363,7 +362,7 @@ namespace osu.Game.Overlays.Notifications
flinging = true;
ClearTransforms();
notification.Close();
notification.Close(true);
return true;
}

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

@ -112,7 +112,7 @@ namespace osu.Game.Overlays.Notifications
private void clearAll()
{
notifications.Children.ForEach(c => c.Close());
notifications.Children.ForEach(c => c.Close(true));
}
protected override void Update()

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

@ -142,7 +142,7 @@ namespace osu.Game.Overlays.Notifications
case ProgressNotificationState.Completed:
loadingSpinner.Hide();
attemptPostCompletion();
base.Close();
base.Close(false);
break;
}
}
@ -235,12 +235,12 @@ namespace osu.Game.Overlays.Notifications
});
}
public override void Close()
public override void Close(bool userTriggered)
{
switch (State)
{
case ProgressNotificationState.Cancelled:
base.Close();
base.Close(userTriggered);
break;
case ProgressNotificationState.Active:

6
osu.Game/Updater/UpdateManager.cs
View File

@ -148,7 +148,7 @@ namespace osu.Game.Updater
StartDownload();
}
public override void Close()
public override void Close(bool userTriggered)
{
// cancelling updates is not currently supported by the underlying updater.
// only allow dismissing for now.
@ -156,7 +156,7 @@ namespace osu.Game.Updater
switch (State)
{
case ProgressNotificationState.Cancelled:
base.Close();
base.Close(userTriggered);
break;
}
}
@ -177,7 +177,7 @@ namespace osu.Game.Updater
public void FailDownload()
{
State = ProgressNotificationState.Cancelled;
Close();
Close(false);
}
}
}