godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #24447 from Paulb23/text_edit_wrap_crash

Browse Source 
Fix Word wrap cache desync causing crash
This commit is contained in:
Rémi Verschelde 2018-12-18 14:45:12 +01:00 committed by GitHub
commit 402e4b817e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scene/gui/text_edit.cpp
View File

@ -846,9 +846,9 @@ void TextEdit::_notification(int p_what) {
bool underlined = false; bool underlined = false;
Vector<String> wrap_rows = get_wrap_rows_text(line);
int line_wrap_amount = times_line_wraps(line); int line_wrap_amount = times_line_wraps(line);
int last_wrap_column = 0; int last_wrap_column = 0;
Vector<String> wrap_rows = get_wrap_rows_text(line);
for (int line_wrap_index = 0; line_wrap_index < line_wrap_amount + 1; line_wrap_index++) { for (int line_wrap_index = 0; line_wrap_index < line_wrap_amount + 1; line_wrap_index++) {
if (line_wrap_index != 0) { if (line_wrap_index != 0) {
@ -3816,6 +3816,10 @@ Vector<String> TextEdit::get_wrap_rows_text(int p_line) const {
// line ends before hit wrap_at; add this word to the substring // line ends before hit wrap_at; add this word to the substring
wrap_substring += word_str; wrap_substring += word_str;
lines.push_back(wrap_substring); lines.push_back(wrap_substring);
// update cache
text.set_line_wrap_amount(p_line, lines.size() - 1);
return lines; return lines;
} }