From 5b03dc8d0bb1d189dc68103971fccf41bfc2a008 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 24 Dec 2023 03:20:42 +0900
Subject: [PATCH 1/2] Use a realm subscription to avoid overhead when hovering
 a toolbar button

Addresses https://github.com/ppy/osu/discussions/26018.
---
 osu.Game/Overlays/Toolbar/ToolbarButton.cs | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index 08bcb6bd8a3d..344f7b2018f0 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -157,6 +157,15 @@ protected ToolbarButton()
             };
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            if (Hotkey != null)
+            {
+                realm.SubscribeToPropertyChanged(r => r.All<RealmKeyBinding>().FirstOrDefault(rkb => rkb.RulesetName == null && rkb.ActionInt == (int)Hotkey.Value), kb => kb.KeyCombinationString, updateKeyBindingTooltip);
+            }
+        }
+
         protected override bool OnMouseDown(MouseDownEvent e) => false;
 
         protected override bool OnClick(ClickEvent e)
@@ -168,8 +177,6 @@ protected override bool OnClick(ClickEvent e)
 
         protected override bool OnHover(HoverEvent e)
         {
-            updateKeyBindingTooltip();
-
             HoverBackground.FadeIn(200);
             tooltipContainer.FadeIn(100);
 
@@ -197,19 +204,12 @@ public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e)
         {
         }
 
-        private void updateKeyBindingTooltip()
+        private void updateKeyBindingTooltip(string keyCombination)
         {
-            if (Hotkey == null) return;
-
-            var realmKeyBinding = realm.Realm.All<RealmKeyBinding>().FirstOrDefault(rkb => rkb.RulesetName == null && rkb.ActionInt == (int)Hotkey.Value);
+            string keyBindingString = keyCombinationProvider.GetReadableString(keyCombination);
 
-            if (realmKeyBinding != null)
-            {
-                string keyBindingString = keyCombinationProvider.GetReadableString(realmKeyBinding.KeyCombination);
-
-                if (!string.IsNullOrEmpty(keyBindingString))
-                    keyBindingTooltip.Text = $" ({keyBindingString})";
-            }
+            if (!string.IsNullOrEmpty(keyBindingString))
+                keyBindingTooltip.Text = $" ({keyBindingString})";
         }
     }
 

From 68430d6ecdbf7810285a818e4f762c07477f6de6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 23 Dec 2023 19:39:17 +0100
Subject: [PATCH 2/2] Fix toolbar keybinding hint not clearing after unbinding
 the keybinding

---
 osu.Game/Overlays/Toolbar/ToolbarButton.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index 344f7b2018f0..81d2de5acb72 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -208,8 +208,9 @@ private void updateKeyBindingTooltip(string keyCombination)
         {
             string keyBindingString = keyCombinationProvider.GetReadableString(keyCombination);
 
-            if (!string.IsNullOrEmpty(keyBindingString))
-                keyBindingTooltip.Text = $" ({keyBindingString})";
+            keyBindingTooltip.Text = !string.IsNullOrEmpty(keyBindingString)
+                ? $" ({keyBindingString})"
+                : string.Empty;
         }
     }