summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorJean-Michel Bernard <jmb462@gmail.com>2023-04-30 18:28:21 +0200
committerRĂ©mi Verschelde <rverschelde@gmail.com>2023-05-12 12:07:02 +0200
commit53df7c18e033dfe12a2136838602eb105d544168 (patch)
treea8a0e1838a4b14d00b01e396e5a2fc9d11dd44b6 /editor
parentf49c69a1e77c6c6ec26c1756ceebfc7d7bed1984 (diff)
Fix right click in selection of additional caret
(cherry picked from commit 5c06c030f2e4b9f6ca2aa3bd8942b3adc165c76a)
Diffstat (limited to 'editor')
-rw-r--r--editor/plugins/script_text_editor.cpp30
1 files changed, 18 insertions, 12 deletions
diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp
index c1a5283662..d0364e4edd 100644
--- a/editor/plugins/script_text_editor.cpp
+++ b/editor/plugins/script_text_editor.cpp
@@ -1800,20 +1800,26 @@ void ScriptTextEditor::_text_edit_gui_input(const Ref<InputEvent> &ev) {
int col = pos.x;
tx->set_move_caret_on_right_click_enabled(EDITOR_GET("text_editor/behavior/navigation/move_caret_on_right_click"));
+ int caret_clicked = -1;
if (tx->is_move_caret_on_right_click_enabled()) {
- tx->remove_secondary_carets();
if (tx->has_selection()) {
- int from_line = tx->get_selection_from_line();
- int to_line = tx->get_selection_to_line();
- int from_column = tx->get_selection_from_column();
- int to_column = tx->get_selection_to_column();
-
- if (row < from_line || row > to_line || (row == from_line && col < from_column) || (row == to_line && col > to_column)) {
- // Right click is outside the selected text
- tx->deselect();
+ for (int i = 0; i < tx->get_caret_count(); i++) {
+ int from_line = tx->get_selection_from_line(i);
+ int to_line = tx->get_selection_to_line(i);
+ int from_column = tx->get_selection_from_column(i);
+ int to_column = tx->get_selection_to_column(i);
+
+ if (row >= from_line && row <= to_line && (row != from_line || col >= from_column) && (row != to_line || col <= to_column)) {
+ // Right click in one of the selected text
+ caret_clicked = i;
+ break;
+ }
}
}
- if (!tx->has_selection()) {
+ if (!caret_clicked) {
+ tx->deselect();
+ tx->remove_secondary_carets();
+ caret_clicked = 0;
tx->set_caret_line(row, false, false);
tx->set_caret_column(col);
}
@@ -1821,10 +1827,10 @@ void ScriptTextEditor::_text_edit_gui_input(const Ref<InputEvent> &ev) {
String word_at_pos = tx->get_word_at_pos(local_pos);
if (word_at_pos.is_empty()) {
- word_at_pos = tx->get_word_under_caret(0);
+ word_at_pos = tx->get_word_under_caret(caret_clicked);
}
if (word_at_pos.is_empty()) {
- word_at_pos = tx->get_selected_text(0);
+ word_at_pos = tx->get_selected_text(caret_clicked);
}
bool has_color = (word_at_pos == "Color");