diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-03-16 13:34:42 +0100 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-03-16 13:34:42 +0100 |
| commit | 5b67305ebb466cea3b767d4abd2f360ebadf3414 (patch) | |
| tree | 71861b0ceb1b3a50dff96f208502cebeaa6e26c1 /tools/editor | |
| parent | cb065b961c80ec6d810539e48ebff75b64367df3 (diff) | |
| parent | 4a0f835ece40db45f1705761cd492bd34e8c4630 (diff) | |
Merge pull request #4065 from TheHX/issue-4058
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.cpp | 3 | ||||
| -rw-r--r-- | tools/editor/plugins/style_box_editor_plugin.cpp | 1 | ||||
| -rw-r--r-- | tools/editor/plugins/theme_editor_plugin.cpp | 6 |
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(); |