summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-05-22 10:45:25 +0200
committerGitHub <noreply@github.com>2019-05-22 10:45:25 +0200
commit41d3f4787e24dbea3d46d881f80fa406bb05de27 (patch)
tree708922ae59be60d5a16b7610f4c178c5f6d21d42
parentd78a9476146982f7d64bb65ffe94a2fc15babba3 (diff)
parentb5c8205312c04205db5fe7ebf87ddbaa9dbfc950 (diff)
Merge pull request #29074 from YeldhamDev/theme_editor_panel_fix
Fix bottom panel visibility behaviour in the theme editor
-rw-r--r--editor/plugins/theme_editor_plugin.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/editor/plugins/theme_editor_plugin.cpp b/editor/plugins/theme_editor_plugin.cpp
index 672d5d3496..5b67d259ba 100644
--- a/editor/plugins/theme_editor_plugin.cpp
+++ b/editor/plugins/theme_editor_plugin.cpp
@@ -879,11 +879,9 @@ ThemeEditor::ThemeEditor() {
void ThemeEditorPlugin::edit(Object *p_node) {
if (Object::cast_to<Theme>(p_node)) {
- theme_editor->show();
theme_editor->edit(Object::cast_to<Theme>(p_node));
} else {
theme_editor->edit(Ref<Theme>());
- theme_editor->hide();
}
}
@@ -898,11 +896,11 @@ void ThemeEditorPlugin::make_visible(bool p_visible) {
theme_editor->set_process(true);
button->show();
editor->make_bottom_panel_item_visible(theme_editor);
-
} else {
theme_editor->set_process(false);
if (theme_editor->is_visible_in_tree())
editor->hide_bottom_panel();
+
button->hide();
}
}