Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add builtin icons as a fallback option and as a way to use the editor's icons #100298

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+13 −0
Open

Add builtin icons as a fallback option and as a way to use the editor's icons #100298

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a62742
add builtin icons as a fallback option and as a way to use the editor…
sylbeth Dec 12, 2024
41c5bc5
Merge pull request #1 from sylbeth/editor-icon-auto-fallback
sylbeth Dec 12, 2024
320c85d
follow pre-commit directions
sylbeth Dec 12, 2024
92d533e
fix non refactoring rename
sylbeth Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions editor/editor_node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4846,6 +4846,17 @@ Ref<Texture2D> EditorNode::_get_class_or_script_icon(const String &p_class, cons
if (theme->has_icon(p_class, EditorStringName(EditorIcons))) {
return theme->get_icon(p_class, EditorStringName(EditorIcons));
}

// If there is a path associated with the node but there was no icon there or it was invalid.
// Then it takes the basename of the file and, if it's the name of an icon in the theme, it uses that instead as a fallback.
// This enables using "Node2D" as a valid path to get the icon without having to copy it and have it inside the project folder.
if (GDExtensionManager::get_singleton()->class_has_icon_path(p_class)) {
String icon_name = GDExtensionManager::get_singleton()
->class_get_icon_path(p_class).get_file().get_basename();
if (theme->has_icon(icon_path, EditorStringName(EditorIcons))) {
return theme->get_icon(icon_path, EditorStringName(EditorIcons));
}
}

if (!p_fallback.is_empty() && theme->has_icon(p_fallback, EditorStringName(EditorIcons))) {
return theme->get_icon(p_fallback, EditorStringName(EditorIcons));
Expand Down
Loading