Refactor editor icon retrieval #21717
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
There are some style issues: https://travis-ci.org/godotengine/godot/jobs/423784992 |
willnationsdev
force-pushed
the
edicon-refactor
branch
from
72282c9
to
ad11551
Compare
|
@akien-mga Should be good to go, if someone wants to review it. |
akien-mga
reviewed
Sep 12, 2018
editor/animation_bezier_editor.cpp
Outdated
| @@ -29,6 +29,7 @@ | |||
| /*************************************************************************/ | |||
|
|
|||
| #include "animation_bezier_editor.h" | |||
| #include "editor/editor_node.h" | |||
There was a problem hiding this comment.
Please always leave an empty line between the .cpp's own header (animation_bezier_editor.h) and the other Godot headers.
|
Rebase needed after my change of |
willnationsdev
force-pushed
the
edicon-refactor
branch
3 times, most recently
from
7ffb941
to
afd5d6d
Compare
reduz
previously requested changes
Sep 13, 2018
editor/editor_data.cpp
Outdated
| } | ||
| } | ||
|
|
||
| Ref<Texture> EditorData::get_object_icon(const Object *p_object, const Control *p_control, const String &p_fallback) const { |
There was a problem hiding this comment.
This is way too complicated. Make the function part of EditorNode and get the icon from the theme or from the gui_base instance, so you dont have to pass instances around.
willnationsdev
force-pushed
the
edicon-refactor
branch
2 times, most recently
from
e344cff
to
bd328c1
Compare
reduz
previously requested changes
Sep 14, 2018
editor/editor_node.cpp
Outdated
| return NULL; | ||
| } | ||
|
|
||
| Ref<Texture> EditorNode::get_object_icon_name(const String &p_class, const String &p_fallback) const { |
There was a problem hiding this comment.
Two suggestions about this function:
- rename to get_class_icon (i think it makes more sense)
- fallback could have a default argument "Object" so it does not need to be passed always
willnationsdev
force-pushed
the
edicon-refactor
branch
from
bd328c1
to
5436abe
Compare
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It looks like this has a ton of different changes, but the vast majority of this is just about centralizing copy-pasta code all over the Godot Editor into a centralized location that does the same processing in every case (rather than bits and pieces that the copy-pasta had induced at various locations).
Fixes #21615 and circumvents any previous "fixes" surrounding "_editor_icon" metadata.
EditorData::script_class_get_name(p_path)so that a path alone can fetch us the name, and from there, the icon path. Start caching these values duringEditorFileSystem::_scan_script_classes(...).EditorData::get_object_icon(obj, ...)andEditorData::get_object_icon_name(name, ...)to fetch the appropriate editor icon depending on whether an object pointer or a String/StringName is available. Edit: we changedget_object_icon_nametoget_class_icon.current_item_is_preferredin thecpp_typecase (prevents a possibleClassDB::is_parent_class()ERR_FAIL_COND_V trigger).get_icon(...)calls in the editor classes, so I started to evaluate all of those files and determine if their usage could be converted into an EditorData call without compromising their logical functionality. I believe I've done that, but I'm sure people will want to investigate it further.