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

Merge pull request #70407 from Koyper/rich_text_bold_italics 

[RTL] Fix push bold or italics not using bold_italics_font when required
This commit is contained in:
Yuri Sizov 2022-12-23 00:10:53 +03:00 committed by GitHub
parent c547c4ef59 81343ae210
commit ecc5c275f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scene/gui/rich_text_label.cpp
View File

@ -3182,7 +3182,8 @@ void RichTextLabel::push_normal() {
void RichTextLabel::push_bold() {
ERR_FAIL_COND(theme_cache.bold_font.is_null());
_push_def_font(BOLD_FONT);
ItemFont *item_font = _find_font(current);
_push_def_font((item_font && item_font->def_font == ITALICS_FONT) ? BOLD_ITALICS_FONT : BOLD_FONT);
}
void RichTextLabel::push_bold_italics() {
@ -3194,7 +3195,8 @@ void RichTextLabel::push_bold_italics() {
void RichTextLabel::push_italics() {
ERR_FAIL_COND(theme_cache.italics_font.is_null());
_push_def_font(ITALICS_FONT);
ItemFont *item_font = _find_font(current);
_push_def_font((item_font && item_font->def_font == BOLD_FONT) ? BOLD_ITALICS_FONT : ITALICS_FONT);
}
void RichTextLabel::push_mono() {