Fix issue where animated icon without a source set wouldn't show fall…

…back icon. (#4556)
microsoft · Mar 18, 2021 · cb19f34 · cb19f34
1 parent d82b146
commit cb19f34
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/dev/AnimatedIcon/AnimatedIcon.cpp b/dev/AnimatedIcon/AnimatedIcon.cpp
@@ -27,6 +27,7 @@ AnimatedIcon::AnimatedIcon()
 void AnimatedIcon::OnApplyTemplate()
 {
     __super::OnApplyTemplate();
+    OnSourcePropertyChanged(nullptr);
     auto const panel = winrt::VisualTreeHelper::GetChild(*this, 0).as<winrt::Panel>();
     m_rootPanel.set(panel);
     m_currentState = GetState(*this);

diff --git a/dev/AnimatedIcon/TestUI/AnimatedIconPage.xaml b/dev/AnimatedIcon/TestUI/AnimatedIconPage.xaml
@@ -656,6 +656,13 @@
                                 </controls:AnimatedIcon>
                             </StackPanel>
                         </Button>
+                        <StackPanel Background="Maroon">
+                            <controls:AnimatedIcon Height="100" Width="100" Foreground="Pink">
+                                <controls:AnimatedIcon.FallbackIconSource>
+                                    <controls:SymbolIconSource Symbol="AddFriend" Foreground="Purple"/>
+                                </controls:AnimatedIcon.FallbackIconSource>
+                            </controls:AnimatedIcon>
+                        </StackPanel>
                     </StackPanel>
                 </StackPanel>
             </ScrollViewer>