Update colours to match design

This commit is contained in:
Dean Herbert 2017-11-22 11:34:54 +09:00
parent 0f8499c580
commit 27fb598352
1 changed files with 10 additions and 4 deletions

View File

@ -4,6 +4,7 @@
using System.Globalization;
using System.Linq;
using OpenTK;
using OpenTK.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Graphics;
@ -92,7 +93,7 @@ public PlaybackTabControl()
public class PlaybackTabItem : TabItem<double>
{
private const float fade_duration = 100;
private const float fade_duration = 200;
private readonly OsuSpriteText text;
private readonly OsuSpriteText textBold;
@ -124,10 +125,14 @@ public PlaybackTabItem(double value) : base(value)
};
}
private Color4 hoveredColour;
private Color4 normalColour;
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
text.Colour = colours.Gray5;
text.Colour = normalColour = colours.YellowDarker;
textBold.Colour = hoveredColour = colours.Yellow;
}
protected override bool OnHover(InputState state)
@ -144,8 +149,9 @@ protected override void OnHoverLost(InputState state)
private void updateState()
{
text.FadeTo(Active || IsHovered ? 0 : 1, fade_duration);
textBold.FadeTo(Active || IsHovered ? 1 : 0, fade_duration);
text.FadeColour(Active || IsHovered ? hoveredColour : normalColour, fade_duration, Easing.OutQuint);
text.FadeTo(Active ? 0 : 1, fade_duration, Easing.OutQuint);
textBold.FadeTo(Active ? 1 : 0, fade_duration, Easing.OutQuint);
}
protected override void OnActivated() => updateState();