Merge pull request #87880 from kitbdev/fix-textedit-freeze

Fix freeze in TextEdit with `scroll_past_end_of_file` and `fit_content_height`
godotengine · Feb 5, 2024 · c23cc08 · c23cc08
2 parents 45e9d20 + 8ddd27c
commit c23cc08
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
@@ -7333,7 +7333,7 @@ void TextEdit::_update_scrollbars() {
 
 	int visible_rows = get_visible_line_count();
 	int total_rows = draw_placeholder ? placeholder_wraped_rows.size() - 1 : get_total_visible_line_count();
-	if (scroll_past_end_of_file_enabled) {
+	if (scroll_past_end_of_file_enabled && !fit_content_height) {
 		total_rows += visible_rows - 1;
 	}