godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10019 from Paulb23/ctrl_backspace_issue_6546

Browse Source 
Made delete next and prev consistent to other editors, issue 6546
This commit is contained in:
Rémi Verschelde 2017-08-01 22:27:35 +02:00 committed by GitHub
commit 7aa802e770
1 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
scene/gui/text_edit.cpp
View File

@ -49,6 +49,10 @@ static bool _is_symbol(CharType c) {
return c != '_' && ((c >= '!' && c <= '/') || (c >= ':' && c <= '@') || (c >= '[' && c <= '`') || (c >= '{' && c <= '~') || c == '\t' || c == ' '); return c != '_' && ((c >= '!' && c <= '/') || (c >= ':' && c <= '@') || (c >= '[' && c <= '`') || (c >= '{' && c <= '~') || c == '\t' || c == ' ');
} }
static bool _is_whitespace(CharType c) {
return c == '\t' || c == ' ';
}
static bool _is_char(CharType c) { static bool _is_char(CharType c) {
return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '_'; return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '_';
@ -2096,45 +2100,43 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
break; break;
#ifdef APPLE_STYLE_KEYS #ifdef APPLE_STYLE_KEYS
if (k->get_alt()) { if (k->get_alt() && cursor.column > 1) {
#else #else
if (k->get_alt()) { if (k->get_alt()) {
scancode_handled = false; scancode_handled = false;
break; break;
} else if (k->get_command()) { } else if (k->get_command() && cursor.column > 1) {
#endif #endif
int line = cursor.line; int line = cursor.line;
int column = cursor.column; int column = cursor.column;
bool prev_char = false; // check if we are removing a single whitespace, if so remove it and the next char type
bool only_whitespace = true; // else we just remove the whitespace
bool only_whitespace = false;
while (only_whitespace && line > 0) { if (_is_whitespace(text[line][column - 1]) && _is_whitespace(text[line][column - 2])) {
only_whitespace = true;
while (column > 0) { } else if (_is_whitespace(text[line][column - 1])) {
CharType c = text[line][column - 1]; // remove the single whitespace
column--;
if (c != '\t' && c != ' ') {
only_whitespace = false;
break;
}
column--;
}
if (only_whitespace) {
line--;
column = text[line].length();
}
} }
// check if its a text char
bool only_char = (_is_text_char(text[line][column - 1]) && !only_whitespace);
// if its not whitespace or char then symbol.
bool only_symbols = !(only_whitespace || only_char);
while (column > 0) { while (column > 0) {
bool ischar = _is_text_char(text[line][column - 1]); bool is_whitespace = _is_whitespace(text[line][column - 1]);
bool is_text_char = _is_text_char(text[line][column - 1]);
if (prev_char && !ischar) if (only_whitespace && !is_whitespace) {
break; break;
} else if (only_char && !is_text_char) {
prev_char = ischar; break;
} else if (only_symbols && (is_whitespace || is_text_char)) {
break;
}
column--; column--;
} }
@ -2356,52 +2358,50 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
int next_column; int next_column;
#ifdef APPLE_STYLE_KEYS #ifdef APPLE_STYLE_KEYS
if (k->get_alt()) { if (k->get_alt() && cursor.column < curline_len - 1) {
#else #else
if (k->get_alt()) { if (k->get_alt()) {
scancode_handled = false; scancode_handled = false;
break; break;
} else if (k->get_command()) { } else if (k->get_command() && cursor.column < curline_len - 1) {
#endif #endif
int last_line = text.size() - 1;
int line = cursor.line; int line = cursor.line;
int column = cursor.column; int column = cursor.column;
bool prev_char = false; // check if we are removing a single whitespace, if so remove it and the next char type
bool only_whitespace = true; // else we just remove the whitespace
bool only_whitespace = false;
while (only_whitespace && line < last_line) { if (_is_whitespace(text[line][column]) && _is_whitespace(text[line][column + 1])) {
only_whitespace = true;
while (column < text[line].length()) { } else if (_is_whitespace(text[line][column])) {
CharType c = text[line][column]; // remove the single whitespace
column++;
if (c != '\t' && c != ' ') {
only_whitespace = false;
break;
}
column++;
}
if (only_whitespace) {
line++;
column = 0;
}
} }
while (column < text[line].length()) { // check if its a text char
bool only_char = (_is_text_char(text[line][column]) && !only_whitespace);
bool ischar = _is_text_char(text[line][column]); // if its not whitespace or char then symbol.
bool only_symbols = !(only_whitespace || only_char);
if (prev_char && !ischar) while (column < curline_len) {
bool is_whitespace = _is_whitespace(text[line][column]);
bool is_text_char = _is_text_char(text[line][column]);
if (only_whitespace && !is_whitespace) {
break; break;
prev_char = ischar; } else if (only_char && !is_text_char) {
break;
} else if (only_symbols && (is_whitespace || is_text_char)) {
break;
}
column++; column++;
} }
next_line = line; next_line = line;
next_column = column; next_column = column;
} else { } else {
next_column = cursor.column < curline_len ? (cursor.column + 1) : 0; next_column = cursor.column < curline_len ? (cursor.column + 1) : 0;
} }