From 850dfdea4809fd5d458686de0d05cbbb74ff398e Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 22 May 2016 20:32:34 +0200
Subject: [PATCH] Dematerialize items when removed.

---
 src/Avalonia.Controls/Presenters/ItemsPresenter.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Controls/Presenters/ItemsPresenter.cs b/src/Avalonia.Controls/Presenters/ItemsPresenter.cs
index 21d2bcada9..23fe8d0a69 100644
--- a/src/Avalonia.Controls/Presenters/ItemsPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/ItemsPresenter.cs
@@ -251,12 +251,13 @@ namespace Avalonia.Controls.Presenters
 
             if (panel.OverflowCount > 0)
             {
-                var remove = panel.OverflowCount;
+                var count = panel.OverflowCount;
+                var index = panel.Children.Count - count;
 
-                panel.Children.RemoveRange(
-                    panel.Children.Count - remove,
-                    panel.OverflowCount);
-                _virt.LastIndex -= remove;
+                panel.Children.RemoveRange(index, count);
+                generator.Dematerialize(index, count);
+
+                _virt.LastIndex -= count;
             }
         }