Browse Source

Merge pull request #429 from VitalElement/master

corrected default binding mode for checkbox, treeview itemms and sele…
pull/447/head
Steven Kirk 11 years ago
parent
commit
f4a6a4ad58
  1. 2
      src/Perspex.Controls/Primitives/SelectingItemsControl.cs
  2. 3
      src/Perspex.Controls/Primitives/ToggleButton.cs
  3. 6
      src/Perspex.Controls/TreeViewItem.cs

2
src/Perspex.Controls/Primitives/SelectingItemsControl.cs

@ -62,7 +62,7 @@ namespace Perspex.Controls.Primitives
PerspexProperty.RegisterDirect<SelectingItemsControl, object>( PerspexProperty.RegisterDirect<SelectingItemsControl, object>(
nameof(SelectedItem), nameof(SelectedItem),
o => o.SelectedItem, o => o.SelectedItem,
(o, v) => o.SelectedItem = v); (o, v) => o.SelectedItem = v, BindingMode.TwoWay);
/// <summary> /// <summary>
/// Defines the <see cref="SelectedItems"/> property. /// Defines the <see cref="SelectedItems"/> property.

3
src/Perspex.Controls/Primitives/ToggleButton.cs

@ -3,6 +3,7 @@
using System; using System;
using Perspex.Interactivity; using Perspex.Interactivity;
using Perspex.Data;
namespace Perspex.Controls.Primitives namespace Perspex.Controls.Primitives
{ {
@ -12,7 +13,7 @@ namespace Perspex.Controls.Primitives
PerspexProperty.RegisterDirect<ToggleButton, bool>( PerspexProperty.RegisterDirect<ToggleButton, bool>(
"IsChecked", "IsChecked",
o => o.IsChecked, o => o.IsChecked,
(o,v) => o.IsChecked = v); (o,v) => o.IsChecked = v, BindingMode.TwoWay);
private bool _isChecked; private bool _isChecked;

6
src/Perspex.Controls/TreeViewItem.cs

@ -20,7 +20,7 @@ namespace Perspex.Controls
/// Defines the <see cref="IsExpanded"/> property. /// Defines the <see cref="IsExpanded"/> property.
/// </summary> /// </summary>
public static readonly StyledProperty<bool> IsExpandedProperty = public static readonly StyledProperty<bool> IsExpandedProperty =
PerspexProperty.Register<TreeViewItem, bool>("IsExpanded"); PerspexProperty.Register<TreeViewItem, bool>("IsExpanded", default(bool), false, Data.BindingMode.TwoWay);
/// <summary> /// <summary>
/// Defines the <see cref="IsSelected"/> property. /// Defines the <see cref="IsSelected"/> property.
@ -30,7 +30,7 @@ namespace Perspex.Controls
private static readonly ITemplate<IPanel> DefaultPanel = private static readonly ITemplate<IPanel> DefaultPanel =
new FuncTemplate<IPanel>(() => new StackPanel new FuncTemplate<IPanel>(() => new StackPanel
{ {
[KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Continue, [KeyboardNavigation.DirectionalNavigationProperty] = KeyboardNavigationMode.Continue,
}); });
@ -40,7 +40,7 @@ namespace Perspex.Controls
/// Initializes static members of the <see cref="TreeViewItem"/> class. /// Initializes static members of the <see cref="TreeViewItem"/> class.
/// </summary> /// </summary>
static TreeViewItem() static TreeViewItem()
{ {
SelectableMixin.Attach<TreeViewItem>(IsSelectedProperty); SelectableMixin.Attach<TreeViewItem>(IsSelectedProperty);
FocusableProperty.OverrideDefaultValue<TreeViewItem>(true); FocusableProperty.OverrideDefaultValue<TreeViewItem>(true);
ItemsPanelProperty.OverrideDefaultValue<TreeViewItem>(DefaultPanel); ItemsPanelProperty.OverrideDefaultValue<TreeViewItem>(DefaultPanel);

Loading…
Cancel
Save