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

Merge pull request #5160 from neikeq/pr-issue-5136 

FindReplaceBar: Fix search bug when text is selected
This commit is contained in:
Juan Linietsky 2016-06-13 15:47:16 -03:00 committed by GitHub
parent dca382647e 9a2d5fa1e1
commit 3cee648144
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/editor/code_editor.cpp
View File

@ -247,8 +247,18 @@ void FindReplaceBar::_get_search_from(int& r_line, int& r_col) {
r_col=text_edit->cursor_get_column(); r_col=text_edit->cursor_get_column();
if (text_edit->is_selection_active() && !replace_all_mode) { if (text_edit->is_selection_active() && !replace_all_mode) {
r_line=text_edit->get_selection_from_line();
r_col=text_edit->get_selection_to_column(); int selection_line=text_edit->get_selection_from_line();
if (text_edit->get_selection_text()==get_search_text() && r_line==selection_line) {
int selection_from_col=text_edit->get_selection_from_column();
if (r_col>=selection_from_col && r_col<=text_edit->get_selection_to_column()) {
r_col=selection_line;
r_col=selection_from_col;
}
}
} }
if (r_line==result_line && r_col>=result_col && r_col<=result_col+get_search_text().length()) { if (r_line==result_line && r_col>=result_col && r_col<=result_col+get_search_text().length()) {