h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-14 00:53:19 +08:00
Code Issues Releases Wiki Activity

Rename Colour to avoid conflict with Drawable.Colour

Browse Source
This commit is contained in:
Dean Herbert 2022-11-30 16:07:21 +09:00
parent 7fca5ee28d
commit 80b0e4a99d
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Overlays/Chat/ChatLine.cs
View File

@ -139,7 +139,7 @@ namespace osu.Game.Overlays.Chat
CornerRadius = 2f, CornerRadius = 2f,
Masking = true, Masking = true,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = drawableUsername.Colour.Darken(1f), Colour = drawableUsername.AccentColour.Darken(1f),
Depth = float.MaxValue, Depth = float.MaxValue,
Child = new Box { RelativeSizeAxes = Axes.Both } Child = new Box { RelativeSizeAxes = Axes.Both }
}); });

26
osu.Game/Overlays/Chat/DrawableUsername.cs
View File

@ -27,7 +27,7 @@ namespace osu.Game.Overlays.Chat
{ {
public partial class DrawableUsername : OsuClickableContainer, IHasContextMenu public partial class DrawableUsername : OsuClickableContainer, IHasContextMenu
{ {
public new Color4 Colour { get; private set; } public Color4 AccentColour { get; }
public float FontSize public float FontSize
{ {
@ -45,19 +45,19 @@ namespace osu.Game.Overlays.Chat
set => base.Width = drawableText.MaxWidth = value; set => base.Width = drawableText.MaxWidth = value;
} }
[Resolved(canBeNull: false)] [Resolved]
private IAPIProvider api { get; set; } = null!; private IAPIProvider api { get; set; } = null!;
[Resolved(canBeNull: false)]
private OsuColour osuColours { get; set; } = null!;
[Resolved] [Resolved]
private OsuColour colours { get; set; } = null!;
[Resolved(canBeNull: true)]
private ChannelManager? chatManager { get; set; } private ChannelManager? chatManager { get; set; }
[Resolved] [Resolved(canBeNull: true)]
private ChatOverlay? chatOverlay { get; set; } private ChatOverlay? chatOverlay { get; set; }
[Resolved] [Resolved(canBeNull: true)]
private UserProfileOverlay? profileOverlay { get; set; } private UserProfileOverlay? profileOverlay { get; set; }
private readonly APIUser user; private readonly APIUser user;
@ -82,13 +82,13 @@ namespace osu.Game.Overlays.Chat
if (string.IsNullOrWhiteSpace(user.Colour)) if (string.IsNullOrWhiteSpace(user.Colour))
{ {
Colour = default_colours[user.Id % default_colours.Length]; AccentColour = default_colours[user.Id % default_colours.Length];
Child = colouredDrawable = drawableText; Child = colouredDrawable = drawableText;
} }
else else
{ {
Colour = Color4Extensions.FromHex(user.Colour); AccentColour = Color4Extensions.FromHex(user.Colour);
Child = new Container Child = new Container
{ {
@ -132,8 +132,8 @@ namespace osu.Game.Overlays.Chat
{ {
base.LoadComplete(); base.LoadComplete();
drawableText.Colour = osuColours.ChatBlue; drawableText.Colour = colours.ChatBlue;
colouredDrawable.Colour = Colour; colouredDrawable.Colour = AccentColour;
} }
public MenuItem[] ContextMenuItems public MenuItem[] ContextMenuItems
@ -168,7 +168,7 @@ namespace osu.Game.Overlays.Chat
protected override bool OnHover(HoverEvent e) protected override bool OnHover(HoverEvent e)
{ {
colouredDrawable.FadeColour(Colour.Lighten(0.4f), 150, Easing.OutQuint); colouredDrawable.FadeColour(AccentColour.Lighten(0.4f), 150, Easing.OutQuint);
return base.OnHover(e); return base.OnHover(e);
} }
@ -177,7 +177,7 @@ namespace osu.Game.Overlays.Chat
{ {
base.OnHoverLost(e); base.OnHoverLost(e);
colouredDrawable.FadeColour(Colour, 250, Easing.OutQuint); colouredDrawable.FadeColour(AccentColour, 250, Easing.OutQuint);
} }
private static readonly Color4[] default_colours = private static readonly Color4[] default_colours =