From 979c5affb898b26e55c3bb0c6a7baae916424928 Mon Sep 17 00:00:00 2001 From: danwalmsley Date: Tue, 16 Feb 2016 22:30:57 +0000 Subject: [PATCH] corrected default binding mode for checkbox, treeview itemms and selected items. --- src/Perspex.Controls/Primitives/SelectingItemsControl.cs | 2 +- src/Perspex.Controls/Primitives/ToggleButton.cs | 3 ++- src/Perspex.Controls/TreeViewItem.cs | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Perspex.Controls/Primitives/SelectingItemsControl.cs b/src/Perspex.Controls/Primitives/SelectingItemsControl.cs index 9ec708dd6b..f6e405a24a 100644 --- a/src/Perspex.Controls/Primitives/SelectingItemsControl.cs +++ b/src/Perspex.Controls/Primitives/SelectingItemsControl.cs @@ -62,7 +62,7 @@ namespace Perspex.Controls.Primitives PerspexProperty.RegisterDirect( nameof(SelectedItem), o => o.SelectedItem, - (o, v) => o.SelectedItem = v); + (o, v) => o.SelectedItem = v, BindingMode.TwoWay); /// /// Defines the property. diff --git a/src/Perspex.Controls/Primitives/ToggleButton.cs b/src/Perspex.Controls/Primitives/ToggleButton.cs index 8d464464ec..c0aedf00ba 100644 --- a/src/Perspex.Controls/Primitives/ToggleButton.cs +++ b/src/Perspex.Controls/Primitives/ToggleButton.cs @@ -3,6 +3,7 @@ using System; using Perspex.Interactivity; +using Perspex.Data; namespace Perspex.Controls.Primitives { @@ -12,7 +13,7 @@ namespace Perspex.Controls.Primitives PerspexProperty.RegisterDirect( "IsChecked", o => o.IsChecked, - (o,v) => o.IsChecked = v); + (o,v) => o.IsChecked = v, BindingMode.TwoWay); private bool _isChecked; diff --git a/src/Perspex.Controls/TreeViewItem.cs b/src/Perspex.Controls/TreeViewItem.cs index fe74ebfd93..d5369840ad 100644 --- a/src/Perspex.Controls/TreeViewItem.cs +++ b/src/Perspex.Controls/TreeViewItem.cs @@ -20,7 +20,7 @@ namespace Perspex.Controls /// Defines the property. /// public static readonly StyledProperty IsExpandedProperty = - PerspexProperty.Register("IsExpanded"); + PerspexProperty.Register("IsExpanded", default(bool), false, Data.BindingMode.TwoWay); /// /// Defines the property. @@ -30,7 +30,7 @@ namespace Perspex.Controls private static readonly ITemplate DefaultPanel = new FuncTemplate(() => new StackPanel - { + { [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Continue, }); @@ -40,7 +40,7 @@ namespace Perspex.Controls /// Initializes static members of the class. /// static TreeViewItem() - { + { SelectableMixin.Attach(IsSelectedProperty); FocusableProperty.OverrideDefaultValue(true); ItemsPanelProperty.OverrideDefaultValue(DefaultPanel);