Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Fix inspector follow focus when child is focused"

Browse source 
This reverts commit 286d3ae415.
This commit is contained in:
风青山 2025-02-26 16:25:50 +08:00
parent 01545c995b
commit a375e77b85
No known key found for this signature in database
GPG key ID: 056264D70ECB0FD5
3 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

21
editor/editor_inspector.cpp
View file

@ -4528,14 +4528,6 @@ void EditorInspector::_node_removed(Node *p_node) {
}
}
void EditorInspector::_gui_focus_changed(Control *p_control) {
if (!is_visible_in_tree() && !is_following_focus()) {
return;
}
// Don't follow focus when the inspector nor any of its children is focused. Prevents potential jumping when gaining focus.
set_follow_focus(has_focus() || child_has_focus());
}
void EditorInspector::_update_current_favorites() {
current_favorites.clear();
if (!can_favorite) {
@ -4733,10 +4725,6 @@ void EditorInspector::_notification(int p_what) {
if (!is_sub_inspector()) {
get_tree()->connect("node_removed", callable_mp(this, &EditorInspector::_node_removed));
}
Viewport *viewport = get_viewport();
ERR_FAIL_NULL(viewport);
viewport->connect("gui_focus_changed", callable_mp(this, &EditorInspector::_gui_focus_changed));
} break;
case NOTIFICATION_PREDELETE: {
@ -4819,6 +4807,15 @@ void EditorInspector::_notification(int p_what) {
update_tree();
}
} break;
case NOTIFICATION_FOCUS_ENTER: {
set_follow_focus(true);
} break;
case NOTIFICATION_FOCUS_EXIT: {
// Don't follow focus when the inspector is not focused. Prevents potential jumping when gaining focus.
set_follow_focus(false);
} break;
}
}