Skip to content

Commit af15dde

Browse files
committed
Simplify signals of TreeSearchPanel
1 parent 1145ce0 commit af15dde

File tree

3 files changed

+7
-15
lines changed

3 files changed

+7
-15
lines changed

editor/task_tree.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -533,10 +533,8 @@ void TaskTree::_notification(int p_what) {
533533
tree->connect("multi_selected", callable_mp(this, &TaskTree::_on_item_selected).unbind(3), CONNECT_DEFERRED);
534534
tree->connect("item_activated", callable_mp(this, &TaskTree::_on_item_activated));
535535
tree->connect("item_collapsed", callable_mp(this, &TaskTree::_on_item_collapsed));
536-
// TODO: Simplify these signals into one (candidate names: changed, updated, update_requested):
537-
tree_search->search_panel->connect("text_changed", callable_mp(this, &TaskTree::_update_tree).unbind(1));
536+
tree_search->search_panel->connect("update_requested", callable_mp(this, &TaskTree::_update_tree));
538537
tree_search->search_panel->connect("visibility_changed", callable_mp(this, &TaskTree::_update_tree));
539-
tree_search->search_panel->connect("filter_toggled", callable_mp(this, &TaskTree::_update_tree));
540538
} break;
541539
case NOTIFICATION_THEME_CHANGED: {
542540
_do_update_theme_item_cache();

editor/tree_search.cpp

+5-10
Original file line numberDiff line numberDiff line change
@@ -82,35 +82,30 @@ void TreeSearchPanel::_add_spacer(float p_width_multiplier) {
8282
add_child(spacer);
8383
}
8484

85-
void TreeSearchPanel::_emit_text_changed(const String &p_text) {
86-
this->emit_signal("text_changed", p_text);
87-
}
88-
8985
void TreeSearchPanel::_emit_text_submitted(const String &p_text) {
9086
this->emit_signal("text_submitted");
9187
}
9288

93-
void TreeSearchPanel::_emit_filter_toggled() {
94-
this->emit_signal("filter_toggled");
89+
void TreeSearchPanel::_emit_update_requested(){
90+
emit_signal("update_requested");
9591
}
9692

9793
void TreeSearchPanel::_notification(int p_what) {
9894
switch (p_what) {
9995
case NOTIFICATION_READY: {
10096
_initialize_controls();
101-
line_edit_search->connect("text_changed", callable_mp(this, &TreeSearchPanel::_emit_text_changed));
97+
line_edit_search->connect("text_changed", callable_mp(this, &TreeSearchPanel::_emit_update_requested).unbind(1));
10298
_initialize_close_callbacks();
10399
line_edit_search->connect("text_submitted", callable_mp(this, &TreeSearchPanel::_emit_text_submitted));
104-
check_button_filter_highlight->connect("pressed", callable_mp(this, &TreeSearchPanel::_emit_filter_toggled));
100+
check_button_filter_highlight->connect("pressed", callable_mp(this, &TreeSearchPanel::_emit_update_requested));
105101
break;
106102
}
107103
}
108104
}
109105

110106
void TreeSearchPanel::_bind_methods() {
111-
ADD_SIGNAL(MethodInfo("text_changed"));
107+
ADD_SIGNAL(MethodInfo("update_requested"));
112108
ADD_SIGNAL(MethodInfo("text_submitted"));
113-
ADD_SIGNAL(MethodInfo("filter_toggled"));
114109
}
115110

116111
TreeSearchPanel::TreeSearchPanel() {

editor/tree_search.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,8 @@ class TreeSearchPanel : public HFlowContainer {
5353
void _add_spacer(float width_multiplier = 1.f);
5454

5555
void _on_draw_highlight(TreeItem *p_item, Rect2 p_rect);
56-
void _emit_text_changed(const String &p_text);
5756
void _emit_text_submitted(const String &p_text);
58-
void _emit_filter_toggled();
57+
void _emit_update_requested();
5958
void _notification(int p_what);
6059

6160
protected:

0 commit comments

Comments
 (0)