Fix Label3D, TextMesh & Font not following project default theme in editor #89311
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
Chubercik
reviewed
Mar 9, 2024
scene/3d/label_3d.cpp
Outdated
| for (const Ref<Theme> &theme : global_context->get_themes()) { | ||
| List<Ref<Theme>> themes = global_context->get_themes(); | ||
| if (Engine::get_singleton()->is_editor_hint()) { | ||
| themes.push_front(ThemeDB::get_singleton()->get_project_theme()); // Preview in the editor properly. |
There was a problem hiding this comment.
// Preview in the editor properly.
Not sure if this comment is necessary
There was a problem hiding this comment.
To me it feels weird that it has to be done this way. I can remove the comment though.
bruvzg
reviewed
Mar 9, 2024
Mickeon
force-pushed
the
label_3d_is_a_mess
branch
from
afbff81 to
ba86704
Compare
|
Curious, but you're right. The problem does also exist for those two. |
Mickeon
changed the title
Chubercik
approved these changes
Mar 9, 2024
KoBeWi
approved these changes
Mar 9, 2024
There was a problem hiding this comment.
The reason why it works is that the global theme context in editor does not contain project theme:
godot/scene/theme/theme_db.cpp
Lines 278 to 280 in 0ace0a1
You are pushing it to front of the iterated theme list, so the Label3D checks it and finds the font (
get_font() will always return something if a default font is assigned).
btw the get_fallback_theme() code below is most likely dead, as fallback theme is the same as the last theme in the List above.
|
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.
Seems to fix #85693 without side effects, and I honestly have no idea why.