Browse Source

Corrected ordering for DataTemplate overriding. i.e. Derived classes come first then base class when selecting Templates for derived classes.

pull/404/head
danwalmsley 11 years ago
parent
commit
93dd92202c
  1. 4
      src/Perspex.Controls/Templates/DataTemplateExtensions.cs

4
src/Perspex.Controls/Templates/DataTemplateExtensions.cs

@ -60,7 +60,7 @@ namespace Perspex.Controls.Templates
{ {
foreach (var i in control.GetSelfAndLogicalAncestors().OfType<IControl>()) foreach (var i in control.GetSelfAndLogicalAncestors().OfType<IControl>())
{ {
foreach (IDataTemplate dt in i.DataTemplates.Reverse()) foreach (IDataTemplate dt in i.DataTemplates)
{ {
if (dt.Match(data)) if (dt.Match(data))
{ {
@ -73,7 +73,7 @@ namespace Perspex.Controls.Templates
if (global != null) if (global != null)
{ {
foreach (IDataTemplate dt in global.DataTemplates.Reverse()) foreach (IDataTemplate dt in global.DataTemplates)
{ {
if (dt.Match(data)) if (dt.Match(data))
{ {

Loading…
Cancel
Save