hertog/godot-module-template
Template
2
1
Fork 1
Code Issues 2 Pull requests 2 Projects Releases Packages Wiki Activity Actions

Merge pull request #115932 from lodetrick/dock-switch

Browse source 
Open previously active dock when closing active dock
This commit is contained in:
Thaddeus Crews 2026-02-25 09:27:51 -06:00
commit 551b4ebc27
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
editor/docks/dock_tab_container.cpp
View file

@ -228,7 +228,7 @@ void DockTabContainer::move_dock_index(EditorDock *p_dock, int p_to_index, bool
int target_index = CLAMP(p_to_index, 0, get_tab_count() - 1);
move_child(p_dock, get_dock(target_index)->get_index(false));
if (p_set_current) {
if (p_set_current && !p_dock->is_visible_in_tree()) {
set_current_tab(target_index);
}
set_block_signals(false);

16
editor/docks/editor_dock_manager.cpp
View file

@ -325,6 +325,11 @@ void EditorDockManager::_move_dock(EditorDock *p_dock, Control *p_target, int p_
DockTabContainer *parent_tabs = Object::cast_to<DockTabContainer>(parent);
if (parent_tabs) {
p_dock->previous_tab_index = parent_tabs->get_tab_idx_from_control(p_dock);
// Swap to previous tab when closing current tab.
if (parent_tabs->get_current_tab() == p_dock->previous_tab_index) {
parent_tabs->set_current_tab(parent_tabs->get_previous_tab());
}
}
parent->set_block_signals(true);
parent->remove_child(p_dock);
@ -340,6 +345,9 @@ void EditorDockManager::_move_dock(EditorDock *p_dock, Control *p_target, int p_
return;
}
// Prevent extra visibility signals from firing.
p_dock->hide();
DockTabContainer *dock_tab_container = Object::cast_to<DockTabContainer>(p_target);
if (p_target != closed_dock_parent) {
if (dock_tab_container->layout != p_dock->current_layout) {
@ -587,8 +595,6 @@ void EditorDockManager::close_dock(EditorDock *p_dock) {
parent_container->dock_closed(p_dock);
}
// Hide before moving to remove inconsistent signals.
p_dock->hide();
_move_dock(p_dock, closed_dock_parent);
_update_layout();
@ -651,8 +657,10 @@ void EditorDockManager::_make_dock_visible(EditorDock *p_dock, bool p_grab_focus
tab_container->get_tab_bar()->grab_focus();
}
int tab_index = tab_container->get_tab_idx_from_control(p_dock);
tab_container->set_current_tab(tab_index);
if (!p_dock->is_visible_in_tree()) {
int tab_index = tab_container->get_tab_idx_from_control(p_dock);
tab_container->set_current_tab(tab_index);
}
}
void EditorDockManager::focus_dock(EditorDock *p_dock) {