h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 15:47:26 +08:00
Code Issues Releases Wiki Activity

Make on-confirmation animation more robust

Browse Source
This commit is contained in:
Dean Herbert 2018-05-22 02:08:44 +09:00
parent 156d7fb25a
commit 323aa189b6
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
osu.Game/Screens/Play/HUD/QuitButton.cs
View File

@ -81,9 +81,11 @@ namespace osu.Game.Screens.Play.HUD
private class Button : HoldToCofirmContainer
{
private SpriteIcon icon;
private CircularProgress progress;
private CircularProgress circularProgress;
private Circle innerCircle;
protected override bool AllowMultipleFires => true;
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
@ -101,7 +103,7 @@ namespace osu.Game.Screens.Play.HUD
Colour = colours.Gray1,
Alpha = 0.5f,
},
progress = new CircularProgress
circularProgress = new CircularProgress
{
RelativeSizeAxes = Axes.Both,
InnerRadius = 1
@ -125,19 +127,38 @@ namespace osu.Game.Screens.Play.HUD
}
};
Progress.BindTo(progress.Current);
bind();
}
private void bind()
{
circularProgress.Current.BindTo(Progress);
Progress.ValueChanged += v => icon.Scale = new Vector2(1 + (float)v * 0.4f);
}
private bool pendingAnimation;
protected override void Confirm()
{
base.Confirm();
innerCircle.ScaleTo(0, 100).Then().FadeOut().ScaleTo(1).FadeIn(500);
// temporarily unbind as to not look weird during flash animation.
Progress.UnbindAll();
pendingAnimation = true;
innerCircle.ScaleTo(0, 100)
.Then().FadeOut().ScaleTo(1).FadeIn(500)
.OnComplete(a => circularProgress.FadeOut(100).OnComplete(_ =>
{
bind();
circularProgress.FadeIn();
pendingAnimation = false;
}));
}
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
{
if (state.Mouse.Buttons.Count == 1)
if (!pendingAnimation && state.Mouse.Buttons.Count == 1)
BeginConfirm();
return true;
}