From e7f58ef781dcc244197abd6feadcb7d4341793e0 Mon Sep 17 00:00:00 2001
From: Nuklon <Nuklon@users.noreply.github.com>
Date: Tue, 24 Mar 2026 13:27:04 +0100
Subject: [PATCH 1/2] Fix ProgressRing not restarting properly when visibily
 changes

---
 .../Controls/ProgressRing/ProgressRing.xaml   | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/Wpf.Ui/Controls/ProgressRing/ProgressRing.xaml b/src/Wpf.Ui/Controls/ProgressRing/ProgressRing.xaml
index 6dc7b15a6..f504bd284 100644
--- a/src/Wpf.Ui/Controls/ProgressRing/ProgressRing.xaml
+++ b/src/Wpf.Ui/Controls/ProgressRing/ProgressRing.xaml
@@ -1,4 +1,4 @@
-<!--
+<!--
     This Source Code Form is subject to the terms of the MIT License.
     If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
     Copyright (C) Leszek Pomianowski and WPF UI Contributors.
@@ -87,11 +87,29 @@
                                             </Storyboard>
                                         </BeginStoryboard>
                                     </Trigger.EnterActions>
-                                    <Trigger.ExitActions>
+                                </Trigger>
+                                <Trigger Property="IsVisible" Value="True">
+                                    <Trigger.EnterActions>
                                         <BeginStoryboard>
-                                            <Storyboard />
+                                            <Storyboard>
+                                                <DoubleAnimation
+                                                    RepeatBehavior="Forever"
+                                                    Storyboard.TargetName="Arc"
+                                                    Storyboard.TargetProperty="(Canvas.RenderTransform).(RotateTransform.Angle)"
+                                                    To="360"
+                                                    Duration="0:0:2" />
+
+                                                <DoubleAnimation
+                                                    AutoReverse="True"
+                                                    RepeatBehavior="Forever"
+                                                    Storyboard.TargetName="Arc"
+                                                    Storyboard.TargetProperty="EndAngle"
+                                                    From="100"
+                                                    To="320"
+                                                    Duration="0:0:5" />
+                                            </Storyboard>
                                         </BeginStoryboard>
-                                    </Trigger.ExitActions>
+                                    </Trigger.EnterActions>
                                 </Trigger>
                             </ControlTemplate.Triggers>
                         </ControlTemplate>

From ba983b76678fbdc86bddbea82e09af223158c596 Mon Sep 17 00:00:00 2001
From: Nuklon <Nuklon@users.noreply.github.com>
Date: Tue, 24 Mar 2026 14:16:57 +0100
Subject: [PATCH 2/2] Use resume/pause/seek instead

---
 .../Controls/ProgressRing/ProgressRing.xaml   | 67 ++++++++-----------
 1 file changed, 29 insertions(+), 38 deletions(-)

diff --git a/src/Wpf.Ui/Controls/ProgressRing/ProgressRing.xaml b/src/Wpf.Ui/Controls/ProgressRing/ProgressRing.xaml
index f504bd284..d12e307b2 100644
--- a/src/Wpf.Ui/Controls/ProgressRing/ProgressRing.xaml
+++ b/src/Wpf.Ui/Controls/ProgressRing/ProgressRing.xaml
@@ -65,51 +65,42 @@
                                 </controls:Arc>
                             </Grid>
                             <ControlTemplate.Triggers>
+                                <EventTrigger SourceName="Arc" RoutedEvent="Loaded">
+                                    <BeginStoryboard Name="RotateStoryboard">
+                                        <Storyboard>
+                                            <DoubleAnimation
+                                                RepeatBehavior="Forever"
+                                                Storyboard.TargetName="Arc"
+                                                Storyboard.TargetProperty="(Canvas.RenderTransform).(RotateTransform.Angle)"
+                                                To="360"
+                                                Duration="0:0:2" />
+                                            <DoubleAnimation
+                                                AutoReverse="True"
+                                                RepeatBehavior="Forever"
+                                                Storyboard.TargetName="Arc"
+                                                Storyboard.TargetProperty="EndAngle"
+                                                From="100"
+                                                To="320"
+                                                Duration="0:0:5" />
+                                        </Storyboard>
+                                    </BeginStoryboard>
+                                </EventTrigger>
                                 <Trigger Property="IsEnabled" Value="True">
                                     <Trigger.EnterActions>
-                                        <BeginStoryboard>
-                                            <Storyboard>
-                                                <DoubleAnimation
-                                                    RepeatBehavior="Forever"
-                                                    Storyboard.TargetName="Arc"
-                                                    Storyboard.TargetProperty="(Canvas.RenderTransform).(RotateTransform.Angle)"
-                                                    To="360"
-                                                    Duration="0:0:2" />
-
-                                                <DoubleAnimation
-                                                    AutoReverse="True"
-                                                    RepeatBehavior="Forever"
-                                                    Storyboard.TargetName="Arc"
-                                                    Storyboard.TargetProperty="EndAngle"
-                                                    From="100"
-                                                    To="320"
-                                                    Duration="0:0:5" />
-                                            </Storyboard>
-                                        </BeginStoryboard>
+                                        <ResumeStoryboard BeginStoryboardName="RotateStoryboard" />
                                     </Trigger.EnterActions>
+                                    <Trigger.ExitActions>
+                                        <PauseStoryboard BeginStoryboardName="RotateStoryboard" />
+                                    </Trigger.ExitActions>
                                 </Trigger>
                                 <Trigger Property="IsVisible" Value="True">
                                     <Trigger.EnterActions>
-                                        <BeginStoryboard>
-                                            <Storyboard>
-                                                <DoubleAnimation
-                                                    RepeatBehavior="Forever"
-                                                    Storyboard.TargetName="Arc"
-                                                    Storyboard.TargetProperty="(Canvas.RenderTransform).(RotateTransform.Angle)"
-                                                    To="360"
-                                                    Duration="0:0:2" />
-
-                                                <DoubleAnimation
-                                                    AutoReverse="True"
-                                                    RepeatBehavior="Forever"
-                                                    Storyboard.TargetName="Arc"
-                                                    Storyboard.TargetProperty="EndAngle"
-                                                    From="100"
-                                                    To="320"
-                                                    Duration="0:0:5" />
-                                            </Storyboard>
-                                        </BeginStoryboard>
+                                        <ResumeStoryboard BeginStoryboardName="RotateStoryboard" />
                                     </Trigger.EnterActions>
+                                    <Trigger.ExitActions>
+                                        <PauseStoryboard BeginStoryboardName="RotateStoryboard" />
+                                        <SeekStoryboard BeginStoryboardName="RotateStoryboard" Offset="0" />
+                                    </Trigger.ExitActions>
                                 </Trigger>
                             </ControlTemplate.Triggers>
                         </ControlTemplate>