Atm0n · Atm0n · Jun 19, 2026 · Jun 19, 2026 · Jun 19, 2026 · Jun 19, 2026
diff --git a/ConfigurableReader/Services/GamepadService.cs b/ConfigurableReader/Services/GamepadService.cs
@@ -51,6 +51,8 @@ public class GamepadService : IDisposable
     private DateTime _lastDPadUpTime = DateTime.MinValue;
     private DateTime _lastDPadDownTime = DateTime.MinValue;
 
+    public Func<bool>? IsActive { get; set; }
+
     public bool HasActiveGamepads => _activeGamepads.Count > 0;
 
     public void Start()
@@ -73,7 +75,11 @@ public void Start()
 
             gamepad.Changes.Subscribe(_ =>
             {
-                Dispatcher.UIThread.Post(() => HandleGamepadInput(gamepad));
+                Dispatcher.UIThread.Post(() =>
+                {
+                    if (IsActive != null && !IsActive()) return;
+                    HandleGamepadInput(gamepad);
+                });
             });
         });
     }

diff --git a/ConfigurableReader/Views/InfoDialog.axaml.cs b/ConfigurableReader/Views/InfoDialog.axaml.cs
@@ -28,7 +28,13 @@ public InfoDialog()
 
                 if (gamepad.BButton || gamepad.AButton || gamepad.Start || gamepad.Select)
                 {
-                    Dispatcher.UIThread.Post(Close);
+                    Dispatcher.UIThread.Post(() =>
+                    {
+                        if (IsActive)
+                        {
+                            Close();
+                        }
+                    });
                 }
             });
         });

diff --git a/ConfigurableReader/Views/MainWindow.Gamepad.cs b/ConfigurableReader/Views/MainWindow.Gamepad.cs
@@ -55,6 +55,7 @@ private void InitializeGamepad()
             _ = HandlePositionAdjustmentAsync(delta);
         };
 
+        _gamepadService.IsActive = () => IsActive;
         _gamepadService.Start();
     }
 

diff --git a/ConfigurableReader/Views/MessageDialog.axaml.cs b/ConfigurableReader/Views/MessageDialog.axaml.cs
@@ -29,7 +29,13 @@ public MessageDialog()
 
                 if (gamepad.BButton || gamepad.AButton || gamepad.Start || gamepad.Select)
                 {
-                    Dispatcher.UIThread.Post(Close);
+                    Dispatcher.UIThread.Post(() =>
+                    {
+                        if (IsActive)
+                        {
+                            Close();
+                        }
+                    });
                 }
             });
         });

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -4,20 +4,20 @@
     <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Avalonia" Version="12.0.3" />
-    <PackageVersion Include="Avalonia.Controls.ColorPicker" Version="12.0.3" />
-    <PackageVersion Include="Avalonia.Desktop" Version="12.0.3" />
-    <PackageVersion Include="Avalonia.Fonts.Inter" Version="12.0.3" />
-    <PackageVersion Include="Avalonia.Themes.Fluent" Version="12.0.3" />
-    <PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.1" />
+    <PackageVersion Include="Avalonia" Version="12.0.4" />
+    <PackageVersion Include="Avalonia.Controls.ColorPicker" Version="12.0.4" />
+    <PackageVersion Include="Avalonia.Desktop" Version="12.0.4" />
+    <PackageVersion Include="Avalonia.Fonts.Inter" Version="12.0.4" />
+    <PackageVersion Include="Avalonia.Themes.Fluent" Version="12.0.4" />
+    <PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.2" />
     <PackageVersion Include="DocumentFormat.OpenXml" Version="3.5.1" />
     <PackageVersion Include="HIDDevices" Version="4.1.2" />
     <PackageVersion Include="HIDDevices.Usages" Version="4.1.2" />
     <PackageVersion Include="HtmlAgilityPack" Version="1.12.4" />
-    <PackageVersion Include="Markdig" Version="1.2.0" />
+    <PackageVersion Include="Markdig" Version="1.3.2" />
     <PackageVersion Include="PdfPig" Version="0.1.14" />
     <PackageVersion Include="VersOne.Epub" Version="3.3.6" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
     <PackageVersion Include="xunit" Version="2.7.0" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
     <PackageVersion Include="Moq" Version="4.20.72" />

diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ A highly customizable, cross-platform text reader designed for a comfortable and
   - Full-text search capability.
   - Automatic Table of Contents extraction for EPUB and PDF files.
   - Custom Bookmarks feature allows saving specific locations with personalized names.
-- **Gamepad Support:** Control your reading experience from the comfort of your couch using any standard HID Gamepad (Xbox, PlayStation, Switch, etc.).
+- **Gamepad Support:** Control your reading experience from the comfort of your couch using any standard HID Gamepad (Xbox, PlayStation, Switch, etc.). Gamepad inputs are only processed when the window is focused/active to avoid accidental inputs when using other applications.
 - **Visual Indicators:** Connection indicator shows whether you are in Keyboard (⌨️) or Gamepad (🎮) mode.
 
 ## Controls
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,6 +55,7 @@ private void InitializeGamepad() @@
                 _ = HandlePositionAdjustmentAsync(delta);
             };
+            _gamepadService.IsActive = () => IsActive;
             _gamepadService.Start();
         }
@@ Expand Down @@