From 6ef87ff047f6fddc7afdc2bd2ff073f4141cb313 Mon Sep 17 00:00:00 2001
From: Tim <tim.uniewski@gmail.com>
Date: Thu, 23 Dec 2021 10:23:26 +0100
Subject: [PATCH 1/2] Improve ButtonSpinner OnPointerWheel

- Only handle the PointerWheelEvent if the control has the focus
- When the pointer wheel should change the selection, mark the event as handled. So any surrounding ScrollViewer does not do the scroll.
- Make the Control Focusable by default in Style
---
 src/Avalonia.Controls/ButtonSpinner.cs                 | 7 ++++---
 src/Avalonia.Themes.Default/ButtonSpinner.xaml         | 1 +
 src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Controls/ButtonSpinner.cs b/src/Avalonia.Controls/ButtonSpinner.cs
index 5fe2cf3704..5a967ab488 100644
--- a/src/Avalonia.Controls/ButtonSpinner.cs
+++ b/src/Avalonia.Controls/ButtonSpinner.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Primitives;
 using Avalonia.Data;
@@ -196,13 +196,14 @@ namespace Avalonia.Controls
         protected override void OnPointerWheelChanged(PointerWheelEventArgs e)
         {
             base.OnPointerWheelChanged(e);
-            if (!e.Handled && AllowSpin)
+
+            if (AllowSpin && IsFocused)
             {
                 if (e.Delta.Y != 0)
                 {
                     var spinnerEventArgs = new SpinEventArgs(SpinEvent, (e.Delta.Y < 0) ? SpinDirection.Decrease : SpinDirection.Increase, true);
                     OnSpin(spinnerEventArgs);
-                    e.Handled = spinnerEventArgs.Handled;
+                    e.Handled = true;
                 }
             }
         }
diff --git a/src/Avalonia.Themes.Default/ButtonSpinner.xaml b/src/Avalonia.Themes.Default/ButtonSpinner.xaml
index ce2b85d2b5..561ca8bedd 100644
--- a/src/Avalonia.Themes.Default/ButtonSpinner.xaml
+++ b/src/Avalonia.Themes.Default/ButtonSpinner.xaml
@@ -5,6 +5,7 @@
     <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}"/>
     <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
     <Setter Property="VerticalContentAlignment" Value="Center"/>
+    <Setter Property="Focusable" Value="True"/>
   </Style>
   <Style Selector="ButtonSpinner /template/ RepeatButton">
     <Setter Property="Background" Value="Transparent"/>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml b/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
index d228c37912..f2344ab380 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ButtonSpinner.xaml
@@ -64,6 +64,7 @@
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
     <Setter Property="HorizontalContentAlignment" Value="Stretch" />
     <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Focusable" Value="True"/>
     <Setter Property="Template">
       <ControlTemplate>
         <DataValidationErrors>

From 69525b8d55c87481b91c8d22f6f72e088a31d8a8 Mon Sep 17 00:00:00 2001
From: Tim <tim.uniewski@gmail.com>
Date: Fri, 24 Dec 2021 14:43:58 +0100
Subject: [PATCH 2/2] Use IsKeyboradFocusWithin instead of IsFocused

---
 src/Avalonia.Controls/ButtonSpinner.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/ButtonSpinner.cs b/src/Avalonia.Controls/ButtonSpinner.cs
index 5a967ab488..f1c1a55a17 100644
--- a/src/Avalonia.Controls/ButtonSpinner.cs
+++ b/src/Avalonia.Controls/ButtonSpinner.cs
@@ -197,7 +197,7 @@ namespace Avalonia.Controls
         {
             base.OnPointerWheelChanged(e);
 
-            if (AllowSpin && IsFocused)
+            if (AllowSpin && IsKeyboardFocusWithin)
             {
                 if (e.Delta.Y != 0)
                 {