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

Add visual highlighting on song select panel hover

Browse Source 
Prerequisite for adding hover sound effects. Didn't feel right without this change.
This commit is contained in:
Dean Herbert
2017-11-26 04:16:36 +09:00
parent b3279082e2
commit 4067b6129b
1 changed files with 46 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
osu.Game/Beatmaps/Drawables/Panel.cs
View File

@ -3,12 +3,15 @@
using System; using System;
using osu.Framework; using osu.Framework;
using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Input; using osu.Framework.Input;
using OpenTK; using OpenTK;
using OpenTK.Graphics; using OpenTK.Graphics;
using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics;
namespace osu.Game.Beatmaps.Drawables namespace osu.Game.Beatmaps.Drawables
{ {
@ -22,6 +25,10 @@ namespace osu.Game.Beatmaps.Drawables
private readonly Container nestedContainer; private readonly Container nestedContainer;
private readonly Container borderContainer;
private readonly Box hoverLayer;
protected override Container<Drawable> Content => nestedContainer; protected override Container<Drawable> Content => nestedContainer;
protected Panel() protected Panel()
@ -29,20 +36,53 @@ namespace osu.Game.Beatmaps.Drawables
Height = MAX_HEIGHT; Height = MAX_HEIGHT;
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
AddInternal(nestedContainer = new Container AddInternal(borderContainer = new Container
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Masking = true, Masking = true,
CornerRadius = 10, CornerRadius = 10,
BorderColour = new Color4(221, 255, 255, 255), BorderColour = new Color4(221, 255, 255, 255),
Children = new Drawable[]
{
nestedContainer = new Container
{
RelativeSizeAxes = Axes.Both,
},
hoverLayer = new Box
{
RelativeSizeAxes = Axes.Both,
Alpha = 0,
Blending = new BlendingParameters { Mode = BlendingMode.Additive },
},
}
}); });
Alpha = 0; Alpha = 0;
} }
protected override bool OnHover(InputState state)
{
hoverLayer.FadeIn(100, Easing.OutQuint);
return base.OnHover(state);
}
protected override void OnHoverLost(InputState state)
{
hoverLayer.FadeOut(1000, Easing.OutQuint);
base.OnHoverLost(state);
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
hoverLayer.Colour = colours.Blue.Opacity(0.1f);
}
public void SetMultiplicativeAlpha(float alpha) public void SetMultiplicativeAlpha(float alpha)
{ {
nestedContainer.Alpha = alpha; borderContainer.Alpha = alpha;
} }
protected override void LoadComplete() protected override void LoadComplete()
@ -94,8 +134,8 @@ namespace osu.Game.Beatmaps.Drawables
protected virtual void Selected() protected virtual void Selected()
{ {
nestedContainer.BorderThickness = 2.5f; borderContainer.BorderThickness = 2.5f;
nestedContainer.EdgeEffect = new EdgeEffectParameters borderContainer.EdgeEffect = new EdgeEffectParameters
{ {
Type = EdgeEffectType.Glow, Type = EdgeEffectType.Glow,
Colour = new Color4(130, 204, 255, 150), Colour = new Color4(130, 204, 255, 150),
@ -106,8 +146,8 @@ namespace osu.Game.Beatmaps.Drawables
protected virtual void Deselected() protected virtual void Deselected()
{ {
nestedContainer.BorderThickness = 0; borderContainer.BorderThickness = 0;
nestedContainer.EdgeEffect = new EdgeEffectParameters borderContainer.EdgeEffect = new EdgeEffectParameters
{ {
Type = EdgeEffectType.Shadow, Type = EdgeEffectType.Shadow,
Offset = new Vector2(1), Offset = new Vector2(1),