diff --git a/src/Snap.Hutao/Snap.Hutao/Extension/EnumExtension.cs b/src/Snap.Hutao/Snap.Hutao/Extension/EnumExtension.cs index 4820856a..ec333e32 100644 --- a/src/Snap.Hutao/Snap.Hutao/Extension/EnumExtension.cs +++ b/src/Snap.Hutao/Snap.Hutao/Extension/EnumExtension.cs @@ -19,9 +19,24 @@ public static class EnumExtension public static string GetDescription(this TEnum @enum) where TEnum : struct, Enum { - string enumName = Must.NotNull(Enum.GetName(@enum)!); + string enumName = Enum.GetName(@enum)!; FieldInfo? field = @enum.GetType().GetField(enumName); DescriptionAttribute? attr = field?.GetCustomAttribute(); return attr?.Description ?? enumName; } + + /// + /// 获取枚举的描述 + /// + /// 枚举的类型 + /// 枚举值 + /// 描述 + public static string? GetDescriptionOrNull(this TEnum @enum) + where TEnum : struct, Enum + { + string enumName = Enum.GetName(@enum)!; + FieldInfo? field = @enum.GetType().GetField(enumName); + DescriptionAttribute? attr = field?.GetCustomAttribute(); + return attr?.Description; + } } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/LaunchGameWindow.xaml b/src/Snap.Hutao/Snap.Hutao/LaunchGameWindow.xaml index 8d607b0e..941e594d 100644 --- a/src/Snap.Hutao/Snap.Hutao/LaunchGameWindow.xaml +++ b/src/Snap.Hutao/Snap.Hutao/LaunchGameWindow.xaml @@ -1,18 +1,16 @@  - - + + @@ -27,17 +25,17 @@ Grid.Row="0" Height="32"> + Margin="12,0,0,0" + VerticalAlignment="Center" + Style="{StaticResource CaptionTextBlockStyle}" + Text="选择账号并启动" + TextWrapping="NoWrap"/> - + + SelectedItem="{Binding SelectedGameAccount, Mode=TwoWay}"> @@ -46,7 +44,7 @@ + Text="{Binding AttachUid, TargetNullValue=该账号尚未绑定 UID}"/> @@ -54,10 +52,10 @@