Merge pull request #108607 from beicause/icon-parent-class-by-default

Repiteo · Repiteo · commit 72a1b5a2e563 · 2025-10-31T09:23:28.000-05:00
Fall back to parent class icon by default for GDExtension
diff --git a/editor/animation/animation_bezier_editor.cpp b/editor/animation/animation_bezier_editor.cpp
@@ -412,7 +412,7 @@ void AnimationBezierTrackEdit::_notification(int p_what) {
 					if (node) {
 						int ofs = 0;
 
-						Ref<Texture2D> icon = EditorNode::get_singleton()->get_object_icon(node, "Node");
+						Ref<Texture2D> icon = EditorNode::get_singleton()->get_object_icon(node);
 
 						text = node->get_name();
 						ofs += h_separation;
diff --git a/editor/animation/animation_blend_tree_editor_plugin.cpp b/editor/animation/animation_blend_tree_editor_plugin.cpp
@@ -858,7 +858,7 @@ bool AnimationNodeBlendTreeEditor::_update_filters(const Ref<AnimationNode> &ano
 
 				if (base->has_node(accum)) {
 					Node *node = base->get_node(accum);
-					ti->set_icon(0, EditorNode::get_singleton()->get_object_icon(node, "Node"));
+					ti->set_icon(0, EditorNode::get_singleton()->get_object_icon(node));
 				}
 
 			} else {
diff --git a/editor/animation/animation_track_editor.cpp b/editor/animation/animation_track_editor.cpp
@@ -2177,7 +2177,7 @@ void AnimationTrackEdit::_notification(int p_what) {
 					}
 					text_color.a *= 0.7;
 				} else if (node) {
-					Ref<Texture2D> icon = EditorNode::get_singleton()->get_object_icon(node, "Node");
+					Ref<Texture2D> icon = EditorNode::get_singleton()->get_object_icon(node);
 					const Vector2 icon_size = Vector2(1, 1) * get_theme_constant(SNAME("class_icon_size"), EditorStringName(Editor));
 
 					icon_rect = Rect2(Point2(ofs, (get_size().height - check->get_height()) / 2).round(), icon->get_size());
@@ -5110,7 +5110,7 @@ void AnimationTrackEditor::_update_tracks() {
 				if (root) {
 					Node *n = root->get_node_or_null(base_path);
 					if (n) {
-						icon = EditorNode::get_singleton()->get_object_icon(n, "Node");
+						icon = EditorNode::get_singleton()->get_object_icon(n);
 						name = n->get_name();
 						tooltip = String(root->get_path_to(n));
 					}
diff --git a/editor/debugger/editor_debugger_tree.cpp b/editor/debugger/editor_debugger_tree.cpp
@@ -258,7 +258,7 @@ void EditorDebuggerTree::update_scene_tree(const SceneDebuggerTree *p_tree, int
 		} else {
 			item->set_tooltip_text(0, node.name + "\n" + TTR("Instance:") + " " + node.scene_file_path + "\n" + TTR("Type:") + " " + node.type_name);
 		}
-		Ref<Texture2D> icon = EditorNode::get_singleton()->get_class_icon(node.type_name, "");
+		Ref<Texture2D> icon = EditorNode::get_singleton()->get_class_icon(node.type_name);
 		if (icon.is_valid()) {
 			item->set_icon(0, icon);
 		}
diff --git a/editor/doc/editor_help.cpp b/editor/doc/editor_help.cpp
@@ -974,7 +974,7 @@ void EditorHelp::_update_doc() {
 	_push_title_font();
 
 	class_desc->add_text(TTR("Class:") + " ");
-	_add_type_icon(edited_class, theme_cache.doc_title_font_size, "Object");
+	_add_type_icon(edited_class, theme_cache.doc_title_font_size, "");
 	class_desc->add_text(nbsp);
 
 	class_desc->push_color(theme_cache.headline_color);
diff --git a/editor/docks/inspector_dock.cpp b/editor/docks/inspector_dock.cpp
@@ -337,7 +337,7 @@ void InspectorDock::_prepare_history() {
 
 		already.insert(id);
 
-		Ref<Texture2D> icon = EditorNode::get_singleton()->get_object_icon(obj, "Object");
+		Ref<Texture2D> icon = EditorNode::get_singleton()->get_object_icon(obj);
 
 		String text;
 		if (obj->has_method("_get_editor_name")) {
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
@@ -5266,7 +5266,7 @@ void EditorNode::_pick_main_scene_custom_action(const String &p_custom_action_na
 	}
 }
 
-Ref<Texture2D> EditorNode::_get_class_or_script_icon(const String &p_class, const String &p_script_path, const String &p_fallback, bool p_fallback_script_to_theme) {
+Ref<Texture2D> EditorNode::_get_class_or_script_icon(const String &p_class, const String &p_script_path, const String &p_fallback, bool p_fallback_script_to_theme, bool p_skip_fallback_virtual) {
 	ERR_FAIL_COND_V_MSG(p_class.is_empty(), nullptr, "Class name cannot be empty.");
 	EditorData &ed = EditorNode::get_editor_data();
 
@@ -5289,8 +5289,9 @@ Ref<Texture2D> EditorNode::_get_class_or_script_icon(const String &p_class, cons
 					base_type = scr->get_instance_base_type();
 				}
 			}
-			if (theme.is_valid() && theme->has_icon(base_type, EditorStringName(EditorIcons))) {
-				return theme->get_icon(base_type, EditorStringName(EditorIcons));
+			if (theme.is_valid()) {
+				bool instantiable = !ClassDB::is_virtual(p_class) && ClassDB::can_instantiate(p_class);
+				return _get_class_or_script_icon(base_type, "", "", false, p_skip_fallback_virtual || instantiable);
 			}
 		}
 	}
@@ -5324,11 +5325,20 @@ Ref<Texture2D> EditorNode::_get_class_or_script_icon(const String &p_class, cons
 
 		// If the fallback is empty or wasn't found, use the default fallback.
 		if (ClassDB::class_exists(p_class)) {
-			bool instantiable = !ClassDB::is_virtual(p_class) && ClassDB::can_instantiate(p_class);
-			if (ClassDB::is_parent_class(p_class, SNAME("Node"))) {
-				return theme->get_icon(instantiable ? "Node" : "NodeDisabled", EditorStringName(EditorIcons));
-			} else {
-				return theme->get_icon(instantiable ? "Object" : "ObjectDisabled", EditorStringName(EditorIcons));
+			if (!p_skip_fallback_virtual) {
+				bool instantiable = !ClassDB::is_virtual(p_class) && ClassDB::can_instantiate(p_class);
+				if (!instantiable) {
+					if (ClassDB::is_parent_class(p_class, SNAME("Node"))) {
+						return theme->get_icon("NodeDisabled", EditorStringName(EditorIcons));
+					} else {
+						return theme->get_icon("ObjectDisabled", EditorStringName(EditorIcons));
+					}
+				}
+			}
+			StringName parent = ClassDB::get_parent_class_nocheck(p_class);
+			if (parent) {
+				// Skip virtual class if `p_skip_fallback_virtual` is true or `p_class` is instantiable.
+				return _get_class_or_script_icon(parent, "", "", false, true);
 			}
 		}
 	}
diff --git a/editor/editor_node.h b/editor/editor_node.h
@@ -696,7 +696,7 @@ class EditorNode : public Node {
 	void _feature_profile_changed();
 	bool _is_class_editor_disabled_by_feature_profile(const StringName &p_class);
 
-	Ref<Texture2D> _get_class_or_script_icon(const String &p_class, const String &p_script_path, const String &p_fallback = "Object", bool p_fallback_script_to_theme = false);
+	Ref<Texture2D> _get_class_or_script_icon(const String &p_class, const String &p_script_path, const String &p_fallback = "", bool p_fallback_script_to_theme = false, bool p_skip_fallback_virtual = false);
 	Ref<Texture2D> _get_editor_theme_native_menu_icon(const StringName &p_name, bool p_global_menu, bool p_dark_mode) const;
 
 	void _pick_main_scene_custom_action(const String &p_custom_action_name);
@@ -938,7 +938,7 @@ class EditorNode : public Node {
 
 	Ref<Script> get_object_custom_type_base(const Object *p_object) const;
 	StringName get_object_custom_type_name(const Object *p_object) const;
-	Ref<Texture2D> get_object_icon(const Object *p_object, const String &p_fallback = "Object");
+	Ref<Texture2D> get_object_icon(const Object *p_object, const String &p_fallback = "");
 	Ref<Texture2D> get_class_icon(const String &p_class, const String &p_fallback = "");
 
 	bool is_object_of_custom_type(const Object *p_object, const StringName &p_class);
diff --git a/editor/inspector/editor_inspector.cpp b/editor/inspector/editor_inspector.cpp
@@ -1886,7 +1886,7 @@ void EditorInspectorCategory::_update_icon() {
 	if (scr.is_valid()) {
 		StringName script_name = EditorNode::get_editor_data().script_class_get_name(scr->get_path());
 		if (script_name == StringName()) {
-			icon = EditorNode::get_singleton()->get_object_icon(scr.ptr(), "Object");
+			icon = EditorNode::get_singleton()->get_object_icon(scr.ptr());
 		} else {
 			icon = EditorNode::get_singleton()->get_class_icon(script_name);
 		}
diff --git a/editor/inspector/editor_properties.cpp b/editor/inspector/editor_properties.cpp
@@ -3082,7 +3082,7 @@ void EditorPropertyNodePath::update_property() {
 	}
 
 	assign->set_text(target_node->get_name());
-	assign->set_button_icon(EditorNode::get_singleton()->get_object_icon(target_node, "Node"));
+	assign->set_button_icon(EditorNode::get_singleton()->get_object_icon(target_node));
 }
 
 void EditorPropertyNodePath::setup(const Vector<StringName> &p_valid_types, bool p_use_path_from_scene_root, bool p_editing_node) {
diff --git a/editor/inspector/editor_resource_picker.cpp b/editor/inspector/editor_resource_picker.cpp
@@ -95,7 +95,7 @@ void EditorResourcePicker::_update_resource() {
 			assign_button->set_text(TTR("<empty>"));
 			assign_button->set_tooltip_text("");
 		} else {
-			assign_button->set_button_icon(EditorNode::get_singleton()->get_object_icon(edited_resource.operator->(), SNAME("Object")));
+			assign_button->set_button_icon(EditorNode::get_singleton()->get_object_icon(edited_resource.operator->()));
 
 			if (!edited_resource->get_name().is_empty()) {
 				assign_button->set_text(edited_resource->get_name());
@@ -576,7 +576,7 @@ void EditorResourcePicker::set_create_options(Object *p_menu_node) {
 
 			inheritors_array.push_back(t);
 
-			Ref<Texture2D> icon = EditorNode::get_singleton()->get_class_icon(t, "Object");
+			Ref<Texture2D> icon = EditorNode::get_singleton()->get_class_icon(t);
 			int id = TYPE_BASE_ID + idx;
 			edit_menu->add_icon_item(icon, t, id);
 			edit_menu->set_item_auto_translate_mode(-1, AUTO_TRANSLATE_MODE_DISABLED);
@@ -1557,7 +1557,7 @@ void EditorAudioStreamPicker::_preview_draw() {
 			icon_modulate = Color(1, 0.5, 0.5, 1); // get_theme_color(SNAME("accent_color"), EditorStringName(Editor));
 		}
 	} else {
-		icon = EditorNode::get_singleton()->get_object_icon(audio_stream.operator->(), "Object");
+		icon = EditorNode::get_singleton()->get_object_icon(audio_stream.operator->());
 	}
 	String text;
 	if (!audio_stream->get_name().is_empty()) {
diff --git a/editor/scene/3d/node_3d_editor_plugin.cpp b/editor/scene/3d/node_3d_editor_plugin.cpp
@@ -1674,7 +1674,7 @@ void Node3DEditorViewport::_list_select(Ref<InputEventMouseButton> b) {
 		for (int i = 0; i < selection_results.size(); i++) {
 			Node3D *spat = selection_results[i];
 
-			Ref<Texture2D> icon = EditorNode::get_singleton()->get_object_icon(spat, "Node");
+			Ref<Texture2D> icon = EditorNode::get_singleton()->get_object_icon(spat);
 
 			String node_path = "/" + root_name + "/" + String(root_path.rel_path_to(spat->get_path()));
 
diff --git a/editor/scene/3d/root_motion_editor_plugin.cpp b/editor/scene/3d/root_motion_editor_plugin.cpp
@@ -108,7 +108,7 @@ void EditorPropertyRootMotion::_node_assign() {
 
 				if (base->has_node(accum)) {
 					Node *node = base->get_node(accum);
-					ti->set_icon(0, EditorNode::get_singleton()->get_object_icon(node, "Node"));
+					ti->set_icon(0, EditorNode::get_singleton()->get_object_icon(node));
 				}
 
 			} else {
diff --git a/editor/scene/canvas_item_editor_plugin.cpp b/editor/scene/canvas_item_editor_plugin.cpp
@@ -2369,7 +2369,7 @@ bool CanvasItemEditor::_gui_input_select(const Ref<InputEvent> &p_event) {
 				for (int i = 0; i < selection_results.size(); i++) {
 					CanvasItem *item = selection_results[i].item;
 
-					Ref<Texture2D> icon = EditorNode::get_singleton()->get_object_icon(item, "Node");
+					Ref<Texture2D> icon = EditorNode::get_singleton()->get_object_icon(item);
 					String node_path = "/" + root_name + "/" + String(root_path.rel_path_to(item->get_path()));
 
 					int locked = 0;
diff --git a/editor/scene/editor_scene_tabs.cpp b/editor/scene/editor_scene_tabs.cpp
@@ -276,7 +276,7 @@ void EditorSceneTabs::_update_tab_titles() {
 		Node *type_node = EditorNode::get_editor_data().get_edited_scene_root(i);
 		Ref<Texture2D> icon;
 		if (type_node) {
-			icon = EditorNode::get_singleton()->get_object_icon(type_node, "Node");
+			icon = EditorNode::get_singleton()->get_object_icon(type_node);
 		}
 		scene_tabs->set_tab_icon(i, icon);
 
diff --git a/editor/scene/resource_preloader_editor_plugin.cpp b/editor/scene/resource_preloader_editor_plugin.cpp
@@ -201,7 +201,7 @@ void ResourcePreloaderEditor::_update_library() {
 		ERR_CONTINUE(r.is_null());
 
 		String type = r->get_class();
-		ti->set_icon(0, EditorNode::get_singleton()->get_class_icon(type, "Object"));
+		ti->set_icon(0, EditorNode::get_singleton()->get_class_icon(type));
 		ti->set_tooltip_text(0, TTR("Instance:") + " " + r->get_path() + "\n" + TTR("Type:") + " " + type);
 
 		ti->set_text(1, r->get_path());
diff --git a/editor/scene/scene_tree_editor.cpp b/editor/scene/scene_tree_editor.cpp
@@ -404,7 +404,7 @@ void SceneTreeEditor::_update_node(Node *p_node, TreeItem *p_item, bool p_part_o
 		}
 	}
 
-	Ref<Texture2D> icon = EditorNode::get_singleton()->get_object_icon(p_node, "Node");
+	Ref<Texture2D> icon = EditorNode::get_singleton()->get_object_icon(p_node);
 	p_item->set_icon(0, icon);
 	p_item->set_metadata(0, p_node->get_path());
 
diff --git a/editor/script/script_text_editor.cpp b/editor/script/script_text_editor.cpp
@@ -75,7 +75,7 @@ void ConnectionInfoDialog::popup_connections(const String &p_method, const Vecto
 			TreeItem *node_item = tree->create_item(root);
 
 			node_item->set_text(0, Object::cast_to<Node>(connection.signal.get_object())->get_name());
-			node_item->set_icon(0, EditorNode::get_singleton()->get_object_icon(connection.signal.get_object(), "Node"));
+			node_item->set_icon(0, EditorNode::get_singleton()->get_object_icon(connection.signal.get_object()));
 			node_item->set_selectable(0, false);
 			node_item->set_editable(0, false);
 
@@ -86,7 +86,7 @@ void ConnectionInfoDialog::popup_connections(const String &p_method, const Vecto
 			node_item->set_editable(1, false);
 
 			node_item->set_text(2, Object::cast_to<Node>(connection.callable.get_object())->get_name());
-			node_item->set_icon(2, EditorNode::get_singleton()->get_object_icon(connection.callable.get_object(), "Node"));
+			node_item->set_icon(2, EditorNode::get_singleton()->get_object_icon(connection.callable.get_object()));
 			node_item->set_selectable(2, false);
 			node_item->set_editable(2, false);
 		}
diff --git a/editor/script/text_editor.cpp b/editor/script/text_editor.cpp
@@ -89,7 +89,7 @@ String TextEditor::get_name() {
 }
 
 Ref<Texture2D> TextEditor::get_theme_icon() {
-	return EditorNode::get_singleton()->get_object_icon(edited_res.ptr(), "TextFile");
+	return EditorNode::get_singleton()->get_object_icon(edited_res.ptr());
 }
 
 Ref<Resource> TextEditor::get_edited_resource() const {

Original file line number	Diff line number	Diff line change
`@@ -858,7 +858,7 @@ bool AnimationNodeBlendTreeEditor::_update_filters(const Ref<AnimationNode> &ano`
`858`	`858`
`859`	`859`	`if (base->has_node(accum)) {`
`860`	`860`	`Node *node = base->get_node(accum);`
`861`		`- ti->set_icon(0, EditorNode::get_singleton()->get_object_icon(node, "Node"));`
	`861`	`+ ti->set_icon(0, EditorNode::get_singleton()->get_object_icon(node));`
`862`	`862`	`}`
`863`	`863`
`864`	`864`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ void EditorDebuggerTree::update_scene_tree(const SceneDebuggerTree *p_tree, int`
`258`	`258`	`} else {`
`259`	`259`	`item->set_tooltip_text(0, node.name + "\n" + TTR("Instance:") + " " + node.scene_file_path + "\n" + TTR("Type:") + " " + node.type_name);`
`260`	`260`	`}`
`261`		`- Ref<Texture2D> icon = EditorNode::get_singleton()->get_class_icon(node.type_name, "");`
	`261`	`+ Ref<Texture2D> icon = EditorNode::get_singleton()->get_class_icon(node.type_name);`
`262`	`262`	`if (icon.is_valid()) {`
`263`	`263`	`item->set_icon(0, icon);`
`264`	`264`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5266,7 +5266,7 @@ void EditorNode::_pick_main_scene_custom_action(const String &p_custom_action_na`
`5266`	`5266`	`}`
`5267`	`5267`	`}`
`5268`	`5268`
`5269`		`-Ref<Texture2D> EditorNode::_get_class_or_script_icon(const String &p_class, const String &p_script_path, const String &p_fallback, bool p_fallback_script_to_theme) {`
	`5269`	`+Ref<Texture2D> EditorNode::_get_class_or_script_icon(const String &p_class, const String &p_script_path, const String &p_fallback, bool p_fallback_script_to_theme, bool p_skip_fallback_virtual) {`
`5270`	`5270`	`ERR_FAIL_COND_V_MSG(p_class.is_empty(), nullptr, "Class name cannot be empty.");`
`5271`	`5271`	`EditorData &ed = EditorNode::get_editor_data();`
`5272`	`5272`
`@@ -5289,8 +5289,9 @@ Ref<Texture2D> EditorNode::_get_class_or_script_icon(const String &p_class, cons`
`5289`	`5289`	`base_type = scr->get_instance_base_type();`
`5290`	`5290`	`}`
`5291`	`5291`	`}`
`5292`		`- if (theme.is_valid() && theme->has_icon(base_type, EditorStringName(EditorIcons))) {`
`5293`		`- return theme->get_icon(base_type, EditorStringName(EditorIcons));`
	`5292`	`+ if (theme.is_valid()) {`
	`5293`	`+ bool instantiable = !ClassDB::is_virtual(p_class) && ClassDB::can_instantiate(p_class);`
	`5294`	`+ return _get_class_or_script_icon(base_type, "", "", false, p_skip_fallback_virtual \|\| instantiable);`
`5294`	`5295`	`}`
`5295`	`5296`	`}`
`5296`	`5297`	`}`
`@@ -5324,11 +5325,20 @@ Ref<Texture2D> EditorNode::_get_class_or_script_icon(const String &p_class, cons`
`5324`	`5325`
`5325`	`5326`	`// If the fallback is empty or wasn't found, use the default fallback.`
`5326`	`5327`	`if (ClassDB::class_exists(p_class)) {`
`5327`		`- bool instantiable = !ClassDB::is_virtual(p_class) && ClassDB::can_instantiate(p_class);`
`5328`		`- if (ClassDB::is_parent_class(p_class, SNAME("Node"))) {`
`5329`		`- return theme->get_icon(instantiable ? "Node" : "NodeDisabled", EditorStringName(EditorIcons));`
`5330`		`- } else {`
`5331`		`- return theme->get_icon(instantiable ? "Object" : "ObjectDisabled", EditorStringName(EditorIcons));`
	`5328`	`+ if (!p_skip_fallback_virtual) {`
	`5329`	`+ bool instantiable = !ClassDB::is_virtual(p_class) && ClassDB::can_instantiate(p_class);`
	`5330`	`+ if (!instantiable) {`
	`5331`	`+ if (ClassDB::is_parent_class(p_class, SNAME("Node"))) {`
	`5332`	`+ return theme->get_icon("NodeDisabled", EditorStringName(EditorIcons));`
	`5333`	`+ } else {`
	`5334`	`+ return theme->get_icon("ObjectDisabled", EditorStringName(EditorIcons));`
	`5335`	`+ }`
	`5336`	`+ }`
	`5337`	`+ }`
	`5338`	`+ StringName parent = ClassDB::get_parent_class_nocheck(p_class);`
	`5339`	`+ if (parent) {`
	`5340`	+ // Skip virtual class if `p_skip_fallback_virtual` is true or `p_class` is instantiable.
	`5341`	`+ return _get_class_or_script_icon(parent, "", "", false, true);`
`5332`	`5342`	`}`
`5333`	`5343`	`}`
`5334`	`5344`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1886,7 +1886,7 @@ void EditorInspectorCategory::_update_icon() {`
`1886`	`1886`	`if (scr.is_valid()) {`
`1887`	`1887`	`StringName script_name = EditorNode::get_editor_data().script_class_get_name(scr->get_path());`
`1888`	`1888`	`if (script_name == StringName()) {`
`1889`		`- icon = EditorNode::get_singleton()->get_object_icon(scr.ptr(), "Object");`
	`1889`	`+ icon = EditorNode::get_singleton()->get_object_icon(scr.ptr());`
`1890`	`1890`	`} else {`
`1891`	`1891`	`icon = EditorNode::get_singleton()->get_class_icon(script_name);`
`1892`	`1892`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3082,7 +3082,7 @@ void EditorPropertyNodePath::update_property() {`
`3082`	`3082`	`}`
`3083`	`3083`
`3084`	`3084`	`assign->set_text(target_node->get_name());`
`3085`		`- assign->set_button_icon(EditorNode::get_singleton()->get_object_icon(target_node, "Node"));`
	`3085`	`+ assign->set_button_icon(EditorNode::get_singleton()->get_object_icon(target_node));`
`3086`	`3086`	`}`
`3087`	`3087`
`3088`	`3088`	`void EditorPropertyNodePath::setup(const Vector<StringName> &p_valid_types, bool p_use_path_from_scene_root, bool p_editing_node) {`