Add support for icons in GDExtension classes

Co-authored-by: Rémi Verschelde <rverschelde@gmail.com>

3 files changed, 33 insertions, 7 deletions

diff --git a/editor/editor_data.cpp b/editor/editor_data.cpp
index 2d095d2dc7..c381c8c322 100644
--- a/editor/editor_data.cpp
+++ b/editor/editor_data.cpp
@@ -31,6 +31,7 @@
 #include "editor_data.h"
 
 #include "core/config/project_settings.h"
+#include "core/extension/gdextension_manager.h"
 #include "core/io/file_access.h"
 #include "core/io/image_loader.h"
 #include "core/io/resource_loader.h"
@@ -1030,6 +1031,17 @@ void EditorData::script_class_load_icon_paths() {
 	}
 }
 
+Ref<Texture2D> EditorData::extension_class_get_icon(const String &p_class) const {
+	if (GDExtensionManager::get_singleton()->class_has_icon_path(p_class)) {
+		String icon_path = GDExtensionManager::get_singleton()->class_get_icon_path(p_class);
+		Ref<Texture2D> icon = _load_script_icon(icon_path);
+		if (icon.is_valid()) {
+			return icon;
+		}
+	}
+	return nullptr;
+}
+
 Ref<Texture2D> EditorData::_load_script_icon(const String &p_path) const {
 	if (!p_path.is_empty() && ResourceLoader::exists(p_path)) {
 		Ref<Texture2D> icon = ResourceLoader::load(p_path);
diff --git a/editor/editor_data.h b/editor/editor_data.h
index fcf43e72f0..370963074c 100644
--- a/editor/editor_data.h
+++ b/editor/editor_data.h
@@ -243,6 +243,8 @@ public:
 	void script_class_save_icon_paths();
 	void script_class_load_icon_paths();
 
+	Ref<Texture2D> extension_class_get_icon(const String &p_class) const;
+
 	Ref<Texture2D> get_script_icon(const Ref<Script> &p_script);
 	void clear_script_icon_cache();
 
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 74e6907215..4fe43f3892 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -4477,21 +4477,33 @@ Ref<Texture2D> EditorNode::_get_class_or_script_icon(const String &p_class, cons
 			return script_icon;
 		}
 
-		// No custom icon was found in the inheritance chain, so check the built-in
-		// base class instead.
+		// No custom icon was found in the inheritance chain, so check the base
+		// class of the script instead.
 		String base_type;
 		p_script->get_language()->get_global_class_name(p_script->get_path(), &base_type);
-		if (gui_base) {
-			if (gui_base->has_theme_icon(base_type, "EditorIcons")) {
-				return gui_base->get_theme_icon(base_type, "EditorIcons");
-			}
-			return gui_base->get_theme_icon(p_fallback, "EditorIcons");
+
+		// Check if the base type is an extension-defined type.
+		Ref<Texture2D> ext_icon = ed.extension_class_get_icon(base_type);
+		if (ext_icon.is_valid()) {
+			return ext_icon;
+		}
+
+		// Look for the base type in the editor theme.
+		// This is only relevant for built-in classes.
+		if (gui_base && gui_base->has_theme_icon(base_type, "EditorIcons")) {
+			return gui_base->get_theme_icon(base_type, "EditorIcons");
 		}
 	}
 
 	// Script was not valid or didn't yield any useful values, try the class name
 	// directly.
 
+	// Check if the class name is an extension-defined type.
+	Ref<Texture2D> ext_icon = ed.extension_class_get_icon(p_class);
+	if (ext_icon.is_valid()) {
+		return ext_icon;
+	}
+
 	// Check if the class name is a custom type.
 	// TODO: Should probably be deprecated in 4.x
 	const EditorData::CustomType *ctype = ed.get_custom_type_by_name(p_class);