Fix exception when reparenting repeater

zyj0021 · Apr 26, 2020 · 3cc4b70 · 3cc4b70
1 parent 974a6e3
commit 3cc4b70
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ModernWpf.Controls/Common/Extensions.cs b/ModernWpf.Controls/Common/Extensions.cs
@@ -14,15 +14,19 @@ public static FlyoutBase Flyout(this Button button)
             return FlyoutService.GetFlyout(button);
         }
 
+        /*
         public static void RemoveAtEnd(this IList list)
         {
             list.RemoveAt(list.Count - 1);
         }
+        */
 
+        /*
         public static void RemoveAtEnd<T>(this IList<T> list)
         {
             list.RemoveAt(list.Count - 1);
         }
+        */
 
         public static void UseSystemFocusVisuals(this Control control, bool value)
         {

diff --git a/ModernWpf.Controls/NavigationView/NavigationViewItem.cs b/ModernWpf.Controls/NavigationView/NavigationViewItem.cs
@@ -585,15 +585,15 @@ void ReparentRepeater()
                     {
                         // Reparent repeater to flyout
                         // TODO: Replace removeatend with something more specific
-                        m_rootGrid.Children.RemoveAtEnd();
+                        m_rootGrid.Children.Remove(repeater);
                         m_flyoutContentGrid.Children.Add(repeater);
                         m_isRepeaterParentedToFlyout = true;
 
                         PropagateDepthToChildren(0);
                     }
                     else if (!ShouldRepeaterShowInFlyout() && m_isRepeaterParentedToFlyout)
                     {
-                        m_flyoutContentGrid.Children.RemoveAtEnd();
+                        m_flyoutContentGrid.Children.Remove(repeater);
                         m_rootGrid.Children.Add(repeater);
                         m_isRepeaterParentedToFlyout = false;