From 594cef14738f99d3f0fa3466756bcf151c3df4ac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Apr 2020 15:47:43 +0900
Subject: [PATCH] Fix BeatmapListingOverlay not taking focus

---
 .../BeatmapListing/BeatmapListingFilterControl.cs    |  2 ++
 .../BeatmapListing/BeatmapListingSearchControl.cs    |  2 ++
 osu.Game/Overlays/BeatmapListingOverlay.cs           | 12 +++++++++++-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
index 8817031bce..8c50409783 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
@@ -159,5 +159,7 @@ protected override void Dispose(bool isDisposing)
 
             base.Dispose(isDisposing);
         }
+
+        public void TakeFocus() => searchControl.TakeFocus();
     }
 }
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
index 2ecdb18667..29c4fe0d2e 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
@@ -121,6 +121,8 @@ private void load(OverlayColourProvider colourProvider)
             background.Colour = colourProvider.Dark6;
         }
 
+        public void TakeFocus() => textBox.TakeFocus();
+
         private class BeatmapSearchTextBox : SearchTextBox
         {
             protected override Color4 SelectionColour => Color4.Gray;
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index e16924464d..000ca6b91c 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -10,6 +10,7 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using osu.Framework.Input.Events;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Containers;
@@ -35,6 +36,8 @@ public BeatmapListingOverlay()
         {
         }
 
+        private BeatmapListingFilterControl filterControl;
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -57,7 +60,7 @@ private void load()
                         Children = new Drawable[]
                         {
                             new BeatmapListingHeader(),
-                            new BeatmapListingFilterControl
+                            filterControl = new BeatmapListingFilterControl
                             {
                                 SearchStarted = onSearchStarted,
                                 SearchFinished = onSearchFinished,
@@ -88,6 +91,13 @@ private void load()
             };
         }
 
+        protected override void OnFocus(FocusEvent e)
+        {
+            base.OnFocus(e);
+
+            filterControl.TakeFocus();
+        }
+
         private CancellationTokenSource cancellationToken;
 
         private void onSearchStarted()