From da71e7a3633ebdd363c577a0584d004ff1b44e08 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Mar 2025 14:24:10 +0900
Subject: [PATCH] Fix enter to select tag not working in results scren

---
 osu.Game/Screens/Ranking/UserTagControl.cs | 35 ++++++++++++++++++----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Ranking/UserTagControl.cs b/osu.Game/Screens/Ranking/UserTagControl.cs
index 3ae6501b36..ae4a918ae5 100644
--- a/osu.Game/Screens/Ranking/UserTagControl.cs
+++ b/osu.Game/Screens/Ranking/UserTagControl.cs
@@ -27,6 +27,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Input.Bindings;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
@@ -500,21 +501,45 @@ namespace osu.Game.Screens.Ranking
                 searchBox.Current.BindValueChanged(_ => searchContainer.SearchTerm = searchBox.Current.Value, true);
             }
 
+            public override bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
+            {
+                if (base.OnPressed(e))
+                    return true;
+
+                if (e.Repeat)
+                    return false;
+
+                if (State.Value == Visibility.Hidden)
+                    return false;
+
+                if (e.Action == GlobalAction.Select)
+                {
+                    attemptSelect();
+                    return true;
+                }
+
+                return false;
+            }
+
             protected override bool OnKeyDown(KeyDownEvent e)
             {
-                var visibleItems = searchContainer.OfType<DrawableAddableTag>().Where(d => d.IsPresent).ToArray();
-
                 if (e.Key == Key.Enter)
                 {
-                    if (visibleItems.Length == 1)
-                        select(visibleItems.Single().Tag);
-
+                    attemptSelect();
                     return true;
                 }
 
                 return base.OnKeyDown(e);
             }
 
+            private void attemptSelect()
+            {
+                var visibleItems = searchContainer.OfType<DrawableAddableTag>().Where(d => d.IsPresent).ToArray();
+
+                if (visibleItems.Length == 1)
+                    select(visibleItems.Single().Tag);
+            }
+
             private void select(UserTag tag)
             {
                 OnSelected?.Invoke(tag);