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

Fix Font NullReferenceException

Browse Source
This commit is contained in:
Ádám Kovács
2023-02-22 17:47:12 +01:00
parent 3db5945cfd
commit 28bc479ee4
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,6 @@ public class FontService : IFontService
public string? GetMainFont()
{
var installedFonts = FontManager.Current.GetInstalledFontFamilyNames().ToList();
return _fontConfiguration.CurrentValue.Main.FirstOrDefault(f => installedFonts.Contains(f));
return _fontConfiguration.CurrentValue.Main.Find(installedFonts.Contains);
}
}

10
src/GuiApp/Avalonia/FileTime.GuiApp/ViewModels/MainWindowViewModel.cs
View File

@@ -1,16 +1,12 @@
using System.Reflection;
using System.Reactive.Linq;
using System.Reflection;
using Avalonia.Input;
using FileTime.App.Core.Services;
using FileTime.App.Core.UserCommand;
using FileTime.App.Core.ViewModels;
using FileTime.Core.Models;
using FileTime.Core.Services;
using FileTime.Core.Timeline;
using FileTime.GuiApp.Services;
using FileTime.Providers.Local;
using InitableService;
using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using MvvmGen;
@@ -31,7 +27,7 @@ namespace FileTime.GuiApp.ViewModels;
public partial class MainWindowViewModel : IMainWindowViewModelBase
{
public bool Loading => false;
public IObservable<string?> MainFont => _fontService.MainFont;
public IObservable<string?> MainFont => _fontService.MainFont.Select(x => x ?? "");
public IGuiAppState AppState => _appState;
public string Title { get; private set; }