Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-15 08:32:54 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #68089 from alfredbaudisch/remove-secondary-carets

Browse Source 
Shortcut and Bind to Remove Secondary Carets
This commit is contained in:
Rémi Verschelde 2022-11-01 08:25:06 +01:00
commit e6751549cf
No known key found for this signature in database
GPG Key ID: C3336907360768E1
4 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/input/input_map.cpp
View File

@ -342,6 +342,7 @@ static const _BuiltinActionDisplayName _builtin_action_display_names[] = {
{ "ui_text_select_all", TTRC("Select All") },
{ "ui_text_select_word_under_caret", TTRC("Select Word Under Caret") },
{ "ui_text_add_selection_for_next_occurrence", TTRC("Add Selection for Next Occurrence") },
{ "ui_text_remove_secondary_carets", TTRC("Remove Secondary Carets") },
{ "ui_text_toggle_insert_mode", TTRC("Toggle Insert Mode") },
{ "ui_text_submit", TTRC("Text Submitted") },
{ "ui_graph_duplicate", TTRC("Duplicate Nodes") },
@ -671,6 +672,10 @@ const HashMap<String, List<Ref<InputEvent>>> &InputMap::get_builtins() {
inputs.push_back(InputEventKey::create_reference(Key::D | KeyModifierMask::CMD_OR_CTRL));
default_builtin_cache.insert("ui_text_add_selection_for_next_occurrence", inputs);
inputs = List<Ref<InputEvent>>();
inputs.push_back(InputEventKey::create_reference(Key::ESCAPE));
default_builtin_cache.insert("ui_text_remove_secondary_carets", inputs);
inputs = List<Ref<InputEvent>>();
inputs.push_back(InputEventKey::create_reference(Key::INSERT));
default_builtin_cache.insert("ui_text_toggle_insert_mode", inputs);

4
doc/classes/ProjectSettings.xml
View File

@ -987,6 +987,10 @@
Default [InputEventAction] to insert a new line after the current one.
[b]Note:[/b] Default [code]ui_*[/code] actions cannot be removed as they are necessary for the internal logic of several [Control]s. The events assigned to the action can however be modified.
</member>
<member name="input/ui_text_remove_secondary_carets" type="Dictionary" setter="" getter="">
If multiple carets are currently active, clear additional carets and keep just one caret.
[b]Note:[/b] Default [code]ui_*[/code] actions cannot be removed as they are necessary for the internal logic of several [Control]s. The events assigned to the action can however be modified.
</member>
<member name="input/ui_text_scroll_down" type="Dictionary" setter="" getter="">
Default [InputEventAction] to scroll down one line of text.
[b]Note:[/b] Default [code]ui_*[/code] actions cannot be removed as they are necessary for the internal logic of several [Control]s. The events assigned to the action can however be modified.

9
scene/gui/text_edit.cpp
View File

@ -2067,6 +2067,11 @@ void TextEdit::gui_input(const Ref<InputEvent> &p_gui_input) {
accept_event();
return;
}
if (k->is_action("ui_text_remove_secondary_carets", true) && _should_remove_secondary_carets()) {
remove_secondary_carets();
accept_event();
return;
}
if (k->is_action("ui_cut", true)) {
cut();
accept_event();
@ -2819,6 +2824,10 @@ void TextEdit::_move_caret_document_end(bool p_select) {
}
}
bool TextEdit::_should_remove_secondary_carets() {
return carets.size() > 1;
}
void TextEdit::_get_above_below_caret_line_column(int p_old_line, int p_old_wrap_index, int p_old_column, bool p_below, int &p_new_line, int &p_new_column, int p_last_fit_x) const {
if (p_last_fit_x == -1) {
p_last_fit_x = _get_column_x_offset_for_line(p_old_column, p_old_line, p_old_column);

1
scene/gui/text_edit.h
View File

@ -597,6 +597,7 @@ private:
void _delete(bool p_word = false, bool p_all_to_right = false);
void _move_caret_document_start(bool p_select);
void _move_caret_document_end(bool p_select);
bool _should_remove_secondary_carets();
// Used in add_caret_at_carets
void _get_above_below_caret_line_column(int p_old_line, int p_old_wrap_index, int p_old_column, bool p_below, int &p_new_line, int &p_new_column, int p_last_fit_x = -1) const;