0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fonts: allow loading OTF fonts and improved extension check logic

Browse source 
Huge thanks to @shadowm for remembering this is why OTF files weren't loading.
This commit is contained in:
Charles Dang 2018-02-14 14:12:00 +11:00
parent 2b49353a2e
commit 7ca648d0dd
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/font/font_config.cpp
View file

@ -81,7 +81,9 @@ bool check_font_file(std::string name) {
return true; return true;
} }
static bool add_font_to_fontlist(const config &fonts_config, namespace
{
bool add_font_to_fontlist(const config &fonts_config,
std::vector<font::subset_descriptor>& fontlist, const std::string& name) std::vector<font::subset_descriptor>& fontlist, const std::string& name)
{ {
const config &font = fonts_config.find_child("font", "name", name); const config &font = fonts_config.find_child("font", "name", name);
@ -95,12 +97,27 @@ static bool add_font_to_fontlist(const config &fonts_config,
return true; return true;
} }
bool is_valid_font_file(const std::string& file)
{
static const std::array<std::string, 3> font_exts { ".ttf", ".ttc", ".otf" };
for(const std::string& ext : font_exts) {
if(filesystem::ends_with(file, ext)) {
return true;
}
}
return false;
}
// Current font family for sanserif and monospace fonts in the game // Current font family for sanserif and monospace fonts in the game
t_string family_order_sans; t_string family_order_sans;
t_string family_order_mono; t_string family_order_mono;
t_string family_order_light; t_string family_order_light;
} // end anon namespace
/*** /***
* Public interface * Public interface
*/ */
@ -220,7 +237,7 @@ manager::manager()
filesystem::get_files_in_dir(path, &files, nullptr, filesystem::ENTIRE_FILE_PATH); filesystem::get_files_in_dir(path, &files, nullptr, filesystem::ENTIRE_FILE_PATH);
} }
for(const std::string& file : files) { for(const std::string& file : files) {
if(file.substr(file.length() - 4) == ".ttf" || file.substr(file.length() - 4) == ".ttc") if(is_valid_font_file(file))
{ {
const std::wstring wfile = unicode_cast<std::wstring>(file); const std::wstring wfile = unicode_cast<std::wstring>(file);
AddFontResourceExW(wfile.c_str(), FR_PRIVATE, nullptr); AddFontResourceExW(wfile.c_str(), FR_PRIVATE, nullptr);
@ -242,7 +259,7 @@ manager::~manager()
if(filesystem::is_directory(path)) if(filesystem::is_directory(path))
filesystem::get_files_in_dir(path, &files, nullptr, filesystem::ENTIRE_FILE_PATH); filesystem::get_files_in_dir(path, &files, nullptr, filesystem::ENTIRE_FILE_PATH);
for(const std::string& file : files) { for(const std::string& file : files) {
if(file.substr(file.length() - 4) == ".ttf" || file.substr(file.length() - 4) == ".ttc") if(is_valid_font_file(file))
{ {
const std::wstring wfile = unicode_cast<std::wstring>(file); const std::wstring wfile = unicode_cast<std::wstring>(file);
RemoveFontResourceExW(wfile.c_str(), FR_PRIVATE, nullptr); RemoveFontResourceExW(wfile.c_str(), FR_PRIVATE, nullptr);