From c2a4a0d4cb4e82386a632db51bb9d122274b5e30 Mon Sep 17 00:00:00 2001 From: passivestar <60579014+passivestar@users.noreply.github.com> Date: Sun, 18 Feb 2024 11:58:37 +0400 Subject: [PATCH] Fix `LineEdit` delete all the way to the left/right when something is selected --- scene/gui/line_edit.cpp | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp index 37212a34ad3..7aa4a136d99 100644 --- a/scene/gui/line_edit.cpp +++ b/scene/gui/line_edit.cpp @@ -138,8 +138,16 @@ void LineEdit::_backspace(bool p_word, bool p_all_to_left) { return; } + if (selection.enabled) { + selection_delete(); + return; + } + + if (caret_column == 0) { + return; // Nothing to do. + } + if (p_all_to_left) { - deselect(); text = text.substr(caret_column); _shape(); set_caret_column(0); @@ -147,11 +155,6 @@ void LineEdit::_backspace(bool p_word, bool p_all_to_left) { return; } - if (selection.enabled) { - selection_delete(); - return; - } - if (p_word) { int cc = caret_column; @@ -176,25 +179,22 @@ void LineEdit::_delete(bool p_word, bool p_all_to_right) { return; } - if (p_all_to_right) { - deselect(); - text = text.substr(0, caret_column); - _shape(); - _text_changed(); - return; - } - if (selection.enabled) { selection_delete(); return; } - int text_len = text.length(); - - if (caret_column == text_len) { + if (caret_column == text.length()) { return; // Nothing to do. } + if (p_all_to_right) { + text = text.substr(0, caret_column); + _shape(); + _text_changed(); + return; + } + if (p_word) { int cc = caret_column; PackedInt32Array words = TS->shaped_text_get_word_breaks(text_rid);