godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #68664 from bruvzg/bmp_base_size 

[Bitmap font] Always set valid fixed size, even if it's not set in the `fnt` file.
This commit is contained in:
Rémi Verschelde 2022-11-14 23:25:28 +01:00
parent f33e482551 e77b6427cb
commit f7c487f676
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scene/resources/font.cpp
View File

@ -1396,6 +1396,9 @@ Error FontFile::load_bitmap_font(const String &p_path) {
case 1: /* info */ { case 1: /* info */ {
ERR_FAIL_COND_V_MSG(block_size < 15, ERR_CANT_CREATE, RTR("Invalid BMFont info block size.")); ERR_FAIL_COND_V_MSG(block_size < 15, ERR_CANT_CREATE, RTR("Invalid BMFont info block size."));
base_size = f->get_16(); base_size = f->get_16();
if (base_size <= 0) {
base_size = 16;
}
uint8_t flags = f->get_8(); uint8_t flags = f->get_8();
if (flags & (1 << 3)) { if (flags & (1 << 3)) {
st_flags.set_flag(TextServer::FONT_BOLD); st_flags.set_flag(TextServer::FONT_BOLD);
@ -1681,7 +1684,6 @@ Error FontFile::load_bitmap_font(const String &p_path) {
if (type == "info") { if (type == "info") {
if (keys.has("size")) { if (keys.has("size")) {
base_size = keys["size"].to_int(); base_size = keys["size"].to_int();
set_fixed_size(base_size);
} }
if (keys.has("outline")) { if (keys.has("outline")) {
outline = keys["outline"].to_int(); outline = keys["outline"].to_int();
@ -1730,6 +1732,7 @@ Error FontFile::load_bitmap_font(const String &p_path) {
encoding = 2; encoding = 2;
} }
} }
set_fixed_size(base_size);
} else if (type == "common") { } else if (type == "common") {
if (keys.has("lineHeight")) { if (keys.has("lineHeight")) {
height = keys["lineHeight"].to_int(); height = keys["lineHeight"].to_int();