From c4543c4a6582579918ef57fcf268ae4fdf74017d Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 19 Jul 2018 10:01:11 +0100
Subject: [PATCH] repro performance issue on listbox resizing.

---
 samples/VirtualizationDemo/MainWindow.xaml    | 63 ++++++++-----------
 .../ViewModels/MainWindowViewModel.cs         |  9 +++
 2 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/samples/VirtualizationDemo/MainWindow.xaml b/samples/VirtualizationDemo/MainWindow.xaml
index c9442af444..294ff16f8b 100644
--- a/samples/VirtualizationDemo/MainWindow.xaml
+++ b/samples/VirtualizationDemo/MainWindow.xaml
@@ -2,43 +2,7 @@
         Title="AvaloniaUI Virtualization Test"
         Width="800"
         Height="600">
-    <DockPanel LastChildFill="True" Margin="16">
-        <StackPanel DockPanel.Dock="Right" 
-                    Margin="16 0 0 0" 
-                    MinWidth="150"
-                    Gap="4">
-            <DropDown Items="{Binding VirtualizationModes}"
-                      SelectedItem="{Binding VirtualizationMode}"/>
-            <DropDown Items="{Binding Orientations}"
-                      SelectedItem="{Binding Orientation}"/>
-            <TextBox Watermark="Item Count"
-                     UseFloatingWatermark="True"
-                     Text="{Binding ItemCount}"/>
-            <TextBox Watermark="Extent"
-                     UseFloatingWatermark="True"
-                     Text="{Binding #listBox.Scroll.Extent, Mode=OneWay}"/>
-            <TextBox Watermark="Offset"
-                     UseFloatingWatermark="True"
-                     Text="{Binding #listBox.Scroll.Offset, Mode=OneWay}"/>
-            <TextBox Watermark="Viewport"
-                     UseFloatingWatermark="True"
-                     Text="{Binding #listBox.Scroll.Viewport, Mode=OneWay}"/>
-            <TextBlock>Horiz. ScrollBar</TextBlock>
-            <DropDown Items="{Binding ScrollBarVisibilities}"
-                      SelectedItem="{Binding HorizontalScrollBarVisibility}"/>
-            <TextBlock>Vert. ScrollBar</TextBlock>
-            <DropDown Items="{Binding ScrollBarVisibilities}"
-                      SelectedItem="{Binding VerticalScrollBarVisibility}"/>
-            <TextBox Watermark="Item to Create"
-                     UseFloatingWatermark="True"
-                     Text="{Binding NewItemString}"/>
-            <Button Command="{Binding AddItemCommand}">Add Item</Button>
-            <Button Command="{Binding RemoveItemCommand}">Remove Item</Button>
-            <Button Command="{Binding RecreateCommand}">Recreate</Button>
-            <Button Command="{Binding SelectFirstCommand}">Select First</Button>
-            <Button Command="{Binding SelectLastCommand}">Select Last</Button>
-        </StackPanel>
-
+    <Grid RowDefinitions="4*,3*,4*">
         <ListBox Name="listBox" 
                  Items="{Binding Items}" 
                  SelectedItems="{Binding SelectedItems}"
@@ -59,5 +23,28 @@
                 </DataTemplate>
             </ListBox.ItemTemplate>
         </ListBox>
-    </DockPanel>
+
+        <Grid Grid.Row="1" Background="LightBlue" />
+
+        <ListBox Name="listBox1" Grid.Row="2"
+                 Items="{Binding Items2}" 
+                 ScrollViewer.HorizontalScrollBarVisibility="{Binding HorizontalScrollBarVisibility, Mode=TwoWay}"
+                 ScrollViewer.VerticalScrollBarVisibility="{Binding VerticalScrollBarVisibility, Mode=TwoWay}">
+            <ListBox.ItemTemplate>
+                <DataTemplate>
+                    <Grid>
+                        <Expander ExpandDirection="Down">
+                            <StackPanel Background="#FFFEFEFE">
+                                <Panel Background="Red" Height="200" Width="200" />
+                            </StackPanel>
+                        </Expander>
+                        <Grid ColumnDefinitions="400, *, 100" Margin="30 0 0 0">
+                            <TextBlock Text="{Binding Header}" />
+                        </Grid>
+                    </Grid>
+                </DataTemplate>
+            </ListBox.ItemTemplate>
+        </ListBox>
+
+    </Grid>
 </Window>
diff --git a/samples/VirtualizationDemo/ViewModels/MainWindowViewModel.cs b/samples/VirtualizationDemo/ViewModels/MainWindowViewModel.cs
index eb08ef9656..fb799742c6 100644
--- a/samples/VirtualizationDemo/ViewModels/MainWindowViewModel.cs
+++ b/samples/VirtualizationDemo/ViewModels/MainWindowViewModel.cs
@@ -17,6 +17,7 @@ namespace VirtualizationDemo.ViewModels
         private string _newItemString = "New Item";
         private int _newItemIndex;
         private IReactiveList<ItemViewModel> _items;
+        private IReactiveDerivedList<ItemViewModel> _items2;
         private string _prefix = "Item";
         private ScrollBarVisibility _horizontalScrollBarVisibility = ScrollBarVisibility.Auto;
         private ScrollBarVisibility _verticalScrollBarVisibility = ScrollBarVisibility.Auto;
@@ -58,6 +59,12 @@ namespace VirtualizationDemo.ViewModels
             private set { this.RaiseAndSetIfChanged(ref _items, value); }
         }
 
+        public IReactiveDerivedList<ItemViewModel> Items2
+        {
+            get { return _items2; }
+            private set { this.RaiseAndSetIfChanged(ref _items2, value); }
+        }
+
         public Orientation Orientation
         {
             get { return _orientation; }
@@ -104,6 +111,7 @@ namespace VirtualizationDemo.ViewModels
                 var items = Enumerable.Range(0, count)
                     .Select(x => new ItemViewModel(x));
                 Items = new ReactiveList<ItemViewModel>(items);
+                Items2 = Items.CreateDerivedCollection(c => c);
             }
             else if (count > Items.Count)
             {
@@ -143,6 +151,7 @@ namespace VirtualizationDemo.ViewModels
             var items = Enumerable.Range(0, _itemCount)
                 .Select(x => new ItemViewModel(x, _prefix));
             Items = new ReactiveList<ItemViewModel>(items);
+            Items2 = Items.CreateDerivedCollection(c => c);
         }
 
         private void SelectItem(int index)