sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-08 09:03:50 +09:00
Code Issues Packages Projects Releases Wiki Activity

Make hint text display briefly at initial display, then on hover

Browse Source
This commit is contained in:
Dean Herbert
2018-05-22 00:02:03 +09:00
parent 3d9d40448d
commit d5afccd610
1 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,8 @@ namespace osu.Game.Screens.Play.HUD
{ {
public class QuitButton : FillFlowContainer public class QuitButton : FillFlowContainer
{ {
public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => button.ReceiveMouseInputAt(screenSpacePos);
private readonly Button button; private readonly Button button;
public Action ExitAction public Action ExitAction
@ -24,28 +26,47 @@ namespace osu.Game.Screens.Play.HUD
set => button.ExitAction = value; set => button.ExitAction = value;
} }
OsuSpriteText text;
public QuitButton() public QuitButton()
{ {
OsuSpriteText text;
Direction = FillDirection.Horizontal; Direction = FillDirection.Horizontal;
Spacing = new Vector2(20, 0); Spacing = new Vector2(20, 0);
Margin = new MarginPadding(10);
Children = new Drawable[] Children = new Drawable[]
{ {
text = new OsuSpriteText text = new OsuSpriteText
{ {
Text = "Hold to Quit", Text = "hold to quit",
Font = @"Exo2.0-Bold", Font = @"Exo2.0-Bold",
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft Origin = Anchor.CentreLeft
}, },
button = new Button(text) button = new Button()
}; };
AutoSizeAxes = Axes.Both; AutoSizeAxes = Axes.Both;
} }
protected override void LoadComplete()
{
text.FadeInFromZero(500, Easing.OutQuint).Delay(1500).FadeOut(500, Easing.OutQuint);
base.LoadComplete();
}
protected override bool OnHover(InputState state)
{
text.FadeIn(500, Easing.OutQuint);
return base.OnHover(state);
}
protected override void OnHoverLost(InputState state)
{
text.FadeOut(500, Easing.OutQuint);
base.OnHoverLost(state);
}
private class Button : CircularContainer private class Button : CircularContainer
{ {
private readonly OsuSpriteText text;
private SpriteIcon icon; private SpriteIcon icon;
private CircularProgress progress; private CircularProgress progress;
@ -53,9 +74,6 @@ namespace osu.Game.Screens.Play.HUD
private const int fade_duration = 200; private const int fade_duration = 200;
private const int progress_duration = 1000; private const int progress_duration = 1000;
private const int text_display_time = 5000;
public Button(OsuSpriteText text) => this.text = text;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours)
@ -79,13 +97,11 @@ namespace osu.Game.Screens.Play.HUD
}, },
progress = new CircularProgress { RelativeSizeAxes = Axes.Both, InnerRadius = 0.1f } progress = new CircularProgress { RelativeSizeAxes = Axes.Both, InnerRadius = 0.1f }
}); });
Scheduler.AddDelayed(() => text.FadeOut(fade_duration), text_display_time);
} }
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
{ {
icon.ScaleTo(1.5f); icon.ScaleTo(1.5f);
text.FadeIn(fade_duration);
progress.FillTo(1, progress_duration).OnComplete(cp => ExitAction()); progress.FillTo(1, progress_duration).OnComplete(cp => ExitAction());
return base.OnMouseDown(state, args); return base.OnMouseDown(state, args);
@ -94,7 +110,6 @@ namespace osu.Game.Screens.Play.HUD
protected override bool OnMouseUp(InputState state, MouseUpEventArgs args) protected override bool OnMouseUp(InputState state, MouseUpEventArgs args)
{ {
icon.ScaleTo(1f); icon.ScaleTo(1f);
Scheduler.AddDelayed(() => text.FadeOut(fade_duration), text_display_time);
progress.FillTo(0, progress_duration / 4f).OnComplete(cp => progress.Current.SetDefault()); progress.FillTo(0, progress_duration / 4f).OnComplete(cp => progress.Current.SetDefault());
return base.OnMouseUp(state, args); return base.OnMouseUp(state, args);