dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-06-04 18:44:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

enhance: use custom JsonConverter instead of converting string to FontFamily in each control

Browse source
This commit is contained in:
leo 2024-03-21 23:19:09 +08:00
parent 0fadab2ca2
commit 56f5f3b4a7
10 changed files with 49 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/SourceGit/Views/Preference.axaml.cs
View file

@ -69,17 +69,19 @@ namespace SourceGit.Views
var pref = ViewModels.Preference.Instance;
DataContext = pref;
var builtInMono = new FontFamily("fonts:SourceGit#JetBrains Mono");
InstalledFonts = new AvaloniaList<FontFamily>();
InstalledFonts.Add(new FontFamily("fonts:SourceGit#JetBrains Mono"));
InstalledFonts.Add(builtInMono);
InstalledFonts.AddRange(FontManager.Current.SystemFonts);
InstalledMonospaceFonts = new AvaloniaList<FontFamily>();
InstalledMonospaceFonts.Add(new FontFamily("fonts:SourceGit#JetBrains Mono"));
InstalledMonospaceFonts.Add(builtInMono);
var curMonoFont = pref.MonospaceFont;
if (!string.IsNullOrEmpty(curMonoFont) && curMonoFont != "fonts:SourceGit#JetBrains Mono")
if (curMonoFont != builtInMono)
{
InstalledMonospaceFonts.Add(new FontFamily(curMonoFont));
InstalledMonospaceFonts.Add(curMonoFont);
}
Task.Run(() =>
@ -87,7 +89,7 @@ namespace SourceGit.Views
var sysMonoFonts = new List<FontFamily>();
foreach (var font in FontManager.Current.SystemFonts)
{
if (font.ToString() == curMonoFont) continue;
if (font == curMonoFont) continue;
var typeface = new Typeface(font);
var testI = new FormattedText(