ADIX7/FileTime2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Return default font

Browse Source
This commit is contained in:
Ádám Kovács
2023-06-30 19:48:19 +02:00
parent d19de82fcd
commit 34f5fc46fb
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/GuiApp/Avalonia/FileTime.GuiApp.Font/Font/Startup.cs
View File

@@ -9,7 +9,7 @@ public static class Startup
{
public static IServiceCollection ConfigureFont(this IServiceCollection services, IConfigurationRoot configurationRoot)
{
services.Configure<FontConfiguration>(configurationRoot.GetSection(FontConfiguration.SectionName));
services.AddOptions<FontConfiguration>().Bind(configurationRoot.GetSection(FontConfiguration.SectionName));
services.AddSingleton<IFontService, FontService>();
return services;
}

10
src/GuiApp/Avalonia/FileTime.GuiApp.Font/Services/FontService.cs
View File

@@ -21,14 +21,12 @@ public class FontService : IFontService
UpdateFonts(fontConfiguration.CurrentValue, null);
}
private void UpdateFonts(FontConfiguration newConfiguration, string? arg2)
{
_mainFont.OnNext(GetMainFont());
}
private void UpdateFonts(FontConfiguration newConfiguration, string? _) => _mainFont.OnNext(GetMainFont());
public string? GetMainFont()
public string GetMainFont()
{
var installedFonts = FontManager.Current.SystemFonts.Select(f => f.Name).ToList();
return _fontConfiguration.CurrentValue.Main.Find(installedFonts.Contains);
return _fontConfiguration.CurrentValue.Main.FirstOrDefault(installedFonts.Contains)
?? FontManager.Current.DefaultFontFamily.Name;
}
}