asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #55729 from cdemirer/fix-script-editor-unexpected-scroll-upon-resize

Browse source
This commit is contained in:
Rémi Verschelde 2021-12-12 20:54:53 +01:00 committed by GitHub
commit e8011be6f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scene/gui/text_edit.cpp
View file

@ -4275,7 +4275,10 @@ double TextEdit::get_scroll_pos_for_line(int p_line, int p_wrap_index) const {
return p_line; return p_line;
} }
double new_line_scroll_pos = get_visible_line_count_in_range(0, CLAMP(p_line, 0, text.size() - 1)); double new_line_scroll_pos = 0.0;
if (p_line > 0) {
new_line_scroll_pos = get_visible_line_count_in_range(0, MIN(p_line - 1, text.size() - 1));
}
new_line_scroll_pos += p_wrap_index; new_line_scroll_pos += p_wrap_index;
return new_line_scroll_pos; return new_line_scroll_pos;
} }
@ -4339,7 +4342,7 @@ int TextEdit::get_visible_line_count_in_range(int p_from_line, int p_to_line) co
/* Returns the total number of (lines + wrapped - hidden). */ /* Returns the total number of (lines + wrapped - hidden). */
if (!_is_hiding_enabled() && get_line_wrapping_mode() == LineWrappingMode::LINE_WRAPPING_NONE) { if (!_is_hiding_enabled() && get_line_wrapping_mode() == LineWrappingMode::LINE_WRAPPING_NONE) {
return p_to_line - p_from_line; return (p_to_line - p_from_line) + 1;
} }
int total_rows = 0; int total_rows = 0;