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

Make the script search have a proper matches counter

Browse Source
This commit is contained in:
Michael Alexsander Silva Dias 2019-08-09 03:47:09 -03:00
parent 985955d5b4
commit 95a8b2b5d9
3 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
editor/code_editor.cpp
View File

@ -163,16 +163,16 @@ bool FindReplaceBar::_search(uint32_t p_flags, int p_from_line, int p_from_col)
result_col = col; result_col = col;
_update_results_count(); _update_results_count();
set_error(vformat(TTR("Found %d match(es)."), results_count));
} else { } else {
result_line = -1; result_line = -1;
result_col = -1; result_col = -1;
text_edit->set_search_text(""); text_edit->set_search_text("");
text_edit->set_search_flags(p_flags); text_edit->set_search_flags(p_flags);
text_edit->set_current_search_result(line, col); text_edit->set_current_search_result(line, col);
set_error(text.empty() ? "" : TTR("No Matches"));
} }
_update_matches_label();
return found; return found;
} }
@ -332,6 +332,18 @@ void FindReplaceBar::_update_results_count() {
} }
} }
void FindReplaceBar::_update_matches_label() {
if (search_text->get_text().empty() || results_count == -1) {
matches_label->hide();
} else {
matches_label->show();
matches_label->add_color_override("font_color", results_count > 0 ? Color(1, 1, 1) : EditorNode::get_singleton()->get_gui_base()->get_color("error_color", "Editor"));
matches_label->set_text(vformat(results_count == 1 ? TTR("%d match.") : TTR("%d matches."), results_count));
}
}
bool FindReplaceBar::search_current() { bool FindReplaceBar::search_current() {
uint32_t flags = 0; uint32_t flags = 0;
@ -411,7 +423,6 @@ void FindReplaceBar::_hide_bar() {
text_edit->set_search_text(""); text_edit->set_search_text("");
result_line = -1; result_line = -1;
result_col = -1; result_col = -1;
set_error("");
hide(); hide();
} }
@ -557,6 +568,7 @@ FindReplaceBar::FindReplaceBar() {
vbc_lineedit = memnew(VBoxContainer); vbc_lineedit = memnew(VBoxContainer);
add_child(vbc_lineedit); add_child(vbc_lineedit);
vbc_lineedit->set_alignment(ALIGN_CENTER);
vbc_lineedit->set_h_size_flags(SIZE_EXPAND_FILL); vbc_lineedit->set_h_size_flags(SIZE_EXPAND_FILL);
VBoxContainer *vbc_button = memnew(VBoxContainer); VBoxContainer *vbc_button = memnew(VBoxContainer);
add_child(vbc_button); add_child(vbc_button);
@ -565,8 +577,10 @@ FindReplaceBar::FindReplaceBar() {
HBoxContainer *hbc_button_search = memnew(HBoxContainer); HBoxContainer *hbc_button_search = memnew(HBoxContainer);
vbc_button->add_child(hbc_button_search); vbc_button->add_child(hbc_button_search);
hbc_button_search->set_alignment(ALIGN_END);
hbc_button_replace = memnew(HBoxContainer); hbc_button_replace = memnew(HBoxContainer);
vbc_button->add_child(hbc_button_replace); vbc_button->add_child(hbc_button_replace);
hbc_button_replace->set_alignment(ALIGN_END);
HBoxContainer *hbc_option_search = memnew(HBoxContainer); HBoxContainer *hbc_option_search = memnew(HBoxContainer);
vbc_option->add_child(hbc_option_search); vbc_option->add_child(hbc_option_search);
@ -580,6 +594,10 @@ FindReplaceBar::FindReplaceBar() {
search_text->connect("text_changed", this, "_search_text_changed"); search_text->connect("text_changed", this, "_search_text_changed");
search_text->connect("text_entered", this, "_search_text_entered"); search_text->connect("text_entered", this, "_search_text_entered");
matches_label = memnew(Label);
hbc_button_search->add_child(matches_label);
matches_label->hide();
find_prev = memnew(ToolButton); find_prev = memnew(ToolButton);
hbc_button_search->add_child(find_prev); hbc_button_search->add_child(find_prev);
find_prev->set_focus_mode(FOCUS_NONE); find_prev->set_focus_mode(FOCUS_NONE);

2
editor/code_editor.h
View File

@ -64,6 +64,7 @@ class FindReplaceBar : public HBoxContainer {
GDCLASS(FindReplaceBar, HBoxContainer); GDCLASS(FindReplaceBar, HBoxContainer);
LineEdit *search_text; LineEdit *search_text;
Label *matches_label;
ToolButton *find_prev; ToolButton *find_prev;
ToolButton *find_next; ToolButton *find_next;
CheckBox *case_sensitive; CheckBox *case_sensitive;
@ -90,6 +91,7 @@ class FindReplaceBar : public HBoxContainer {
void _get_search_from(int &r_line, int &r_col); void _get_search_from(int &r_line, int &r_col);
void _update_results_count(); void _update_results_count();
void _update_matches_label();
void _show_search(); void _show_search();
void _hide_bar(); void _hide_bar();

12
editor/editor_help.cpp
View File

@ -1738,19 +1738,13 @@ void FindBar::_update_results_count() {
void FindBar::_update_matches_label() { void FindBar::_update_matches_label() {
if (results_count > 0) { if (search_text->get_text().empty() || results_count == -1) {
matches_label->show();
matches_label->add_color_override("font_color", Color(1, 1, 1));
matches_label->set_text(vformat(TTR("Found %d match(es)."), results_count));
} else if (search_text->get_text().empty()) {
matches_label->hide(); matches_label->hide();
} else { } else {
matches_label->show(); matches_label->show();
matches_label->add_color_override("font_color", EditorNode::get_singleton()->get_gui_base()->get_color("error_color", "Editor")); matches_label->add_color_override("font_color", results_count > 0 ? Color(1, 1, 1) : EditorNode::get_singleton()->get_gui_base()->get_color("error_color", "Editor"));
matches_label->set_text(TTR("No Matches")); matches_label->set_text(vformat(results_count == 1 ? TTR("%d match.") : TTR("%d matches."), results_count));
} }
} }