From d41260c6b7a0f88a33ce55d3d778ba634d8d2e55 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Sat, 3 Oct 2015 17:15:57 +0200 Subject: [PATCH] Use same property for SelectedItemProperty On SelectingItemsControl and TreeView. --- src/Perspex.Controls/TreeView.cs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Perspex.Controls/TreeView.cs b/src/Perspex.Controls/TreeView.cs index 369882fd18..c077d42aee 100644 --- a/src/Perspex.Controls/TreeView.cs +++ b/src/Perspex.Controls/TreeView.cs @@ -2,19 +2,21 @@ // Licensed under the MIT license. See licence.md file in the project root for full license information. using System; -using System.Collections; -using System.Collections.Generic; using System.Linq; using Perspex.Controls.Generators; +using Perspex.Controls.Primitives; using Perspex.Input; -using Perspex.VisualTree; namespace Perspex.Controls { public class TreeView : ItemsControl { public static readonly PerspexProperty SelectedItemProperty = - PerspexProperty.Register("SelectedItem"); + SelectingItemsControl.SelectedItemProperty.AddOwner( + o => o.SelectedItem, + (o, v) => o.SelectedItem = v); + + private object _selectedItem; static TreeView() { @@ -33,8 +35,8 @@ namespace Perspex.Controls public object SelectedItem { - get { return GetValue(SelectedItemProperty); } - set { SetValue(SelectedItemProperty, value); } + get { return _selectedItem; } + set { SetAndRaise(SelectedItemProperty, ref _selectedItem, value); } } protected override IItemContainerGenerator CreateItemContainerGenerator()