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

Merge pull request #50500 from LightningAA/simplify-subviewport-preview-editor-theme 

Remove unnecessary `get_editor_theme()` in `SubViewportPreview`
This commit is contained in:
Rémi Verschelde 2021-07-20 11:19:07 +02:00 committed by GitHub
parent 8b1c60c1a3 8aaa41ec97
commit 1af58e046e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
editor/plugins/sub_viewport_preview_editor_plugin.cpp
View File

@ -38,6 +38,7 @@ void EditorInspectorPluginSubViewportPreview::parse_begin(Object *p_object) {
SubViewport *sub_viewport = Object::cast_to<SubViewport>(p_object); SubViewport *sub_viewport = Object::cast_to<SubViewport>(p_object);
TexturePreview *sub_viewport_preview = memnew(TexturePreview(sub_viewport->get_texture(), false)); TexturePreview *sub_viewport_preview = memnew(TexturePreview(sub_viewport->get_texture(), false));
// Otherwise `sub_viewport_preview`'s `texture_display` doesn't update properly when `sub_viewport`'s size changes.
sub_viewport->connect("size_changed", callable_mp((CanvasItem *)sub_viewport_preview->get_texture_display(), &CanvasItem::update)); sub_viewport->connect("size_changed", callable_mp((CanvasItem *)sub_viewport_preview->get_texture_display(), &CanvasItem::update));
add_custom_control(sub_viewport_preview); add_custom_control(sub_viewport_preview);
} }

8
editor/plugins/texture_editor_plugin.cpp
View File

@ -37,10 +37,8 @@ TextureRect *TexturePreview::get_texture_display() {
} }
TexturePreview::TexturePreview(Ref<Texture2D> p_texture, bool p_show_metadata) { TexturePreview::TexturePreview(Ref<Texture2D> p_texture, bool p_show_metadata) {
Ref<Theme> theme = EditorNode::get_singleton()->get_editor_theme();
TextureRect *checkerboard = memnew(TextureRect); TextureRect *checkerboard = memnew(TextureRect);
checkerboard->set_texture(theme->get_icon("Checkerboard", "EditorIcons")); checkerboard->set_texture(get_theme_icon("Checkerboard", "EditorIcons"));
checkerboard->set_stretch_mode(TextureRect::STRETCH_TILE); checkerboard->set_stretch_mode(TextureRect::STRETCH_TILE);
checkerboard->set_texture_repeat(CanvasItem::TEXTURE_REPEAT_ENABLED); checkerboard->set_texture_repeat(CanvasItem::TEXTURE_REPEAT_ENABLED);
checkerboard->set_custom_minimum_size(Size2(0.0, 256.0) * EDSCALE); checkerboard->set_custom_minimum_size(Size2(0.0, 256.0) * EDSCALE);
@ -70,10 +68,10 @@ TexturePreview::TexturePreview(Ref<Texture2D> p_texture, bool p_show_metadata) {
metadata_label->add_theme_font_size_override("font_size", 16 * EDSCALE); metadata_label->add_theme_font_size_override("font_size", 16 * EDSCALE);
metadata_label->add_theme_color_override("font_outline_color", Color::named("black")); metadata_label->add_theme_color_override("font_outline_color", Color::named("black"));
metadata_label->add_theme_constant_override("outline_size", 2 * EDSCALE); metadata_label->add_theme_constant_override("outline_size", 2 * EDSCALE);
Ref<Font> metadata_label_font = theme->get_font("expression", "EditorFonts"); Ref<Font> metadata_label_font = get_theme_font("expression", "EditorFonts");
metadata_label->add_theme_font_override("font", metadata_label_font); metadata_label->add_theme_font_override("font", metadata_label_font);
// it's okay that these colors are static since the grid color is static too // It's okay that these colors are static since the grid color is static too.
metadata_label->add_theme_color_override("font_color", Color::named("white")); metadata_label->add_theme_color_override("font_color", Color::named("white"));
metadata_label->add_theme_color_override("font_color_shadow", Color::named("black")); metadata_label->add_theme_color_override("font_color_shadow", Color::named("black"));