godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-25 15:37:42 +00:00
Code Releases Wiki Activity

Fix editor layout reset on startup

Browse Source
This commit is contained in:
Hilderin
2024-09-04 19:31:23 -04:00
parent b6223c0df0
commit 151645a1b6
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
editor/editor_node.cpp
View File

@@ -5240,8 +5240,8 @@ void EditorNode::_copy_warning(const String &p_str) {
} }
void EditorNode::_save_editor_layout() { void EditorNode::_save_editor_layout() {
if (waiting_for_first_scan) { if (!load_editor_layout_done) {
return; // Scanning, do not touch docks. return;
} }
Ref<ConfigFile> config; Ref<ConfigFile> config;
config.instantiate(); config.instantiate();
@@ -5297,22 +5297,22 @@ void EditorNode::_load_editor_layout() {
if (overridden_default_layout >= 0) { if (overridden_default_layout >= 0) {
_layout_menu_option(overridden_default_layout); _layout_menu_option(overridden_default_layout);
} }
return; } else {
ep.step(TTR("Loading docks..."), 1, true);
editor_dock_manager->load_docks_from_config(config, "docks");
ep.step(TTR("Reopening scenes..."), 2, true);
_load_open_scenes_from_config(config);
ep.step(TTR("Loading central editor layout..."), 3, true);
_load_central_editor_layout_from_config(config);
ep.step(TTR("Loading plugin window layout..."), 4, true);
editor_data.set_plugin_window_layout(config);
ep.step(TTR("Editor layout ready."), 5, true);
} }
load_editor_layout_done = true;
ep.step(TTR("Loading docks..."), 1, true);
editor_dock_manager->load_docks_from_config(config, "docks");
ep.step(TTR("Reopening scenes..."), 2, true);
_load_open_scenes_from_config(config);
ep.step(TTR("Loading central editor layout..."), 3, true);
_load_central_editor_layout_from_config(config);
ep.step(TTR("Loading plugin window layout..."), 4, true);
editor_data.set_plugin_window_layout(config);
ep.step(TTR("Editor layout ready."), 5, true);
} }
void EditorNode::_save_central_editor_layout_to_config(Ref<ConfigFile> p_config_file) { void EditorNode::_save_central_editor_layout_to_config(Ref<ConfigFile> p_config_file) {

1
editor/editor_node.h
View File

@@ -462,6 +462,7 @@ private:
bool requested_first_scan = false; bool requested_first_scan = false;
bool waiting_for_first_scan = true; bool waiting_for_first_scan = true;
bool load_editor_layout_done = false;
int current_menu_option = 0; int current_menu_option = 0;