From 64548db5b5b01a998347dd2d6142ed0b9970a69c Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Sun, 14 Sep 2014 18:14:15 +0200 Subject: [PATCH] Added a border to TreeView. Shows that something's not being measured properly... --- Perspex/Themes/Default/TreeViewStyle.cs | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Perspex/Themes/Default/TreeViewStyle.cs b/Perspex/Themes/Default/TreeViewStyle.cs index 9d14627b09..8ed1fe8800 100644 --- a/Perspex/Themes/Default/TreeViewStyle.cs +++ b/Perspex/Themes/Default/TreeViewStyle.cs @@ -8,6 +8,7 @@ namespace Perspex.Themes.Default { using System.Linq; using Perspex.Controls; + using Perspex.Media; using Perspex.Styling; public class TreeViewStyle : Styles @@ -20,7 +21,9 @@ namespace Perspex.Themes.Default { Setters = new[] { - new Setter(Button.TemplateProperty, ControlTemplate.Create(this.Template)), + new Setter(TreeView.TemplateProperty, ControlTemplate.Create(this.Template)), + new Setter(TreeView.BorderBrushProperty, Brushes.Black), + new Setter(TreeView.BorderThicknessProperty, 1.0), }, }, }); @@ -28,10 +31,16 @@ namespace Perspex.Themes.Default private Control Template(TreeView control) { - return new ItemsPresenter + return new Border { - [~ItemsPresenter.ItemsProperty] = control[~TreeView.ItemsProperty], - [~ItemsPresenter.ItemsPanelProperty] = control[~TreeView.ItemsPanelProperty], + [~Border.BackgroundProperty] = control[~TreeView.BackgroundProperty], + [~Border.BorderBrushProperty] = control[~TreeView.BorderBrushProperty], + [~Border.BorderThicknessProperty] = control[~TreeView.BorderThicknessProperty], + Content = new ItemsPresenter + { + [~ItemsPresenter.ItemsProperty] = control[~TreeView.ItemsProperty], + [~ItemsPresenter.ItemsPanelProperty] = control[~TreeView.ItemsPanelProperty], + } }; } }