From fae1df0351289b5fd91817a5bde85209273cb124 Mon Sep 17 00:00:00 2001
From: jkuehner <jochen.kuehner@kardex.com>
Date: Thu, 22 Oct 2015 23:31:23 +0200
Subject: [PATCH] Performance / UI fixes

---
 .../Project/Controls/ClearableTextBox.cs      |  5 --
 .../Project/Controls/ControlStyles.xaml       | 25 +++---
 .../PropertyGrid/Editors/ComboBoxEditor.xaml  |  3 +
 .../Editors/ComboBoxEditor.xaml.cs            | 12 ---
 .../PropertyGrid/Editors/TextBoxEditor.xaml   |  7 +-
 .../Project/PropertyGrid/PropertyGridView.cs  |  7 --
 .../PropertyGrid/PropertyGridView.xaml        | 87 +++++++++++++++++--
 WpfDesign/Project/PropertyGrid/Category.cs    |  8 +-
 .../Project/PropertyGrid/PropertyNode.cs      |  3 -
 9 files changed, 100 insertions(+), 57 deletions(-)

diff --git a/WpfDesign.Designer/Project/Controls/ClearableTextBox.cs b/WpfDesign.Designer/Project/Controls/ClearableTextBox.cs
index c1b26fb..014d51d 100644
--- a/WpfDesign.Designer/Project/Controls/ClearableTextBox.cs
+++ b/WpfDesign.Designer/Project/Controls/ClearableTextBox.cs
@@ -16,14 +16,9 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Controls;
-using System.Windows.Data;
 
 namespace ICSharpCode.WpfDesign.Designer.Controls
 {
diff --git a/WpfDesign.Designer/Project/Controls/ControlStyles.xaml b/WpfDesign.Designer/Project/Controls/ControlStyles.xaml
index ce5a035..140f2f8 100644
--- a/WpfDesign.Designer/Project/Controls/ControlStyles.xaml
+++ b/WpfDesign.Designer/Project/Controls/ControlStyles.xaml
@@ -660,25 +660,24 @@
 						<ScrollViewer x:Name="PART_ContentHost" VerticalAlignment="Center"
 						              Margin="0,0,18,0"
 						              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-						<Viewbox Stretch="Uniform" HorizontalAlignment="Right" VerticalAlignment="Stretch" Margin="0,3,3,3">
-							<Button x:Name="TextRemover"
+						<Button x:Name="TextRemover"
 							        Width="14"
 							        Height="14"
-							        HorizontalAlignment="Stretch"
+									Margin="0,0,3,0"
+							        HorizontalAlignment="Right"
 							        VerticalAlignment="Stretch"
 							        IsTabStop="False"
 							        RenderTransformOrigin="0.5,0.5"
 							        Style="{StaticResource ClearButtonStyle}">
-								<Button.RenderTransform>
-									<TransformGroup>
-										<ScaleTransform ScaleX="1" ScaleY="1" />
-										<SkewTransform />
-										<RotateTransform />
-										<TranslateTransform />
-									</TransformGroup>
-								</Button.RenderTransform>
-							</Button>
-						</Viewbox>
+							<Button.RenderTransform>
+								<TransformGroup>
+									<ScaleTransform ScaleX="1" ScaleY="1" />
+									<SkewTransform />
+									<RotateTransform />
+									<TranslateTransform />
+								</TransformGroup>
+							</Button.RenderTransform>
+						</Button>
 					</Grid>
 				</ControlTemplate>
 			</Setter.Value>
diff --git a/WpfDesign.Designer/Project/PropertyGrid/Editors/ComboBoxEditor.xaml b/WpfDesign.Designer/Project/PropertyGrid/Editors/ComboBoxEditor.xaml
index a511967..b79b6fd 100644
--- a/WpfDesign.Designer/Project/PropertyGrid/Editors/ComboBoxEditor.xaml
+++ b/WpfDesign.Designer/Project/PropertyGrid/Editors/ComboBoxEditor.xaml
@@ -8,6 +8,9 @@
 	Background="{x:Null}"
 	Focusable="False"
 	IsNullable="False"
+	VirtualizingStackPanel.ScrollUnit="Pixel" 
+	VirtualizingStackPanel.IsVirtualizing="True" 
+	ScrollViewer.CanContentScroll="True"
 >
 	<local:NullableComboBox.ItemsPanel>
 		<ItemsPanelTemplate>
diff --git a/WpfDesign.Designer/Project/PropertyGrid/Editors/ComboBoxEditor.xaml.cs b/WpfDesign.Designer/Project/PropertyGrid/Editors/ComboBoxEditor.xaml.cs
index 85e43f6..cd3add5 100644
--- a/WpfDesign.Designer/Project/PropertyGrid/Editors/ComboBoxEditor.xaml.cs
+++ b/WpfDesign.Designer/Project/PropertyGrid/Editors/ComboBoxEditor.xaml.cs
@@ -17,19 +17,7 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using ICSharpCode.WpfDesign.PropertyGrid;
 using System.Windows.Controls.Primitives;
 using ICSharpCode.WpfDesign.Designer.themes;
 
diff --git a/WpfDesign.Designer/Project/PropertyGrid/Editors/TextBoxEditor.xaml b/WpfDesign.Designer/Project/PropertyGrid/Editors/TextBoxEditor.xaml
index 1fee98e..5415e3b 100644
--- a/WpfDesign.Designer/Project/PropertyGrid/Editors/TextBoxEditor.xaml
+++ b/WpfDesign.Designer/Project/PropertyGrid/Editors/TextBoxEditor.xaml
@@ -1,9 +1,10 @@
-<TextBox 
+<controls:ClearableTextBox 
     x:Class="ICSharpCode.WpfDesign.Designer.PropertyGrid.Editors.TextBoxEditor"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"    
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:ICSharpCode.WpfDesign.Designer.Controls"
     Text="{Binding ValueString}"
     BorderThickness="0"
     Background="{x:Null}"
     >	
-</TextBox>
+</controls:ClearableTextBox>
diff --git a/WpfDesign.Designer/Project/PropertyGrid/PropertyGridView.cs b/WpfDesign.Designer/Project/PropertyGrid/PropertyGridView.cs
index a854a6e..c7728c1 100644
--- a/WpfDesign.Designer/Project/PropertyGrid/PropertyGridView.cs
+++ b/WpfDesign.Designer/Project/PropertyGrid/PropertyGridView.cs
@@ -19,16 +19,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 using System.Windows.Controls.Primitives;
 using ICSharpCode.WpfDesign.PropertyGrid;
 
diff --git a/WpfDesign.Designer/Project/PropertyGrid/PropertyGridView.xaml b/WpfDesign.Designer/Project/PropertyGrid/PropertyGridView.xaml
index cc254dc..3ee3ba7 100644
--- a/WpfDesign.Designer/Project/PropertyGrid/PropertyGridView.xaml
+++ b/WpfDesign.Designer/Project/PropertyGrid/PropertyGridView.xaml
@@ -116,7 +116,20 @@
 						<DockPanel.Resources>
 							<DataTemplate DataType="{x:Type PropertyGridBase:Category}">
 								<Expander Header="{Binding Name}" Style="{StaticResource CategoryExpanderStyle}" IsExpanded="{Binding IsExpanded}" Visibility="{Binding IsVisible, Converter={x:Static Converters:CollapsedWhenFalse.Instance}}">
-									<ItemsControl ItemsSource="{Binding Properties}" />
+									<ItemsControl VirtualizingStackPanel.ScrollUnit="Pixel" VirtualizingStackPanel.IsVirtualizing="True" ScrollViewer.CanContentScroll="True" ItemsSource="{Binding Properties}">
+										<ItemsControl.ItemsPanel>
+											<ItemsPanelTemplate>
+												<VirtualizingStackPanel />
+											</ItemsPanelTemplate>
+										</ItemsControl.ItemsPanel>
+										<ItemsControl.Template>
+											<ControlTemplate>
+												<Border BorderThickness="{TemplateBinding Border.BorderThickness}" Padding="{TemplateBinding Control.Padding}" BorderBrush="{TemplateBinding Border.BorderBrush}" Background="{TemplateBinding Panel.Background}" SnapsToDevicePixels="True">
+													<ItemsPresenter SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}" />
+												</Border>
+											</ControlTemplate>
+										</ItemsControl.Template>
+									</ItemsControl>
 								</Expander>
 							</DataTemplate>
 							<DataTemplate DataType="{x:Type PropertyGridBase:PropertyNode}">
@@ -134,9 +147,37 @@
 										</DockPanel>
 									</Border>
 									<StackPanel Visibility="{Binding IsExpanded, Converter={x:Static Converters:CollapsedWhenFalse.Instance}}">
-										<ItemsControl ItemsSource="{Binding Children}" Visibility="{Binding Children.Count, Converter={x:Static Converters:CollapsedWhenZero.Instance}}" />
+										<ItemsControl Background="#F9F9F4"  Visibility="{Binding Children.Count, Converter={x:Static Converters:CollapsedWhenZero.Instance}}" VirtualizingStackPanel.ScrollUnit="Pixel" VirtualizingStackPanel.IsVirtualizing="True" ScrollViewer.CanContentScroll="True" ItemsSource="{Binding Children}">
+											<ItemsControl.ItemsPanel>
+												<ItemsPanelTemplate>
+													<VirtualizingStackPanel />
+												</ItemsPanelTemplate>
+											</ItemsControl.ItemsPanel>
+											<ItemsControl.Template>
+												<ControlTemplate>
+													<Border BorderThickness="{TemplateBinding Border.BorderThickness}" Padding="{TemplateBinding Control.Padding}" BorderBrush="{TemplateBinding Border.BorderBrush}" Background="{TemplateBinding Panel.Background}" SnapsToDevicePixels="True">
+														<ItemsPresenter SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}" />
+													</Border>
+												</ControlTemplate>
+											</ItemsControl.Template>
+										</ItemsControl>
 										<Expander Visibility="{Binding MoreChildren.Count, Converter={x:Static Converters:CollapsedWhenZero.Instance}}" Style="{StaticResource MoreExpanderStyle}">
-											<ItemsControl ItemsSource="{Binding MoreChildren}" Background="#F9F9F4" />
+											<ItemsControl Background="#F9F9F4" VirtualizingStackPanel.ScrollUnit="Pixel" VirtualizingStackPanel.IsVirtualizing="True" ScrollViewer.CanContentScroll="True" ItemsSource="{Binding MoreChildren}">
+												<ItemsControl.ItemsPanel>
+													<ItemsPanelTemplate>
+														<VirtualizingStackPanel />
+													</ItemsPanelTemplate>
+												</ItemsControl.ItemsPanel>
+												<ItemsControl.Template>
+													<ControlTemplate>
+														<Border BorderThickness="{TemplateBinding Border.BorderThickness}" Padding="{TemplateBinding Control.Padding}" BorderBrush="{TemplateBinding Border.BorderBrush}" Background="{TemplateBinding Panel.Background}" SnapsToDevicePixels="True">
+															<ScrollViewer Padding="{TemplateBinding Control.Padding}" Focusable="False">
+																<ItemsPresenter SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}" />
+															</ScrollViewer>
+														</Border>
+													</ControlTemplate>
+												</ItemsControl.Template>
+											</ItemsControl>
 										</Expander>
 									</StackPanel>
 								</StackPanel>
@@ -211,12 +252,44 @@
 							</StackPanel>
 						</Grid>
 						<Grid x:Name="c1" Background="White">
-							<ScrollViewer HorizontalScrollBarVisibility="Disabled" Visibility="{Binding CurrentTab, Converter={x:Static Converters:EnumVisibility.Instance}, ConverterParameter=Properties}">
+							<!--<ScrollViewer HorizontalScrollBarVisibility="Disabled" Visibility="{Binding CurrentTab, Converter={x:Static Converters:EnumVisibility.Instance}, ConverterParameter=Properties}">
 								<ItemsControl ItemsSource="{Binding Categories}" />
-							</ScrollViewer>
-							<ScrollViewer HorizontalScrollBarVisibility="Disabled" Visibility="{Binding CurrentTab, Converter={x:Static Converters:EnumVisibility.Instance}, ConverterParameter=Events}">
+							</ScrollViewer>-->
+							<!--<ScrollViewer HorizontalScrollBarVisibility="Disabled" Visibility="{Binding CurrentTab, Converter={x:Static Converters:EnumVisibility.Instance}, ConverterParameter=Events}">
 								<ItemsControl ItemsSource="{Binding Events}" />
-							</ScrollViewer>
+							</ScrollViewer>-->
+							<ItemsControl VirtualizingStackPanel.ScrollUnit="Pixel" Visibility="{Binding CurrentTab, Converter={x:Static Converters:EnumVisibility.Instance}, ConverterParameter=Properties}" VirtualizingStackPanel.IsVirtualizing="True" ScrollViewer.CanContentScroll="True" ItemsSource="{Binding Categories}">
+								<ItemsControl.ItemsPanel>
+									<ItemsPanelTemplate>
+										<VirtualizingStackPanel />
+									</ItemsPanelTemplate>
+								</ItemsControl.ItemsPanel>
+								<ItemsControl.Template>
+									<ControlTemplate>
+										<Border BorderThickness="{TemplateBinding Border.BorderThickness}" Padding="{TemplateBinding Control.Padding}" BorderBrush="{TemplateBinding Border.BorderBrush}" Background="{TemplateBinding Panel.Background}" SnapsToDevicePixels="True">
+											<ScrollViewer Padding="{TemplateBinding Control.Padding}" Focusable="False">
+												<ItemsPresenter SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}" />
+											</ScrollViewer>
+										</Border>
+									</ControlTemplate>
+								</ItemsControl.Template>
+							</ItemsControl>
+							<ItemsControl VirtualizingStackPanel.ScrollUnit="Pixel" Visibility="{Binding CurrentTab, Converter={x:Static Converters:EnumVisibility.Instance}, ConverterParameter=Events}" VirtualizingStackPanel.IsVirtualizing="True" ScrollViewer.CanContentScroll="True" ItemsSource="{Binding Events}">
+								<ItemsControl.ItemsPanel>
+									<ItemsPanelTemplate>
+										<VirtualizingStackPanel />
+									</ItemsPanelTemplate>
+								</ItemsControl.ItemsPanel>
+								<ItemsControl.Template>
+									<ControlTemplate>
+										<Border BorderThickness="{TemplateBinding Border.BorderThickness}" Padding="{TemplateBinding Control.Padding}" BorderBrush="{TemplateBinding Border.BorderBrush}" Background="{TemplateBinding Panel.Background}" SnapsToDevicePixels="True">
+											<ScrollViewer Padding="{TemplateBinding Control.Padding}" Focusable="False">
+												<ItemsPresenter SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}" />
+											</ScrollViewer>
+										</Border>
+									</ControlTemplate>
+								</ItemsControl.Template>
+							</ItemsControl>
 							<Thumb x:Name="PART_Thumb" HorizontalAlignment="Left" Width="4" Margin="-2 0 0 0" Cursor="SizeWE">
 								<Thumb.RenderTransform>
 									<TranslateTransform X="{Binding FirstColumnWidth, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" />
diff --git a/WpfDesign/Project/PropertyGrid/Category.cs b/WpfDesign/Project/PropertyGrid/Category.cs
index d1af72e..12867ec 100644
--- a/WpfDesign/Project/PropertyGrid/Category.cs
+++ b/WpfDesign/Project/PropertyGrid/Category.cs
@@ -16,13 +16,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using ICSharpCode.WpfDesign.PropertyGrid;
+using System.ComponentModel;			  
 
 namespace ICSharpCode.WpfDesign.PropertyGrid
 {
diff --git a/WpfDesign/Project/PropertyGrid/PropertyNode.cs b/WpfDesign/Project/PropertyGrid/PropertyNode.cs
index 98e94eb..9edfdac 100644
--- a/WpfDesign/Project/PropertyGrid/PropertyNode.cs
+++ b/WpfDesign/Project/PropertyGrid/PropertyNode.cs
@@ -17,12 +17,9 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.ComponentModel;
 using System.Windows;
-using System.Windows.Controls;
 using System.Collections.ObjectModel;
 using System.Windows.Data;
 using System.Windows.Media;