Skip to content

The font loading logic can be changed to execute asynchronously #5087

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.

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

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
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
34 changes: 31 additions & 3 deletions v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public OptionSettingWindow()

this.Owner = Application.Current.MainWindow;
_config = LazyConfig.Instance.GetConfig();
var lstFonts = GetFonts(Utils.GetFontsPath());


ViewModel = new OptionSettingViewModel(this);

Expand Down Expand Up @@ -90,8 +90,7 @@ public OptionSettingWindow()
cmbSubConvertUrl.Items.Add(it);
});

lstFonts.ForEach(it => { cmbcurrentFontFamily.Items.Add(it); });
cmbcurrentFontFamily.Items.Add(string.Empty);
LoadFontsAsync(); //If there are many font files, opening the OptionSettingWindow will noticeably lag. The font loading logic can be changed to execute asynchronously.

this.WhenActivated(disposables =>
{
Expand Down Expand Up @@ -213,5 +212,34 @@ private List<string> GetFonts(string path)
}
return lstFonts;
}

private async void LoadFontsAsync()
{
try
{
await Task.Run(() => {
return GetFonts(Utils.GetFontsPath());
}).ContinueWith(t => {
if (t.Exception == null)
{
Dispatcher.Invoke(() => {
foreach (var font in t.Result)
{
cmbcurrentFontFamily.Items.Add(font);
}
});
}
else
{
// 处理异常
Logging.SaveLog("fill fonts error", t.Exception);
}
});
}
catch (Exception ex)
{
Logging.SaveLog("Async font loading error", ex);
}
}
}
}