Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #51866 from requizm/fix/49455

Browse source 
Fix `line_separation` working incorrectly in `RichTextLabel`
This commit is contained in:
Hugo Locurcio 2021-08-20 23:24:42 +02:00 • committed by GitHub
commit 2daef0400a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/classes/RichTextLabel.xml
View file

@ -555,7 +555,7 @@
<theme_item name="italics_font_size" data_type="font_size" type="int"> <theme_item name="italics_font_size" data_type="font_size" type="int">
The font size used for italics text. The font size used for italics text.
</theme_item> </theme_item>
<theme_item name="line_separation" data_type="constant" type="int" default="1"> <theme_item name="line_separation" data_type="constant" type="int" default="0">
The vertical space between lines. The vertical space between lines.
</theme_item> </theme_item>
<theme_item name="mono_font" data_type="font" type="Font"> <theme_item name="mono_font" data_type="font" type="Font">

2
scene/gui/rich_text_label.cpp
View file

@ -1435,7 +1435,7 @@ void RichTextLabel::_notification(int p_what) {
while (ofs.y < size.height && from_line < main->lines.size()) { while (ofs.y < size.height && from_line < main->lines.size()) {
visible_paragraph_count++; visible_paragraph_count++;
visible_line_count += _draw_line(main, from_line, ofs, text_rect.size.x, base_color, outline_size, outline_color, font_shadow_color, use_outline, shadow_ofs); visible_line_count += _draw_line(main, from_line, ofs, text_rect.size.x, base_color, outline_size, outline_color, font_shadow_color, use_outline, shadow_ofs);
ofs.y += main->lines[from_line].text_buf->get_size().y; ofs.y += main->lines[from_line].text_buf->get_size().y + get_theme_constant(SNAME("line_separation"));
from_line++; from_line++;
} }
} break; } break;

2
scene/resources/default_theme/default_theme.cpp
View file

@ -917,7 +917,7 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
theme->set_constant("shadow_offset_y", "RichTextLabel", 1 * scale); theme->set_constant("shadow_offset_y", "RichTextLabel", 1 * scale);
theme->set_constant("shadow_as_outline", "RichTextLabel", 0 * scale); theme->set_constant("shadow_as_outline", "RichTextLabel", 0 * scale);
theme->set_constant("line_separation", "RichTextLabel", 1 * scale); theme->set_constant("line_separation", "RichTextLabel", 0 * scale);
theme->set_constant("table_hseparation", "RichTextLabel", 3 * scale); theme->set_constant("table_hseparation", "RichTextLabel", 3 * scale);
theme->set_constant("table_vseparation", "RichTextLabel", 3 * scale); theme->set_constant("table_vseparation", "RichTextLabel", 3 * scale);