gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-07-19 20:26:19 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #91168 from kitbdev/docks-dont-edit-current-v2

Browse source 
Don't edit current when changing docks v2
This commit is contained in:
Rémi Verschelde 2024-04-30 17:03:25 +02:00
parent b1da4b2a84 eefd311456
commit bf00e1efde
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
editor/editor_dock_manager.cpp
View file

@ -147,7 +147,6 @@ void EditorDockManager::_update_layout() {
if (!dock_context_popup->is_inside_tree() || EditorNode::get_singleton()->is_exiting()) {
return;
}
EditorNode::get_singleton()->edit_current();
dock_context_popup->docks_updated();
_update_docks_menu();
EditorNode::get_singleton()->save_editor_layout_delayed();

6
editor/editor_inspector.cpp
View file

@ -4024,14 +4024,16 @@ void EditorInspector::_notification(int p_what) {
} break;
case NOTIFICATION_PREDELETE: {
edit(nullptr); //just in case
if (EditorNode::get_singleton() && !EditorNode::get_singleton()->is_exiting()) {
// Don't need to clean up if exiting, and object may already be freed.
edit(nullptr);
}
} break;
case NOTIFICATION_EXIT_TREE: {
if (!sub_inspector) {
get_tree()->disconnect("node_removed", callable_mp(this, &EditorInspector::_node_removed));
}
edit(nullptr);
} break;
case NOTIFICATION_VISIBILITY_CHANGED: {