From 5b11c9f8513b1bd8a4e970836f8023b15fd96077 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Thu, 29 Jan 2015 14:56:42 +0100 Subject: [PATCH] Fix bug in tree view style. ItemsPresenter didn't have an ID. Also don't return null for logical children of an ItemsControl with no presenter. --- Perspex.Controls/ItemsControl.cs | 6 ++++++ Perspex.Themes.Default/TreeViewItemStyle.cs | 1 + 2 files changed, 7 insertions(+) diff --git a/Perspex.Controls/ItemsControl.cs b/Perspex.Controls/ItemsControl.cs index 265314264a..08a4f2ba27 100644 --- a/Perspex.Controls/ItemsControl.cs +++ b/Perspex.Controls/ItemsControl.cs @@ -96,6 +96,12 @@ namespace Perspex.Controls panel.VisualChildren, x => (ILogical)x); } + else + { + this.logicalChildren = new PerspexReadOnlyListView( + new PerspexList(), + x => (ILogical)x); + } } private void ItemsChanged(Tuple value) diff --git a/Perspex.Themes.Default/TreeViewItemStyle.cs b/Perspex.Themes.Default/TreeViewItemStyle.cs index b1123ce262..a3a830b28c 100644 --- a/Perspex.Themes.Default/TreeViewItemStyle.cs +++ b/Perspex.Themes.Default/TreeViewItemStyle.cs @@ -101,6 +101,7 @@ namespace Perspex.Themes.Default }, new ItemsPresenter { + Id = "itemsPresenter", Margin = new Thickness(24, 0, 0, 0), [~ItemsPresenter.ItemsProperty] = control[~TreeViewItem.ItemsProperty], [~ItemsPresenter.ItemsPanelProperty] = control[~TreeViewItem.ItemsPanelProperty],