diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedButton.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedButton.cs
index 2587960275..178a68b599 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedButton.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneRoundedButton.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Tests.Visual.UserInterface
},
new SettingsButton
{
- Text = "Test button",
+ Text = "Test settings button",
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Enabled = { BindTarget = enabled },
diff --git a/osu.Game/Graphics/UserInterface/OsuButton.cs b/osu.Game/Graphics/UserInterface/OsuButton.cs
index dae5de2d65..6f1312652b 100644
--- a/osu.Game/Graphics/UserInterface/OsuButton.cs
+++ b/osu.Game/Graphics/UserInterface/OsuButton.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Graphics.UserInterface
///
/// Sets a custom background colour to this button, replacing the provided default.
///
- public Color4 BackgroundColour
+ public virtual Color4 BackgroundColour
{
get => backgroundColour ?? defaultBackgroundColour;
set
@@ -90,6 +90,7 @@ namespace osu.Game.Graphics.UserInterface
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both,
+ Depth = float.MaxValue,
},
Hover = new Box
{
@@ -141,13 +142,15 @@ namespace osu.Game.Graphics.UserInterface
return base.OnClick(e);
}
+ protected virtual float HoverLayerFinalAlpha => 0.1f;
+
protected override bool OnHover(HoverEvent e)
{
if (Enabled.Value)
{
Hover.FadeTo(0.2f, 40, Easing.OutQuint)
.Then()
- .FadeTo(0.1f, 800, Easing.OutQuint);
+ .FadeTo(HoverLayerFinalAlpha, 800, Easing.OutQuint);
}
return base.OnHover(e);
diff --git a/osu.Game/Graphics/UserInterfaceV2/RoundedButton.cs b/osu.Game/Graphics/UserInterfaceV2/RoundedButton.cs
index 4477633da1..3d970284ec 100644
--- a/osu.Game/Graphics/UserInterfaceV2/RoundedButton.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/RoundedButton.cs
@@ -1,19 +1,28 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
using System.Collections.Generic;
using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Events;
using osu.Framework.Localisation;
+using osu.Game.Graphics.Backgrounds;
using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays;
+using osuTK.Graphics;
namespace osu.Game.Graphics.UserInterfaceV2
{
public class RoundedButton : OsuButton, IFilterable
{
+ private TrianglesV2? triangles;
+
+ protected override float HoverLayerFinalAlpha => 0;
+
+ private Color4 triangleGradientSecondColour = Color4.Transparent;
+
public override float Height
{
get => base.Height;
@@ -26,19 +35,63 @@ namespace osu.Game.Graphics.UserInterfaceV2
}
}
+ public override Color4 BackgroundColour
+ {
+ get => base.BackgroundColour;
+ set
+ {
+ base.BackgroundColour = value;
+ triangleGradientSecondColour = BackgroundColour.Lighten(0.2f);
+ updateColours();
+ }
+ }
+
[BackgroundDependencyLoader(true)]
- private void load(OsuColour colours)
+ private void load(OverlayColourProvider? overlayColourProvider, OsuColour colours)
{
// According to flyte, buttons are supposed to have explicit colours for now.
// Not sure this is the correct direction, but we haven't decided on an `OverlayColourProvider` stand-in yet.
// This is a better default. See `SettingsButton` for an override which uses `OverlayColourProvider`.
- DefaultBackgroundColour = colours.Blue3;
+ DefaultBackgroundColour = overlayColourProvider?.Colour3 ?? colours.Blue3;
+ triangleGradientSecondColour = overlayColourProvider?.Colour1 ?? colours.Blue3.Lighten(0.2f);
}
protected override void LoadComplete()
{
base.LoadComplete();
+
updateCornerRadius();
+
+ Add(triangles = new TrianglesV2
+ {
+ Thickness = 0.02f,
+ SpawnRatio = 0.6f,
+ RelativeSizeAxes = Axes.Both,
+ Depth = float.MaxValue,
+ });
+
+ updateColours();
+ }
+
+ private void updateColours()
+ {
+ if (triangles == null)
+ return;
+
+ triangles.ColourTop = triangleGradientSecondColour;
+ triangles.ColourBottom = BackgroundColour;
+ }
+
+ protected override bool OnHover(HoverEvent e)
+ {
+ Background.FadeColour(triangleGradientSecondColour, 300, Easing.OutQuint);
+ return base.OnHover(e);
+ }
+
+ protected override void OnHoverLost(HoverLostEvent e)
+ {
+ Background.FadeColour(BackgroundColour, 300, Easing.OutQuint);
+ base.OnHoverLost(e);
}
private void updateCornerRadius() => Content.CornerRadius = DrawHeight / 2;
diff --git a/osu.Game/Overlays/Settings/SettingsButton.cs b/osu.Game/Overlays/Settings/SettingsButton.cs
index 5f2a416f58..10aea92b22 100644
--- a/osu.Game/Overlays/Settings/SettingsButton.cs
+++ b/osu.Game/Overlays/Settings/SettingsButton.cs
@@ -1,16 +1,11 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
using System.Collections.Generic;
using System.Linq;
-using JetBrains.Annotations;
-using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Cursor;
using osu.Framework.Localisation;
-using osu.Game.Graphics;
using osu.Game.Graphics.UserInterfaceV2;
namespace osu.Game.Overlays.Settings
@@ -23,12 +18,6 @@ namespace osu.Game.Overlays.Settings
Padding = new MarginPadding { Left = SettingsPanel.CONTENT_MARGINS, Right = SettingsPanel.CONTENT_MARGINS };
}
- [BackgroundDependencyLoader(true)]
- private void load([CanBeNull] OverlayColourProvider overlayColourProvider, OsuColour colours)
- {
- DefaultBackgroundColour = overlayColourProvider?.Highlight1 ?? colours.Blue3;
- }
-
public LocalisableString TooltipText { get; set; }
public override IEnumerable FilterTerms