From 209e7a10dfc516b42b98644abc1f2d07bbb3982b Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Sat, 28 Feb 2015 23:24:46 +0100 Subject: [PATCH] Fix DataContext property for items controls. --- Perspex.Controls/Generators/ItemContainerGenerator.cs | 1 + Perspex.Controls/Templates/DataTemplateExtensions.cs | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Perspex.Controls/Generators/ItemContainerGenerator.cs b/Perspex.Controls/Generators/ItemContainerGenerator.cs index f89c0209e6..e9c6f68431 100644 --- a/Perspex.Controls/Generators/ItemContainerGenerator.cs +++ b/Perspex.Controls/Generators/ItemContainerGenerator.cs @@ -84,6 +84,7 @@ namespace Perspex.Controls.Generators foreach (object item in items) { Control container = this.CreateContainerOverride(item); + container.DataContext = item; container.TemplatedParent = null; this.AddInternal(item, container); result.Add(container); diff --git a/Perspex.Controls/Templates/DataTemplateExtensions.cs b/Perspex.Controls/Templates/DataTemplateExtensions.cs index ac196ce16f..b70d1ec004 100644 --- a/Perspex.Controls/Templates/DataTemplateExtensions.cs +++ b/Perspex.Controls/Templates/DataTemplateExtensions.cs @@ -30,8 +30,6 @@ namespace Perspex.Controls.Templates result = DataTemplate.Default.Build(data); } - result.DataContext = data; - return result; }