Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/ReactiveUI.Winforms/RoutedViewHost.cs
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public RoutedControlHost()
/// </value>
[Category("ReactiveUI")]
[Description("The default control when no viewmodel is specified")]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public Control? DefaultContent
{
get => _defaultContent;
Expand All @@ -110,7 +110,7 @@ public Control? DefaultContent
/// </summary>
[Category("ReactiveUI")]
[Description("The router.")]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public RoutingState? Router
{
get => _router;
Expand All @@ -121,7 +121,7 @@ public RoutingState? Router
/// Gets or sets the view contract observable.
/// </summary>
[Browsable(false)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public IObservable<string>? ViewContractObservable
{
get => _viewContractObservable;
Expand All @@ -132,7 +132,7 @@ public IObservable<string>? ViewContractObservable
/// Gets or sets the view locator.
/// </summary>
[Browsable(false)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public IViewLocator? ViewLocator { get; set; }

/// <inheritdoc/>
Expand Down
11 changes: 5 additions & 6 deletions src/ReactiveUI.Winforms/ViewModelViewHost.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ public ViewModelControlHost()
/// <summary>
/// Gets or sets a value indicating whether [default cache views enabled].
/// </summary>
[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
public static bool DefaultCacheViewsEnabled { get; set; }

/// <summary>
Expand All @@ -58,7 +57,7 @@ public ViewModelControlHost()
/// </summary>
[Category("ReactiveUI")]
[Description("The default control when no viewmodel is specified")]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public Control? DefaultContent
{
get => _defaultContent;
Expand All @@ -72,7 +71,7 @@ public Control? DefaultContent
/// The view contract observable.
/// </value>
[Browsable(false)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public IObservable<string>? ViewContractObservable
{
get => _viewContractObservable;
Expand All @@ -83,14 +82,14 @@ public IObservable<string>? ViewContractObservable
/// Gets or sets the view locator.
/// </summary>
[Browsable(false)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public IViewLocator? ViewLocator { get; set; }

/// <inheritdoc/>
[Category("ReactiveUI")]
[Description("The viewmodel to host.")]
[Bindable(true)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public object? ViewModel
{
get => _viewModel;
Expand All @@ -103,7 +102,7 @@ public object? ViewModel
[Category("ReactiveUI")]
[Description("The Current View")]
[Bindable(true)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public object? Content
{
get => _content;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,17 @@ namespace ReactiveUI.Winforms
public RoutedControlHost() { }
[System.ComponentModel.Category("ReactiveUI")]
[System.ComponentModel.Description("The default control when no viewmodel is specified")]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
public System.Windows.Forms.Control? DefaultContent { get; set; }
[System.ComponentModel.Category("ReactiveUI")]
[System.ComponentModel.Description("The router.")]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
public ReactiveUI.RoutingState? Router { get; set; }
[System.ComponentModel.Browsable(false)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
public System.IObservable<string>? ViewContractObservable { get; set; }
[System.ComponentModel.Browsable(false)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
public ReactiveUI.IViewLocator? ViewLocator { get; set; }
public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged;
public event System.ComponentModel.PropertyChangingEventHandler? PropertyChanging;
Expand Down Expand Up @@ -112,25 +112,24 @@ namespace ReactiveUI.Winforms
[System.ComponentModel.Bindable(true)]
[System.ComponentModel.Category("ReactiveUI")]
[System.ComponentModel.Description("The Current View")]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
public object? Content { get; protected set; }
public System.Windows.Forms.Control? CurrentView { get; }
[System.ComponentModel.Category("ReactiveUI")]
[System.ComponentModel.Description("The default control when no viewmodel is specified")]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
public System.Windows.Forms.Control? DefaultContent { get; set; }
[System.ComponentModel.Browsable(false)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
public System.IObservable<string>? ViewContractObservable { get; set; }
[System.ComponentModel.Browsable(false)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
public ReactiveUI.IViewLocator? ViewLocator { get; set; }
[System.ComponentModel.Bindable(true)]
[System.ComponentModel.Category("ReactiveUI")]
[System.ComponentModel.Description("The viewmodel to host.")]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
public object? ViewModel { get; set; }
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
public static bool DefaultCacheViewsEnabled { get; set; }
public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged;
public event System.ComponentModel.PropertyChangingEventHandler? PropertyChanging;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,17 @@ namespace ReactiveUI.Winforms
public RoutedControlHost() { }
[System.ComponentModel.Category("ReactiveUI")]
[System.ComponentModel.Description("The default control when no viewmodel is specified")]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
public System.Windows.Forms.Control? DefaultContent { get; set; }
[System.ComponentModel.Category("ReactiveUI")]
[System.ComponentModel.Description("The router.")]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
public ReactiveUI.RoutingState? Router { get; set; }
[System.ComponentModel.Browsable(false)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
public System.IObservable<string>? ViewContractObservable { get; set; }
[System.ComponentModel.Browsable(false)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
public ReactiveUI.IViewLocator? ViewLocator { get; set; }
public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged;
public event System.ComponentModel.PropertyChangingEventHandler? PropertyChanging;
Expand Down Expand Up @@ -112,25 +112,24 @@ namespace ReactiveUI.Winforms
[System.ComponentModel.Bindable(true)]
[System.ComponentModel.Category("ReactiveUI")]
[System.ComponentModel.Description("The Current View")]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
public object? Content { get; protected set; }
public System.Windows.Forms.Control? CurrentView { get; }
[System.ComponentModel.Category("ReactiveUI")]
[System.ComponentModel.Description("The default control when no viewmodel is specified")]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
public System.Windows.Forms.Control? DefaultContent { get; set; }
[System.ComponentModel.Browsable(false)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
public System.IObservable<string>? ViewContractObservable { get; set; }
[System.ComponentModel.Browsable(false)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
public ReactiveUI.IViewLocator? ViewLocator { get; set; }
[System.ComponentModel.Bindable(true)]
[System.ComponentModel.Category("ReactiveUI")]
[System.ComponentModel.Description("The viewmodel to host.")]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
public object? ViewModel { get; set; }
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
public static bool DefaultCacheViewsEnabled { get; set; }
public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged;
public event System.ComponentModel.PropertyChangingEventHandler? PropertyChanging;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,17 @@ namespace ReactiveUI.Winforms
public RoutedControlHost() { }
[System.ComponentModel.Category("ReactiveUI")]
[System.ComponentModel.Description("The default control when no viewmodel is specified")]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
public System.Windows.Forms.Control? DefaultContent { get; set; }
[System.ComponentModel.Category("ReactiveUI")]
[System.ComponentModel.Description("The router.")]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
public ReactiveUI.RoutingState? Router { get; set; }
[System.ComponentModel.Browsable(false)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
public System.IObservable<string>? ViewContractObservable { get; set; }
[System.ComponentModel.Browsable(false)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
public ReactiveUI.IViewLocator? ViewLocator { get; set; }
public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged;
public event System.ComponentModel.PropertyChangingEventHandler? PropertyChanging;
Expand Down Expand Up @@ -112,25 +112,24 @@ namespace ReactiveUI.Winforms
[System.ComponentModel.Bindable(true)]
[System.ComponentModel.Category("ReactiveUI")]
[System.ComponentModel.Description("The Current View")]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
public object? Content { get; protected set; }
public System.Windows.Forms.Control? CurrentView { get; }
[System.ComponentModel.Category("ReactiveUI")]
[System.ComponentModel.Description("The default control when no viewmodel is specified")]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
public System.Windows.Forms.Control? DefaultContent { get; set; }
[System.ComponentModel.Browsable(false)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
public System.IObservable<string>? ViewContractObservable { get; set; }
[System.ComponentModel.Browsable(false)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
public ReactiveUI.IViewLocator? ViewLocator { get; set; }
[System.ComponentModel.Bindable(true)]
[System.ComponentModel.Category("ReactiveUI")]
[System.ComponentModel.Description("The viewmodel to host.")]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
public object? ViewModel { get; set; }
[System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)]
public static bool DefaultCacheViewsEnabled { get; set; }
public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged;
public event System.ComponentModel.PropertyChangingEventHandler? PropertyChanging;
Expand Down
Loading