Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #105656 from Koyper/fix_line_edit_text_edit_composite_character_backspace_delete

Browse source 
[LineEdit/TextEdit] Add composite character backspace delete and get composite character positions
This commit is contained in:
Thaddeus Crews 2025-04-24 09:09:30 -05:00
commit d9122205ec
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
7 changed files with 139 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

43
scene/gui/text_edit.cpp
View file

@ -3724,6 +3724,14 @@ bool TextEdit::is_emoji_menu_enabled() const {
return emoji_menu_enabled;
}
void TextEdit::set_backspace_deletes_composite_character_enabled(bool p_enabled) {
backspace_deletes_composite_character_enabled = p_enabled;
}
bool TextEdit::is_backspace_deletes_composite_character_enabled() const {
return backspace_deletes_composite_character_enabled;
}
void TextEdit::set_shortcut_keys_enabled(bool p_enabled) {
shortcut_keys_enabled = p_enabled;
}
@ -6057,6 +6065,26 @@ int TextEdit::get_selection_origin_column(int p_caret) const {
return carets[p_caret].selection.origin_column;
}
int TextEdit::get_next_composite_character_column(int p_line, int p_column) const {
ERR_FAIL_INDEX_V(p_line, text.size(), -1);
ERR_FAIL_INDEX_V(p_column, text[p_line].length() + 1, -1);
if (p_column == text[p_line].length()) {
return p_column;
} else {
return TS->shaped_text_next_character_pos(text.get_line_data(p_line)->get_rid(), (p_column));
}
}
int TextEdit::get_previous_composite_character_column(int p_line, int p_column) const {
ERR_FAIL_INDEX_V(p_line, text.size(), -1);
ERR_FAIL_INDEX_V(p_column, text[p_line].length() + 1, -1);
if (p_column == 0) {
return 0;
} else {
return TS->shaped_text_prev_character_pos(text.get_line_data(p_line)->get_rid(), p_column);
}
}
int TextEdit::get_selection_from_line(int p_caret) const {
ERR_FAIL_INDEX_V(p_caret, carets.size(), -1);
if (!has_selection(p_caret)) {
@ -6958,6 +6986,9 @@ void TextEdit::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_emoji_menu_enabled", "enable"), &TextEdit::set_emoji_menu_enabled);
ClassDB::bind_method(D_METHOD("is_emoji_menu_enabled"), &TextEdit::is_emoji_menu_enabled);
ClassDB::bind_method(D_METHOD("set_backspace_deletes_composite_character_enabled", "enable"), &TextEdit::set_backspace_deletes_composite_character_enabled);
ClassDB::bind_method(D_METHOD("is_backspace_deletes_composite_character_enabled"), &TextEdit::is_backspace_deletes_composite_character_enabled);
ClassDB::bind_method(D_METHOD("set_shortcut_keys_enabled", "enabled"), &TextEdit::set_shortcut_keys_enabled);
ClassDB::bind_method(D_METHOD("is_shortcut_keys_enabled"), &TextEdit::is_shortcut_keys_enabled);
@ -7151,6 +7182,8 @@ void TextEdit::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_caret_column", "column", "adjust_viewport", "caret_index"), &TextEdit::set_caret_column, DEFVAL(true), DEFVAL(0));
ClassDB::bind_method(D_METHOD("get_caret_column", "caret_index"), &TextEdit::get_caret_column, DEFVAL(0));
ClassDB::bind_method(D_METHOD("get_next_composite_character_column", "line", "column"), &TextEdit::get_next_composite_character_column);
ClassDB::bind_method(D_METHOD("get_previous_composite_character_column", "line", "column"), &TextEdit::get_previous_composite_character_column);
ClassDB::bind_method(D_METHOD("get_caret_wrap_index", "caret_index"), &TextEdit::get_caret_wrap_index, DEFVAL(0));
@ -7360,6 +7393,7 @@ void TextEdit::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "editable"), "set_editable", "is_editable");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "context_menu_enabled"), "set_context_menu_enabled", "is_context_menu_enabled");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "emoji_menu_enabled"), "set_emoji_menu_enabled", "is_emoji_menu_enabled");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "backspace_deletes_composite_character_enabled"), "set_backspace_deletes_composite_character_enabled", "is_backspace_deletes_composite_character_enabled");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "shortcut_keys_enabled"), "set_shortcut_keys_enabled", "is_shortcut_keys_enabled");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "selecting_enabled"), "set_selecting_enabled", "is_selecting_enabled");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "deselect_on_focus_loss_enabled"), "set_deselect_on_focus_loss_enabled", "is_deselect_on_focus_loss_enabled");
@ -7596,7 +7630,14 @@ void TextEdit::_backspace_internal(int p_caret) {
}
int from_line = to_column > 0 ? to_line : to_line - 1;
int from_column = to_column > 0 ? (to_column - 1) : (text[to_line - 1].length());
int from_column = 0;
if (to_column == 0) {
from_column = text[to_line - 1].length();
} else if (caret_mid_grapheme_enabled || !backspace_deletes_composite_character_enabled) {
from_column = to_column - 1;
} else {
from_column = get_previous_composite_character_column(to_line, to_column);
}
merge_gutters(from_line, to_line);