asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4557 from Paulb23/autocomplete_truncate_issue_4554

Browse source 
Fixed autocomplete truncate, issue 4554
This commit is contained in:
Rémi Verschelde 2016-05-07 20:19:40 +02:00
commit 59e68ae6d0
1 changed files with 15 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
scene/gui/text_edit.cpp
View file

@ -1659,35 +1659,27 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
if (k.unicode>32) { if (k.unicode>32) {
if (cursor.column<text[cursor.line].length() && text[cursor.line][cursor.column]==k.unicode) { const CharType chr[2] = {(CharType)k.unicode, 0};
//same char, move ahead if(auto_brace_completion_enabled && _is_pair_symbol(chr[0])) {
cursor_set_column(cursor.column+1); _consume_pair_symbol(chr[0]);
} else { } else {
//different char, go back
const CharType chr[2] = {(CharType)k.unicode, 0};
if(auto_brace_completion_enabled && _is_pair_symbol(chr[0])) {
_consume_pair_symbol(chr[0]);
} else {
// remove the old character if in insert mode // remove the old character if in insert mode
if (insert_mode) { if (insert_mode) {
begin_complex_operation(); begin_complex_operation();
// make sure we don't try and remove empty space // make sure we don't try and remove empty space
if (cursor.column < get_line(cursor.line).length()) { if (cursor.column < get_line(cursor.line).length()) {
_remove_text(cursor.line, cursor.column, cursor.line, cursor.column + 1); _remove_text(cursor.line, cursor.column, cursor.line, cursor.column + 1);
}
}
_insert_text_at_cursor(chr);
if (insert_mode) {
end_complex_operation();
} }
} }
}
_insert_text_at_cursor(chr);
if (insert_mode) {
end_complex_operation();
}
}
_update_completion_candidates(); _update_completion_candidates();
accept_event(); accept_event();