noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #60919 from bruvzg/fix_os_scale

Browse Source
This commit is contained in:
Rémi Verschelde
2022-05-10 14:04:23 +02:00
committed by GitHub
parent cc66d5e173 68304bec47
commit ff071377d4
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/text_server_adv/text_server_adv.cpp
View File

@@ -2172,6 +2172,11 @@ void TextServerAdvanced::font_set_scale(const RID &p_font_rid, int64_t p_size, d
Vector2i size = _get_size(fd, p_size);
ERR_FAIL_COND(!_ensure_cache_for_size(fd, size));
#ifdef MODULE_FREETYPE_ENABLED
if (fd->cache[size]->face) {
return; // Do not override scale for dynamic fonts, it's calculated automatically.
}
#endif
fd->cache[size]->scale = p_scale;
}

5
modules/text_server_fb/text_server_fb.cpp
View File

@@ -1334,6 +1334,11 @@ void TextServerFallback::font_set_scale(const RID &p_font_rid, int64_t p_size, d
Vector2i size = _get_size(fd, p_size);
ERR_FAIL_COND(!_ensure_cache_for_size(fd, size));
#ifdef MODULE_FREETYPE_ENABLED
if (fd->cache[size]->face) {
return; // Do not override scale for dynamic fonts, it's calculated automatically.
}
#endif
fd->cache[size]->scale = p_scale;
}