mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-23 04:04:09 +01:00
Code Issues Releases Wiki Activity

Fix #12735: Default fonts should use default font size as-is. (#12814)

Browse Source 
Minimum readable font size should only apply to fallback and configured fonts.
This commit is contained in:
Peter Nelson
2024-06-26 12:45:39 +01:00
committed by GitHub
parent 88e53dbdc8
commit 209b0320d5
5 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/fontcache.cpp
View File

@@ -145,6 +145,26 @@ extern void LoadWin32Font(FontSize fs);
extern void LoadCoreTextFont(FontSize fs);
#endif
/**
* Test if a font setting uses the default font.
* @return true iff the font is not configured and no fallback font data is present.
*/
static bool IsDefaultFont(const FontCacheSubSetting &setting)
{
return setting.font.empty() && setting.os_handle == nullptr;
}
/**
* Get the scalable font size to use for a FontSize.
* @param fs FontSize to get the scalable font size for.
* @return Scalable font size to use.
*/
uint GetFontCacheFontSize(FontSize fs)
{
const FontCacheSubSetting &setting = *GetFontCacheSubSetting(fs);
return IsDefaultFont(setting) ? FontCache::GetDefaultFontHeight(fs) : setting.size;
}
#if defined(WITH_FREETYPE) || defined(_WIN32) || defined(WITH_COCOA)
/**
* Get name of default font file for a given font size.