godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #50777 from KoBeWi/Schrödinger's-Label

Browse Source 
Don't set metadata_label font if it doesn't exist
This commit is contained in:
Rémi Verschelde 2021-07-23 18:19:43 +02:00 committed by GitHub
commit d17201afc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/plugins/texture_editor_plugin.cpp
View File

@ -48,8 +48,10 @@ void TexturePreview::_notification(int p_what) {
break; break;
} }
if (metadata_label) {
Ref<Font> metadata_label_font = get_theme_font(SNAME("expression"), SNAME("EditorFonts")); Ref<Font> metadata_label_font = get_theme_font(SNAME("expression"), SNAME("EditorFonts"));
metadata_label->add_theme_font_override("font", metadata_label_font); metadata_label->add_theme_font_override("font", metadata_label_font);
}
checkerboard->set_texture(get_theme_icon(SNAME("Checkerboard"), SNAME("EditorIcons"))); checkerboard->set_texture(get_theme_icon(SNAME("Checkerboard"), SNAME("EditorIcons")));
} break; } break;

6
editor/plugins/texture_editor_plugin.h
View File

@ -39,10 +39,10 @@ class TexturePreview : public MarginContainer {
GDCLASS(TexturePreview, MarginContainer); GDCLASS(TexturePreview, MarginContainer);
private: private:
TextureRect *texture_display; TextureRect *texture_display = nullptr;
TextureRect *checkerboard; TextureRect *checkerboard = nullptr;
Label *metadata_label; Label *metadata_label = nullptr;
protected: protected:
void _notification(int p_what); void _notification(int p_what);