Merge pull request #1459 from robmikh/reordergridanimationfix

Poke UIElement Z-Index when a container is being recycled in ReorderGridAnimation
CommunityToolkit · Aug 31, 2017 · 2f745dc · 2f745dc
2 parents 96b4b45 + 2214326
commit 2f745dc
Showing 1 changed file with 19 additions and 1 deletion.
diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/ReorderGridAnimation.cs b/Microsoft.Toolkit.Uwp.UI.Animations/ReorderGridAnimation.cs
@@ -77,6 +77,9 @@ private static void OnDurationChanged(DependencyObject d, DependencyPropertyChan
 
                 view.ContainerContentChanging -= OnContainerContentChanging;
                 view.ContainerContentChanging += OnContainerContentChanging;
+
+                view.ChoosingItemContainer -= OnChoosingItemContainer;
+                view.ChoosingItemContainer += OnChoosingItemContainer;
             }
         }
 
@@ -99,7 +102,7 @@ private static void OnContainerContentChanging(ListViewBase sender, ContainerCon
             var elementVisual = ElementCompositionPreview.GetElementVisual(args.ItemContainer);
             if (args.InRecycleQueue)
             {
-                elementVisual.ImplicitAnimations = null;
+                PokeUIElementZIndex(args.ItemContainer);
             }
             else
             {
@@ -108,6 +111,14 @@ private static void OnContainerContentChanging(ListViewBase sender, ContainerCon
             }
         }
 
+        private static void OnChoosingItemContainer(ListViewBase sender, ChoosingItemContainerEventArgs args)
+        {
+            if (args.ItemContainer != null)
+            {
+                PokeUIElementZIndex(args.ItemContainer);
+            }
+        }
+
         private static CompositionAnimationGroup CreateOffsetAnimation(Compositor compositor, double duration)
         {
             Vector3KeyFrameAnimation offsetAnimation = compositor.CreateVector3KeyFrameAnimation();
@@ -120,5 +131,12 @@ private static CompositionAnimationGroup CreateOffsetAnimation(Compositor compos
 
             return animationGroup;
         }
+
+        private static void PokeUIElementZIndex(UIElement element)
+        {
+            var oldZIndex = Canvas.GetZIndex(element);
+            Canvas.SetZIndex(element, oldZIndex + 1);
+            Canvas.SetZIndex(element, oldZIndex);
+        }
     }
 }