diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-02-05 14:50:33 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-02-05 14:50:33 +0100 |
| commit | c23cc08b1c6fc18c17418c770c6230323a84da20 (patch) | |
| tree | 2657d00915071eaea41387dd32fe9bf369ef3e4a | |
| parent | 45e9d20d6064effc0d6bea8d396e12db366d885b (diff) | |
| parent | 8ddd27ce1ee321f8d307d0593d1045bc23deb6c3 (diff) | |
| download | redot-engine-c23cc08b1c6fc18c17418c770c6230323a84da20.tar.gz | |
Merge pull request #87880 from kitbdev/fix-textedit-freeze
Fix freeze in TextEdit with `scroll_past_end_of_file` and `fit_content_height`
| -rw-r--r-- | scene/gui/text_edit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 540c999131..e2925920a2 100644 --- 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; } |