Browse Source

Merge branch 'master' of https://github.com/Perspex/Perspex

pull/331/merge
Steven Kirk 10 years ago
parent
commit
0c458383be
  1. 9
      samples/BindingTest/MainWindow.xaml
  2. 17
      samples/BindingTest/ViewModels/MainWindowViewModel.cs
  3. 1
      src/Perspex.Controls/Primitives/ToggleButton.cs

9
samples/BindingTest/MainWindow.xaml

@ -68,5 +68,14 @@
</ContentControl>
</StackPanel>
</TabItem>
<TabItem Header="Commands">
<StackPanel Margin="18" Gap="4" Width="200">
<Button Content="Button" Command="{Binding StringValueCommand}" CommandParameter="Button"/>
<ToggleButton Content="ToggleButton" IsChecked="{Binding BooleanFlag, Mode=OneWay}" Command="{Binding StringValueCommand}" CommandParameter="ToggleButton"/>
<CheckBox Content="CheckBox" IsChecked="{Binding !BooleanFlag, Mode=OneWay}" Command="{Binding StringValueCommand}" CommandParameter="CheckBox"/>
<RadioButton Content="RadionButton" IsChecked="{Binding !!BooleanFlag, Mode=OneWay}" Command="{Binding StringValueCommand}" CommandParameter="RadioButton"/>
<TextBox Text="{Binding Path=StringValue}"/>
</StackPanel>
</TabItem>
</TabControl>
</Window>

17
samples/BindingTest/ViewModels/MainWindowViewModel.cs

@ -2,6 +2,7 @@
using System.Collections.ObjectModel;
using System.Linq;
using ReactiveUI;
using System.Reactive.Linq;
namespace BindingTest.ViewModels
{
@ -10,6 +11,7 @@ namespace BindingTest.ViewModels
private string _booleanString = "True";
private double _doubleValue = 5.0;
private string _stringValue = "Simple Binding";
private bool _booleanFlag = false;
public MainWindowViewModel()
{
@ -28,6 +30,13 @@ namespace BindingTest.ViewModels
var r = new Random();
Items.Move(r.Next(Items.Count), 1);
});
StringValueCommand = ReactiveCommand.Create();
StringValueCommand.Subscribe(param =>
{
BooleanFlag = !BooleanFlag;
StringValue = param.ToString();
});
}
public ObservableCollection<TestItem> Items { get; }
@ -51,5 +60,13 @@ namespace BindingTest.ViewModels
get { return _stringValue; }
set { this.RaiseAndSetIfChanged(ref _stringValue, value); }
}
public bool BooleanFlag
{
get { return _booleanFlag; }
set { this.RaiseAndSetIfChanged(ref _booleanFlag, value); }
}
public ReactiveCommand<object> StringValueCommand { get; }
}
}

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

@ -32,6 +32,7 @@ namespace Perspex.Controls.Primitives
protected override void OnClick(RoutedEventArgs e)
{
Toggle();
base.OnClick(e);
}
protected virtual void Toggle()

Loading…
Cancel
Save