nick/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-02-07 19:32:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #115839 from SpikeTrapBoomStudios/make-editor-docks-respect-pin-behavior

Browse Source 
Fix: Skip setting current dock when tab cannot switch [ Make EditorDocks respect panel lock ]
This commit is contained in:
Thaddeus Crews
2026-02-04 11:04:23 -06:00
parent a662390817 a66742d699
commit 7dac0bc3be
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
editor/docks/editor_dock_manager.cpp
View File

@@ -607,12 +607,13 @@ void EditorDockManager::open_dock(EditorDock *p_dock, bool p_set_current) {
// Open dock to its previous location.
if (p_dock->dock_slot_index != EditorDock::DOCK_SLOT_NONE) {
TabContainer *slot = dock_slots[p_dock->dock_slot_index];
DockTabContainer *slot = dock_slots[p_dock->dock_slot_index];
int tab_index = p_dock->previous_tab_index;
if (tab_index < 0) {
tab_index = slot->get_tab_count();
}
_move_dock(p_dock, slot, tab_index, p_set_current);
_move_dock(p_dock, slot, tab_index, p_set_current && slot->can_switch_dock());
} else {
_open_dock_in_window(p_dock, true, true);
return;