From 26d6f96c4e2decdba1836a98280a2ba6381c379d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 17 Mar 2021 16:56:58 +0900
Subject: [PATCH] Fix LabelledTextBox not correctly forwarding focus to its
 underlying TextBox component

---
 osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs b/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs
index 4aeda74be8..266eb11319 100644
--- a/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/LabelledTextBox.cs
@@ -5,6 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Events;
 using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Graphics.UserInterfaceV2
@@ -53,6 +54,14 @@ namespace osu.Game.Graphics.UserInterfaceV2
             CornerRadius = CORNER_RADIUS,
         };
 
+        public override bool AcceptsFocus => true;
+
+        protected override void OnFocus(FocusEvent e)
+        {
+            base.OnFocus(e);
+            GetContainingInputManager().ChangeFocus(Component);
+        }
+
         protected override OsuTextBox CreateComponent() => CreateTextBox().With(t =>
         {
             t.OnCommit += (sender, newText) => OnCommit?.Invoke(sender, newText);