Fix that SolidBrushEditor was to small, and show WPF Brushes

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/PropertyGrid/Editors/BrushEditor/BrushEditor.cs

@@ -51,10 +51,16 @@ namespace ICSharpCode.WpfDesign.Designer.PropertyGrid.Editors.BrushEditor
 			.GetProperties(BindingFlags.Static | BindingFlags.Public)
 			.Where(p => p.PropertyType == typeof(Color))
 			.Select(p => new BrushItem()
-			{
-        		Name = p.Name,
-        		Brush = new SolidColorBrush((Color)p.GetValue(null, null))
-			})
+			        {
+			        	Name = p.Name,
+			        	Brush = new SolidColorBrush((Color)p.GetValue(null, null))
+			        })
+			.ToArray();
+
+		public static BrushItem[] WpfBrushes = typeof(Brushes)
+			.GetProperties(BindingFlags.Static | BindingFlags.Public)
+			.Where(p => p.PropertyType == typeof(SolidColorBrush))
+			.Select(p => new BrushItem() { Name = p.Name, Brush = (Brush)p.GetValue(null, null) })
 			.ToArray();
 
 		SolidColorBrush solidColorBrush = new SolidColorBrush(Colors.White);
@@ -176,6 +182,10 @@ namespace ICSharpCode.WpfDesign.Designer.PropertyGrid.Editors.BrushEditor
 		public IEnumerable<BrushItem> AvailableBrushes {
 			get { return SystemBrushes; }
 		}
+		
+		public IEnumerable<BrushItem> AvailableWpfBrushes {
+				get { return WpfBrushes; }
+		}
 
 		public void MakeGradientHorizontal()
 		{

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/PropertyGrid/Editors/BrushEditor/BrushEditorView.xaml

@@ -7,7 +7,7 @@
              xmlns:Converters="clr-namespace:ICSharpCode.WpfDesign.Designer.Converters"
              xmlns:PropertyGrid="clr-namespace:ICSharpCode.WpfDesign.Designer.PropertyGrid"
              xmlns:widgets="http://icsharpcode.net/sharpdevelop/widgets"
-             Width="395">
+             Width="395" MinHeight="320">
 	
 	<UserControl.Resources>
 			
@@ -73,7 +73,12 @@
 			<BrushEditor:GradientBrushEditor />
 		</TabItem>
 		<TabItem Header="Brush List">
-			<ListBox ItemsSource="{Binding AvailableBrushes}"
+			<ListBox MaxHeight="320" ItemsSource="{Binding AvailableBrushes}"
+			         SelectedValue="{Binding Brush.Color}"
+			         SelectedValuePath="Brush.Color" />
+		</TabItem>
+		<TabItem Header="Wpf Brush List">
+			<ListBox MaxHeight="320" ItemsSource="{Binding AvailableWpfBrushes}"
 			         SelectedValue="{Binding Brush.Color}"
 			         SelectedValuePath="Brush.Color" />
 		</TabItem>

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/PropertyGrid/Editors/BrushEditor/BrushEditorView.xaml.cs

@@ -43,10 +43,6 @@ namespace ICSharpCode.WpfDesign.Designer.PropertyGrid.Editors.BrushEditor
 			DataContext = BrushEditor;
 
 			SpecialInitializeComponent();
-
-			SetBinding(HeightProperty, new Binding("Brush") {
-				Converter = HeightConverter.Instance
-			});
 		}
 		
 		/// <summary>
@@ -64,21 +60,5 @@ namespace ICSharpCode.WpfDesign.Designer.PropertyGrid.Editors.BrushEditor
 		}
 
 		public BrushEditor BrushEditor { get; private set; }
-
-		class HeightConverter : IValueConverter
-		{
-			public static HeightConverter Instance = new HeightConverter();
-
-			public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-			{
-				if (value is GradientBrush) return double.NaN;
-				return 315;
-			}
-
-			public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-			{
-				throw new NotImplementedException();
-			}
-		}
 	}
 }

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/PropertyGrid/Editors/BrushEditor/SolidBrushEditor.xaml

@@ -3,7 +3,7 @@
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:widgets="http://icsharpcode.net/sharpdevelop/widgets"
 	x:Name="this"
-	Height="284">
+	Height="320">
 	<TabControl>
 		<TabItem Header="Color Picker">
 			<widgets:ColorPicker Color="{Binding Color, ElementName=this}" />
@@ -13,5 +13,10 @@
 			         SelectedValue="{Binding Color, ElementName=this}"
 			         SelectedValuePath="Brush.Color" />
 		</TabItem>
+		<TabItem Header="Wpf Color List">
+			<ListBox ItemsSource="{Binding AvailableWpfBrushes}"
+			         SelectedValue="{Binding Color, ElementName=this}"
+			         SelectedValuePath="Brush.Color" />
+		</TabItem>
 	</TabControl>
 </UserControl>