mirror of
https://github.com/ppy/osu
synced 2025-01-03 04:42:10 +00:00
Don't play fling animation when activating a notification
This commit is contained in:
parent
c064853751
commit
4ee3e8f087
@ -227,7 +227,7 @@ namespace osu.Game.Overlays.Notifications
|
||||
if (e.Button == MouseButton.Left)
|
||||
Activated?.Invoke();
|
||||
|
||||
Close(true);
|
||||
Close(false);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -245,13 +245,13 @@ namespace osu.Game.Overlays.Notifications
|
||||
|
||||
public bool WasClosed;
|
||||
|
||||
public virtual void Close(bool userTriggered)
|
||||
public virtual void Close(bool runFlingAnimation)
|
||||
{
|
||||
if (WasClosed) return;
|
||||
|
||||
WasClosed = true;
|
||||
|
||||
if (userTriggered && dragContainer.FlingLeft())
|
||||
if (runFlingAnimation && dragContainer.FlingLeft())
|
||||
this.FadeOut(600, Easing.In);
|
||||
else
|
||||
{
|
||||
|
@ -235,12 +235,12 @@ namespace osu.Game.Overlays.Notifications
|
||||
});
|
||||
}
|
||||
|
||||
public override void Close(bool userTriggered)
|
||||
public override void Close(bool runFlingAnimation)
|
||||
{
|
||||
switch (State)
|
||||
{
|
||||
case ProgressNotificationState.Cancelled:
|
||||
base.Close(userTriggered);
|
||||
base.Close(runFlingAnimation);
|
||||
break;
|
||||
|
||||
case ProgressNotificationState.Active:
|
||||
|
@ -148,7 +148,7 @@ namespace osu.Game.Updater
|
||||
StartDownload();
|
||||
}
|
||||
|
||||
public override void Close(bool userTriggered)
|
||||
public override void Close(bool runFlingAnimation)
|
||||
{
|
||||
// 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(userTriggered);
|
||||
base.Close(runFlingAnimation);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user