mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Use the first matched font in GDI font lister

Browse source 
Previously, when reading font data, we only set FaceName to the matched font. When we are using some font with special font weight (e.g. @Source Han Sans J Heavy), if we do not correct the font weight in the LOGFONTW struct, then subsequent call to get_font_data will fall back to default font. This causes wrongly matching Arial.ttf to any font that does not provide standard font weights.

Instead of only correcting FaceName using the matched font, we simply use the first matched font, thus the FaceName, Weight, CharSet, etc. will all be correct. This also eliminates the memcpy.
This commit is contained in:
wangqr 2020-01-05 17:12:02 -05:00
parent cb77c0b395
commit cd7ee8d505
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/font_file_lister_gdi.cpp
View file

@ -154,7 +154,7 @@ CollectionResult GdiFontFileLister::GetFontPaths(std::string const& facename, in
// Gather all of the styles for the given family name // Gather all of the styles for the given family name
std::vector<LOGFONTW> matches; std::vector<LOGFONTW> matches;
using type = decltype(matches); using type = decltype(matches);
EnumFontFamiliesEx(dc, &lf, [](const LOGFONT *lf, const TEXTMETRIC *, DWORD, LPARAM lParam) -> int { EnumFontFamiliesExW(dc, &lf, [](const LOGFONTW *lf, const TEXTMETRICW *, DWORD, LPARAM lParam) -> int {
reinterpret_cast<type*>(lParam)->push_back(*lf); reinterpret_cast<type*>(lParam)->push_back(*lf);
return 1; return 1;
}, (LPARAM)&matches, 0); }, (LPARAM)&matches, 0);
@ -187,11 +187,8 @@ CollectionResult GdiFontFileLister::GetFontPaths(std::string const& facename, in
ret.fake_bold = (italic && has_italic ? !has_bold_italic : !has_bold); ret.fake_bold = (italic && has_italic ? !has_bold_italic : !has_bold);
} }
// Use the family name supplied by EnumFontFamiliesEx as it may be a localized version
memcpy(lf.lfFaceName, matches[0].lfFaceName, LF_FACESIZE);
// Open the font and get the data for it to look up in the index // Open the font and get the data for it to look up in the index
auto hfont = CreateFontIndirectW(&lf); auto hfont = CreateFontIndirectW(&matches[0]);
SelectObject(dc, hfont); SelectObject(dc, hfont);
BOOST_SCOPE_EXIT_ALL(=) { BOOST_SCOPE_EXIT_ALL(=) {
SelectObject(dc, nullptr); SelectObject(dc, nullptr);