godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-03 18:11:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #111535 from kitbdev/fix-textedit-dont-select

Browse Source 
Fix TextEdit selecting when closing popup
This commit is contained in:
Thaddeus Crews
2025-11-10 08:20:08 -06:00
parent 57311e717a 49cf8654fa
commit 82e6303634
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scene/gui/text_edit.cpp
View File

@@ -877,6 +877,7 @@ void TextEdit::_notification(int p_what) {
window_has_focus = false;
draw_caret = false;
queue_redraw();
set_selection_mode(SelectionMode::SELECTION_MODE_NONE);
} break;
case NOTIFICATION_INTERNAL_PROCESS: {
@@ -2482,6 +2483,7 @@ void TextEdit::gui_input(const Ref<InputEvent> &p_gui_input) {
dragging_minimap = false;
dragging_selection = false;
can_drag_minimap = false;
set_selection_mode(SelectionMode::SELECTION_MODE_NONE);
click_select_held->stop();
if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CLIPBOARD_PRIMARY)) {
DisplayServer::get_singleton()->clipboard_set_primary(get_selected_text());
@@ -8408,7 +8410,10 @@ void TextEdit::_update_selection_mode_pointer(bool p_initial) {
carets.write[caret_index].selection.word_begin_column = column;
carets.write[caret_index].selection.word_end_column = column;
} else {
select(get_selection_origin_line(caret_index), get_selection_origin_column(caret_index), line, column, caret_index);
int origin_line = get_selection_origin_line(caret_index);
bool is_new_selection_dir_right = line > origin_line || (line == origin_line && column >= carets[caret_index].selection.word_begin_column);
int origin_col = is_new_selection_dir_right ? carets[caret_index].selection.word_begin_column : carets[caret_index].selection.word_end_column;
select(origin_line, origin_col, line, column, caret_index);
}
adjust_viewport_to_caret(caret_index);
@@ -8475,7 +8480,7 @@ void TextEdit::_update_selection_mode_line(bool p_initial) {
int line = pos.y;
int caret_index = get_caret_count() - 1;
int origin_line = p_initial && !has_selection(caret_index) ? line : get_selection_origin_line();
int origin_line = p_initial && !has_selection(caret_index) ? line : get_selection_origin_line(caret_index);
bool line_below = line >= origin_line;
int origin_col = line_below ? 0 : get_line(origin_line).length();
int caret_line = line_below ? line + 1 : line;