From 0ee143cc73bab077ce3bc93109cbb8b6d2c8457d Mon Sep 17 00:00:00 2001
From: Pat Hartl <pat@pathar.tl>
Date: Sat, 6 Jun 2026 07:00:07 -0500
Subject: [PATCH] Only scroll focus when using keyboard/gamepad navigation

---
 LANCommander.Launcher/Controls/CarouselControl.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/LANCommander.Launcher/Controls/CarouselControl.cs b/LANCommander.Launcher/Controls/CarouselControl.cs
index ed1195d7..a8a08c59 100644
--- a/LANCommander.Launcher/Controls/CarouselControl.cs
+++ b/LANCommander.Launcher/Controls/CarouselControl.cs
@@ -178,6 +178,12 @@ public class CarouselControl : TemplatedControl
     {
         base.OnGotFocus(e);
 
+        // Only scroll when focus was gained via keyboard/gamepad navigation.
+        // Pointer-initiated focus should not scroll, as it moves the item out
+        // from under the cursor and prevents the click from registering.
+        if (e.NavigationMethod == NavigationMethod.Pointer)
+            return;
+
         if (_itemsControl == null || e.Source is not Visual focusedVisual)
             return;