1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 21:43:22 +08:00

Stay displayed while hovering

This commit is contained in:
Dean Herbert 2022-07-20 20:29:18 +09:00
parent 03e644e548
commit 0fb959a565

View File

@ -7,6 +7,8 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour; using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Cursor; using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.Events;
using osu.Framework.Localisation; using osu.Framework.Localisation;
using osu.Framework.Platform; using osu.Framework.Platform;
using osu.Framework.Threading; using osu.Framework.Threading;
@ -23,6 +25,10 @@ namespace osu.Game.Graphics.UserInterface
private Container mainContent = null!; private Container mainContent = null!;
private Container background = null!;
private const float idle_background_alpha = 0.4f;
[Resolved] [Resolved]
private OsuColour colours { get; set; } = null!; private OsuColour colours { get; set; } = null!;
@ -39,9 +45,24 @@ namespace osu.Game.Graphics.UserInterface
mainContent = new Container mainContent = new Container
{ {
Alpha = 0, Alpha = 0,
Size = new Vector2(30), AutoSizeAxes = Axes.Both,
Children = new Drawable[] Children = new Drawable[]
{ {
background = new Container
{
RelativeSizeAxes = Axes.Both,
CornerRadius = 5,
Masking = true,
Alpha = idle_background_alpha,
Children = new Drawable[]
{
new Box
{
Colour = colours.Gray0,
RelativeSizeAxes = Axes.Both,
},
}
},
msCounter = new FrameTimeCounter msCounter = new FrameTimeCounter
{ {
Anchor = Anchor.TopRight, Anchor = Anchor.TopRight,
@ -65,6 +86,20 @@ namespace osu.Game.Graphics.UserInterface
displayTemporarily(); displayTemporarily();
} }
protected override bool OnHover(HoverEvent e)
{
background.FadeTo(1, 200);
displayTemporarily();
return base.OnHover(e);
}
protected override void OnHoverLost(HoverLostEvent e)
{
background.FadeTo(idle_background_alpha, 200);
displayTemporarily();
base.OnHoverLost(e);
}
private bool isDisplayed; private bool isDisplayed;
private ScheduledDelegate? fadeOutDelegate; private ScheduledDelegate? fadeOutDelegate;
@ -75,11 +110,15 @@ namespace osu.Game.Graphics.UserInterface
mainContent.FadeTo(1, 300, Easing.OutQuint); mainContent.FadeTo(1, 300, Easing.OutQuint);
fadeOutDelegate?.Cancel(); fadeOutDelegate?.Cancel();
fadeOutDelegate = Scheduler.AddDelayed(() =>
if (!IsHovered)
{ {
mainContent.FadeTo(0, 1000, Easing.In); fadeOutDelegate = Scheduler.AddDelayed(() =>
isDisplayed = false; {
}, 2000); mainContent.FadeTo(0, 1000, Easing.In);
isDisplayed = false;
}, 2000);
}
} }
[Resolved] [Resolved]