From a4e533d1b28e4dee69e0801c707b7eccb5c6f383 Mon Sep 17 00:00:00 2001
From: Emmanuel Hansen <emmausssss@gmail.com>
Date: Tue, 8 Sep 2026 11:48:15 +0000
Subject: [PATCH] fluent2 - replace hardcoded easing with theme resource

---
 src/Avalonia.Themes.Fluent2/Accents/BaseResources.xaml |  5 ++++-
 .../Accents/Fluent2TokenResources.xaml                 |  2 --
 .../Accents/FluentControlResources.xaml                |  4 ++++
 .../Controls/DateTimePickerShared.xaml                 |  4 ++--
 src/Avalonia.Themes.Fluent2/Controls/ListBoxItem.xaml  |  2 +-
 src/Avalonia.Themes.Fluent2/Controls/PipsPager.xaml    | 10 +++++-----
 src/Avalonia.Themes.Fluent2/Controls/RadioButton.xaml  |  7 +++----
 src/Avalonia.Themes.Fluent2/Controls/ScrollBar.xaml    |  2 +-
 src/Avalonia.Themes.Fluent2/Controls/ToggleSwitch.xaml | 10 +++++-----
 src/Avalonia.Themes.Fluent2/Controls/TreeViewItem.xaml |  2 +-
 10 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent2/Accents/BaseResources.xaml b/src/Avalonia.Themes.Fluent2/Accents/BaseResources.xaml
index a4e249de82..690af6dee2 100644
--- a/src/Avalonia.Themes.Fluent2/Accents/BaseResources.xaml
+++ b/src/Avalonia.Themes.Fluent2/Accents/BaseResources.xaml
@@ -6,6 +6,9 @@
   <FontFamily x:Key="ContentControlThemeFontFamily">fonts:Inter#Inter, $Default</FontFamily>
   <sys:Double x:Key="ControlContentThemeFontSize">14</sys:Double>
 
+  <sys:TimeSpan x:Key="ControlFastAnimationDuration">00:00:00.167</sys:TimeSpan>
+  <SplineEasing x:Key="ControlFastOutSlowInKeySpline" X1="0" Y1="0" X2="0" Y2="1" />
+
   <SolidColorBrush x:Key="SystemControlTransparentBrush" Color="Transparent" />
   <x:Boolean x:Key="UseSystemFocusVisuals">True</x:Boolean>
   <Thickness x:Key="TextControlBorderThemeThickness">1</Thickness>
@@ -53,7 +56,7 @@
 
   <!-- Moved from Menu.xaml -->
   <Thickness x:Key="MenuBarItemPadding">10,4,10,4</Thickness>
-  
+
   <ResourceDictionary.ThemeDictionaries>
     <ResourceDictionary x:Key="Default">
       <SolidColorBrush x:Key="SystemControlBackgroundAccentBrush" Color="{DynamicResource SystemAccentColor}" />
diff --git a/src/Avalonia.Themes.Fluent2/Accents/Fluent2TokenResources.xaml b/src/Avalonia.Themes.Fluent2/Accents/Fluent2TokenResources.xaml
index ed1a5f5104..4e9634e6aa 100644
--- a/src/Avalonia.Themes.Fluent2/Accents/Fluent2TokenResources.xaml
+++ b/src/Avalonia.Themes.Fluent2/Accents/Fluent2TokenResources.xaml
@@ -301,9 +301,7 @@
   </ResourceDictionary.ThemeDictionaries>
 
   <!-- Canonical WinUI animation constants (variant independent). -->
-  <x:String x:Key="ControlFastOutSlowInKeySpline">0,0,0,1</x:String>
   <x:String x:Key="ControlNormalAnimationDuration">00:00:00.250</x:String>
-  <x:String x:Key="ControlFastAnimationDuration">00:00:00.167</x:String>
   <x:String x:Key="ControlFastAnimationAfterDuration">00:00:00.168</x:String>
   <x:String x:Key="ControlFasterAnimationDuration">00:00:00.083</x:String>
 </ResourceDictionary>
diff --git a/src/Avalonia.Themes.Fluent2/Accents/FluentControlResources.xaml b/src/Avalonia.Themes.Fluent2/Accents/FluentControlResources.xaml
index fc6cd796b4..7f5fcf7172 100644
--- a/src/Avalonia.Themes.Fluent2/Accents/FluentControlResources.xaml
+++ b/src/Avalonia.Themes.Fluent2/Accents/FluentControlResources.xaml
@@ -459,6 +459,8 @@
       <StaticResource x:Key="SliderTickBarFill" ResourceKey="ControlStrongFillColorDefaultBrush" />
       <StaticResource x:Key="SliderTickBarFillDisabled" ResourceKey="ControlStrongFillColorDisabledBrush" />
       <StaticResource x:Key="SliderInlineTickBarFill" ResourceKey="ControlFillColorInputActiveBrush" />
+      <StaticResource x:Key="SliderOuterThumbBackground" ResourceKey="ControlSolidFillColorDefaultBrush" />
+      <StaticResource x:Key="SliderThumbBorderBrush" ResourceKey="ControlElevationBorderBrush" />
 
       <!--Recources ToggleSwitch-->
       <Thickness x:Key="ToggleSwitchOnStrokeThickness">0</Thickness>
@@ -1157,6 +1159,8 @@
       <StaticResource x:Key="SliderTickBarFill" ResourceKey="ControlStrongFillColorDefaultBrush" />
       <StaticResource x:Key="SliderTickBarFillDisabled" ResourceKey="ControlStrongFillColorDisabledBrush" />
       <StaticResource x:Key="SliderInlineTickBarFill" ResourceKey="ControlFillColorInputActiveBrush" />
+      <StaticResource x:Key="SliderOuterThumbBackground" ResourceKey="ControlSolidFillColorDefaultBrush" />
+      <StaticResource x:Key="SliderThumbBorderBrush" ResourceKey="ControlElevationBorderBrush" />
 
       <!--ToggleSwitch-->
       <Thickness x:Key="ToggleSwitchOnStrokeThickness">0</Thickness>
diff --git a/src/Avalonia.Themes.Fluent2/Controls/DateTimePickerShared.xaml b/src/Avalonia.Themes.Fluent2/Controls/DateTimePickerShared.xaml
index d1ef9c0da7..4dbe510744 100644
--- a/src/Avalonia.Themes.Fluent2/Controls/DateTimePickerShared.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/DateTimePickerShared.xaml
@@ -140,7 +140,7 @@
     <Setter Property="Opacity" Value="0"/>
     <Setter Property="Transitions">
       <Transitions>
-        <DoubleTransition Property="Opacity" Duration="0:0:0.167" />
+        <DoubleTransition Property="Opacity" Duration="{StaticResource ControlFastAnimationDuration}" />
       </Transitions>
     </Setter>
     <Setter Property="Content">
@@ -174,7 +174,7 @@
     <Setter Property="Opacity" Value="0"/>
     <Setter Property="Transitions">
       <Transitions>
-        <DoubleTransition Property="Opacity" Duration="0:0:0.167" />
+        <DoubleTransition Property="Opacity" Duration="{StaticResource ControlFastAnimationDuration}" />
       </Transitions>
     </Setter>
     <Setter Property="Content">
diff --git a/src/Avalonia.Themes.Fluent2/Controls/ListBoxItem.xaml b/src/Avalonia.Themes.Fluent2/Controls/ListBoxItem.xaml
index 048fb9db26..bd7b8d5b27 100644
--- a/src/Avalonia.Themes.Fluent2/Controls/ListBoxItem.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/ListBoxItem.xaml
@@ -63,7 +63,7 @@
                      Fill="{DynamicResource AccentFillColorDefaultBrush}">
             <Rectangle.Transitions>
               <Transitions>
-                <TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.167" Easing="0,0 0,1" />
+                <TransformOperationsTransition Property="RenderTransform" Duration="{StaticResource ControlFastAnimationDuration}" Easing="0,0 0,1" />
               </Transitions>
             </Rectangle.Transitions>
           </Rectangle>
diff --git a/src/Avalonia.Themes.Fluent2/Controls/PipsPager.xaml b/src/Avalonia.Themes.Fluent2/Controls/PipsPager.xaml
index ea16b93bff..ceb5be7f2d 100644
--- a/src/Avalonia.Themes.Fluent2/Controls/PipsPager.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/PipsPager.xaml
@@ -97,8 +97,8 @@
                    StrokeThickness="1">
             <Ellipse.Transitions>
               <Transitions>
-                <BrushTransition Property="Fill" Duration="0:0:0.167" />
-                <BrushTransition Property="Stroke" Duration="0:0:0.167" />
+                <BrushTransition Property="Fill" Duration="{StaticResource ControlFastAnimationDuration}" />
+                <BrushTransition Property="Stroke" Duration="{StaticResource ControlFastAnimationDuration}" />
               </Transitions>
             </Ellipse.Transitions>
           </Ellipse>
@@ -110,9 +110,9 @@
                    Fill="{DynamicResource PipsPagerSelectionIndicatorForeground}">
             <Ellipse.Transitions>
               <Transitions>
-                <DoubleTransition Property="Width" Duration="0:0:0.167" />
-                <DoubleTransition Property="Height" Duration="0:0:0.167" />
-                <BrushTransition Property="Fill" Duration="0:0:0.167" />
+                <DoubleTransition Property="Width" Duration="{StaticResource ControlFastAnimationDuration}" />
+                <DoubleTransition Property="Height" Duration="{StaticResource ControlFastAnimationDuration}" />
+                <BrushTransition Property="Fill" Duration="{StaticResource ControlFastAnimationDuration}" />
               </Transitions>
             </Ellipse.Transitions>
           </Ellipse>
diff --git a/src/Avalonia.Themes.Fluent2/Controls/RadioButton.xaml b/src/Avalonia.Themes.Fluent2/Controls/RadioButton.xaml
index 307f42447a..4c25686650 100644
--- a/src/Avalonia.Themes.Fluent2/Controls/RadioButton.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/RadioButton.xaml
@@ -18,8 +18,7 @@
   <x:Double x:Key="RadioButtonCheckGlyphSize">12</x:Double>
   <x:Double x:Key="RadioButtonCheckGlyphPointerOverSize">14</x:Double>
   <x:Double x:Key="RadioButtonCheckGlyphPressedOverSize">10</x:Double>
-  <!-- WinUI ControlFastOutSlowInKeySpline -->
-  <Easing x:Key="RadioButtonCheckGlyphEasing">0,0,0,1</Easing>
+  <StaticResource x:Key="RadioButtonCheckGlyphEasing" ResourceKey="ControlFastOutSlowInKeySpline"/>
 
   <!-- WinUI reference: RadioButton_themeresources.xaml (DefaultRadioButtonStyle), tag winui3/release/1.5.2.
        The check glyph is a white dot on an accent-filled outer circle; it grows to 14px on hover and
@@ -79,8 +78,8 @@
                   UseLayoutRounding="False">
                 <Ellipse.Transitions>
                   <Transitions>
-                    <DoubleTransition Property="Width" Duration="0:0:0.167" Easing="{StaticResource RadioButtonCheckGlyphEasing}" />
-                    <DoubleTransition Property="Height" Duration="0:0:0.167" Easing="{StaticResource RadioButtonCheckGlyphEasing}" />
+                    <DoubleTransition Property="Width" Duration="{StaticResource ControlFastAnimationDuration}" Easing="{StaticResource RadioButtonCheckGlyphEasing}" />
+                    <DoubleTransition Property="Height" Duration="{StaticResource ControlFastAnimationDuration}" Easing="{StaticResource RadioButtonCheckGlyphEasing}" />
                   </Transitions>
                 </Ellipse.Transitions>
               </Ellipse>
diff --git a/src/Avalonia.Themes.Fluent2/Controls/ScrollBar.xaml b/src/Avalonia.Themes.Fluent2/Controls/ScrollBar.xaml
index 1e545e4765..2e438f47b3 100644
--- a/src/Avalonia.Themes.Fluent2/Controls/ScrollBar.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/ScrollBar.xaml
@@ -50,7 +50,7 @@
     <Setter Property="Transitions">
       <Transitions>
         <CornerRadiusTransition Property="CornerRadius" Duration="0:0:0.1" />
-        <TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.167" Delay="0:0:0.1">
+        <TransformOperationsTransition Property="RenderTransform" Duration="{StaticResource ControlFastAnimationDuration}" Delay="0:0:0.1">
           <TransformOperationsTransition.Easing>
             <SplineEasing X1="0" Y1="0" X2="0" Y2="1" />
           </TransformOperationsTransition.Easing>
diff --git a/src/Avalonia.Themes.Fluent2/Controls/ToggleSwitch.xaml b/src/Avalonia.Themes.Fluent2/Controls/ToggleSwitch.xaml
index d98a4d8029..3e9f45bd91 100644
--- a/src/Avalonia.Themes.Fluent2/Controls/ToggleSwitch.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/ToggleSwitch.xaml
@@ -43,7 +43,7 @@
           <DoubleTransition
               Easing="{StaticResource ToggleSwitchKnobEasing}"
               Property="Canvas.Left"
-              Duration="0:0:0.167" />
+              Duration="{StaticResource ControlFastAnimationDuration}" />
         </Transitions>
     </Setter>
     <Setter Property="Template">
@@ -137,8 +137,8 @@
                   Height="{DynamicResource ToggleSwitchKnobSize}">
                   <Ellipse.Transitions>
                     <Transitions>
-                      <DoubleTransition Property="Width" Duration="0:0:0.167" Easing="{StaticResource ToggleSwitchKnobEasing}" />
-                      <DoubleTransition Property="Height" Duration="0:0:0.167" Easing="{StaticResource ToggleSwitchKnobEasing}" />
+                      <DoubleTransition Property="Width" Duration="{StaticResource ControlFastAnimationDuration}" Easing="{StaticResource ToggleSwitchKnobEasing}" />
+                      <DoubleTransition Property="Height" Duration="{StaticResource ControlFastAnimationDuration}" Easing="{StaticResource ToggleSwitchKnobEasing}" />
                     </Transitions>
                   </Ellipse.Transitions>
                 </Ellipse>
@@ -149,8 +149,8 @@
                   Height="{DynamicResource ToggleSwitchKnobSize}">
                   <Ellipse.Transitions>
                     <Transitions>
-                      <DoubleTransition Property="Width" Duration="0:0:0.167" Easing="{StaticResource ToggleSwitchKnobEasing}" />
-                      <DoubleTransition Property="Height" Duration="0:0:0.167" Easing="{StaticResource ToggleSwitchKnobEasing}" />
+                      <DoubleTransition Property="Width" Duration="{StaticResource ControlFastAnimationDuration}" Easing="{StaticResource ToggleSwitchKnobEasing}" />
+                      <DoubleTransition Property="Height" Duration="{StaticResource ControlFastAnimationDuration}" Easing="{StaticResource ToggleSwitchKnobEasing}" />
                     </Transitions>
                   </Ellipse.Transitions>
                 </Ellipse>
diff --git a/src/Avalonia.Themes.Fluent2/Controls/TreeViewItem.xaml b/src/Avalonia.Themes.Fluent2/Controls/TreeViewItem.xaml
index ecfaa657d2..9a4e7ae716 100644
--- a/src/Avalonia.Themes.Fluent2/Controls/TreeViewItem.xaml
+++ b/src/Avalonia.Themes.Fluent2/Controls/TreeViewItem.xaml
@@ -129,7 +129,7 @@
                          IsVisible="False">
                 <Rectangle.Transitions>
                   <Transitions>
-                    <TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.167" Easing="0,0 0,1" />
+                    <TransformOperationsTransition Property="RenderTransform" Duration="{StaticResource ControlFastAnimationDuration}" Easing="0,0 0,1" />
                   </Transitions>
                 </Rectangle.Transitions>
               </Rectangle>