summaryrefslogtreecommitdiff
path: root/tools/editor
diff options
context:
space:
mode:
authorFranklin Sobrinho <franklin_gs@hotmail.com>2016-03-15 15:15:50 -0300
committerFranklin Sobrinho <franklin_gs@hotmail.com>2016-03-15 15:15:50 -0300
commit4a0f835ece40db45f1705761cd492bd34e8c4630 (patch)
treed47ff360567b5e4d15b3b11107549dfe4ee5ce0f /tools/editor
parentbe4d58e1203ae35dab97b14f08098f50998d4201 (diff)
Fix editors panels, of the bottom panel, not resizing in some cases
Diffstat (limited to 'tools/editor')
-rw-r--r--tools/editor/plugins/animation_player_editor_plugin.cpp3
-rw-r--r--tools/editor/plugins/style_box_editor_plugin.cpp1
-rw-r--r--tools/editor/plugins/theme_editor_plugin.cpp6
3 files changed, 7 insertions, 3 deletions
diff --git a/tools/editor/plugins/animation_player_editor_plugin.cpp b/tools/editor/plugins/animation_player_editor_plugin.cpp
index 0b06aab447..67f730f300 100644
--- a/tools/editor/plugins/animation_player_editor_plugin.cpp
+++ b/tools/editor/plugins/animation_player_editor_plugin.cpp
@@ -1500,7 +1500,8 @@ bool AnimationPlayerEditorPlugin::handles(Object *p_object) const {
void AnimationPlayerEditorPlugin::make_visible(bool p_visible) {
if (p_visible) {
- anim_editor->show();
+
+ editor->make_bottom_panel_item_visible(anim_editor);
anim_editor->set_process(true);
anim_editor->ensure_visibility();
// editor->animation_panel_make_visible(true);
diff --git a/tools/editor/plugins/style_box_editor_plugin.cpp b/tools/editor/plugins/style_box_editor_plugin.cpp
index 3d7cf4135d..f08d2a7376 100644
--- a/tools/editor/plugins/style_box_editor_plugin.cpp
+++ b/tools/editor/plugins/style_box_editor_plugin.cpp
@@ -92,6 +92,7 @@ void StyleBoxEditorPlugin::make_visible(bool p_visible){
if (p_visible) {
button->show();
+ EditorNode::get_singleton()->make_bottom_panel_item_visible(stylebox_editor);
} else {
if (stylebox_editor->is_visible())
diff --git a/tools/editor/plugins/theme_editor_plugin.cpp b/tools/editor/plugins/theme_editor_plugin.cpp
index ef7b3b17c3..938b8344ba 100644
--- a/tools/editor/plugins/theme_editor_plugin.cpp
+++ b/tools/editor/plugins/theme_editor_plugin.cpp
@@ -833,10 +833,12 @@ void ThemeEditorPlugin::make_visible(bool p_visible){
if (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())
- EditorNode::get_singleton()->hide_bottom_panel();
+ editor->hide_bottom_panel();
button->hide();
}
}
@@ -848,7 +850,7 @@ ThemeEditorPlugin::ThemeEditorPlugin(EditorNode *p_node) {
theme_editor->set_custom_minimum_size(Size2(0,500));
// p_node->get_viewport()->add_child(theme_editor);
- button=EditorNode::get_singleton()->add_bottom_panel_item("Theme",theme_editor);
+ button=editor->add_bottom_panel_item("Theme",theme_editor);
button->hide();