diff --git a/App/ModernWpfPlayground.csproj b/App/ModernWpfPlayground.csproj index aea1af3..3a2db8b 100644 --- a/App/ModernWpfPlayground.csproj +++ b/App/ModernWpfPlayground.csproj @@ -9,7 +9,7 @@ - + diff --git a/Controls/Controls.csproj b/Controls/Controls.csproj index 1a5ff40..7bdcfcf 100644 --- a/Controls/Controls.csproj +++ b/Controls/Controls.csproj @@ -7,7 +7,7 @@ - + diff --git a/Controls/PropertyPresenter/PropertyPresenter.xaml.cs b/Controls/PropertyPresenter/PropertyPresenter.xaml.cs index 0dd4bd5..683b94f 100644 --- a/Controls/PropertyPresenter/PropertyPresenter.xaml.cs +++ b/Controls/PropertyPresenter/PropertyPresenter.xaml.cs @@ -85,7 +85,7 @@ namespace Controls /// /// Command. /// - public ICommand Command + public ICommand? Command { get => (ICommand)GetValue(CommandProperty); set => SetValue(CommandProperty, value); @@ -94,7 +94,7 @@ namespace Controls /// /// Command content. /// - public object CommandContent + public object? CommandContent { get => GetValue(CommandContentProperty); set => SetValue(CommandContentProperty, value); @@ -103,7 +103,7 @@ namespace Controls /// /// Command parameter. /// - public object CommandParameter + public object? CommandParameter { get => GetValue(CommandParameterProperty); set => SetValue(CommandParameterProperty, value); @@ -130,7 +130,7 @@ namespace Controls /// /// Label. /// - public string Label + public string? Label { get => (string)GetValue(LabelProperty); set => SetValue(LabelProperty, value); @@ -148,7 +148,7 @@ namespace Controls /// /// Symbol. /// - public object Symbol + public object? Symbol { get => GetValue(SymbolProperty); set => SetValue(SymbolProperty, value); @@ -157,7 +157,7 @@ namespace Controls /// /// Value. /// - public object Value + public object? Value { get => GetValue(ValueProperty); set => SetValue(ValueProperty, value); @@ -173,6 +173,9 @@ namespace Controls } /// - public override string ToString() => Value != null ? base.ToString() + " " + Value : base.ToString(); + public override string ToString() + { + return $"{base.ToString()} {Value}"; + } } } \ No newline at end of file