godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-13 13:31:48 +00:00
Code Releases Wiki Activity

Search custom types when filtering on type in the SceneTree dock

Browse Source
This commit is contained in:
Mike Precup
2025-04-09 23:00:52 -07:00
parent 215acd52e8
commit 6b9d67a547
2 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
editor/gui/scene_tree_editor.cpp
View File

@@ -1107,6 +1107,33 @@ bool SceneTreeEditor::_update_filter(TreeItem *p_parent, bool p_scroll_to_select
return p_parent->is_visible(); return p_parent->is_visible();
} }
bool SceneTreeEditor::_node_matches_class_term(const Node *p_item_node, const String &p_term) {
if (p_term.is_empty()) {
// Defend against https://github.com/godotengine/godot/issues/82473
return true;
}
Ref<Script> item_script = p_item_node->get_script();
while (item_script.is_valid()) {
String global_name = item_script->get_global_name();
if (global_name.to_lower().contains(p_term)) {
return true;
}
item_script = item_script->get_base_script();
}
String type = p_item_node->get_class();
// Every Node is a Node, duh!
while (type != "Node") {
if (type.to_lower().contains(p_term)) {
return true;
}
type = ClassDB::get_parent_class(type);
}
return false;
}
bool SceneTreeEditor::_item_matches_all_terms(TreeItem *p_item, const PackedStringArray &p_terms) { bool SceneTreeEditor::_item_matches_all_terms(TreeItem *p_item, const PackedStringArray &p_terms) {
if (p_terms.is_empty()) { if (p_terms.is_empty()) {
return true; return true;
@@ -1122,18 +1149,8 @@ bool SceneTreeEditor::_item_matches_all_terms(TreeItem *p_item, const PackedStri
if (parameter == "type" || parameter == "t") { if (parameter == "type" || parameter == "t") {
// Filter by Type. // Filter by Type.
String type = get_node(p_item->get_metadata(0))->get_class(); Node *item_node = get_node(p_item->get_metadata(0));
bool term_in_inherited_class = false; if (!_node_matches_class_term(item_node, argument)) {
// Every Node is a Node, duh!
while (type != "Node") {
if (type.to_lower().contains(argument)) {
term_in_inherited_class = true;
break;
}
type = ClassDB::get_parent_class(type);
}
if (!term_in_inherited_class) {
return false; return false;
} }
} else if (parameter == "group" || parameter == "g") { } else if (parameter == "group" || parameter == "g") {

1
editor/gui/scene_tree_editor.h
View File

@@ -146,6 +146,7 @@ class SceneTreeEditor : public Control {
void _test_update_tree(); void _test_update_tree();
bool _update_filter(TreeItem *p_parent = nullptr, bool p_scroll_to_selected = false); bool _update_filter(TreeItem *p_parent = nullptr, bool p_scroll_to_selected = false);
bool _node_matches_class_term(const Node *p_item_node, const String &p_term);
bool _item_matches_all_terms(TreeItem *p_item, const PackedStringArray &p_terms); bool _item_matches_all_terms(TreeItem *p_item, const PackedStringArray &p_terms);
void _tree_changed(); void _tree_changed();
void _tree_process_mode_changed(); void _tree_process_mode_changed();