godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #101481 from bruvzg/rtl_fade 

[RTL] Fix "fade" effect char index calculations.
This commit is contained in:
Rémi Verschelde 2025-01-13 20:22:37 +01:00
parent 68190ce3bc c5dc6e1c6d
commit 2c521ea57d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scene/gui/rich_text_label.cpp
View File

@ -1184,8 +1184,8 @@ int RichTextLabel::_draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_o
//Apply fx. //Apply fx.
if (fade) { if (fade) {
float faded_visibility = 1.0f; float faded_visibility = 1.0f;
if (glyphs[i].start >= fade->starting_index) { if (l.char_offset + glyphs[i].start >= fade->char_ofs + fade->starting_index) {
faded_visibility -= (float)(glyphs[i].start - fade->starting_index) / (float)fade->length; faded_visibility -= (float)((l.char_offset + glyphs[i].start) - (fade->char_ofs + fade->starting_index)) / (float)fade->length;
faded_visibility = faded_visibility < 0.0f ? 0.0f : faded_visibility; faded_visibility = faded_visibility < 0.0f ? 0.0f : faded_visibility;
} }
font_color.a = faded_visibility; font_color.a = faded_visibility;
@ -5331,10 +5331,10 @@ void RichTextLabel::append_text(const String &p_bbcode) {
tag_stack.push_front("outline_size"); tag_stack.push_front("outline_size");
} else if (bbcode_name == "fade") { } else if (bbcode_name == "fade") {
int start_index = brk_pos; int start_index = 0;
OptionMap::Iterator start_option = bbcode_options.find("start"); OptionMap::Iterator start_option = bbcode_options.find("start");
if (start_option) { if (start_option) {
start_index += start_option->value.to_int(); start_index = start_option->value.to_int();
} }
int length = 10; int length = 10;