From 49b74d78670d85ef7a3b159b43b9504c5ff7156a Mon Sep 17 00:00:00 2001
From: Jai Sharma <jai@jai.moe>
Date: Tue, 15 Mar 2022 22:33:36 +0000
Subject: [PATCH] Use `BindTarget` instead of caching for `ControlItem`
 mentions bindable flow

---
 osu.Game/Overlays/Chat/ChannelControl/ControlItem.cs       | 2 +-
 .../Overlays/Chat/ChannelControl/ControlItemMention.cs     | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Chat/ChannelControl/ControlItem.cs b/osu.Game/Overlays/Chat/ChannelControl/ControlItem.cs
index d886e8b45a..d73ebed817 100644
--- a/osu.Game/Overlays/Chat/ChannelControl/ControlItem.cs
+++ b/osu.Game/Overlays/Chat/ChannelControl/ControlItem.cs
@@ -20,7 +20,6 @@ namespace osu.Game.Overlays.Chat.ChannelControl
         public event Action<Channel>? OnRequestSelect;
         public event Action<Channel>? OnRequestLeave;
 
-        [Cached]
         public readonly BindableInt Mentions = new BindableInt();
 
         [Cached]
@@ -92,6 +91,7 @@ namespace osu.Game.Overlays.Chat.ChannelControl
                                     Anchor = Anchor.CentreLeft,
                                     Origin = Anchor.CentreLeft,
                                     Margin = new MarginPadding { Right = 3 },
+                                    Mentions = { BindTarget = Mentions },
                                 },
                                 close = new ControlItemClose
                                 {
diff --git a/osu.Game/Overlays/Chat/ChannelControl/ControlItemMention.cs b/osu.Game/Overlays/Chat/ChannelControl/ControlItemMention.cs
index 5118386977..beb2713c92 100644
--- a/osu.Game/Overlays/Chat/ChannelControl/ControlItemMention.cs
+++ b/osu.Game/Overlays/Chat/ChannelControl/ControlItemMention.cs
@@ -16,10 +16,9 @@ namespace osu.Game.Overlays.Chat.ChannelControl
 {
     public class ControlItemMention : CircularContainer
     {
-        private OsuSpriteText? countText;
+        public readonly BindableInt Mentions = new BindableInt();
 
-        [Resolved]
-        private BindableInt mentions { get; set; } = null!;
+        private OsuSpriteText? countText;
 
         [Resolved]
         private OsuColour osuColour { get; set; } = null!;
@@ -56,7 +55,7 @@ namespace osu.Game.Overlays.Chat.ChannelControl
         {
             base.LoadComplete();
 
-            mentions.BindValueChanged(change =>
+            Mentions.BindValueChanged(change =>
             {
                 int mentionCount = change.NewValue;