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

Mod customisation header's color is now based on the state of the panel rather than the hover of the container.

Browse Source
This commit is contained in:
Fabep 2024-09-02 19:14:08 +02:00
parent 16c2c14037
commit e3457d8501
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
osu.Game/Overlays/Mods/ModCustomisationHeader.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Extensions.Color4Extensions;
@ -20,7 +19,7 @@ using static osu.Game.Overlays.Mods.ModCustomisationPanel;
namespace osu.Game.Overlays.Mods
{
public partial class ModCustomisationHeader : OsuHoverContainer
public partial class ModCustomisationHeader : OsuClickableContainer
{
private Box background = null!;
private Box backgroundFlash = null!;
@ -29,8 +28,6 @@ namespace osu.Game.Overlays.Mods
[Resolved]
private OverlayColourProvider colourProvider { get; set; } = null!;
protected override IEnumerable<Drawable> EffectTargets => new[] { background };
public readonly Bindable<ModCustomisationPanelState> ExpandedState = new Bindable<ModCustomisationPanelState>(ModCustomisationPanelState.Collapsed);
private readonly ModCustomisationPanel panel;
@ -52,6 +49,7 @@ namespace osu.Game.Overlays.Mods
background = new Box
{
RelativeSizeAxes = Axes.Both,
Colour = colourProvider.Dark3,
},
backgroundFlash = new Box
{
@ -84,9 +82,6 @@ namespace osu.Game.Overlays.Mods
}
}
};
IdleColour = colourProvider.Dark3;
HoverColour = colourProvider.Light4;
}
protected override void LoadComplete()
@ -110,6 +105,20 @@ namespace osu.Game.Overlays.Mods
{
icon.ScaleTo(v.NewValue > ModCustomisationPanelState.Collapsed ? new Vector2(1, -1) : Vector2.One, 300, Easing.OutQuint);
}, true);
panel.ExpandedState.BindValueChanged(v =>
{
switch (v.NewValue)
{
case ModCustomisationPanelState.Expanded:
case ModCustomisationPanelState.ExpandedByMod:
fadeBackgroundColor(colourProvider.Light4);
break;
default:
fadeBackgroundColor(colourProvider.Dark3);
break;
};
}, false);
}
protected override bool OnHover(HoverEvent e)
@ -119,5 +128,10 @@ namespace osu.Game.Overlays.Mods
return base.OnHover(e);
}
private void fadeBackgroundColor(Color4 color)
{
background.FadeColour(color, 500, Easing.OutQuint);
}
}
}