diff options
Diffstat (limited to 'editor/gui/editor_bottom_panel.cpp')
| -rw-r--r-- | editor/gui/editor_bottom_panel.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/editor/gui/editor_bottom_panel.cpp b/editor/gui/editor_bottom_panel.cpp index 3e74a3c94e..3cb95a3926 100644 --- a/editor/gui/editor_bottom_panel.cpp +++ b/editor/gui/editor_bottom_panel.cpp @@ -188,10 +188,11 @@ Button *EditorBottomPanel::add_item(String p_text, Control *p_item, const Ref<Sh } void EditorBottomPanel::remove_item(Control *p_item) { + bool was_visible = false; for (int i = 0; i < items.size(); i++) { if (items[i].control == p_item) { if (p_item->is_visible_in_tree()) { - _switch_to_item(false, i); + was_visible = true; } item_vbox->remove_child(items[i].control); button_hbox->remove_child(items[i].button); @@ -200,6 +201,16 @@ void EditorBottomPanel::remove_item(Control *p_item) { break; } } + + if (was_visible) { + // Open the first panel to ensure that if the removed dock was visible, the bottom + // panel will not collapse. + _switch_to_item(true, 0); + } else if (last_opened_control == p_item) { + // When a dock is removed by plugins, it might not have been visible, and it + // might have been the last_opened_control. We need to make sure to reset the last opened control. + last_opened_control = items[0].control; + } } void EditorBottomPanel::make_item_visible(Control *p_item, bool p_visible) { |