From 517a3929fb0a4b7a05d56ae123630e686c092aff Mon Sep 17 00:00:00 2001
From: jogibear9988 <jochen.kuehner@gmx.de>
Date: Fri, 31 Oct 2014 23:55:53 +0100
Subject: [PATCH 01/21] XAML Designer Demo Project -> Fix for Assembly search

---
 samples/XamlDesigner/App.xaml.cs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/samples/XamlDesigner/App.xaml.cs b/samples/XamlDesigner/App.xaml.cs
index 6a9be5c98c..5d9484dadf 100644
--- a/samples/XamlDesigner/App.xaml.cs
+++ b/samples/XamlDesigner/App.xaml.cs
@@ -31,9 +31,16 @@ namespace ICSharpCode.XamlDesigner
 
 		private static bool internalLoad = false;
 		private static string lastRequesting = null;
-		
+
 		Assembly AppDomain_CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
 		{
+			var assList = AppDomain.CurrentDomain.GetAssemblies();
+			var loaded = assList.FirstOrDefault(x => x.FullName == args.Name);
+			if (loaded != null)
+			{
+				return loaded;
+			}
+
 			if (internalLoad)
 				return null;
 			
@@ -48,7 +55,7 @@ namespace ICSharpCode.XamlDesigner
 				ass = Assembly.Load(args.Name);
 			}
 			catch (Exception) { }
-			
+
 			if (ass == null && args.RequestingAssembly != null) {
 				lastRequesting = args.RequestingAssembly.Location;
 				var dir = Path.GetDirectoryName(args.RequestingAssembly.Location);
@@ -68,7 +75,7 @@ namespace ICSharpCode.XamlDesigner
 			}
 			
 			internalLoad = false;
-			
+
 			return ass;
 		}
 		

From 836f506428368e9609586fdf75d87feaa7cc899b Mon Sep 17 00:00:00 2001
From: jogibear9988 <jochen.kuehner@gmx.de>
Date: Fri, 31 Oct 2014 23:56:41 +0100
Subject: [PATCH 02/21] Fix a Null ref. Exception in Thumbnail View (when
 rootItem could not be parsed)

---
 .../WpfDesign.Designer/Project/ThumbnailView/ThumbnailView.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/ThumbnailView/ThumbnailView.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/ThumbnailView/ThumbnailView.cs
index fc837b3a43..2913fa6bdc 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/ThumbnailView/ThumbnailView.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/ThumbnailView/ThumbnailView.cs
@@ -133,7 +133,7 @@ namespace ICSharpCode.WpfDesign.Designer.ThumbnailView
 			xOffset = 0;
 			yOffset = 0;
 			
-			if (this.DesignSurface.DesignContext != null)
+			if (this.DesignSurface.DesignContext != null && this.DesignSurface.DesignContext.RootItem != null)
 			{
 				var designedElement = this.DesignSurface.DesignContext.RootItem.Component as FrameworkElement;
 				

From edc62f082f0397c074ee3cfea619d449cf189125 Mon Sep 17 00:00:00 2001
From: jogibear9988 <jochen.kuehner@gmx.de>
Date: Fri, 31 Oct 2014 23:58:13 +0100
Subject: [PATCH 03/21] ^XAML Designer example Project -> Show only Controls
 with public parameterless Constructor

---
 samples/XamlDesigner/Toolbox.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/XamlDesigner/Toolbox.cs b/samples/XamlDesigner/Toolbox.cs
index d4880827a7..b4b400e8c6 100644
--- a/samples/XamlDesigner/Toolbox.cs
+++ b/samples/XamlDesigner/Toolbox.cs
@@ -78,7 +78,7 @@ namespace ICSharpCode.XamlDesigner
 
 		static bool IsControl(Type t)
 		{
-			return !t.IsAbstract && !t.IsGenericTypeDefinition && t.IsSubclassOf(typeof(FrameworkElement));
+			return !t.IsAbstract && !t.IsGenericTypeDefinition && t.IsSubclassOf(typeof(UIElement)) && t.GetConstructor(BindingFlags.Public | BindingFlags.Instance, null, Type.EmptyTypes, null) != null;
 		}
 	}
 

From 9b283d21cfded09e5f82005119b90286f6418535 Mon Sep 17 00:00:00 2001
From: jogibear9988 <jochen.kuehner@gmx.de>
Date: Sat, 1 Nov 2014 00:01:45 +0100
Subject: [PATCH 04/21] XamlDesignItem -> Fix Event removal

---
 .../WpfDesign/WpfDesign.Designer/Project/Xaml/XamlDesignItem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Xaml/XamlDesignItem.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Xaml/XamlDesignItem.cs
index 008a5249d3..736a8ef126 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Xaml/XamlDesignItem.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Xaml/XamlDesignItem.cs
@@ -134,7 +134,7 @@ namespace ICSharpCode.WpfDesign.Designer.Xaml
 		/// </summary>
 		public override event EventHandler ParentChanged {
 			add    { _xamlObject.ParentPropertyChanged += value; }
-			remove { _xamlObject.ParentPropertyChanged += value; }
+			remove { _xamlObject.ParentPropertyChanged -= value; }
 		}
 		
 		public override UIElement View {

From f72e6b88064cd52cb48bfa3541d53afecea67377 Mon Sep 17 00:00:00 2001
From: jogibear9988 <jochen.kuehner@gmx.de>
Date: Sat, 1 Nov 2014 00:23:44 +0100
Subject: [PATCH 05/21] New Unit Tests. "ListBox2" does not work at the moment!

---
 .../Tests/XamlDom/SamplesTests.cs             | 136 +++++++++++-------
 1 file changed, 86 insertions(+), 50 deletions(-)

diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs
index 7d490b2150..37902a37d2 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs
@@ -127,7 +127,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 		}
 		
 		[Test]
-		public void Resources()
+		public void Resources1()
 		{
 			TestLoading(@"<Page Name=""root""
   xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
@@ -141,19 +141,19 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 </Page>");
 		}
 
-        [Test]
-        public void Resources2()
-        {
-            TestLoading(@"<UserControl
+		[Test]
+		public void Resources2()
+		{
+			TestLoading(@"<UserControl
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
     <UserControl.Resources>
        <ResourceDictionary />
    </UserControl.Resources>
   </UserControl>");
-        }
+		}
 
-        [Test]
+		[Test]
 		public void Resources3()
 		{
 			TestLoading(@"<UserControl
@@ -165,10 +165,10 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
   </UserControl>");
 		}
 
-        [Test]
-        public void Resources4()
-        {
-            TestLoading(@"<UserControl
+		[Test]
+		public void Resources4()
+		{
+			TestLoading(@"<UserControl
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
     <UserControl.Resources>
@@ -177,8 +177,25 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
         </ResourceDictionary>
    </UserControl.Resources>
   </UserControl>");
-        }
-		
+		}
+
+		[Test]
+		public void Resources5()
+		{
+			TestLoading(@"<UserControl
+    xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+    xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source=""/ICSharpCode.WpfDesign.Tests;component/Test.xaml"" />
+             </ResourceDictionary.MergedDictionaries >
+        </ResourceDictionary>
+   </UserControl.Resources>
+  </UserControl>");
+		}
+
+
 		[Test]
 		public void Animation1()
 		{
@@ -234,7 +251,7 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 		[Test]
 		public void Animation3()
 		{
-			TestLoading(@"<Window 
+			TestLoading(@"<Window
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
 <Canvas>
@@ -258,10 +275,10 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 </Window>");
 		}
 
-        [Test]
-        public void ContentControl1()
-        {
-            TestLoading(@"<Window
+		[Test]
+		public void ContentControl1()
+		{
+			TestLoading(@"<Window
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
 <Canvas>
@@ -270,12 +287,12 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 </ContentControl>
 </Canvas>
 </Window>");
-        }
+		}
 
-        [Test]
-        public void ContentControl2()
-        {
-            TestLoading(@"<Window
+		[Test]
+		public void ContentControl2()
+		{
+			TestLoading(@"<Window
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
 <Canvas>
@@ -286,24 +303,24 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 </ContentControl>
 </Canvas>
 </Window>");
-        }
+		}
 
-        [Test]
-        public void Children1()
-        {
-            TestLoading(@"<Window
+		[Test]
+		public void Children1()
+		{
+			TestLoading(@"<Window
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
 <Canvas>
 <Button />
 </Canvas>
 </Window>");
-        }
+		}
 
-	    [Test]
-	    public void Children2()
-	    {
-	        TestLoading(@"<Window
+		[Test]
+		public void Children2()
+		{
+			TestLoading(@"<Window
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
 <Canvas>
@@ -312,12 +329,12 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 </Canvas.Children>
 </Canvas>
 </Window>");
-	    }
+		}
 
-	    [Test]
-        public void Children3()
-        {
-            TestLoading(@"<Window
+		[Test]
+		public void Children3()
+		{
+			TestLoading(@"<Window
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
 <Canvas>
@@ -326,12 +343,12 @@ namespace ICSharpCode.WpfDesign.Tests.XamlDom
 </Canvas.Children>
 </Canvas>
 </Window>");
-        }
+		}
 
-        [Test]
-        public void ListBox1()
-        {
-            TestLoading(@"<Window
+		[Test]
+		public void ListBox1()
+		{
+			TestLoading(@"<Window
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
 <Canvas>
@@ -341,13 +358,32 @@ bb
 </ListBox>
 </Canvas>
 </Window>");
-        }
+		}
 
+		[Test]
+		public void ListBox2()
+		{
+			TestLoading(@"<Window
+    xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+    xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
+<Canvas>
+<ListBox ScrollViewer.VerticalScrollBarVisibility=""Hidden"">
+    <ListBox.ItemContainerStyle>
+        <Style TargetType=""{x:Type ListBoxItem}"">
+            <Setter Property=""Width"" Value=""10"" />
+        </Style>
+    </ListBox.ItemContainerStyle>
+aa
+bb
+</ListBox>
+</Canvas>
+</Window>");
+		}
 
-        [Test]
-        public void CData1()
-        {
-            TestLoading(@"<Window
+		[Test]
+		public void CData1()
+		{
+			TestLoading(@"<Window
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
 <Canvas>
@@ -364,6 +400,6 @@ bb
         </x:Code>
  </Canvas>
 </Window>");
-        }
-    }
+		}
+	}
 }

From f9780edac0bd7fb88696b038fe2203f3a90b635e Mon Sep 17 00:00:00 2001
From: jogibear9988 <jochen.kuehner@gmx.de>
Date: Sat, 1 Nov 2014 00:41:18 +0100
Subject: [PATCH 06/21] Fix Property Finding if
 ComponentType!=Component.GetType() for Example on WindowClone. Maybe we need
 to do the same for Events? And maybe cache the Properties for a Type? (Not
 for a Instance!)

---
 .../WpfDesign.XamlDom/Project/XamlParser.cs          | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlParser.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlParser.cs
index ab11c59682..47985ebc59 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlParser.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlParser.cs
@@ -457,13 +457,11 @@ namespace ICSharpCode.WpfDesign.XamlDom
 		
 		internal static XamlPropertyInfo FindProperty(object elementInstance, Type propertyType, string propertyName)
 		{
-			PropertyDescriptorCollection properties;
-			if (elementInstance != null) {
-				properties = TypeDescriptor.GetProperties(elementInstance);
-			} else {
-				properties = TypeDescriptor.GetProperties(propertyType);
-			}
-			PropertyDescriptor propertyInfo = properties[propertyName];
+			PropertyDescriptor propertyInfo = TypeDescriptor.GetProperties(propertyType)[propertyName];
+
+			if (propertyInfo == null && elementInstance != null)
+				propertyInfo = TypeDescriptor.GetProperties(elementInstance).OfType<DependencyPropertyDescriptor>().FirstOrDefault(x => x.IsAttached && x.Name == propertyName);
+			
 			if (propertyInfo != null) {
 				return new XamlNormalPropertyInfo(propertyInfo);
 			} else {

From edc54d74875cd504d097deebf35b54882acc38dc Mon Sep 17 00:00:00 2001
From: jogibear9988 <jochen.kuehner@gmx.de>
Date: Sat, 1 Nov 2014 00:51:03 +0100
Subject: [PATCH 07/21] A test for a Property wich could not be found on
 WindowClone! But we should throw a Exception that the Property is not
 writeable!

---
 .../Tests/XamlDom/SamplesTests.cs                 | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs
index 37902a37d2..25e1d33ead 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs
@@ -17,6 +17,8 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
+using System.IO;
+using ICSharpCode.WpfDesign.XamlDom;
 using NUnit.Framework;
 
 namespace ICSharpCode.WpfDesign.Tests.XamlDom
@@ -380,7 +382,18 @@ bb
 </Window>");
 		}
 
-		[Test]
+        [Test]
+        public void Window1()
+        {
+            var xaml= @"<Window
+    xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+    xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"" IsActive=""true"">
+</Window>";
+
+            XamlParser.Parse(new StringReader(xaml));
+        }
+
+        [Test]
 		public void CData1()
 		{
 			TestLoading(@"<Window

From a79ea00a1f16533886643af2847eff7807553aba Mon Sep 17 00:00:00 2001
From: jogibear9988 <jochen.kuehner@gmx.de>
Date: Sat, 1 Nov 2014 17:34:30 +0100
Subject: [PATCH 08/21] Better Error MEssage -> Show wich Property is doubled

---
 .../WpfDesign/WpfDesign.XamlDom/Project/XamlObject.cs           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlObject.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlObject.cs
index fbe1131988..66f9c34056 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlObject.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlObject.cs
@@ -70,7 +70,7 @@ namespace ICSharpCode.WpfDesign.XamlDom
 			if (property.IsAttached == false) {
 				foreach (XamlProperty p in properties) {
 					if (p.IsAttached == false && p.PropertyName == property.PropertyName)
-						throw new XamlLoadException("duplicate property");
+						throw new XamlLoadException("duplicate property:" + property.PropertyName);
 				}
 			}
 			#endif

From 42c60c809b2831b58a198c80fe8aa813097526b9 Mon Sep 17 00:00:00 2001
From: jogibear9988 <jochen.kuehner@gmx.de>
Date: Sat, 1 Nov 2014 17:36:57 +0100
Subject: [PATCH 09/21] XAML Designer Sample -> Better Error Display

---
 samples/XamlDesigner/DocumentView.xaml    |  4 ++--
 samples/XamlDesigner/DocumentView.xaml.cs | 12 ++++++++--
 samples/XamlDesigner/ErrorListView.xaml   | 29 ++++++++++++++---------
 3 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/samples/XamlDesigner/DocumentView.xaml b/samples/XamlDesigner/DocumentView.xaml
index 06f45a450f..760bb699b9 100644
--- a/samples/XamlDesigner/DocumentView.xaml
+++ b/samples/XamlDesigner/DocumentView.xaml
@@ -13,10 +13,10 @@
 		<Grid>
 			<AvalonEdit:TextEditor
 				x:Name="uxTextEditor"
-				SyntaxHighlighting="XML"
+				SyntaxHighlighting="XML" ShowLineNumbers="True"
 				Visibility="{Binding InXamlMode, Converter={StaticResource CollapsedWhenFalse}}" />
 			<ContentPresenter Content="{Binding DesignSurface}"
-			                  Visibility="{Binding InDesignMode, Converter={StaticResource CollapsedWhenFalse}}"/>
+				Visibility="{Binding InDesignMode, Converter={StaticResource CollapsedWhenFalse}}"/>
 		</Grid>
 	</DockPanel>
 </UserControl>
\ No newline at end of file
diff --git a/samples/XamlDesigner/DocumentView.xaml.cs b/samples/XamlDesigner/DocumentView.xaml.cs
index fad8fa09f4..755ba648d1 100644
--- a/samples/XamlDesigner/DocumentView.xaml.cs
+++ b/samples/XamlDesigner/DocumentView.xaml.cs
@@ -25,7 +25,7 @@ namespace ICSharpCode.XamlDesigner
 			InitializeComponent();
 
 			Document = doc;
-			Shell.Instance.Views[doc] = this;			
+			Shell.Instance.Views[doc] = this;
 
 			//uxTextEditor.DataBindings.Add("Text", doc, "Text", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged);
 			Document.Mode = DocumentMode.Design;
@@ -52,7 +52,15 @@ namespace ICSharpCode.XamlDesigner
 			try {
 				uxTextEditor.ScrollTo(error.Line, error.Column);
 				uxTextEditor.CaretOffset = uxTextEditor.Document.GetOffset(error.Line, error.Column);
-			} catch (ArgumentException) {
+				
+				int n = 0;
+				char chr;
+				while ((chr = uxTextEditor.Document.GetCharAt(uxTextEditor.CaretOffset + n)) != ' ' && chr != '.' && chr != '<' && chr != '>' && chr != '"')
+				{ n++; }
+
+				uxTextEditor.SelectionLength = n;
+			}
+			catch (ArgumentException) {
 				// invalid line number
 			}
 		}
diff --git a/samples/XamlDesigner/ErrorListView.xaml b/samples/XamlDesigner/ErrorListView.xaml
index fa661fa0e3..158a26f25e 100644
--- a/samples/XamlDesigner/ErrorListView.xaml
+++ b/samples/XamlDesigner/ErrorListView.xaml
@@ -2,15 +2,22 @@
          xmlns="http://schemas.microsoft.com/netfx/2007/xaml/presentation"
          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
          xmlns:Services="clr-namespace:ICSharpCode.WpfDesign.Designer.Services;assembly=ICSharpCode.WpfDesign.Designer">
-    <Control.Resources>
-        <DataTemplate DataType="{x:Type Services:XamlError}">
-            <StackPanel Orientation="Horizontal">
-                <Image Source="Images/Error.png"
-                       Stretch="None"
-                       Margin="2"/>
-                <TextBlock Text="{Binding Message}" 
-                           VerticalAlignment="Center"/>
-            </StackPanel>
-        </DataTemplate>
-    </Control.Resources>
+	<Control.Resources>
+		<DataTemplate DataType="{x:Type Services:XamlError}">
+			<StackPanel Orientation="Horizontal">
+				<Image Source="Images/Error.png"
+				       Stretch="None"
+				       Margin="2"/>
+				<TextBlock TextAlignment="Right" Text="{Binding Line}" Width="25"
+				           VerticalAlignment="Center"/>
+				<TextBlock Text=" / "
+				           VerticalAlignment="Center"/>
+				<TextBlock Text="{Binding Column}" Width="25"
+				           VerticalAlignment="Center"/>
+				<TextBlock Text=" - " />
+				<TextBlock Text="{Binding Message}"
+				           VerticalAlignment="Center"/>
+			</StackPanel>
+		</DataTemplate>
+	</Control.Resources>
 </ListBox>

From 41bf6eddb0edb39ab09e7127b218bab032a18aae Mon Sep 17 00:00:00 2001
From: jogibear9988 <jochen.kuehner@gmx.de>
Date: Sat, 1 Nov 2014 17:39:11 +0100
Subject: [PATCH 10/21] Fixes that sometimes both namespaces need to be
 compared.

This XAML works after this fix:

<Fluent:RibbonWindow RenderOptions.BitmapScalingMode="HighQuality"
        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
        xmlns:windows="clr-namespace:MCC.Visu.Configurator.Windows"
                    xmlns:Fluent="clr-namespace:Fluent;assembly=Fluent"
                    >
    <Grid>
            <Fluent:Ribbon >
                <Fluent:RibbonTabItem>
	 <Fluent:RibbonGroupBox>
                            <Fluent:Gallery>
                                <Fluent:Gallery.ItemContainerStyle>
                                    <Style />
                                </Fluent:Gallery.ItemContainerStyle>
                                <Image />
                            </Fluent:Gallery>
                 </Fluent:RibbonGroupBox>
                </Fluent:RibbonTabItem>
                </Fluent:Ribbon>
          </Grid>
</Fluent:RibbonWindow>
---
 .../WpfDesign/WpfDesign.XamlDom/Project/XamlDocument.cs       | 4 ++--
 .../WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs       | 3 ++-
 .../WpfDesign/WpfDesign.XamlDom/Project/XamlTypeFinder.cs     | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlDocument.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlDocument.cs
index b517eea9f0..b09468d7c8 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlDocument.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlDocument.cs
@@ -219,14 +219,14 @@ namespace ICSharpCode.WpfDesign.XamlDom
 			return new XamlObject(this, xml, elementType, instance);
 		}
 		
-		internal string GetNamespaceFor(Type type)
+		internal string GetNamespaceFor(Type type, bool getClrNamespace = false)
 		{
 			if (type == typeof (DesignTimeProperties))
 				return XamlConstants.DesignTimeNamespace;
 			if (type == typeof (MarkupCompatibilityProperties))
 				return XamlConstants.MarkupCompatibilityNamespace;
 
-			return _typeFinder.GetXmlNamespaceFor(type.Assembly, type.Namespace);
+			return _typeFinder.GetXmlNamespaceFor(type.Assembly, type.Namespace, getClrNamespace);
 		}
 
 		internal string GetPrefixForNamespace(string @namespace)
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs
index 9e95465448..8379cbd291 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs
@@ -317,10 +317,11 @@ namespace ICSharpCode.WpfDesign.XamlDom
 		{
 			var localName = elementType.Name + "." + propertyName;
 			var namespaceURI = xamlDocument.GetNamespaceFor(elementType);
+			var clrNamespaceURI = xamlDocument.GetNamespaceFor(elementType, true);
 
 			foreach (XmlNode childNode in node.ChildNodes)
 			{
-				if (childNode.LocalName == localName && childNode.NamespaceURI == namespaceURI)
+				if (childNode.LocalName == localName && (childNode.NamespaceURI == namespaceURI || childNode.NamespaceURI == clrNamespaceURI))
 				{
 					return childNode;
 				}
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlTypeFinder.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlTypeFinder.cs
index 81f6a4c50c..b072c0ccbc 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlTypeFinder.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlTypeFinder.cs
@@ -117,11 +117,11 @@ namespace ICSharpCode.WpfDesign.XamlDom
 		/// <summary>
 		/// Gets the XML namespace that can be used for the specified assembly/namespace combination.
 		/// </summary>
-		public string GetXmlNamespaceFor(Assembly assembly, string @namespace)
+		public string GetXmlNamespaceFor(Assembly assembly, string @namespace, bool getClrNamespace = false)
 		{
 			AssemblyNamespaceMapping mapping = new AssemblyNamespaceMapping(assembly, @namespace);
 			string xmlNamespace;
-			if (reverseDict.TryGetValue(mapping, out xmlNamespace)) {
+			if (!getClrNamespace && reverseDict.TryGetValue(mapping, out xmlNamespace)) {
 				return xmlNamespace;
 			} else {
 				return "clr-namespace:" + mapping.Namespace + ";assembly=" + mapping.Assembly.GetName().Name;

From c2d558543e3a975220b7df540e31f4124e01cdf3 Mon Sep 17 00:00:00 2001
From: jogibear9988 <jochen.kuehner@gmx.de>
Date: Sat, 1 Nov 2014 17:40:36 +0100
Subject: [PATCH 11/21] Xaml Parser should use the current node on Exceptions,
 so we have a better Line/Column Number

---
 .../WpfDesign.XamlDom/Project/XamlParser.cs   | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlParser.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlParser.cs
index 47985ebc59..d601293f82 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlParser.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlParser.cs
@@ -80,6 +80,8 @@ namespace ICSharpCode.WpfDesign.XamlDom
 				throw new ArgumentNullException("reader");
 			return Parse(XmlReader.Create(reader), settings);
 		}
+
+		private XmlNode currentParsedNode;
 		
 		/// <summary>
 		/// Parses a XAML document using an XmlReader.
@@ -128,7 +130,7 @@ namespace ICSharpCode.WpfDesign.XamlDom
 				var root = p.ParseObject(document.DocumentElement);
 				p.document.ParseComplete(root);
 			} catch (Exception x) {
-				p.ReportException(x, document.DocumentElement);
+				p.ReportException(x, p.currentParsedNode);
 			}
 
 			return p.document;
@@ -220,12 +222,15 @@ namespace ICSharpCode.WpfDesign.XamlDom
 				if (onlyTextNodes && numberOfTextNodes == 1) {
 					foreach (XmlNode childNode in element.ChildNodes) {
 						if (childNode.NodeType == XmlNodeType.Text) {
+							currentParsedNode = childNode;
 							initializeFromTextValueInsteadOfConstructor = (XamlTextValue)ParseValue(childNode);
 						}
 					}
 				}
 			}
-			
+
+			currentParsedNode = element;
+
 			object instance;
 			if (initializeFromTextValueInsteadOfConstructor != null) {
 				instance = TypeDescriptor.GetConverter(elementType).ConvertFromString(
@@ -318,6 +323,7 @@ namespace ICSharpCode.WpfDesign.XamlDom
 				collectionPropertyElement = element;
 			} else if (defaultProperty != null && defaultProperty.IsCollection && !element.IsEmpty) {
 				foreach (XmlNode childNode in elementChildNodes) {
+					currentParsedNode = childNode;
 					XmlElement childElement = childNode as XmlElement;
 					if (childElement == null || !ObjectChildElementIsPropertyElement(childElement)) {
 						obj.AddProperty(collectionProperty = new XamlProperty(obj, defaultProperty));
@@ -328,6 +334,8 @@ namespace ICSharpCode.WpfDesign.XamlDom
 				}
 			}
 
+			currentParsedNode = element;
+
 			if (collectionType != null && collectionInstance == null && elementChildNodes.Count() == 1)
 			{
 				var firstChild = elementChildNodes.First() as XmlElement;
@@ -344,6 +352,7 @@ namespace ICSharpCode.WpfDesign.XamlDom
 			else
 			{
 				foreach (XmlNode childNode in elementChildNodes) {
+					currentParsedNode = childNode;
 					XmlElement childElement = childNode as XmlElement;
 					if (childElement != null) {
 						if (childElement.NamespaceURI == XamlConstants.XamlNamespace)
@@ -374,6 +383,8 @@ namespace ICSharpCode.WpfDesign.XamlDom
 					}
 				}
 			}
+
+			currentParsedNode = element;
 		}
 
 		IEnumerable<XmlNode> GetNormalizedChildNodes(XmlElement element)
@@ -412,10 +423,12 @@ namespace ICSharpCode.WpfDesign.XamlDom
 		                                                 Justification="We need to continue parsing, and the error is reported to the user.")]
 		XamlPropertyValue ParseValue(XmlNode childNode)
 		{
+			currentParsedNode = childNode;
+
 			try {
-				return ParseValueCore(childNode);
+				return ParseValueCore(currentParsedNode);
 			} catch (Exception x) {
-				ReportException(x, childNode);
+				ReportException(x, currentParsedNode);
 			}
 			return null;
 		}
@@ -647,6 +660,7 @@ namespace ICSharpCode.WpfDesign.XamlDom
 			}
 			
 			foreach (XmlNode childNode in element.ChildNodes) {
+				currentParsedNode = childNode;
 				XamlPropertyValue childValue = ParseValue(childNode);
 				if (childValue != null) {
 					if (propertyInfo.IsCollection) {
@@ -667,7 +681,9 @@ namespace ICSharpCode.WpfDesign.XamlDom
 					}
 				}
 			}
-			
+
+			currentParsedNode = element;
+
 			currentXmlSpace = oldXmlSpace;
 		}
 

From 919506b02cfa0aaebacf306ca75097a4be82e27f Mon Sep 17 00:00:00 2001
From: jogibear9988 <jochen.kuehner@gmx.de>
Date: Sat, 1 Nov 2014 18:04:39 +0100
Subject: [PATCH 12/21] Outline Node Can throw an Exception when there is a
 Binding on this Properties. This fixes it!

---
 .../Project/OutlineView/OutlineNodeBase.cs      | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/OutlineView/OutlineNodeBase.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/OutlineView/OutlineNodeBase.cs
index 648b4097ec..bd0df157fa 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/OutlineView/OutlineNodeBase.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/OutlineView/OutlineNodeBase.cs
@@ -30,15 +30,26 @@ namespace ICSharpCode.WpfDesign.Designer.OutlineView
 		protected OutlineNodeBase(DesignItem designItem)
 		{
 			DesignItem = designItem;
-			
 
-			var hidden = designItem.Properties.GetAttachedProperty(DesignTimeProperties.IsHiddenProperty).ValueOnInstance;
+			bool hidden = false;
+			try
+			{
+				hidden = (bool)designItem.Properties.GetAttachedProperty(DesignTimeProperties.IsHiddenProperty).ValueOnInstance;
+			}
+			catch (Exception)
+			{ }
 			if (hidden != null && (bool)hidden) {
 				_isDesignTimeVisible = false;
 				((FrameworkElement)DesignItem.Component).Visibility = Visibility.Hidden;
 			}
 
-			var locked = designItem.Properties.GetAttachedProperty(DesignTimeProperties.IsLockedProperty).ValueOnInstance;
+			bool locked = false;
+			try
+			{
+				locked = (bool)designItem.Properties.GetAttachedProperty(DesignTimeProperties.IsLockedProperty).ValueOnInstance;
+			}
+			catch (Exception)
+			{ }
 			if (locked != null && (bool)locked) {
 				_isDesignTimeLocked = true;
 			}

From 78a9c71acb2f084bad65cb24cacf48a35adf7b81 Mon Sep 17 00:00:00 2001
From: jogibear9988 <jochen.kuehner@gmx.de>
Date: Sat, 1 Nov 2014 18:50:12 +0100
Subject: [PATCH 13/21] XamlObjectServiceProvider should also return
 XamlTypeResolverProvider (it's used in XamlPropertyInfo)

---
 .../Project/XamlObjectServiceProvider.cs      | 124 +++++++++---------
 1 file changed, 64 insertions(+), 60 deletions(-)

diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlObjectServiceProvider.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlObjectServiceProvider.cs
index e32e261e3e..5337340e34 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlObjectServiceProvider.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlObjectServiceProvider.cs
@@ -29,7 +29,7 @@ namespace ICSharpCode.WpfDesign.XamlDom
 	/// A service provider that provides the IProvideValueTarget and IXamlTypeResolver services.
 	/// No other services (e.g. from the document's service provider) are offered.
 	/// </summary>
-    public class XamlObjectServiceProvider : IServiceProvider, IProvideValueTarget, IXamlSchemaContextProvider, IAmbientProvider
+	public class XamlObjectServiceProvider : IServiceProvider, IProvideValueTarget, IXamlSchemaContextProvider, IAmbientProvider
 	{
 		/// <summary>
 		/// Creates a new XamlObjectServiceProvider instance.
@@ -61,12 +61,16 @@ namespace ICSharpCode.WpfDesign.XamlDom
 			if (serviceType == typeof(IXamlTypeResolver)) {
 				return Resolver;
 			}
-            if (serviceType == typeof(IXamlSchemaContextProvider)) {
-                return this;
-            }
-            if (serviceType == typeof(IAmbientProvider)) {
-                return this;
-            }
+			if (serviceType == typeof(XamlTypeResolverProvider))
+			{
+				return Resolver;
+			}
+			if (serviceType == typeof(IXamlSchemaContextProvider)) {
+				return this;
+			}
+			if (serviceType == typeof(IAmbientProvider)) {
+				return this;
+			}
 			return null;
 		}
 
@@ -110,57 +114,57 @@ namespace ICSharpCode.WpfDesign.XamlDom
 
 		#endregion
 
-        #region IXamlSchemaContextProvider Members
-
-        private XamlSchemaContext iCsharpXamlSchemaContext;
-
-        //Maybe we new our own XamlSchemaContext?
-        //private class ICsharpXamlSchemaContext : XamlSchemaContext
-        //{
-        //    public override XamlType GetXamlType(Type type)
-        //    {
-        //        return base.GetXamlType(type);
-        //    }
-        //}
-
-	    public XamlSchemaContext SchemaContext
-	    {
-	        get
-	        {
-                return iCsharpXamlSchemaContext = iCsharpXamlSchemaContext ?? new XamlSchemaContext();
-	        }
-	    }
-
-	    #endregion
-
-        #region IAmbientProvider Members
-
-        public AmbientPropertyValue GetFirstAmbientValue(IEnumerable<XamlType> ceilingTypes, params XamlMember[] properties)
-	    {
-	        return null;
-	    }
-
-	    public object GetFirstAmbientValue(params XamlType[] types)
-	    {
-	        return null;
-	    }
-
-	    public IEnumerable<AmbientPropertyValue> GetAllAmbientValues(IEnumerable<XamlType> ceilingTypes, params XamlMember[] properties)
-	    {
-            return new List<AmbientPropertyValue>();
-	    }
-
-	    public IEnumerable<object> GetAllAmbientValues(params XamlType[] types)
-	    {
-            return new List<object>();
-	    }
-
-	    public IEnumerable<AmbientPropertyValue> GetAllAmbientValues(IEnumerable<XamlType> ceilingTypes, bool searchLiveStackOnly, IEnumerable<XamlType> types,
-	        params XamlMember[] properties)
-	    {
-	        return new List<AmbientPropertyValue>();
-	    }
-
-        #endregion
-    }
+		#region IXamlSchemaContextProvider Members
+
+		private XamlSchemaContext iCsharpXamlSchemaContext;
+
+		//Maybe we new our own XamlSchemaContext?
+		//private class ICsharpXamlSchemaContext : XamlSchemaContext
+		//{
+		//    public override XamlType GetXamlType(Type type)
+		//    {
+		//        return base.GetXamlType(type);
+		//    }
+		//}
+
+		public XamlSchemaContext SchemaContext
+		{
+			get
+			{
+				return iCsharpXamlSchemaContext = iCsharpXamlSchemaContext ?? new XamlSchemaContext();
+			}
+		}
+
+		#endregion
+
+		#region IAmbientProvider Members
+
+		public AmbientPropertyValue GetFirstAmbientValue(IEnumerable<XamlType> ceilingTypes, params XamlMember[] properties)
+		{
+			return null;
+		}
+
+		public object GetFirstAmbientValue(params XamlType[] types)
+		{
+			return null;
+		}
+
+		public IEnumerable<AmbientPropertyValue> GetAllAmbientValues(IEnumerable<XamlType> ceilingTypes, params XamlMember[] properties)
+		{
+			return new List<AmbientPropertyValue>();
+		}
+
+		public IEnumerable<object> GetAllAmbientValues(params XamlType[] types)
+		{
+			return new List<object>();
+		}
+
+		public IEnumerable<AmbientPropertyValue> GetAllAmbientValues(IEnumerable<XamlType> ceilingTypes, bool searchLiveStackOnly, IEnumerable<XamlType> types,
+		                                                             params XamlMember[] properties)
+		{
+			return new List<AmbientPropertyValue>();
+		}
+
+		#endregion
+	}
 }

From 1123193b5421e6a36c764b008bd993ad629d09ab Mon Sep 17 00:00:00 2001
From: jogibear9988 <jochen.kuehner@gmx.de>
Date: Sat, 1 Nov 2014 18:51:25 +0100
Subject: [PATCH 14/21] One more Test, and disable a non working one

---
 .../Tests/XamlDom/SamplesTests.cs             | 33 +++++++++++++++----
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs
index 25e1d33ead..45d0d29a0d 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs
@@ -363,6 +363,8 @@ bb
 		}
 
 		[Test]
+		[Ignore("To fix this Test, we need a special Handling for Setter class, because MS Xaml Parser casts the Value of a Setter to the PropertyType wich is defined in another Property!")]
+		//Or maybe we need support for XamlSetTypeConverterAttribute, TypeConverterAttribute(typeof(SetterTriggerConditionValueConverter)), ...
 		public void ListBox2()
 		{
 			TestLoading(@"<Window
@@ -382,18 +384,35 @@ bb
 </Window>");
 		}
 
-        [Test]
-        public void Window1()
-        {
-            var xaml= @"<Window
+		[Test]
+		public void ListBox3()
+		{
+			TestLoading(@"<Window
+    xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+    xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"">
+<Canvas>
+<ListBox>
+    <ListBox.ItemContainerStyle>
+        <Style />
+    </ListBox.ItemContainerStyle>
+<Image />
+</ListBox>
+</Canvas>
+</Window>");
+		}
+
+		[Test]
+		public void Window1()
+		{
+			var xaml= @"<Window
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"" IsActive=""true"">
 </Window>";
 
-            XamlParser.Parse(new StringReader(xaml));
-        }
+			XamlParser.Parse(new StringReader(xaml));
+		}
 
-        [Test]
+		[Test]
 		public void CData1()
 		{
 			TestLoading(@"<Window

From 97d31ee03bdcdfcd9e0d9553f1c8c1813a65fde3 Mon Sep 17 00:00:00 2001
From: jogibear9988 <jochen.kuehner@gmx.de>
Date: Sun, 2 Nov 2014 19:25:20 +0100
Subject: [PATCH 15/21] More Unittests

---
 .../WpfDesign/WpfDesign.Designer/Tests/Test.xaml            | 3 +++
 .../WpfDesign.Designer/Tests/WpfDesign.Tests.csproj         | 6 +++++-
 .../WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs        | 3 +--
 3 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Test.xaml

diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Test.xaml b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Test.xaml
new file mode 100644
index 0000000000..61820b241f
--- /dev/null
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/Test.xaml
@@ -0,0 +1,3 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/WpfDesign.Tests.csproj b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/WpfDesign.Tests.csproj
index 141e0a2947..780ad08b4f 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/WpfDesign.Tests.csproj
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/WpfDesign.Tests.csproj
@@ -102,5 +102,9 @@
       <Name>WpfDesign.Designer</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Page Include="Test.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs
index 45d0d29a0d..7cc26d38c8 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/XamlDom/SamplesTests.cs
@@ -16,7 +16,6 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-using System;
 using System.IO;
 using ICSharpCode.WpfDesign.XamlDom;
 using NUnit.Framework;
@@ -363,7 +362,7 @@ bb
 		}
 
 		[Test]
-		[Ignore("To fix this Test, we need a special Handling for Setter class, because MS Xaml Parser casts the Value of a Setter to the PropertyType wich is defined in another Property!")]
+		//[Ignore("To fix this Test, we need a special Handling for Setter class, because MS Xaml Parser casts the Value of a Setter to the PropertyType wich is defined in another Property!")]
 		//Or maybe we need support for XamlSetTypeConverterAttribute, TypeConverterAttribute(typeof(SetterTriggerConditionValueConverter)), ...
 		public void ListBox2()
 		{

From 1952626a1ed9dee80263d1287286f959c65996ac Mon Sep 17 00:00:00 2001
From: jogibear9988 <jochen.kuehner@gmx.de>
Date: Sun, 2 Nov 2014 19:30:21 +0100
Subject: [PATCH 16/21] Support for Styles in WPF Designer Fix Unittest
 "ListBox2" fixes #587

---
 .../Project/CollectionSupport.cs              | 11 +++---
 .../WpfDesign.XamlDom/Project/XamlObject.cs   | 36 +++++++++++++++++--
 .../Project/XamlObjectServiceProvider.cs      | 23 +++++++++---
 .../WpfDesign.XamlDom/Project/XamlParser.cs   |  4 +--
 .../WpfDesign.XamlDom/Project/XamlProperty.cs | 32 +++++++++++++++--
 5 files changed, 90 insertions(+), 16 deletions(-)

diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/CollectionSupport.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/CollectionSupport.cs
index 064a4bb77c..01b71be2f6 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/CollectionSupport.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/CollectionSupport.cs
@@ -85,11 +85,12 @@ namespace ICSharpCode.WpfDesign.XamlDom
 			} else if (collectionInstance is IDictionary) {
 				object val = newElement.GetValueFor(null);
 				object key = newElement is XamlObject ? ((XamlObject)newElement).GetXamlAttribute("Key") : null;
-				//if (key == null || key == "") {
-				//	if (val is Style)
-				//		key = ((Style)val).TargetType;
-				//}
-				if (key == null || (key as string) == "")
+                if (key == null || key == "")
+                {
+                    if (val is Style)
+                        key = ((Style)val).TargetType;
+                }
+                if (key == null || (key as string) == "")
 					key = val;
 				((IDictionary)collectionInstance).Add(key, val);
 			} else {
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlObject.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlObject.cs
index 66f9c34056..1ff20e9a43 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlObject.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlObject.cs
@@ -22,10 +22,12 @@ using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Linq;
+using System.Reflection;
 using System.Windows.Markup;
 using System.Xml;
 using System.Windows.Data;
 using System.Windows;
+using System.Xaml;
 
 namespace ICSharpCode.WpfDesign.XamlDom
 {
@@ -53,6 +55,7 @@ namespace ICSharpCode.WpfDesign.XamlDom
 			this.instance = instance;
 
 			this.contentPropertyName = GetContentPropertyName(elementType);
+			XamlSetTypeConverter = GetTypeConverterDelegate(elementType);
 
 			ServiceProvider = new XamlObjectServiceProvider(this);
 			CreateWrapper();
@@ -183,7 +186,36 @@ namespace ICSharpCode.WpfDesign.XamlDom
 			
 			return null;
 		}
-		
+
+		internal delegate void TypeConverterDelegate(Object targetObject, XamlSetTypeConverterEventArgs eventArgs);
+
+		internal TypeConverterDelegate XamlSetTypeConverter { get; private set; }
+
+		internal static TypeConverterDelegate GetTypeConverterDelegate(Type elementType)
+		{
+			var attrs = elementType.GetCustomAttributes(typeof(XamlSetTypeConverterAttribute), true) as XamlSetTypeConverterAttribute[];
+			if (attrs != null && attrs.Length > 0)
+			{
+				var name = attrs[0].XamlSetTypeConverterHandler;
+				var method=elementType.GetMethod(name, BindingFlags.Static|BindingFlags.Public|BindingFlags.NonPublic);
+
+				return (TypeConverterDelegate) TypeConverterDelegate.CreateDelegate(typeof(TypeConverterDelegate), method);
+			}
+
+			return null;
+		}
+
+		private XamlType _systemXamlTypeForProperty = null;
+		public XamlType SystemXamlTypeForProperty
+		{
+			get
+			{
+				if (_systemXamlTypeForProperty == null)
+					_systemXamlTypeForProperty = new XamlType(this.ElementType, this.ServiceProvider.SchemaContext);
+				return _systemXamlTypeForProperty;
+			}
+		}
+
 		internal override void AddNodeTo(XamlProperty property)
 		{
 			XamlObject holder;
@@ -353,7 +385,7 @@ namespace ICSharpCode.WpfDesign.XamlDom
 		/// Gets/Sets the name of this XamlObject.
 		/// </summary>
 		public string Name {
-			get 
+			get
 			{
 				string name = GetXamlAttribute("Name");
 				
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlObjectServiceProvider.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlObjectServiceProvider.cs
index 5337340e34..1b05165a23 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlObjectServiceProvider.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlObjectServiceProvider.cs
@@ -141,7 +141,7 @@ namespace ICSharpCode.WpfDesign.XamlDom
 
 		public AmbientPropertyValue GetFirstAmbientValue(IEnumerable<XamlType> ceilingTypes, params XamlMember[] properties)
 		{
-			return null;
+			return GetAllAmbientValues(ceilingTypes, properties).FirstOrDefault();
 		}
 
 		public object GetFirstAmbientValue(params XamlType[] types)
@@ -151,7 +151,23 @@ namespace ICSharpCode.WpfDesign.XamlDom
 
 		public IEnumerable<AmbientPropertyValue> GetAllAmbientValues(IEnumerable<XamlType> ceilingTypes, params XamlMember[] properties)
 		{
-			return new List<AmbientPropertyValue>();
+			var obj = this.XamlObject.ParentObject;
+
+			while (obj != null)
+			{
+				if (ceilingTypes.Any(x => obj.SystemXamlTypeForProperty.CanAssignTo(x)))
+				{
+					foreach (var pr in obj.Properties)
+					{
+						if (properties.Any(x => x.Name == pr.PropertyName))
+						{
+							yield return new AmbientPropertyValue(pr.SystemXamlMemberForProperty, pr.ValueOnInstance);
+						}
+					}
+				}
+
+				obj = obj.ParentObject;
+			}
 		}
 
 		public IEnumerable<object> GetAllAmbientValues(params XamlType[] types)
@@ -159,8 +175,7 @@ namespace ICSharpCode.WpfDesign.XamlDom
 			return new List<object>();
 		}
 
-		public IEnumerable<AmbientPropertyValue> GetAllAmbientValues(IEnumerable<XamlType> ceilingTypes, bool searchLiveStackOnly, IEnumerable<XamlType> types,
-		                                                             params XamlMember[] properties)
+		public IEnumerable<AmbientPropertyValue> GetAllAmbientValues(IEnumerable<XamlType> ceilingTypes, bool searchLiveStackOnly, IEnumerable<XamlType> types, params XamlMember[] properties)
 		{
 			return new List<AmbientPropertyValue>();
 		}
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlParser.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlParser.cs
index d601293f82..b43125e912 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlParser.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlParser.cs
@@ -289,9 +289,7 @@ namespace ICSharpCode.WpfDesign.XamlDom
 				ParseObjectAttribute(obj, attribute);
 			}
 			
-			if (!(obj.Instance is Style)) {
-				ParseObjectContent(obj, element, defaultProperty, initializeFromTextValueInsteadOfConstructor);
-			}
+			ParseObjectContent(obj, element, defaultProperty, initializeFromTextValueInsteadOfConstructor);
 			
 			if (iSupportInitializeInstance != null) {
 				iSupportInitializeInstance.EndInit();
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs
index 8379cbd291..802195fcdb 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs
@@ -21,8 +21,11 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Linq;
+using System.Reflection;
 using System.Xml;
 using System.Windows;
+using System.Windows.Markup;
+using System.Xaml;
 
 namespace ICSharpCode.WpfDesign.XamlDom
 {
@@ -203,7 +206,7 @@ namespace ICSharpCode.WpfDesign.XamlDom
 			propertyValue.ParentProperty = this;
 			propertyValue.AddNodeTo(this);
 			UpdateValueOnInstance();
-			
+
 			ParentObject.OnPropertyChanged(this);
 			
 			if (!wasSet) {
@@ -222,13 +225,38 @@ namespace ICSharpCode.WpfDesign.XamlDom
 			if (PropertyValue != null) {
 				try {
 					ValueOnInstance = PropertyValue.GetValueFor(propertyInfo);
+
+					if (this.parentObject.XamlSetTypeConverter != null)
+						this.ParentObject.XamlSetTypeConverter(this.parentObject.Instance, new XamlSetTypeConverterEventArgs(this.SystemXamlMemberForProperty, null, ((XamlTextValue) propertyValue).Text, this.parentObject.OwnerDocument.GetTypeDescriptorContext(this.parentObject), null));
 				}
 				catch {
 					Debug.WriteLine("UpdateValueOnInstance() failed");
 				}
 			}
 		}
-		
+
+		private XamlMember _systemXamlMemberForProperty = null;
+		public XamlMember SystemXamlMemberForProperty
+		{
+			get
+			{
+				if (_systemXamlMemberForProperty == null)
+					_systemXamlMemberForProperty = new XamlMember(this.PropertyName, SystemXamlTypeForProperty, false);
+				return _systemXamlMemberForProperty;
+			}
+		}
+
+		private XamlType _systemXamlTypeForProperty = null;
+		public XamlType SystemXamlTypeForProperty
+		{
+			get
+			{
+				if (_systemXamlTypeForProperty == null)
+					_systemXamlTypeForProperty = new XamlType(this.PropertyTargetType,
+					                                          this.ParentObject.ServiceProvider.SchemaContext);
+				return _systemXamlTypeForProperty;
+			}
+		}
 		/// <summary>
 		/// Resets the properties value.
 		/// </summary>

From b8045d294d6b39979274cab52292345af77ca85d Mon Sep 17 00:00:00 2001
From: jogibear9988 <jochen.kuehner@gmx.de>
Date: Sun, 2 Nov 2014 19:51:44 +0100
Subject: [PATCH 17/21] Bugfix that "<TextBlock>aaa</TextBlock>" could be shown
 in the Designer

---
 .../Project/Xaml/XamlModelCollectionElementsCollection.cs   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Xaml/XamlModelCollectionElementsCollection.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Xaml/XamlModelCollectionElementsCollection.cs
index 8e6d937f6a..e70e3c1a20 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Xaml/XamlModelCollectionElementsCollection.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Xaml/XamlModelCollectionElementsCollection.cs
@@ -107,7 +107,9 @@ namespace ICSharpCode.WpfDesign.Designer.Xaml
 		public IEnumerator<DesignItem> GetEnumerator()
 		{
 			foreach (XamlPropertyValue val in property.CollectionElements) {
-				yield return GetItem(val);
+				var item = GetItem(val);
+				if (item != null)
+					yield return item;
 			}
 		}
 		
@@ -121,7 +123,7 @@ namespace ICSharpCode.WpfDesign.Designer.Xaml
 			if (val is XamlObject) {
 				return context._componentService.GetDesignItem( ((XamlObject)val).Instance );
 			} else {
-				throw new NotImplementedException();
+				return null; //	throw new NotImplementedException();
 			}
 		}
 		

From ee653915ba2f3652068bf1f34567962a9114c71c Mon Sep 17 00:00:00 2001
From: jogibear9988 <jochen.kuehner@gmx.de>
Date: Sun, 2 Nov 2014 21:08:36 +0100
Subject: [PATCH 18/21] Default Style of Window now has no CornerRadius

---
 .../WpfDesign.Designer/Project/Controls/ControlStyles.xaml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ControlStyles.xaml b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ControlStyles.xaml
index 7183b558c4..77ed2ad5cc 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ControlStyles.xaml
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ControlStyles.xaml
@@ -117,7 +117,7 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type Controls:WindowClone}">
-					<Border Background="{DynamicResource {x:Static SystemColors.GradientActiveCaptionBrushKey}}" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="1,1,1,1" CornerRadius="5,5,5,5">
+					<Border Background="{DynamicResource {x:Static SystemColors.GradientActiveCaptionBrushKey}}" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="1,1,1,1">
 						<DockPanel Margin="4,0,4,4">
 							<DockPanel Height="26" DockPanel.Dock="Top">
 								<Image Width="16" Height="16" Margin="1,0,0,0" Source="{TemplateBinding Window.Icon}" />

From b70e8474217e270e5d6d39d34727b4460d546c94 Mon Sep 17 00:00:00 2001
From: jogibear9988 <jochen.kuehner@gmx.de>
Date: Sun, 2 Nov 2014 21:57:25 +0100
Subject: [PATCH 19/21] Show a Icon for the WindowClone in the Designer

---
 .../Project/Controls/ControlStyles.xaml       |  13 ++-
 .../WpfDesign.Designer/Project/Converters.cs  |  82 +++++++++++-------
 .../Images/Icons.32x32.EmptyProjectIcon.png   | Bin 0 -> 891 bytes
 .../Project/WpfDesign.Designer.csproj         |   3 +
 4 files changed, 59 insertions(+), 39 deletions(-)
 create mode 100644 src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Images/Icons.32x32.EmptyProjectIcon.png

diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ControlStyles.xaml b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ControlStyles.xaml
index 77ed2ad5cc..a0d1ac20a9 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ControlStyles.xaml
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ControlStyles.xaml
@@ -120,14 +120,11 @@
 					<Border Background="{DynamicResource {x:Static SystemColors.GradientActiveCaptionBrushKey}}" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="1,1,1,1">
 						<DockPanel Margin="4,0,4,4">
 							<DockPanel Height="26" DockPanel.Dock="Top">
-								<Image Width="16" Height="16" Margin="1,0,0,0" Source="{TemplateBinding Window.Icon}" />
-								<Button Name="CloseButton" VerticalAlignment="Top" Width="43" Height="17" DockPanel.Dock="Right">
-									<Path Fill="#FFF6F2F2" Stretch="Uniform" Margin="1" Stroke="#FF808080" Data="M160,400 L176,400 192,384 208,400 224,400 200,376 224,352 208,352 192,368 176,352 160,352 184,376 z" />
-								</Button>
-								<Button Name="MaximiseButton" VerticalAlignment="Top" Width="25" Height="17" DockPanel.Dock="Right" />
-								<Button Name="MinimizeButton" VerticalAlignment="Top" Width="25" Height="17" DockPanel.Dock="Right">
-									<!--<Rectangle Fill="#FFF6F2F2" RadiusX="0.5" RadiusY="0.5" Width="12" Height="5" Stroke="#FF808080" VerticalAlignment="Bottom" HorizontalAlignment="Center"/>-->
-								</Button>
+								<Image Width="16" Height="16" Margin="1,0,0,0" Source="/ICSharpCode.WpfDesign.Designer;component/Images/Icons.32x32.EmptyProjectIcon.png" Visibility="{Binding Window.Icon, Converter={x:Static Converters:CollapsedWhenZero.Instance}}" />
+								<Image Width="16" Height="16" Margin="1,0,0,0" Source="{TemplateBinding Window.Icon}" Visibility="{Binding Window.Icon, Converter={x:Static Converters:CollapsedWhenNotNull.Instance}}" />
+								<Button Content="r" FontFamily="Marlett" Name="CloseButton" VerticalAlignment="Top" Width="43" Height="17" DockPanel.Dock="Right" />
+								<Button Content="1" FontFamily="Marlett" Name="MinimizeButton" VerticalAlignment="Top" Width="25" Height="17" DockPanel.Dock="Right" />
+								<Button Content="0" FontFamily="Marlett" Name="MaximiseButton" VerticalAlignment="Top" Width="25" Height="17" DockPanel.Dock="Right" />
 								<Label Margin="4,0,0,0" Content="{TemplateBinding Window.Title}" />
 							</DockPanel>
 							<Border Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}">
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Converters.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Converters.cs
index 92a11aa73e..e2df3c5568 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Converters.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Converters.cs
@@ -111,6 +111,26 @@ namespace ICSharpCode.WpfDesign.Designer.Converters
 		}
 	}
 
+	public class CollapsedWhenNotNull : IValueConverter
+	{
+		[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes", Justification = "converter is immutable")]
+		public static readonly CollapsedWhenNotNull Instance = new CollapsedWhenNotNull();
+
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			if (value != null)
+			{
+				return Visibility.Collapsed;
+			}
+			return Visibility.Visible;
+		}
+
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
+	}
+
 	public class FalseWhenNull : IValueConverter
 	{
 		[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes", Justification = "converter is immutable")]
@@ -160,37 +180,37 @@ namespace ICSharpCode.WpfDesign.Designer.Converters
 		}
 	}
 
-    public class ControlToRealWidthConverter : IMultiValueConverter
-    {
-        public static readonly ControlToRealWidthConverter Instance = new ControlToRealWidthConverter();
-
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
-        {
-            return PlacementOperation.GetRealElementSize((UIElement)values[0]).Width;
-        }
-
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-
-    public class ControlToRealHeightConverter : IMultiValueConverter
-    {
-        public static readonly ControlToRealHeightConverter Instance = new ControlToRealHeightConverter();
-
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
-        {
-            return PlacementOperation.GetRealElementSize((UIElement)values[0]).Height;
-        }
-
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-
-    public class FormatDoubleConverter : IValueConverter
+	public class ControlToRealWidthConverter : IMultiValueConverter
+	{
+		public static readonly ControlToRealWidthConverter Instance = new ControlToRealWidthConverter();
+
+		public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+		{
+			return PlacementOperation.GetRealElementSize((UIElement)values[0]).Width;
+		}
+
+		public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
+	}
+
+	public class ControlToRealHeightConverter : IMultiValueConverter
+	{
+		public static readonly ControlToRealHeightConverter Instance = new ControlToRealHeightConverter();
+
+		public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+		{
+			return PlacementOperation.GetRealElementSize((UIElement)values[0]).Height;
+		}
+
+		public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
+	}
+
+	public class FormatDoubleConverter : IValueConverter
 	{
 		[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes", Justification = "converter is immutable")]
 		public static readonly FormatDoubleConverter Instance=new FormatDoubleConverter();
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Images/Icons.32x32.EmptyProjectIcon.png b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Images/Icons.32x32.EmptyProjectIcon.png
new file mode 100644
index 0000000000000000000000000000000000000000..1977344cf2296c7e31161478f4705d86226d6c6c
GIT binary patch
literal 891
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!pj3%#L`iUdT1k0gQ7S_~VrE{6o}X)oLYc9i
zsh**M!Iz?i3=B-KJY5_^BHZ6jKkXe7D04jaic!>4C5<~Sf+~(#f>}*Br`Q^#DV<(<
zW|>LwkyfGBFDBh#wz)yVr{j{QwXr6q*crY3;S(%)`nd_ed-}0TlRo47=ick})i)G`
z$^AHBTk!sG&Aaz`?|8YQqP&G42zO|j9xuwW@DX~_C3^V&$0H$=ZyTlWzsb!}$HZ#O
zC{n^+u=sTUpT5eN?C%d>^;^c|eN}pY+dd}ao5J>s&2QG{&3XL7BC2oM!QLNg{7FA7
z1@G^@apRdY$9}UNm-|Kk)UBSix2&kE;l-o<Jx5f|Jm2*CZOk>Zc5U6bm`6=}s>Jo`
z${zhuXD_n5H8D2Z`PpyDIcsMg%RI+fw?^yL@oi0RF4K7wmgR{FrZ(RwTFp88RQrZy
zrF^gB_>{kt8D9(gbFAoJ!4nb2K-V@`_BT3j8tWuFE`8Txe0a3>l--ss@thI=OB`;t
zPvK9J<X2eE(Q(CJ$I2l%_0T;p=0~e^y$)RC56f9+n(RE+mowt-1BVad(qY?nOkn`J
z_ibzP8=l_Hw^l8vHg65i*Y#Lw^!SOi@FeYCi@3xC8?R5kuy59Zi{i-^pK3(f=l?yp
za8n{{=}Q5=X*@~`D;U`2{vWEVmH%e@%Jt7-xi^&;dhdSUy<pe%&e(Emf%4_D2Q9yH
zGe$;6@=Ox9Jj!BZY#gZ|(BN}IlgY@)XvY2b$N&7<BXYvkPjJG#dFMRdeg3(`K@aGr
zEn7_7iq>D(W-Xc+%(7(JGNVbm@8)Sv=$@nGu>7)N|8eH!mo*`BOO_Z+Kh3)Pt{#}H
zqOQLA=FP}6XU=#u#sEVrYV9;j8NP_MVPL%qnwp(AbIfL(O@nX^4JZ2g`yb9Q@d7KB
z>TUD&^-U})3gUXAw45Vg_0^tZ_I7qqlT}m<CZBA%crg&-jHN+_RsWThm4g(-EyeeB
zC@If8n$&nOVFJ@mrJcbnE$!{E4<9--!{@}#FaBFh7-t=*UlG?{`)U4<U|`;0@O1Ta
JS?83{1OUcjgtq_y

literal 0
HcmV?d00001

diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/WpfDesign.Designer.csproj b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/WpfDesign.Designer.csproj
index cd35d12092..40aadb1395 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/WpfDesign.Designer.csproj
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/WpfDesign.Designer.csproj
@@ -458,4 +458,7 @@
   <ItemGroup>
     <Resource Include="Images\canvas.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\Icons.32x32.EmptyProjectIcon.png" />
+  </ItemGroup>
 </Project>
\ No newline at end of file

From c8aef40143d88f4066ccbf896bc17d005e85b1b6 Mon Sep 17 00:00:00 2001
From: jogibear9988 <jochen.kuehner@gmx.de>
Date: Sun, 2 Nov 2014 23:39:17 +0100
Subject: [PATCH 20/21] Hide Min and Max Buton when NoResize

---
 .../Project/Controls/ControlStyles.xaml       |  4 +--
 .../Project/Controls/WindowClone.cs           | 15 ++++++---
 .../WpfDesign.Designer/Project/Converters.cs  | 31 ++++++++++++++++++-
 3 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ControlStyles.xaml b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ControlStyles.xaml
index a0d1ac20a9..2a80e2118e 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ControlStyles.xaml
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ControlStyles.xaml
@@ -123,8 +123,8 @@
 								<Image Width="16" Height="16" Margin="1,0,0,0" Source="/ICSharpCode.WpfDesign.Designer;component/Images/Icons.32x32.EmptyProjectIcon.png" Visibility="{Binding Window.Icon, Converter={x:Static Converters:CollapsedWhenZero.Instance}}" />
 								<Image Width="16" Height="16" Margin="1,0,0,0" Source="{TemplateBinding Window.Icon}" Visibility="{Binding Window.Icon, Converter={x:Static Converters:CollapsedWhenNotNull.Instance}}" />
 								<Button Content="r" FontFamily="Marlett" Name="CloseButton" VerticalAlignment="Top" Width="43" Height="17" DockPanel.Dock="Right" />
-								<Button Content="1" FontFamily="Marlett" Name="MinimizeButton" VerticalAlignment="Top" Width="25" Height="17" DockPanel.Dock="Right" />
-								<Button Content="0" FontFamily="Marlett" Name="MaximiseButton" VerticalAlignment="Top" Width="25" Height="17" DockPanel.Dock="Right" />
+								<Button Content="1" FontFamily="Marlett" Name="MinimizeButton" VerticalAlignment="Top" Width="25" Height="17" DockPanel.Dock="Right" Visibility="{Binding ResizeMode, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static Converters:EnumCollapsed.Instance}, ConverterParameter=NoResize}" />
+								<Button Content="0" FontFamily="Marlett" Name="MaximiseButton" VerticalAlignment="Top" Width="25" Height="17" DockPanel.Dock="Right" Visibility="{Binding ResizeMode, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static Converters:EnumCollapsed.Instance}, ConverterParameter=NoResize}" />
 								<Label Margin="4,0,0,0" Content="{TemplateBinding Window.Title}" />
 							</DockPanel>
 							<Border Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}">
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/WindowClone.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/WindowClone.cs
index ef4cf69196..f17876425c 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/WindowClone.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/WindowClone.cs
@@ -93,15 +93,20 @@ namespace ICSharpCode.WpfDesign.Designer.Controls
 			get { return owner; }
 			set { owner = value; }
 		}
-		
+
 		/// <summary>
 		/// Gets or sets the resize mode.
 		/// </summary>
-		public ResizeMode ResizeMode {
-			get { return (ResizeMode)GetValue(Window.ResizeModeProperty); }
-			set { SetValue(Window.ResizeModeProperty, value); }
+		public ResizeMode ResizeMode
+		{
+			get { return (ResizeMode)GetValue(ResizeModeProperty); }
+			set { SetValue(ResizeModeProperty, value); }
 		}
-		
+
+		// Using a DependencyProperty as the backing store for ResizeMode.  This enables animation, styling, binding, etc...
+		public static readonly DependencyProperty ResizeModeProperty =
+			DependencyProperty.Register("ResizeMode", typeof(ResizeMode), typeof(WindowClone), new PropertyMetadata(System.Windows.ResizeMode.CanResize));
+
 		/// <summary>
 		/// This property has no effect. (for compatibility with <see cref="Window"/> only).
 		/// </summary>
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Converters.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Converters.cs
index e2df3c5568..8450b8bcfe 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Converters.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Converters.cs
@@ -300,7 +300,36 @@ namespace ICSharpCode.WpfDesign.Designer.Converters
 			return Enum.Parse(targetType, parameterString);
 		}
 	}
-	
+
+	public class EnumCollapsed : IValueConverter
+	{
+		[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes", Justification = "converter is immutable")]
+		public static readonly EnumCollapsed Instance = new EnumCollapsed();
+
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			string parameterString = parameter as string;
+			if (parameterString == null)
+				return DependencyProperty.UnsetValue;
+
+			if (Enum.IsDefined(value.GetType(), value) == false)
+				return DependencyProperty.UnsetValue;
+
+			object parameterValue = Enum.Parse(value.GetType(), parameterString);
+
+			return parameterValue.Equals(value) ? Visibility.Collapsed : Visibility.Visible;
+		}
+
+		public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+		{
+			string parameterString = parameter as string;
+			if (parameterString == null)
+				return DependencyProperty.UnsetValue;
+
+			return Enum.Parse(targetType, parameterString);
+		}
+	}
+
 	public class InvertedZoomConverter : IValueConverter
 	{
 		[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes", Justification = "converter is immutable")]

From e22bde0025f4ebe2366aad20dc6ef36c7e09d371 Mon Sep 17 00:00:00 2001
From: jogibear9988 <jochen.kuehner@gmx.de>
Date: Mon, 3 Nov 2014 00:11:46 +0100
Subject: [PATCH 21/21] Fix Icon Binding -> But now Properties in PropertyGrid
 are wrong, look how it can be fixed!

---
 .../Project/Controls/ControlStyles.xaml        |  4 ++--
 .../Project/Controls/WindowClone.cs            | 18 ++++++++++--------
 .../WpfDesign.Designer/Project/Converters.cs   |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ControlStyles.xaml b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ControlStyles.xaml
index 2a80e2118e..c4c96bccb7 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ControlStyles.xaml
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ControlStyles.xaml
@@ -120,8 +120,8 @@
 					<Border Background="{DynamicResource {x:Static SystemColors.GradientActiveCaptionBrushKey}}" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="1,1,1,1">
 						<DockPanel Margin="4,0,4,4">
 							<DockPanel Height="26" DockPanel.Dock="Top">
-								<Image Width="16" Height="16" Margin="1,0,0,0" Source="/ICSharpCode.WpfDesign.Designer;component/Images/Icons.32x32.EmptyProjectIcon.png" Visibility="{Binding Window.Icon, Converter={x:Static Converters:CollapsedWhenZero.Instance}}" />
-								<Image Width="16" Height="16" Margin="1,0,0,0" Source="{TemplateBinding Window.Icon}" Visibility="{Binding Window.Icon, Converter={x:Static Converters:CollapsedWhenNotNull.Instance}}" />
+								<Image Width="16" Height="16" Margin="1,0,0,0" Source="/ICSharpCode.WpfDesign.Designer;component/Images/Icons.32x32.EmptyProjectIcon.png" Visibility="{Binding Icon, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static Converters:CollapsedWhenNotNull.Instance}}" />
+								<Image Width="16" Height="16" Margin="1,0,0,0" Source="{TemplateBinding Window.Icon}" Visibility="{Binding Icon, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static Converters:CollapsedWhenZero.Instance}}" />
 								<Button Content="r" FontFamily="Marlett" Name="CloseButton" VerticalAlignment="Top" Width="43" Height="17" DockPanel.Dock="Right" />
 								<Button Content="1" FontFamily="Marlett" Name="MinimizeButton" VerticalAlignment="Top" Width="25" Height="17" DockPanel.Dock="Right" Visibility="{Binding ResizeMode, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static Converters:EnumCollapsed.Instance}, ConverterParameter=NoResize}" />
 								<Button Content="0" FontFamily="Marlett" Name="MaximiseButton" VerticalAlignment="Top" Width="25" Height="17" DockPanel.Dock="Right" Visibility="{Binding ResizeMode, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static Converters:EnumCollapsed.Instance}, ConverterParameter=NoResize}" />
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/WindowClone.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/WindowClone.cs
index f17876425c..a43bbcf42c 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/WindowClone.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/WindowClone.cs
@@ -66,15 +66,17 @@ namespace ICSharpCode.WpfDesign.Designer.Controls
 			}
 			set { }
 		}
-		
-		/// <summary>
-		/// Specifies the icon to use.
-		/// </summary>
-		public ImageSource Icon {
-			get { return (ImageSource)GetValue(Window.IconProperty); }
-			set { SetValue(Window.IconProperty, value); }
+
+		public ImageSource Icon
+		{
+			get { return (ImageSource)GetValue(IconProperty); }
+			set { SetValue(IconProperty, value); }
 		}
-		
+
+		// Using a DependencyProperty as the backing store for Icon.  This enables animation, styling, binding, etc...
+		public static readonly DependencyProperty IconProperty =
+			DependencyProperty.Register("Icon", typeof(ImageSource), typeof(WindowClone), new PropertyMetadata(null));
+
 		/// <summary>
 		/// This property has no effect. (for compatibility with <see cref="Window"/> only).
 		/// </summary>
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Converters.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Converters.cs
index 8450b8bcfe..101cf285bf 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Converters.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Converters.cs
@@ -99,7 +99,7 @@ namespace ICSharpCode.WpfDesign.Designer.Converters
 
 		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
 		{
-			if (value == null || (int)value == 0) {
+			if (value == null || (value is int && (int)value == 0)) {
 				return Visibility.Collapsed;
 			}
 			return Visibility.Visible;