From 9fee1d1d5ada0c632e81495b601c0041dd329a58 Mon Sep 17 00:00:00 2001 From: intervinn Date: Thu, 19 Jun 2025 18:31:55 +0300 Subject: [PATCH] more clear namings --- Bloxstrap/UI/Elements/Settings/Pages/ModsPage.xaml | 2 +- Bloxstrap/UI/ViewModels/Settings/ModsViewModel.cs | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Bloxstrap/UI/Elements/Settings/Pages/ModsPage.xaml b/Bloxstrap/UI/Elements/Settings/Pages/ModsPage.xaml index 310af7e..d050d09 100644 --- a/Bloxstrap/UI/Elements/Settings/Pages/ModsPage.xaml +++ b/Bloxstrap/UI/Elements/Settings/Pages/ModsPage.xaml @@ -99,7 +99,7 @@ Description="{x:Static resources:Strings.Menu_Mods_Misc_CustomFont_Description}"> - + diff --git a/Bloxstrap/UI/ViewModels/Settings/ModsViewModel.cs b/Bloxstrap/UI/ViewModels/Settings/ModsViewModel.cs index 42e7ba7..fcb07fb 100644 --- a/Bloxstrap/UI/ViewModels/Settings/ModsViewModel.cs +++ b/Bloxstrap/UI/ViewModels/Settings/ModsViewModel.cs @@ -57,8 +57,8 @@ namespace Bloxstrap.UI.ViewModels.Settings OnPropertyChanged(nameof(ChooseCustomFontVisibility)); OnPropertyChanged(nameof(DeleteCustomFontVisibility)); - OnPropertyChanged(nameof(CustomFontFont)); - OnPropertyChanged(nameof(CustomFontName)); + OnPropertyChanged(nameof(DeleteCustomFontFontFamily)); + OnPropertyChanged(nameof(DeleteCustomFontFontName)); } public ICommand OpenModsFolderCommand => new RelayCommand(OpenModsFolder); @@ -67,7 +67,7 @@ namespace Bloxstrap.UI.ViewModels.Settings public Visibility DeleteCustomFontVisibility => !String.IsNullOrEmpty(TextFontTask.NewState) ? Visibility.Visible : Visibility.Collapsed; - public System.Windows.Media.FontFamily CustomFontFont + public System.Windows.Media.FontFamily DeleteCustomFontFontFamily { get { @@ -88,7 +88,7 @@ namespace Bloxstrap.UI.ViewModels.Settings } } - public string CustomFontName + public string DeleteCustomFontFontName { get { @@ -97,8 +97,8 @@ namespace Bloxstrap.UI.ViewModels.Settings return String.Empty; } - var fontFamily = CustomFontFont; - return fontFamily.FamilyNames.Values.First(); + var fontFamily = DeleteCustomFontFontFamily; + return String.Join(" ", fontFamily.FamilyNames.Values); } }