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

Fix TextEdit scrolls wrong on text selection

Browse Source
This commit is contained in:
kit
2025-02-28 13:19:46 -05:00
parent 15ff450680
commit b7a8138907
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scene/gui/text_edit.cpp
View File

@ -6081,7 +6081,7 @@ void TextEdit::adjust_viewport_to_caret(int p_caret) {
set_line_as_last_visible(cur_line, cur_wrap); set_line_as_last_visible(cur_line, cur_wrap);
} }
_adjust_viewport_to_caret_horizontally(p_caret); _adjust_viewport_to_caret_horizontally(p_caret, false);
} }
void TextEdit::center_viewport_to_caret(int p_caret) { void TextEdit::center_viewport_to_caret(int p_caret) {
@ -8186,7 +8186,7 @@ void TextEdit::_scroll_lines_down() {
merge_overlapping_carets(); merge_overlapping_carets();
} }
void TextEdit::_adjust_viewport_to_caret_horizontally(int p_caret) { void TextEdit::_adjust_viewport_to_caret_horizontally(int p_caret, bool p_maximize_selection) {
if (get_line_wrapping_mode() != LineWrappingMode::LINE_WRAPPING_NONE) { if (get_line_wrapping_mode() != LineWrappingMode::LINE_WRAPPING_NONE) {
first_visible_col = 0; first_visible_col = 0;
h_scroll->set_value(first_visible_col); h_scroll->set_value(first_visible_col);
@ -8220,7 +8220,7 @@ void TextEdit::_adjust_viewport_to_caret_horizontally(int p_caret) {
int ime_end_column = get_caret_column(p_caret) + (ime_selection.y > 0 ? ime_selection.x + ime_selection.y : ime_text.length()); int ime_end_column = get_caret_column(p_caret) + (ime_selection.y > 0 ? ime_selection.x + ime_selection.y : ime_text.length());
caret_end_pos = _get_column_x_offset_for_line(ime_end_column, get_caret_line(p_caret), ime_end_column); caret_end_pos = _get_column_x_offset_for_line(ime_end_column, get_caret_line(p_caret), ime_end_column);
prioritize_end = false; prioritize_end = false;
} else if (has_selection(p_caret) && get_selection_from_line(p_caret) == get_selection_to_line(p_caret)) { } else if (p_maximize_selection && has_selection(p_caret) && get_selection_from_line(p_caret) == get_selection_to_line(p_caret)) {
// Use selection if it is on one line. // Use selection if it is on one line.
caret_start_pos = _get_column_x_offset_for_line(get_selection_from_column(p_caret), get_caret_line(p_caret), get_selection_from_column(p_caret)); caret_start_pos = _get_column_x_offset_for_line(get_selection_from_column(p_caret), get_caret_line(p_caret), get_selection_from_column(p_caret));
caret_end_pos = _get_column_x_offset_for_line(get_selection_to_column(p_caret), get_caret_line(p_caret), get_selection_to_column(p_caret)); caret_end_pos = _get_column_x_offset_for_line(get_selection_to_column(p_caret), get_caret_line(p_caret), get_selection_to_column(p_caret));

2
scene/gui/text_edit.h
View File

@ -539,7 +539,7 @@ private:
void _scroll_lines_up(); void _scroll_lines_up();
void _scroll_lines_down(); void _scroll_lines_down();
void _adjust_viewport_to_caret_horizontally(int p_caret = 0); void _adjust_viewport_to_caret_horizontally(int p_caret = 0, bool p_maximize_selection = true);
// Minimap. // Minimap.
bool draw_minimap = false; bool draw_minimap = false;