diff --git a/src/Calculator/Views/Memory.xaml.cs b/src/Calculator/Views/Memory.xaml.cs index 759ea8a1..c20818e9 100644 --- a/src/Calculator/Views/Memory.xaml.cs +++ b/src/Calculator/Views/Memory.xaml.cs @@ -19,14 +19,12 @@ namespace CalculatorApp public CalculatorApp.ViewModel.StandardCalculatorViewModel Model { - get { return (CalculatorApp.ViewModel.StandardCalculatorViewModel)GetValue(ModelProperty); } - set { SetValue(ModelProperty, value); } + get + { + return (CalculatorApp.ViewModel.StandardCalculatorViewModel)this.DataContext; + } } - // Using a DependencyProperty as the backing store for Model. This enables animation, styling, binding, etc... - public static readonly DependencyProperty ModelProperty = - DependencyProperty.Register(nameof(Model), typeof(CalculatorApp.ViewModel.StandardCalculatorViewModel), typeof(Memory), new PropertyMetadata(default(CalculatorApp.ViewModel.StandardCalculatorViewModel))); - public GridLength RowHeight { get { return (GridLength)GetValue(RowHeightProperty); }