Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-21 19:42:43 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #98678 from Daylily-Zeleen/daylily-zeleen/fix_text_edit

Browse Source 
Fix `total_visible_line_count` calculation when removing and clearing `TextEdit`'s text.
This commit is contained in:
Thaddeus Crews 2024-11-12 12:13:20 -06:00
commit 51d7d6b5b7
No known key found for this signature in database
GPG Key ID: 62181B86FE9E5D84
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scene/gui/text_edit.cpp
View File

@ -332,6 +332,7 @@ void TextEdit::Text::clear() {
max_line_width_dirty = true; max_line_width_dirty = true;
max_line_height_dirty = true; max_line_height_dirty = true;
total_visible_line_count = 0;
Line line; Line line;
line.gutters.resize(gutter_count); line.gutters.resize(gutter_count);
@ -421,6 +422,10 @@ void TextEdit::Text::remove_range(int p_from_line, int p_to_line) {
for (int i = p_from_line; i < p_to_line; i++) { for (int i = p_from_line; i < p_to_line; i++) {
const Line &text_line = text[i]; const Line &text_line = text[i];
if (text_line.hidden) {
continue;
}
if (text_line.height == max_line_height) { if (text_line.height == max_line_height) {
max_line_height_dirty = true; max_line_height_dirty = true;
} }
@ -435,6 +440,8 @@ void TextEdit::Text::remove_range(int p_from_line, int p_to_line) {
text.write[(i - diff) + 1] = text[i + 1]; text.write[(i - diff) + 1] = text[i + 1];
} }
text.resize(text.size() - diff); text.resize(text.size() - diff);
ERR_FAIL_COND(total_visible_line_count < 0); // BUG
} }
void TextEdit::Text::add_gutter(int p_at) { void TextEdit::Text::add_gutter(int p_at) {