Skip to content

Commit 77bb6d0

Browse files
authored
fix(controls): Fix ProgressRing not restarting properly when visibily changes (#1678)
1 parent 3b4e8f5 commit 77bb6d0

1 file changed

Lines changed: 32 additions & 23 deletions

File tree

src/Wpf.Ui/Controls/ProgressRing/ProgressRing.xaml

Lines changed: 32 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!--
1+
<!--
22
This Source Code Form is subject to the terms of the MIT License.
33
If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
44
Copyright (C) Leszek Pomianowski and WPF UI Contributors.
@@ -65,32 +65,41 @@
6565
</controls:Arc>
6666
</Grid>
6767
<ControlTemplate.Triggers>
68+
<EventTrigger SourceName="Arc" RoutedEvent="Loaded">
69+
<BeginStoryboard Name="RotateStoryboard">
70+
<Storyboard>
71+
<DoubleAnimation
72+
RepeatBehavior="Forever"
73+
Storyboard.TargetName="Arc"
74+
Storyboard.TargetProperty="(Canvas.RenderTransform).(RotateTransform.Angle)"
75+
To="360"
76+
Duration="0:0:2" />
77+
<DoubleAnimation
78+
AutoReverse="True"
79+
RepeatBehavior="Forever"
80+
Storyboard.TargetName="Arc"
81+
Storyboard.TargetProperty="EndAngle"
82+
From="100"
83+
To="320"
84+
Duration="0:0:5" />
85+
</Storyboard>
86+
</BeginStoryboard>
87+
</EventTrigger>
6888
<Trigger Property="IsEnabled" Value="True">
6989
<Trigger.EnterActions>
70-
<BeginStoryboard>
71-
<Storyboard>
72-
<DoubleAnimation
73-
RepeatBehavior="Forever"
74-
Storyboard.TargetName="Arc"
75-
Storyboard.TargetProperty="(Canvas.RenderTransform).(RotateTransform.Angle)"
76-
To="360"
77-
Duration="0:0:2" />
78-
79-
<DoubleAnimation
80-
AutoReverse="True"
81-
RepeatBehavior="Forever"
82-
Storyboard.TargetName="Arc"
83-
Storyboard.TargetProperty="EndAngle"
84-
From="100"
85-
To="320"
86-
Duration="0:0:5" />
87-
</Storyboard>
88-
</BeginStoryboard>
90+
<ResumeStoryboard BeginStoryboardName="RotateStoryboard" />
91+
</Trigger.EnterActions>
92+
<Trigger.ExitActions>
93+
<PauseStoryboard BeginStoryboardName="RotateStoryboard" />
94+
</Trigger.ExitActions>
95+
</Trigger>
96+
<Trigger Property="IsVisible" Value="True">
97+
<Trigger.EnterActions>
98+
<ResumeStoryboard BeginStoryboardName="RotateStoryboard" />
8999
</Trigger.EnterActions>
90100
<Trigger.ExitActions>
91-
<BeginStoryboard>
92-
<Storyboard />
93-
</BeginStoryboard>
101+
<PauseStoryboard BeginStoryboardName="RotateStoryboard" />
102+
<SeekStoryboard BeginStoryboardName="RotateStoryboard" Offset="0" />
94103
</Trigger.ExitActions>
95104
</Trigger>
96105
</ControlTemplate.Triggers>

0 commit comments

Comments
 (0)