mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2025-12-10 15:02:06 +01:00
Code Issues Releases Wiki Activity

Change: Prefer normal/medium weight font in FontConfig fallback detection. (#14672)

Browse Source 
This way it behaves similar to Windows.
This commit is contained in:
Peter Nelson
2025-09-28 00:30:47 +01:00
committed by GitHub
parent e58fdb8840
commit 380f9e8b48
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/os/unix/font_unix.cpp
View File

@@ -123,6 +123,22 @@ FT_Error GetFontByFaceName(std::string_view font_name, FT_Face *face)
return err; return err;
} }
/**
* Get distance between font weight and preferred font weights.
* @param weight Font weight from FontConfig.
* @return Distance from preferred weight, where lower values are preferred.
*/
static int GetPreferredWeightDistance(int weight)
{
/* Prefer a font between normal and medium weight. */
static constexpr int PREFERRED_WEIGHT_MIN = FC_WEIGHT_NORMAL;
static constexpr int PREFERRED_WEIGHT_MAX = FC_WEIGHT_MEDIUM;
if (weight < PREFERRED_WEIGHT_MIN) return std::abs(weight - PREFERRED_WEIGHT_MIN);
if (weight > PREFERRED_WEIGHT_MAX) return weight - PREFERRED_WEIGHT_MAX;
return 0;
}
bool FontConfigFindFallbackFont(FontCacheSettings *settings, const std::string &language_isocode, MissingGlyphSearcher *callback) bool FontConfigFindFallbackFont(FontCacheSettings *settings, const std::string &language_isocode, MissingGlyphSearcher *callback)
{ {
bool ret = false; bool ret = false;
@@ -164,9 +180,10 @@ bool FontConfigFindFallbackFont(FontCacheSettings *settings, const std::string &
FcPatternGetInteger(font, FC_SLANT, 0, &value); FcPatternGetInteger(font, FC_SLANT, 0, &value);
if (value != 0) continue; if (value != 0) continue;
/* We want the fatter font as they look better at small sizes. */ /* We want a font near to medium weight. */
FcPatternGetInteger(font, FC_WEIGHT, 0, &value); FcPatternGetInteger(font, FC_WEIGHT, 0, &value);
if (value <= best_weight) continue; int weight = GetPreferredWeightDistance(value);
if (best_weight != -1 && weight > best_weight) continue;
/* Possible match based on attributes, get index. */ /* Possible match based on attributes, get index. */
int32_t index; int32_t index;
@@ -179,7 +196,7 @@ bool FontConfigFindFallbackFont(FontCacheSettings *settings, const std::string &
Debug(fontcache, 1, "Font \"{}\" misses{} glyphs", FromFcString(file), missing ? "" : " no"); Debug(fontcache, 1, "Font \"{}\" misses{} glyphs", FromFcString(file), missing ? "" : " no");
if (!missing) { if (!missing) {
best_weight = value; best_weight = weight;
best_font = FromFcString(file); best_font = FromFcString(file);
best_index = index; best_index = index;
} }