h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-24 04:38:44 +08:00
Code Issues Releases Wiki Activity

Merge pull request from Joehuu/fix-color/underline-tab-control-checkbox

Browse Source
This commit is contained in:
Dean Herbert 2020-07-12 12:59:23 +09:00 committed by GitHub
commit a812b8e7fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 9 deletions

15
osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs

@ -21,7 +21,6 @@ namespace osu.Game.Graphics.UserInterface
{ {
private readonly Box box; private readonly Box box;
private readonly SpriteText text; private readonly SpriteText text;
private readonly SpriteIcon icon;
private Color4? accentColour; private Color4? accentColour;
@ -32,12 +31,6 @@ namespace osu.Game.Graphics.UserInterface
{ {
accentColour = value; accentColour = value;
if (Current.Value)
{
text.Colour = AccentColour;
icon.Colour = AccentColour;
}
updateFade(); updateFade();
} }
} }
@ -52,6 +45,8 @@ namespace osu.Game.Graphics.UserInterface
public OsuTabControlCheckbox() public OsuTabControlCheckbox()
{ {
SpriteIcon icon;
AutoSizeAxes = Axes.Both; AutoSizeAxes = Axes.Both;
Children = new Drawable[] Children = new Drawable[]
@ -89,6 +84,8 @@ namespace osu.Game.Graphics.UserInterface
{ {
icon.Icon = selected.NewValue ? FontAwesome.Regular.CheckCircle : FontAwesome.Regular.Circle; icon.Icon = selected.NewValue ? FontAwesome.Regular.CheckCircle : FontAwesome.Regular.Circle;
text.Font = text.Font.With(weight: selected.NewValue ? FontWeight.Bold : FontWeight.Medium); text.Font = text.Font.With(weight: selected.NewValue ? FontWeight.Bold : FontWeight.Medium);
updateFade();
}; };
} }
@ -115,8 +112,8 @@ namespace osu.Game.Graphics.UserInterface
private void updateFade() private void updateFade()
{ {
box.FadeTo(IsHovered ? 1 : 0, transition_length, Easing.OutQuint); box.FadeTo(Current.Value || IsHovered ? 1 : 0, transition_length, Easing.OutQuint);
text.FadeColour(IsHovered ? Color4.White : AccentColour, transition_length, Easing.OutQuint); text.FadeColour(Current.Value || IsHovered ? Color4.White : AccentColour, transition_length, Easing.OutQuint);
} }
} }
} }