asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #59190 from timothyqiu/rtl-visible-lines

Browse source
This commit is contained in:
Rémi Verschelde 2022-03-16 11:21:57 +01:00 committed by GitHub
commit add9049ee1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
scene/gui/rich_text_label.cpp
View file

@ -415,7 +415,7 @@ int RichTextLabel::_process_line(ItemFrame *p_frame, const Vector2 &p_ofs, int &
cw = tab_size * font->get_char_size(' ').width;
}
if (end > 0 && fw + cw + begin > p_width) {
if (end > 0 && w + cw + begin > p_width) {
break; //don't allow lines longer than assigned width
}
@ -438,12 +438,13 @@ int RichTextLabel::_process_line(ItemFrame *p_frame, const Vector2 &p_ofs, int &
was_separatable = separatable;
just_breaked_in_middle = false;
w += cw;
fw += cw;
end++;
}
CHECK_HEIGHT(fh);
ENSURE_WIDTH(fw);
ENSURE_WIDTH(w);
line_ascent = MAX(line_ascent, ascent);
line_descent = MAX(line_descent, descent);
@ -467,6 +468,7 @@ int RichTextLabel::_process_line(ItemFrame *p_frame, const Vector2 &p_ofs, int &
}
{
float line_length = 0.0f;
float ofs = 0.0f - backtrack;
for (int i = 0; i < end; i++) {
@ -579,18 +581,19 @@ int RichTextLabel::_process_line(ItemFrame *p_frame, const Vector2 &p_ofs, int &
if (visible) {
line_is_blank = false;
w += font->get_char_size(c[i], c[i + 1]).x;
}
if (c[i] == '\t') {
visible = false;
}
const float current_char_width = font->get_char_size(fx_char, c[i + 1]).x;
if (visible) {
if (selected) {
cw = font->get_char_size(fx_char, c[i + 1]).x;
cw = current_char_width;
draw_rect(Rect2(p_ofs.x + pofs, p_ofs.y + y, cw, lh), selection_bg);
}
line_length += current_char_width;
const Color char_color = selected && override_selected_font_color ? selection_fg : fx_color;
const Color shadow_color = p_font_color_shadow * Color(1, 1, 1, char_color.a);
@ -612,7 +615,7 @@ int RichTextLabel::_process_line(ItemFrame *p_frame, const Vector2 &p_ofs, int &
cw = drawer.draw_char(ci, p_ofs + Point2(align_ofs + pofs, y + lh - line_descent) + fx_offset, fx_char, c[i + 1], char_color);
}
} else if (previously_visible && c[i] != '\t') {
backtrack += font->get_char_size(fx_char, c[i + 1]).x;
backtrack += current_char_width;
}
p_char_count++;
@ -636,7 +639,7 @@ int RichTextLabel::_process_line(ItemFrame *p_frame, const Vector2 &p_ofs, int &
const int line_y = y + lh - (line_descent - 2);
const Point2 from = p_ofs + Point2(align_ofs + wofs, line_y);
const Point2 to = from + Point2(w + (is_at_line_wrap ? 0 : align_spacing), 0);
const Point2 to = from + Point2(line_length + (is_at_line_wrap ? 0 : align_spacing), 0);
VS::get_singleton()->canvas_item_add_line(ci, from, to, uc, line_width);
}
if (strikethrough) {
@ -645,7 +648,7 @@ int RichTextLabel::_process_line(ItemFrame *p_frame, const Vector2 &p_ofs, int &
const int line_y = y + lh - (line_ascent + line_descent) / 2;
const Point2 from = p_ofs + Point2(align_ofs + wofs, line_y);
const Point2 to = from + Point2(w + (is_at_line_wrap ? 0 : align_spacing), 0);
const Point2 to = from + Point2(line_length + (is_at_line_wrap ? 0 : align_spacing), 0);
VS::get_singleton()->canvas_item_add_line(ci, from, to, uc, line_width);
}
}