diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-05-10 14:04:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-10 14:04:23 +0200 |
| commit | ff071377d40cf2970cebbde8ad082da79bd28331 (patch) | |
| tree | 4fb6a3f66566620df3e6d078dcc16def9ce0ce34 /modules | |
| parent | cc66d5e173ef5e585321853178449b19be739561 (diff) | |
| parent | 68304bec47a8acd709fb56c9178d5356eb92e26f (diff) | |
Merge pull request #60919 from bruvzg/fix_os_scale
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/text_server_adv/text_server_adv.cpp | 5 | ||||
| -rw-r--r-- | modules/text_server_fb/text_server_fb.cpp | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/modules/text_server_adv/text_server_adv.cpp b/modules/text_server_adv/text_server_adv.cpp index ba249aff7a..07421b7275 100644 --- a/modules/text_server_adv/text_server_adv.cpp +++ b/modules/text_server_adv/text_server_adv.cpp @@ -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; } diff --git a/modules/text_server_fb/text_server_fb.cpp b/modules/text_server_fb/text_server_fb.cpp index 8ae56aa64d..257c569a25 100644 --- a/modules/text_server_fb/text_server_fb.cpp +++ b/modules/text_server_fb/text_server_fb.cpp @@ -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; } |