Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-07 22:00:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #113262 from lodetrick/dock-default-fix

Browse source 
Fix Editor Docks not updating tab styles when loading layout
This commit is contained in:
Rémi Verschelde 2025-12-01 11:49:32 +01:00
commit 7135bb534f
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
editor/docks/editor_dock_manager.cpp
View file

@ -703,27 +703,22 @@ void EditorDockManager::load_docks_from_config(Ref<ConfigFile> p_layout, const S
dock->load_layout_from_config(p_layout, section_name);
continue;
}
if (allow_floating_docks && floating_docks_dump.has(name)) {
_restore_dock_to_saved_window(dock, floating_docks_dump[name]);
} else if (i >= 0) {
if (dock->transient && !dock->is_open) {
dock->dock_slot_index = i;
} else if (i >= 0 && !(dock->transient && !dock->is_open)) {
// Safe to include transient open docks here because they won't be in the closed dock dump.
if (closed_docks.has(name)) {
dock->is_open = false;
dock->hide();
_move_dock(dock, closed_dock_parent);
} else {
dock->is_open = true;
_move_dock(dock, dock_slots[i].container, 0);
}
}
dock->load_layout_from_config(p_layout, section_name);
if (!dock->transient) {
if (closed_docks.has(name)) {
_move_dock(dock, closed_dock_parent);
dock->is_open = false;
dock->hide();
} else {
dock->is_open = true;
}
}
dock->dock_slot_index = i;
dock->previous_tab_index = i >= 0 ? j : 0;
}