h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-05 13:42:59 +08:00
Code Issues Releases Wiki Activity

Fix tab dropdown receiving accent colour too early

Browse Source
This commit is contained in:
Bartłomiej Dach 2021-10-17 13:31:49 +02:00
parent ef03787fe0
commit 61127a389c
No known key found for this signature in database
GPG Key ID: BCECCD4FA41F6497
1 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
osu.Game/Graphics/UserInterface/OsuTabDropdown.cs
View File

@ -22,15 +22,21 @@ namespace osu.Game.Graphics.UserInterface
{ {
accentColour = value; accentColour = value;
if (IsLoaded)
propagateAccentColour();
}
}
private void propagateAccentColour()
{
if (Menu is OsuDropdownMenu dropdownMenu) if (Menu is OsuDropdownMenu dropdownMenu)
{ {
dropdownMenu.HoverColour = value; dropdownMenu.HoverColour = accentColour;
dropdownMenu.SelectionColour = value.Opacity(0.5f); dropdownMenu.SelectionColour = accentColour.Opacity(0.5f);
} }
if (Header is OsuTabDropdownHeader tabDropdownHeader) if (Header is OsuTabDropdownHeader tabDropdownHeader)
tabDropdownHeader.AccentColour = value; tabDropdownHeader.AccentColour = accentColour;
}
} }
public OsuTabDropdown() public OsuTabDropdown()
@ -38,6 +44,12 @@ namespace osu.Game.Graphics.UserInterface
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
} }
protected override void LoadComplete()
{
base.LoadComplete();
propagateAccentColour();
}
protected override DropdownMenu CreateMenu() => new OsuTabDropdownMenu(); protected override DropdownMenu CreateMenu() => new OsuTabDropdownMenu();
protected override DropdownHeader CreateHeader() => new OsuTabDropdownHeader protected override DropdownHeader CreateHeader() => new OsuTabDropdownHeader
@ -80,7 +92,7 @@ namespace osu.Game.Graphics.UserInterface
{ {
accentColour = value; accentColour = value;
BackgroundColourHover = value; BackgroundColourHover = value;
Foreground.Colour = value; updateColour();
} }
} }
@ -116,15 +128,20 @@ namespace osu.Game.Graphics.UserInterface
protected override bool OnHover(HoverEvent e) protected override bool OnHover(HoverEvent e)
{ {
Foreground.Colour = BackgroundColour; updateColour();
return base.OnHover(e); return base.OnHover(e);
} }
protected override void OnHoverLost(HoverLostEvent e) protected override void OnHoverLost(HoverLostEvent e)
{ {
Foreground.Colour = BackgroundColourHover; updateColour();
base.OnHoverLost(e); base.OnHoverLost(e);
} }
private void updateColour()
{
Foreground.Colour = IsHovered ? BackgroundColour : BackgroundColourHover;
}
} }
} }
} }