Browse Source

Merge pull request #2265 from worldbeater/patch-1

Fix AvaloniaProperty registration type in ReactiveUserControl
pull/2268/head
Steven Kirk 8 years ago
committed by GitHub
parent
commit
cbf22436aa
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      src/Avalonia.ReactiveUI/ReactiveUserControl.cs

4
src/Avalonia.ReactiveUI/ReactiveUserControl.cs

@ -16,7 +16,7 @@ namespace Avalonia
public class ReactiveUserControl<TViewModel> : UserControl, IViewFor<TViewModel> where TViewModel : class public class ReactiveUserControl<TViewModel> : UserControl, IViewFor<TViewModel> where TViewModel : class
{ {
public static readonly AvaloniaProperty<TViewModel> ViewModelProperty = AvaloniaProperty public static readonly AvaloniaProperty<TViewModel> ViewModelProperty = AvaloniaProperty
.Register<ReactiveWindow<TViewModel>, TViewModel>(nameof(ViewModel)); .Register<ReactiveUserControl<TViewModel>, TViewModel>(nameof(ViewModel));
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="ReactiveUserControl{TViewModel}"/> class. /// Initializes a new instance of the <see cref="ReactiveUserControl{TViewModel}"/> class.
@ -41,4 +41,4 @@ namespace Avalonia
set => ViewModel = (TViewModel)value; set => ViewModel = (TViewModel)value;
} }
} }
} }

Loading…
Cancel
Save