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

Add background hover and adjust remaining metrics

Browse Source
This commit is contained in:
Dean Herbert 2022-08-30 17:58:32 +09:00
parent bea12ab3c2
commit c846bf20a7
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,6 +58,11 @@ namespace osu.Game.Overlays.Notifications
protected virtual IconUsage CloseButtonIcon => FontAwesome.Solid.Check;
[Resolved]
private OverlayColourProvider colourProvider { get; set; } = null!;
private Box background = null!;
protected Notification()
{
RelativeSizeAxes = Axes.X;
@ -73,7 +78,7 @@ namespace osu.Game.Overlays.Notifications
},
MainContent = new Container
{
CornerRadius = 8,
CornerRadius = 6,
Masking = true,
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
@ -133,9 +138,9 @@ namespace osu.Game.Overlays.Notifications
}
[BackgroundDependencyLoader]
private void load(OverlayColourProvider colourProvider)
private void load()
{
MainContent.Add(new Box
MainContent.Add(background = new Box
{
RelativeSizeAxes = Axes.Both,
Colour = colourProvider.Background3,
@ -143,6 +148,18 @@ namespace osu.Game.Overlays.Notifications
});
}
protected override bool OnHover(HoverEvent e)
{
background.FadeColour(colourProvider.Background2, 200, Easing.OutQuint);
return base.OnHover(e);
}
protected override void OnHoverLost(HoverLostEvent e)
{
background.FadeColour(colourProvider.Background3, 200, Easing.OutQuint);
base.OnHoverLost(e);
}
protected override bool OnClick(ClickEvent e)
{
if (Activated?.Invoke() ?? true)
@ -193,7 +210,7 @@ namespace osu.Game.Overlays.Notifications
private void load()
{
RelativeSizeAxes = Axes.Y;
Width = 24;
Width = 28;
Children = new Drawable[]
{
@ -216,15 +233,15 @@ namespace osu.Game.Overlays.Notifications
protected override bool OnHover(HoverEvent e)
{
background.FadeIn(200);
icon.FadeColour(colourProvider.Content1, 200);
background.FadeIn(200, Easing.OutQuint);
icon.FadeColour(colourProvider.Content1, 200, Easing.OutQuint);
return base.OnHover(e);
}
protected override void OnHoverLost(HoverLostEvent e)
{
background.FadeOut(200);
icon.FadeColour(colourProvider.Foreground1, 200);
background.FadeOut(200, Easing.OutQuint);
icon.FadeColour(colourProvider.Foreground1, 200, Easing.OutQuint);
base.OnHoverLost(e);
}
}