Fix issue with ProgressRing not animating after being unloaded (#6775)

microsoft · Mar 2, 2022 · b8eb652 · b8eb652
1 parent 0b8152b
commit b8eb652
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/dev/ProgressRing/ProgressRing.cpp b/dev/ProgressRing/ProgressRing.cpp
@@ -31,6 +31,7 @@ ProgressRing::ProgressRing()
     SetValue(s_TemplateSettingsProperty, winrt::make<::ProgressRingTemplateSettings>());
 
     SizeChanged({ this, &ProgressRing::OnSizeChanged });
+    Loaded({ this, &ProgressRing::OnLoaded });
 }
 
 winrt::AutomationPeer ProgressRing::OnCreateAutomationPeer()
@@ -65,6 +66,11 @@ void ProgressRing::OnSizeChanged(const winrt::IInspectable&, const winrt::IInspe
     ApplyTemplateSettings();
 }
 
+void ProgressRing::OnLoaded(const winrt::IInspectable&, const winrt::IInspectable&)
+{
+    UpdateStates();
+}
+
 void ProgressRing::OnForegroundPropertyChanged(const winrt::DependencyObject&, const winrt::DependencyProperty&)
 {
     if (const auto foreground = Foreground().try_as<winrt::SolidColorBrush>())

diff --git a/dev/ProgressRing/ProgressRing.h b/dev/ProgressRing/ProgressRing.h
@@ -43,6 +43,7 @@ class ProgressRing :
     void SetLottieForegroundColor(const winrt::IAnimatedVisualSource);
     void SetLottieBackgroundColor(const winrt::IAnimatedVisualSource);
     void OnSizeChanged(const winrt::IInspectable&, const winrt::IInspectable&);
+    void OnLoaded(const winrt::IInspectable&, const winrt::IInspectable&);
     void UpdateStates();
     void ApplyTemplateSettings();
     void UpdateLottieProgress();

diff --git a/dev/TabView/TestUI/TabViewPage.xaml b/dev/TabView/TestUI/TabViewPage.xaml
@@ -185,13 +185,15 @@
                         <StackPanel Padding="16" Background="{ThemeResource TabViewItemHeaderBackgroundSelected}">
                             <TextBlock>Shop text</TextBlock>
                             <Button Content="SecondTabButton" AutomationProperties.Name="SecondTabButton"/>
+                            <controls:ProgressRing IsActive="True"/>
                         </StackPanel>
                     </controls:TabViewItem>
 
                     <controls:TabViewItem x:Name="LongHeaderTab" AutomationProperties.Name="LongHeaderTab" Header="Long Header No Icon">
                         <StackPanel Padding="16" Background="{ThemeResource TabViewItemHeaderBackgroundSelected}">
                             <TextBlock >Emoji text</TextBlock>
                             <Button Content="Button 3"/>
+                            <controls:ProgressRing IsActive="True"/>
                         </StackPanel>
                     </controls:TabViewItem>