From f5c9df88761317ca9e0158b13d08f6b3468157d5 Mon Sep 17 00:00:00 2001 From: Leonard Hecker Date: Thu, 14 Apr 2022 02:40:23 +0200 Subject: [PATCH] Another attempt at fixing nearby font loading --- src/renderer/base/FontCache.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/renderer/base/FontCache.h b/src/renderer/base/FontCache.h index e7a5c4134ca..163da0239d5 100644 --- a/src/renderer/base/FontCache.h +++ b/src/renderer/base/FontCache.h @@ -62,13 +62,16 @@ namespace Microsoft::Console::Render::FontCache wil::com_ptr fontSetBuilder; THROW_IF_FAILED(factory5->CreateFontSetBuilder(fontSetBuilder.addressof())); - THROW_IF_FAILED(fontSetBuilder->AddFontSet(systemFontSet.get())); for (const auto& file : nearbyFontFiles) { LOG_IF_FAILED(fontSetBuilder->AddFontFile(file.get())); } + // IDWriteFontSetBuilder ignores any families that have already been added. + // By adding the system font collection last, we ensure our nearby fonts take precedence. + THROW_IF_FAILED(fontSetBuilder->AddFontSet(systemFontSet.get())); + wil::com_ptr fontSet; THROW_IF_FAILED(fontSetBuilder->CreateFontSet(fontSet.addressof()));