Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-24 05:04:10 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Include inherited classes in Filter Nodes' "type:" filter & fix "group:"

Browse Source 
Also fixes not all private, internal groups being skipped in the "group:" filter.
This commit is contained in:
Micky 2022-09-16 23:01:33 +02:00
parent 61021c08f8
commit 44738e1e15
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
editor/scene_tree_editor.cpp
View File

@ -673,27 +673,37 @@ bool SceneTreeEditor::_item_matches_all_terms(TreeItem *p_item, PackedStringArra
if (parameter == "type" || parameter == "t") {
// Filter by Type.
String node_type = get_node(p_item->get_metadata(0))->get_class().to_lower();
String type = get_node(p_item->get_metadata(0))->get_class();
bool term_in_inherited_class = false;
// Every Node is is a Node, duh!
while (type != "Node") {
if (type.to_lower().contains(argument)) {
term_in_inherited_class = true;
break;
}
if (!node_type.contains(argument)) {
type = ClassDB::get_parent_class(type);
}
if (!term_in_inherited_class) {
return false;
}
} else if (parameter == "group" || parameter == "g") {
// Filter by Group.
Node *node = get_node(p_item->get_metadata(0));
List<Node::GroupInfo> group_info_list;
node->get_groups(&group_info_list);
if (group_info_list.is_empty()) {
return false;
}
// When argument is empty, match all Nodes belonging to any group.
if (!argument.is_empty()) {
if (argument.is_empty()) {
// When argument is empty, match all Nodes belonging to any exposed group.
if (node->get_persistent_group_count() == 0) {
return false;
}
} else {
List<Node::GroupInfo> group_info_list;
node->get_groups(&group_info_list);
bool term_in_groups = false;
for (int j = 0; j < group_info_list.size(); j++) {
// Ignore private groups.
if (String(group_info_list[j].name).begins_with("__")) {
continue;
if (!group_info_list[j].persistent) {
continue; // Ignore internal groups.
}
if (String(group_info_list[j].name).to_lower().contains(argument)) {
term_in_groups = true;