mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-06 17:37:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4082 from Paulb23/word_highlighting

Browse Source 
Fixes for Word highlighting
This commit is contained in:
Rémi Verschelde 2016-03-17 22:26:40 +01:00
commit 3adc5a45ab
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
scene/gui/text_edit.cpp
View File

@ -644,10 +644,7 @@ void TextEdit::_notification(int p_what) {
Point2 cursor_pos;
// get the highlighted words
String highlighted_text;
if (is_selection_active()) {
highlighted_text = get_selection_text();
}
String highlighted_text = get_selection_text();
for (int i=0;i<visible_rows;i++) {
@ -667,7 +664,7 @@ void TextEdit::_notification(int p_what) {
// check if line contains highlighted word
int highlighted_text_col = -1;
if (is_selection_active()) {
if (highlighted_text.length() != 0) {
highlighted_text_col = _get_column_pos_of_word(highlighted_text, str, 0);
}
@ -3222,16 +3219,22 @@ int TextEdit::_get_column_pos_of_word(const String &p_key, const String &p_searc
p_from_column = 0;
}
// match case
col = p_search.findn(p_key, p_from_column);
while (col == -1 && p_from_column <= p_search.length()) {
// match case
col = p_search.findn(p_key, p_from_column);
// whole words only
if (col != -1) {
if (col > 0 && _is_text_char(p_search[col-1])) {
col = -1;
} else if (_is_text_char(p_search[col+p_key.length()])) {
col = -1;
// whole words only
if (col != -1) {
p_from_column=col;
if (col > 0 && _is_text_char(p_search[col-1])) {
col = -1;
} else if (_is_text_char(p_search[col+p_key.length()])) {
col = -1;
}
}
p_from_column+=1;
}
}
return col;