Merge pull request #103266 from KoBeWi/l8ter_m8

akien-mga · akien-mga · commit cc7a951140fb · 2025-02-25T15:28:14.000+01:00
Load docks layout after their position is initialized
diff --git a/editor/editor_dock_manager.cpp b/editor/editor_dock_manager.cpp
@@ -547,10 +547,10 @@ void EditorDockManager::load_docks_from_config(Ref<ConfigFile> p_layout, const S
 				continue;
 			}
 			Control *dock = dock_map[name];
-			dock->call(SNAME("_load_layout_from_config"), p_layout, p_section);
 
 			if (!all_docks[dock].enabled) {
 				// Don't open disabled docks.
+				dock->call(SNAME("_load_layout_from_config"), p_layout, p_section);
 				continue;
 			}
 			bool at_bottom = false;
@@ -563,6 +563,7 @@ void EditorDockManager::load_docks_from_config(Ref<ConfigFile> p_layout, const S
 			} else if (i >= 0) {
 				_move_dock(dock, dock_slot[i], 0);
 			}
+			dock->call(SNAME("_load_layout_from_config"), p_layout, p_section);
 
 			if (closed_docks.has(name)) {
 				_move_dock(dock, closed_dock_parent);

Original file line number	Diff line number	Diff line change
`@@ -547,10 +547,10 @@ void EditorDockManager::load_docks_from_config(Ref<ConfigFile> p_layout, const S`
`547`	`547`	`continue;`
`548`	`548`	`}`
`549`	`549`	`Control *dock = dock_map[name];`
`550`		`- dock->call(SNAME("_load_layout_from_config"), p_layout, p_section);`
`551`	`550`
`552`	`551`	`if (!all_docks[dock].enabled) {`
`553`	`552`	`// Don't open disabled docks.`
	`553`	`+ dock->call(SNAME("_load_layout_from_config"), p_layout, p_section);`
`554`	`554`	`continue;`
`555`	`555`	`}`
`556`	`556`	`bool at_bottom = false;`
`@@ -563,6 +563,7 @@ void EditorDockManager::load_docks_from_config(Ref<ConfigFile> p_layout, const S`
`563`	`563`	`} else if (i >= 0) {`
`564`	`564`	`_move_dock(dock, dock_slot[i], 0);`
`565`	`565`	`}`
	`566`	`+ dock->call(SNAME("_load_layout_from_config"), p_layout, p_section);`
`566`	`567`
`567`	`568`	`if (closed_docks.has(name)) {`
`568`	`569`	`_move_dock(dock, closed_dock_parent);`