From 6d83af01e21228e56753d200e7aee0c94e0b2e67 Mon Sep 17 00:00:00 2001
From: Terochi <mates.cernicky@gmail.com>
Date: Tue, 15 Nov 2022 13:06:02 +0100
Subject: [PATCH] Moved and renamed MessageHistoryTextBox.cs for better fit.

---
 .../UserInterface/MessageHistoryTextBox.cs}   | 21 +++++++++++--------
 osu.Game/Online/Chat/StandAloneChatDisplay.cs |  3 ++-
 osu.Game/Overlays/Chat/ChatTextBox.cs         |  3 ++-
 3 files changed, 16 insertions(+), 11 deletions(-)
 rename osu.Game/{Overlays/Chat/ChatRecentTextBox.cs => Graphics/UserInterface/MessageHistoryTextBox.cs} (82%)

diff --git a/osu.Game/Overlays/Chat/ChatRecentTextBox.cs b/osu.Game/Graphics/UserInterface/MessageHistoryTextBox.cs
similarity index 82%
rename from osu.Game/Overlays/Chat/ChatRecentTextBox.cs
rename to osu.Game/Graphics/UserInterface/MessageHistoryTextBox.cs
index 87bc3ee48c..45497e0451 100644
--- a/osu.Game/Overlays/Chat/ChatRecentTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/MessageHistoryTextBox.cs
@@ -3,12 +3,11 @@
 
 using System.Collections.Generic;
 using osu.Framework.Input.Events;
-using osu.Game.Graphics.UserInterface;
 using osuTK.Input;
 
-namespace osu.Game.Overlays.Chat
+namespace osu.Game.Graphics.UserInterface
 {
-    public class ChatRecentTextBox : FocusedTextBox
+    public class MessageHistoryTextBox : FocusedTextBox
     {
         private readonly List<string> messageHistory = new List<string>();
 
@@ -16,6 +15,15 @@ public class ChatRecentTextBox : FocusedTextBox
 
         private string originalMessage = string.Empty;
 
+        public MessageHistoryTextBox()
+        {
+            Current.ValueChanged += text =>
+            {
+                if (string.IsNullOrEmpty(text.NewValue))
+                    messageIndex = -1;
+            };
+        }
+
         protected override bool OnKeyDown(KeyDownEvent e)
         {
             /* Behavior:
@@ -53,12 +61,7 @@ protected override bool OnKeyDown(KeyDownEvent e)
                     return true;
             }
 
-            bool onKeyDown = base.OnKeyDown(e);
-
-            if (string.IsNullOrEmpty(Text))
-                messageIndex = -1;
-
-            return onKeyDown;
+            return base.OnKeyDown(e);
         }
 
         protected override void Commit()
diff --git a/osu.Game/Online/Chat/StandAloneChatDisplay.cs b/osu.Game/Online/Chat/StandAloneChatDisplay.cs
index de0387e017..fe279d50a9 100644
--- a/osu.Game/Online/Chat/StandAloneChatDisplay.cs
+++ b/osu.Game/Online/Chat/StandAloneChatDisplay.cs
@@ -12,6 +12,7 @@
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.Chat;
 using osu.Game.Resources.Localisation.Web;
 using osuTK.Graphics;
@@ -119,7 +120,7 @@ private void channelChanged(ValueChangedEvent<Channel> e)
             AddInternal(drawableChannel);
         }
 
-        public class ChatTextBox : ChatRecentTextBox
+        public class ChatTextBox : MessageHistoryTextBox
         {
             protected override bool OnKeyDown(KeyDownEvent e)
             {
diff --git a/osu.Game/Overlays/Chat/ChatTextBox.cs b/osu.Game/Overlays/Chat/ChatTextBox.cs
index d3c1a4ad8b..26ff4a5b4e 100644
--- a/osu.Game/Overlays/Chat/ChatTextBox.cs
+++ b/osu.Game/Overlays/Chat/ChatTextBox.cs
@@ -2,11 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Bindables;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Resources.Localisation.Web;
 
 namespace osu.Game.Overlays.Chat
 {
-    public class ChatTextBox : ChatRecentTextBox
+    public class ChatTextBox : MessageHistoryTextBox
     {
         public readonly BindableBool ShowSearch = new BindableBool();