From 7808da21603f63e8d3974cc701bae3a758cd966b Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Fri, 2 Jun 2023 12:25:56 +0800
Subject: [PATCH 1/4] feat: attach transitions after ToggleSwitch loaded.

---
 src/Avalonia.Controls/ToggleSwitch.cs         | 34 +++++++++++++++++--
 .../Controls/ToggleSwitch.xaml                | 21 ++++++------
 .../Controls/ToggleSwitch.xaml                | 18 +++++++---
 3 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/src/Avalonia.Controls/ToggleSwitch.cs b/src/Avalonia.Controls/ToggleSwitch.cs
index a68a022e67..989c3cb261 100644
--- a/src/Avalonia.Controls/ToggleSwitch.cs
+++ b/src/Avalonia.Controls/ToggleSwitch.cs
@@ -1,4 +1,5 @@
-using Avalonia.Controls.Metadata;
+using Avalonia.Animation;
+using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
@@ -42,6 +43,10 @@ namespace Avalonia.Controls
                     x.UpdateKnobPos(x.IsChecked.Value);
                 }
             });
+            KnobTransitionsProperty.Changed.AddClassHandler<ToggleSwitch>((x, e) =>
+            {
+                x.AssignTransitions();
+            });
         }
 
         /// <summary>
@@ -68,6 +73,8 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<IDataTemplate?> OnContentTemplateProperty =
             AvaloniaProperty.Register<ToggleSwitch, IDataTemplate?>(nameof(OnContentTemplate));
 
+        public static readonly StyledProperty<Transitions> KnobTransitionsProperty = AvaloniaProperty.Register<ToggleSwitch, Transitions>(nameof(KnobTransitions));
+
         /// <summary>
         /// Gets or Sets the Content that is displayed when in the On State.
         /// </summary>
@@ -116,6 +123,14 @@ namespace Avalonia.Controls
             set { SetValue(OnContentTemplateProperty, value); }
         }
 
+        public Transitions KnobTransitions
+        {
+            get { return GetValue(KnobTransitionsProperty); }
+            set { SetValue(KnobTransitionsProperty, value); }
+        }
+
+        
+
         private void OffContentChanged(AvaloniaPropertyChangedEventArgs e)
         {
             if (e.OldValue is ILogical oldChild)
@@ -176,8 +191,23 @@ namespace Avalonia.Controls
             {
                 UpdateKnobPos(IsChecked.Value);
             }
+            
         }
-        
+
+        protected override void OnLoaded()
+        {
+            base.OnLoaded();
+            AssignTransitions();
+        }
+
+        private void AssignTransitions()
+        {
+            if (_knobsPanel != null)
+            {
+                _knobsPanel.Transitions = KnobTransitions;
+            }
+        }
+
         private void KnobsPanel_PointerPressed(object? sender, Input.PointerPressedEventArgs e)
         {
             _switchStartPoint = e.GetPosition(_switchKnob);
diff --git a/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml b/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
index 47d7953096..63c11f6ff8 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
@@ -28,6 +28,14 @@
     <Setter Property="HorizontalContentAlignment" Value="Left" />
     <Setter Property="VerticalContentAlignment" Value="Center" />
     <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+    <Setter Property="KnobTransitions">
+      <Transitions>
+          <DoubleTransition
+              Easing="CubicEaseOut"
+              Property="Canvas.Left"
+              Duration="0:0:0.2" />
+        </Transitions>
+    </Setter>
     <Setter Property="Template">
       <ControlTemplate>
         <Grid Background="{TemplateBinding Background}" RowDefinitions="Auto,*">
@@ -134,16 +142,9 @@
       <Setter Property="Margin" Value="0" />
     </Style>
 
-    <!--  NormalState  -->
-    <Style Selector="^:not(:dragging) /template/ Grid#PART_MovingKnobs">
-      <Setter Property="Transitions">
-        <Transitions>
-          <DoubleTransition
-              Easing="CubicEaseOut"
-              Property="Canvas.Left"
-              Duration="0:0:0.2" />
-        </Transitions>
-      </Setter>
+    <!--  Dragging State  -->
+    <Style Selector="^:dragging /template/ Grid#PART_MovingKnobs">
+      <Setter Property="Transitions" Value="{x:Null}"/>
     </Style>
 
     <!--  PointerOverState  -->
diff --git a/src/Avalonia.Themes.Simple/Controls/ToggleSwitch.xaml b/src/Avalonia.Themes.Simple/Controls/ToggleSwitch.xaml
index a51aeb9ee6..1178c96419 100644
--- a/src/Avalonia.Themes.Simple/Controls/ToggleSwitch.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/ToggleSwitch.xaml
@@ -46,6 +46,14 @@
     <Setter Property="HorizontalContentAlignment" Value="Left" />
     <Setter Property="VerticalContentAlignment" Value="Center" />
     <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}" />
+    <Setter Property="KnobTransitions">
+      <Transitions>
+        <DoubleTransition
+            Easing="CubicEaseOut"
+            Property="Canvas.Left"
+            Duration="0:0:0.2" />
+      </Transitions>
+    </Setter>
     <Setter Property="Template">
       <ControlTemplate>
         <Grid Background="{TemplateBinding Background}"
@@ -123,11 +131,6 @@
 
               <Grid x:Name="PART_MovingKnobs"
                     Width="20" Height="20">
-                <Grid.Transitions>
-                  <Transitions>
-                    <DoubleTransition Property="Canvas.Left" Duration="0:0:0.2" Easing="CubicEaseOut" />
-                  </Transitions>
-                </Grid.Transitions>
 
                 <Ellipse x:Name="SwitchKnobOn"
                          Fill="{DynamicResource HighlightForegroundColor}"
@@ -147,6 +150,11 @@
       <Setter Property="Margin" Value="0" />
     </Style>
 
+    <!--  Dragging State  -->
+    <Style Selector="^:dragging /template/ Grid#PART_MovingKnobs">
+      <Setter Property="Transitions" Value="{x:Null}"/>
+    </Style>
+
     <!-- PointerOverState -->
     <Style Selector="^:pointerover /template/ Border#OuterBorder">
       <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighColor}" />

From 9aaa70840559afb7506475cc5a97bb1c4596ba44 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Fri, 2 Jun 2023 12:36:40 +0800
Subject: [PATCH 2/4] misc: update docs. format code.

---
 src/Avalonia.Controls/ToggleSwitch.cs | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Controls/ToggleSwitch.cs b/src/Avalonia.Controls/ToggleSwitch.cs
index 989c3cb261..1868f47145 100644
--- a/src/Avalonia.Controls/ToggleSwitch.cs
+++ b/src/Avalonia.Controls/ToggleSwitch.cs
@@ -45,7 +45,7 @@ namespace Avalonia.Controls
             });
             KnobTransitionsProperty.Changed.AddClassHandler<ToggleSwitch>((x, e) =>
             {
-                x.AssignTransitions();
+                x.UpdateKnobTransitions();
             });
         }
 
@@ -73,7 +73,11 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<IDataTemplate?> OnContentTemplateProperty =
             AvaloniaProperty.Register<ToggleSwitch, IDataTemplate?>(nameof(OnContentTemplate));
 
-        public static readonly StyledProperty<Transitions> KnobTransitionsProperty = AvaloniaProperty.Register<ToggleSwitch, Transitions>(nameof(KnobTransitions));
+        /// <summary>
+        /// Defines the <see cref="KnobTransitions"/> property.
+        /// </summary>
+        public static readonly StyledProperty<Transitions> KnobTransitionsProperty = 
+            AvaloniaProperty.Register<ToggleSwitch, Transitions>(nameof(KnobTransitions));
 
         /// <summary>
         /// Gets or Sets the Content that is displayed when in the On State.
@@ -123,6 +127,9 @@ namespace Avalonia.Controls
             set { SetValue(OnContentTemplateProperty, value); }
         }
 
+        /// <summary>
+        /// Gets or Sets the <see cref="Transitions"/> of switching knob. 
+        /// </summary>
         public Transitions KnobTransitions
         {
             get { return GetValue(KnobTransitionsProperty); }
@@ -191,16 +198,15 @@ namespace Avalonia.Controls
             {
                 UpdateKnobPos(IsChecked.Value);
             }
-            
         }
 
         protected override void OnLoaded()
         {
             base.OnLoaded();
-            AssignTransitions();
+            UpdateKnobTransitions();
         }
 
-        private void AssignTransitions()
+        private void UpdateKnobTransitions()
         {
             if (_knobsPanel != null)
             {

From beb7cec6c49aba28b7d91f0db19309d4336b0cbf Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Fri, 2 Jun 2023 12:58:33 +0800
Subject: [PATCH 3/4] feat: resolve dragging position flickering issue.

---
 src/Avalonia.Controls/ToggleSwitch.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/ToggleSwitch.cs b/src/Avalonia.Controls/ToggleSwitch.cs
index 1868f47145..48b068d324 100644
--- a/src/Avalonia.Controls/ToggleSwitch.cs
+++ b/src/Avalonia.Controls/ToggleSwitch.cs
@@ -230,7 +230,7 @@ namespace Avalonia.Controls
                 _knobsPanel!.ClearValue(Canvas.LeftProperty);
 
                 PseudoClasses.Set(":dragging", false);
-
+  
                 if (shouldBecomeChecked == IsChecked)
                 {
                     UpdateKnobPos(shouldBecomeChecked);
@@ -239,6 +239,7 @@ namespace Avalonia.Controls
                 {
                     SetCurrentValue(IsCheckedProperty, shouldBecomeChecked);
                 }
+                UpdateKnobTransitions();
             }
             else
             {
@@ -254,6 +255,10 @@ namespace Avalonia.Controls
         {
             if (_knobsPanelPressed)
             {
+                if(_knobsPanel != null)
+                {
+                    _knobsPanel.Transitions = null;
+                }
                 var difference = e.GetPosition(_switchKnob) - _switchStartPoint;
 
                 if ((!_isDragging) && (System.Math.Abs(difference.X) > 3))

From d186b49b39de1bd10d522e280b37391e564a4bce Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Fri, 2 Jun 2023 13:11:44 +0800
Subject: [PATCH 4/4] feat: remove :dragging transition in styles.

---
 src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml | 5 -----
 src/Avalonia.Themes.Simple/Controls/ToggleSwitch.xaml | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml b/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
index 63c11f6ff8..ff9de247f4 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
@@ -142,11 +142,6 @@
       <Setter Property="Margin" Value="0" />
     </Style>
 
-    <!--  Dragging State  -->
-    <Style Selector="^:dragging /template/ Grid#PART_MovingKnobs">
-      <Setter Property="Transitions" Value="{x:Null}"/>
-    </Style>
-
     <!--  PointerOverState  -->
     <Style Selector="^:pointerover /template/ Border#OuterBorder">
       <Setter Property="BorderBrush" Value="{DynamicResource ToggleSwitchStrokeOffPointerOver}" />
diff --git a/src/Avalonia.Themes.Simple/Controls/ToggleSwitch.xaml b/src/Avalonia.Themes.Simple/Controls/ToggleSwitch.xaml
index 1178c96419..f2e0981d4c 100644
--- a/src/Avalonia.Themes.Simple/Controls/ToggleSwitch.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/ToggleSwitch.xaml
@@ -150,11 +150,6 @@
       <Setter Property="Margin" Value="0" />
     </Style>
 
-    <!--  Dragging State  -->
-    <Style Selector="^:dragging /template/ Grid#PART_MovingKnobs">
-      <Setter Property="Transitions" Value="{x:Null}"/>
-    </Style>
-
     <!-- PointerOverState -->
     <Style Selector="^:pointerover /template/ Border#OuterBorder">
       <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderHighColor}" />