Use nearby fonts for font fallback #11764
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,6 +32,7 @@ hyperlink | |
| hyperlinking | ||
| hyperlinks | ||
| img | ||
| inlined | ||
| It'd | ||
| kje | ||
| liga | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -96,6 +96,11 @@ bool DxFontInfo::GetFallback() const noexcept | |
| return _didFallback; | ||
| } | ||
|
|
||
| IDWriteFontCollection* DxFontInfo::GetNearbyCollection() const noexcept | ||
| { | ||
| return _nearbyCollection.Get(); | ||
| } | ||
|
|
||
| void DxFontInfo::SetFromEngine(const std::wstring_view familyName, | ||
| const DWRITE_FONT_WEIGHT weight, | ||
| const DWRITE_FONT_STYLE style, | ||
|
|
@@ -223,13 +228,11 @@ void DxFontInfo::SetFromEngine(const std::wstring_view familyName, | |
| // If the system collection missed, try the files sitting next to our binary. | ||
| if (withNearbyLookup && !familyExists) | ||
| { | ||
| // May be null on OS below Windows 10. If null, just skip the attempt. | ||
| if (const auto nearbyCollection = _NearbyCollection(dwriteFactory)) | ||
| { | ||
| THROW_IF_FAILED(nearbyCollection->FindFamilyName(_familyName.data(), &familyIndex, &familyExists)); | ||
| fontCollection = nearbyCollection; | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -332,42 +335,48 @@ void DxFontInfo::SetFromEngine(const std::wstring_view familyName, | |
| // - dwriteFactory - The DWrite factory to use | ||
| // Return Value: | ||
| // - DirectWrite font collection. May be null if one cannot be created. | ||
| [[nodiscard]] IDWriteFontCollection* DxFontInfo::_NearbyCollection(gsl::not_null<IDWriteFactory1*> dwriteFactory) | ||
| { | ||
| if (_nearbyCollection) | ||
| { | ||
| return _nearbyCollection.Get(); | ||
| } | ||
|
|
||
| // The convenience interfaces for loading fonts from files | ||
| // are only available on Windows 10+. | ||
|
There was a problem hiding this comment. What happened to this check? Are these available on Win7 now? (If so, we should get rid of the comment, or update to say that it doesn't matter) There was a problem hiding this comment. If I had to guess, it's because we switched to using There was a problem hiding this comment. It is always better to do live detection of features (think backports!) instead of version number checks. There was a problem hiding this comment. Yeah, version checks (including the entirety of This is especially so since the current code has a bug. Can you spot it? 😄 // Builder2 has a convenience to just feed in paths to font files.
::Microsoft::WRL::ComPtr<IDWriteFontSetBuilder2> fontSetBuilder2;
THROW_IF_FAILED(fontSetBuilder.As(&fontSetBuilder2));This will throw if you don't have Windows 10 Build 20348 or newer installed, which lead to #10211 and got solved somewhat "by accident" in a way, since the problem wasn't just corrupted fonts per se. There was a problem hiding this comment. Oh btw: Let's not store results from |
||
| ::Microsoft::WRL::ComPtr<IDWriteFactory6> factory6; | ||
| if (FAILED(dwriteFactory->QueryInterface<IDWriteFactory6>(&factory6))) | ||
| { | ||
| return nullptr; | ||
| } | ||
|
|
||
| ::Microsoft::WRL::ComPtr<IDWriteFontCollection1> systemFontCollection; | ||
| THROW_IF_FAILED(factory6->GetSystemFontCollection(false, &systemFontCollection, 0)); | ||
|
|
||
| ::Microsoft::WRL::ComPtr<IDWriteFontSet> systemFontSet; | ||
| THROW_IF_FAILED(systemFontCollection->GetFontSet(&systemFontSet)); | ||
|
|
||
| ::Microsoft::WRL::ComPtr<IDWriteFontSetBuilder2> fontSetBuilder2; | ||
| THROW_IF_FAILED(factory6->CreateFontSetBuilder(&fontSetBuilder2)); | ||
|
|
||
| THROW_IF_FAILED(fontSetBuilder2->AddFontSet(systemFontSet.Get())); | ||
|
|
||
| // Magic static so we only attempt to grovel the hard disk once no matter how many instances | ||
| // of the font collection itself we require. | ||
| static const auto knownPaths = s_GetNearbyFonts(); | ||
| for (auto& p : knownPaths) | ||
| { | ||
| fontSetBuilder2->AddFontFile(p.c_str()); | ||
| } | ||
|
|
||
| ::Microsoft::WRL::ComPtr<IDWriteFontSet> fontSet; | ||
| THROW_IF_FAILED(fontSetBuilder2->CreateFontSet(&fontSet)); | ||
|
|
||
| ::Microsoft::WRL::ComPtr<IDWriteFontCollection1> fontCollection; | ||
| THROW_IF_FAILED(factory6->CreateFontCollectionFromFontSet(fontSet.Get(), &fontCollection)); | ||
|
|
||
| _nearbyCollection = fontCollection; | ||
| return _nearbyCollection.Get(); | ||
| } | ||
|
|
||
| // Routine Description: | ||
|
|
@@ -386,18 +395,11 @@ void DxFontInfo::SetFromEngine(const std::wstring_view familyName, | |
| const std::filesystem::path module{ wil::GetModuleFileNameW<std::wstring>(nullptr) }; | ||
| const auto folder{ module.parent_path() }; | ||
|
|
||
| for (const auto& p : std::filesystem::directory_iterator(folder)) | ||
| { | ||
| if (til::ends_with(p.path().native(), L".ttf")) | ||
| { | ||
| paths.push_back(p.path()); | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah this is just me following the most common C++ style guide for imports... It breaks them up into the following order:
(Google has a good explanation here.)
This ordering helps with clarity as you know immediately where some file resides at.
This is especially helpful with MSVC, which for whatever reason has decided to not actually implement C++ and treats¹ You'll find that most projects follow this style and in fact even in this project most code follows this style already.#include "foo"and#include <foo>synonymous. With the above order such imports cannot be confused anymore under msvc, which is nice.But in short: Considering that our project already does this for most files, I feel like it's alright to modify files that don't do this yet.
¹ Turns out every compiler does that. The only thing msvc does differently is that it searches in the parent directories of all previously included files in a unit as well.``