Skip to content

fix: improve font string processing in SetFonts method #1092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 13, 2025
Merged

fix: improve font string processing in SetFonts method #1092

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions src/App.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,9 @@ public static void SetFonts(string defaultFont, string monospaceFont, bool onlyU
app._fontsOverrides = null;
}

defaultFont = ProcessFontString(defaultFont);
monospaceFont = ProcessFontString(monospaceFont);

var resDic = new ResourceDictionary();
if (!string.IsNullOrEmpty(defaultFont))
resDic.Add("Fonts.Default", new FontFamily(defaultFont));
Expand Down Expand Up @@ -437,6 +440,28 @@ private static bool TryLaunchAsRebaseMessageEditor(string[] args, out int exitCo
return true;
}

private static string ProcessFontString(string input)
{
if (string.IsNullOrEmpty(input)) return string.Empty;

var parts = input.Split(',');
var result = new StringBuilder();
var isFirst = true;

foreach (var part in parts)
{
var trimmed = part.Trim();
if (!string.IsNullOrEmpty(trimmed))
{
if (!isFirst) result.Append(',');
result.Append(trimmed);
isFirst = false;
}
}

return result.ToString();
}

private bool TryLaunchAsCoreEditor(IClassicDesktopStyleApplicationLifetime desktop)
{
var args = desktop.Args;
Expand Down