Skip to content

Commit 8ad45da

Browse files
committed
Merge pull request #113494 from arkology/dock_free()
Fix DistractionFreeMode and BottomPanel
2 parents d7d09a9 + 828242a commit 8ad45da

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

editor/docks/editor_dock_manager.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -864,7 +864,7 @@ void EditorDockManager::focus_dock(EditorDock *p_dock) {
864864
return;
865865
}
866866

867-
if (!docks_visible) {
867+
if (!docks_visible && p_dock->get_parent() != EditorNode::get_bottom_panel()) {
868868
return;
869869
}
870870

@@ -912,7 +912,7 @@ void EditorDockManager::set_docks_visible(bool p_show) {
912912
return;
913913
}
914914
docks_visible = p_show;
915-
for (int i = 0; i < DockConstants::DOCK_SLOT_MAX; i++) {
915+
for (int i = 0; i < DockConstants::DOCK_SLOT_BOTTOM; i++) {
916916
dock_slots[i].container->set_visible(docks_visible && dock_slots[i].container->get_tab_count() > 0);
917917
}
918918
_update_layout();

editor/gui/editor_bottom_panel.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,10 @@ void EditorBottomPanel::_repaint() {
115115
pin_button->set_visible(!panel_collapsed);
116116
expand_button->set_visible(!panel_collapsed);
117117
if (expand_button->is_pressed()) {
118-
EditorNode::get_top_split()->set_visible(panel_collapsed);
118+
_expand_button_toggled(!panel_collapsed);
119+
} else {
120+
_theme_changed();
119121
}
120-
121-
_theme_changed();
122122
}
123123

124124
void EditorBottomPanel::save_layout_to_config(Ref<ConfigFile> p_config_file, const String &p_section) const {

0 commit comments

Comments
 (0)