From 80b0e4a99da48122dd4cfbc2224ab3681bda8a45 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 30 Nov 2022 16:07:21 +0900
Subject: [PATCH] Rename `Colour` to avoid conflict with `Drawable.Colour`

---
 osu.Game/Overlays/Chat/ChatLine.cs         |  2 +-
 osu.Game/Overlays/Chat/DrawableUsername.cs | 26 +++++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Overlays/Chat/ChatLine.cs b/osu.Game/Overlays/Chat/ChatLine.cs
index 4d5fbaac42..2b8718939e 100644
--- a/osu.Game/Overlays/Chat/ChatLine.cs
+++ b/osu.Game/Overlays/Chat/ChatLine.cs
@@ -139,7 +139,7 @@ namespace osu.Game.Overlays.Chat
                     CornerRadius = 2f,
                     Masking = true,
                     RelativeSizeAxes = Axes.Both,
-                    Colour = drawableUsername.Colour.Darken(1f),
+                    Colour = drawableUsername.AccentColour.Darken(1f),
                     Depth = float.MaxValue,
                     Child = new Box { RelativeSizeAxes = Axes.Both }
                 });
diff --git a/osu.Game/Overlays/Chat/DrawableUsername.cs b/osu.Game/Overlays/Chat/DrawableUsername.cs
index c8c7d38ce6..d6dbb76f37 100644
--- a/osu.Game/Overlays/Chat/DrawableUsername.cs
+++ b/osu.Game/Overlays/Chat/DrawableUsername.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Overlays.Chat
 {
     public partial class DrawableUsername : OsuClickableContainer, IHasContextMenu
     {
-        public new Color4 Colour { get; private set; }
+        public Color4 AccentColour { get; }
 
         public float FontSize
         {
@@ -45,19 +45,19 @@ namespace osu.Game.Overlays.Chat
             set => base.Width = drawableText.MaxWidth = value;
         }
 
-        [Resolved(canBeNull: false)]
+        [Resolved]
         private IAPIProvider api { get; set; } = null!;
 
-        [Resolved(canBeNull: false)]
-        private OsuColour osuColours { get; set; } = null!;
-
         [Resolved]
+        private OsuColour colours { get; set; } = null!;
+
+        [Resolved(canBeNull: true)]
         private ChannelManager? chatManager { get; set; }
 
-        [Resolved]
+        [Resolved(canBeNull: true)]
         private ChatOverlay? chatOverlay { get; set; }
 
-        [Resolved]
+        [Resolved(canBeNull: true)]
         private UserProfileOverlay? profileOverlay { get; set; }
 
         private readonly APIUser user;
@@ -82,13 +82,13 @@ namespace osu.Game.Overlays.Chat
 
             if (string.IsNullOrWhiteSpace(user.Colour))
             {
-                Colour = default_colours[user.Id % default_colours.Length];
+                AccentColour = default_colours[user.Id % default_colours.Length];
 
                 Child = colouredDrawable = drawableText;
             }
             else
             {
-                Colour = Color4Extensions.FromHex(user.Colour);
+                AccentColour = Color4Extensions.FromHex(user.Colour);
 
                 Child = new Container
                 {
@@ -132,8 +132,8 @@ namespace osu.Game.Overlays.Chat
         {
             base.LoadComplete();
 
-            drawableText.Colour = osuColours.ChatBlue;
-            colouredDrawable.Colour = Colour;
+            drawableText.Colour = colours.ChatBlue;
+            colouredDrawable.Colour = AccentColour;
         }
 
         public MenuItem[] ContextMenuItems
@@ -168,7 +168,7 @@ namespace osu.Game.Overlays.Chat
 
         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);
         }
@@ -177,7 +177,7 @@ namespace osu.Game.Overlays.Chat
         {
             base.OnHoverLost(e);
 
-            colouredDrawable.FadeColour(Colour, 250, Easing.OutQuint);
+            colouredDrawable.FadeColour(AccentColour, 250, Easing.OutQuint);
         }
 
         private static readonly Color4[] default_colours =