Merge b54e44aa58 into 1f21e8ce0b

Bloxstrap/Paths.cs

@@ -26,9 +26,8 @@
 
         public static string Application { get; private set; } = "";
 
-        public static string Fonts => Path.Combine(Modifications, "content\\fonts");
+        public static string Fonts => Path.Combine("content\\fonts");
         public static string CustomFont => Path.Combine(Fonts, "CustomFont.ttf");
-        
 
         public static bool Initialized => !String.IsNullOrEmpty(Base);
 

Bloxstrap/UI/Elements/Settings/Pages/ModsPage.xaml

@@ -99,7 +99,7 @@
             Description="{x:Static resources:Strings.Menu_Mods_Misc_CustomFont_Description}">
             <StackPanel>
                 <ui:Button Icon="DocumentAdd16" Content="{x:Static resources:Strings.Menu_Mods_Misc_CustomFont_Choose}" Command="{Binding ManageCustomFontCommand}" Visibility="{Binding ChooseCustomFontVisibility, Mode=OneWay}" />
-                <ui:Button Icon="Delete16" FontFamily="{Binding CustomFontFont}" Content="{Binding CustomFontName}" Appearance="Danger" Command="{Binding ManageCustomFontCommand}" Visibility="{Binding DeleteCustomFontVisibility, Mode=OneWay}" />
+                <ui:Button Icon="Delete16" FontFamily="{Binding DeleteCustomFontFontFamily}" Content="{x:Static resources:Strings.Menu_Mods_Misc_CustomFont_Remove}" Appearance="Danger" Command="{Binding ManageCustomFontCommand}" Visibility="{Binding DeleteCustomFontVisibility, Mode=OneWay}" />
             </StackPanel>
         </controls:OptionControl>
     </StackPanel>

Bloxstrap/UI/ViewModels/Settings/ModsViewModel.cs

@@ -9,10 +9,10 @@ using Windows.Win32.Foundation;
 
 using CommunityToolkit.Mvvm.Input;
 
-using Bloxstrap.Models.SettingTasks;
 using Bloxstrap.AppData;
-using System.Windows.Media;
 using System.Drawing.Text;
+using Wpf.Ui.Controls;
+using System.Windows.Media;
 
 namespace Bloxstrap.UI.ViewModels.Settings
 {
@@ -54,11 +54,12 @@ namespace Bloxstrap.UI.ViewModels.Settings
 
                 TextFontTask.NewState = dialog.FileName;
             }
+            
 
             OnPropertyChanged(nameof(ChooseCustomFontVisibility));
             OnPropertyChanged(nameof(DeleteCustomFontVisibility));
-            OnPropertyChanged(nameof(CustomFontFont));
             OnPropertyChanged(nameof(CustomFontName));
+            OnPropertyChanged(nameof(DeleteCustomFontFontFamily));
         }
 
         public ICommand OpenModsFolderCommand => new RelayCommand(OpenModsFolder);
@@ -67,38 +68,15 @@ 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 => new System.Windows.Media.FontFamily($"{TextFontTask.NewState}#{CustomFontName}");
-        {
-            get
-            {
-                using (PrivateFontCollection collection = new PrivateFontCollection())
-                {
-                    Uri uri;
-                    if (TextFontTask.NewState == String.Empty)
-                    {
-                        uri = new Uri("pack://application:,,,/Resources/Fonts/Rubik-VariableFont_wght.ttf");
-                    } else
-                    {
-                        uri = new Uri(TextFontTask.NewState, UriKind.Absolute);
-                    }
-                    
-                    var fontFamilies = Fonts.GetFontFamilies(uri);
-                    return fontFamilies.First();
-                }
-            }
-        }
 
         public string CustomFontName
         {
             get
             {
-                if (TextFontTask.NewState == String.Empty)
+                var families = Fonts.GetFontFamilies(TextFontTask.NewState);
-                {
+                var first = families.ElementAt(0);
-                    return String.Empty;
+                return first.ToString().Split("#").ElementAt(first.ToString().Split("#").Count() - 1);
-                }
-
-                var fontFamily = CustomFontFont;
-                return fontFamily.FamilyNames.Values.First();
             }
         }