Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-25 13:43:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Don't edit current when changing docks"

Browse Source 
This reverts commit 55711b2ee8.
Fixes #91046.
This commit is contained in:
Rémi Verschelde 2024-04-23 19:08:16 +02:00
parent 7abe0c6014
commit 2ad43045a3
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
editor/editor_dock_manager.cpp
View File

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

5
editor/editor_inspector.cpp
View File

@ -3477,10 +3477,8 @@ void EditorInspector::edit(Object *p_object) {
next_object = p_object; // Some plugins need to know the next edited object when clearing the inspector. next_object = p_object; // Some plugins need to know the next edited object when clearing the inspector.
if (object) { if (object) {
_clear(); _clear();
if (object->is_connected("property_list_changed", callable_mp(this, &EditorInspector::_changed_callback))) {
object->disconnect("property_list_changed", callable_mp(this, &EditorInspector::_changed_callback)); object->disconnect("property_list_changed", callable_mp(this, &EditorInspector::_changed_callback));
} }
}
per_array_page.clear(); per_array_page.clear();
object = p_object; object = p_object;
@ -4021,13 +4019,14 @@ void EditorInspector::_notification(int p_what) {
} break; } break;
case NOTIFICATION_PREDELETE: { case NOTIFICATION_PREDELETE: {
edit(nullptr); edit(nullptr); //just in case
} break; } break;
case NOTIFICATION_EXIT_TREE: { case NOTIFICATION_EXIT_TREE: {
if (!sub_inspector) { if (!sub_inspector) {
get_tree()->disconnect("node_removed", callable_mp(this, &EditorInspector::_node_removed)); get_tree()->disconnect("node_removed", callable_mp(this, &EditorInspector::_node_removed));
} }
edit(nullptr);
} break; } break;
case NOTIFICATION_VISIBILITY_CHANGED: { case NOTIFICATION_VISIBILITY_CHANGED: {