Merge pull request #56685 from timothyqiu/rtl-su

Fix BBCode underline prevents strikethrough from rendering
This commit is contained in:
Rémi Verschelde 2022-01-11 08:51:04 +01:00 committed by GitHub
commit 822728220b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1005,7 +1005,8 @@ int RichTextLabel::_draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_o
float y_off = TS->shaped_text_get_underline_position(rid);
float underline_width = TS->shaped_text_get_underline_thickness(rid) * get_theme_default_base_scale();
draw_line(p_ofs + Vector2(off.x, off.y + y_off), p_ofs + Vector2(off.x + glyphs[i].advance * glyphs[i].repeat, off.y + y_off), uc, underline_width);
} else if (_find_strikethrough(it)) {
}
if (_find_strikethrough(it)) {
Color uc = font_color;
uc.a *= 0.5;
float y_off = -TS->shaped_text_get_ascent(rid) + TS->shaped_text_get_size(rid).y / 2;