miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert: "Change: Support side-by-side fallback FontCaches instead of hierarchical. (#13303)"

Browse Source 
This reverts commit 1829f7926d.
This commit is contained in:
Peter Nelson
2025-12-13 00:29:06 +00:00
committed by dP
parent 766ab3804d
commit 2c528229cb
32 changed files with 480 additions and 783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/survey.cpp
View File

@@ -303,16 +303,10 @@ void SurveyConfiguration(nlohmann::json &survey)
*/
void SurveyFont(nlohmann::json &survey)
{
for (FontSize fs = FS_BEGIN; fs < FS_END; fs++) {
const FontCacheSubSetting *setting = GetFontCacheSubSetting(fs);
auto &font = survey[std::string(FontSizeToName(fs))];
font["configured"]["font"] = setting->font;
font["configured"]["size"] = setting->size;
}
for (const auto &fc : FontCache::Get()) {
auto &font = survey[std::string(FontSizeToName(fc->GetSize()))];
font["active"].push_back(fc->GetFontName());
}
survey["small"] = FontCache::Get(FS_SMALL)->GetFontName();
survey["medium"] = FontCache::Get(FS_NORMAL)->GetFontName();
survey["large"] = FontCache::Get(FS_LARGE)->GetFontName();
survey["mono"] = FontCache::Get(FS_MONO)->GetFontName();
}
/**