Remove allocation overhead in button propagation flow

ppy · Jan 11, 2024 · 94b4b24 · 94b4b24
1 parent 631577e
commit 94b4b24
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/osu.Framework/Input/Bindings/KeyBindingContainer.cs b/osu.Framework/Input/Bindings/KeyBindingContainer.cs
@@ -211,6 +211,7 @@ private bool handleNewPressed(InputState state, InputKey newKey, Vector2? scroll
 
             bool handled = false;
             var bindings = KeyBindings?.Except(pressedBindings) ?? Enumerable.Empty<IKeyBinding>();
+
             var newlyPressed = bindings.Where(m =>
                 m.KeyCombination.IsPressed(pressedCombination, matchingMode));
 

diff --git a/osu.Framework/Input/ButtonEventManager.cs b/osu.Framework/Input/ButtonEventManager.cs
@@ -121,7 +121,16 @@ private void handleButtonUp(InputState state)
         /// <returns>The drawable which handled the event or null if none.</returns>
         protected Drawable? PropagateButtonEvent(IEnumerable<Drawable> drawables, UIEvent e)
         {
-            var handledBy = drawables.FirstOrDefault(target => target.TriggerEvent(e));
+            Drawable? handledBy = null;
+
+            foreach (Drawable target in drawables)
+            {
+                if (target.TriggerEvent(e))
+                {
+                    handledBy = target;
+                    break;
+                }
+            }
 
             if (handledBy != null)
                 Logger.Log($"{e} handled by {handledBy}.", LoggingTarget.Runtime, LogLevel.Debug);