From 2562d73e83b238ae0eda1c2c54247b223f539034 Mon Sep 17 00:00:00 2001 From: Max Katz Date: Wed, 30 Apr 2025 20:21:35 -0700 Subject: [PATCH] Avoid global static in UpdateSelectionFromPointerEvent --- src/Avalonia.Controls/ListBox.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Avalonia.Controls/ListBox.cs b/src/Avalonia.Controls/ListBox.cs index 470cd287be..80c9ba6c0c 100644 --- a/src/Avalonia.Controls/ListBox.cs +++ b/src/Avalonia.Controls/ListBox.cs @@ -166,7 +166,7 @@ namespace Avalonia.Controls internal bool UpdateSelectionFromPointerEvent(Control source, PointerEventArgs e) { - var hotkeys = Application.Current!.PlatformSettings?.HotkeyConfiguration; + var hotkeys = TopLevel.GetTopLevel(source)?.PlatformSettings?.HotkeyConfiguration; var toggle = hotkeys is not null && e.KeyModifiers.HasAllFlags(hotkeys.CommandModifiers); return UpdateSelectionFromEventSource(