maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #18931 from guilhermefelipecgs/fix_find_bar

Browse source 
[Doc] Fixes in find bar
This commit is contained in:
Rémi Verschelde 2018-05-25 17:49:36 +02:00 committed by GitHub
parent 335679f481 22041264ed
commit ba125a60a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
editor/editor_help.cpp
View file

@ -1978,8 +1978,27 @@ FindBar::FindBar() {
}
void FindBar::popup_search() {
show();
search_text->grab_focus();
bool grabbed_focus = false;
if (!search_text->has_focus()) {
search_text->grab_focus();
grabbed_focus = true;
}
if (!search_text->get_text().empty()) {
search_text->select_all();
search_text->set_cursor_position(search_text->get_text().length());
if (grabbed_focus) {
_search();
}
}
call_deferred("_update_size");
}
void FindBar::_update_size() {
container->set_custom_minimum_size(Size2(0, hbc->get_size().height));
}
@ -2016,6 +2035,7 @@ void FindBar::_bind_methods() {
ClassDB::bind_method("_search_next", &FindBar::search_next);
ClassDB::bind_method("_search_prev", &FindBar::search_prev);
ClassDB::bind_method("_hide_pressed", &FindBar::_hide_bar);
ClassDB::bind_method("_update_size", &FindBar::_update_size);
ADD_SIGNAL(MethodInfo("search"));
}

2
editor/editor_help.h
View file

@ -148,6 +148,8 @@ class FindBar : public HBoxContainer {
void _search_text_changed(const String &p_text);
void _search_text_entered(const String &p_text);
void _update_size();
protected:
void _notification(int p_what);
void _unhandled_input(const Ref<InputEvent> &p_event);