diff --git a/App.xaml b/App.xaml index 0a3a638..4836c1e 100644 --- a/App.xaml +++ b/App.xaml @@ -3,7 +3,6 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:ModernWpfPlayground" - xmlns:propertyPresenter2="clr-namespace:ModernWpfPlayground.PropertyPresenter2" xmlns:ui="http://schemas.modernwpf.com/2019" StartupUri="MainWindow.xaml"> diff --git a/PropertyPresenter2/EnumToKeyValueListConverter.cs b/PropertyPresenter2/EnumToKeyValueListConverter.cs index 27994ab..815b3c4 100644 --- a/PropertyPresenter2/EnumToKeyValueListConverter.cs +++ b/PropertyPresenter2/EnumToKeyValueListConverter.cs @@ -28,10 +28,10 @@ namespace ModernWpfPlayground.PropertyPresenter2 { if (!(value is Enum enumValue)) return string.Empty; var descriptionAttribute = enumValue.GetType() - .GetField(enumValue.ToString()).GetCustomAttributes(false) + .GetField(enumValue.ToString())?.GetCustomAttributes(false) .OfType().FirstOrDefault(); - return descriptionAttribute?.Description ?? value.ToString(); + return descriptionAttribute?.Description ?? value.ToString() ?? string.Empty; } object IValueConverter.ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) diff --git a/PropertyPresenter2/ValueConverter.cs b/PropertyPresenter2/ValueConverter.cs index 7030726..68b7bbd 100644 --- a/PropertyPresenter2/ValueConverter.cs +++ b/PropertyPresenter2/ValueConverter.cs @@ -51,7 +51,7 @@ namespace ModernWpfPlayground.PropertyPresenter2 /// geometry /// color of the icon /// - public static ImageSource GetIcon(Geometry geometry, Brush brush) + public static ImageSource GetIcon(Geometry geometry, Brush? brush) { if (brush == null) brush = Brushes.Black; @@ -77,7 +77,7 @@ namespace ModernWpfPlayground.PropertyPresenter2 FontStyles.Normal, FontWeights.Normal, FontStretches.Normal), - 64, brush); + 64, brush, 1.5); var geometry = formattedText.BuildGeometry(new Point(0, 0)); return GetIcon(geometry, null);