Connor/factory-hole-game
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix inspector jumping when gaining focus

Browse Source
This commit is contained in:
kobewi
2025-01-18 20:27:51 +01:00
parent 7b1ed520bd
commit 9226424401
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/classes/EditorInspector.xml
View File

@@ -51,7 +51,6 @@
<members> <members>
<member name="draw_focus_border" type="bool" setter="set_draw_focus_border" getter="get_draw_focus_border" overrides="ScrollContainer" default="true" /> <member name="draw_focus_border" type="bool" setter="set_draw_focus_border" getter="get_draw_focus_border" overrides="ScrollContainer" default="true" />
<member name="focus_mode" type="int" setter="set_focus_mode" getter="get_focus_mode" overrides="Control" enum="Control.FocusMode" default="2" /> <member name="focus_mode" type="int" setter="set_focus_mode" getter="get_focus_mode" overrides="Control" enum="Control.FocusMode" default="2" />
<member name="follow_focus" type="bool" setter="set_follow_focus" getter="is_following_focus" overrides="ScrollContainer" default="true" />
<member name="horizontal_scroll_mode" type="int" setter="set_horizontal_scroll_mode" getter="get_horizontal_scroll_mode" overrides="ScrollContainer" enum="ScrollContainer.ScrollMode" default="0" /> <member name="horizontal_scroll_mode" type="int" setter="set_horizontal_scroll_mode" getter="get_horizontal_scroll_mode" overrides="ScrollContainer" enum="ScrollContainer.ScrollMode" default="0" />
</members> </members>
<signals> <signals>

15
editor/editor_inspector.cpp
View File

@@ -2996,6 +2996,7 @@ void EditorInspector::update_tree() {
int current_focusable = -1; int current_focusable = -1;
// Temporarily disable focus following on the root inspector to avoid jumping while the inspector is updating. // Temporarily disable focus following on the root inspector to avoid jumping while the inspector is updating.
bool was_following = get_root_inspector()->is_following_focus();
get_root_inspector()->set_follow_focus(false); get_root_inspector()->set_follow_focus(false);
if (property_focusable != -1) { if (property_focusable != -1) {
@@ -3024,7 +3025,7 @@ void EditorInspector::update_tree() {
_clear(!object); _clear(!object);
if (!object) { if (!object) {
get_root_inspector()->set_follow_focus(true); get_root_inspector()->set_follow_focus(was_following);
return; return;
} }
@@ -3890,7 +3891,7 @@ void EditorInspector::update_tree() {
EditorNode::get_singleton()->hide_unused_editors(); EditorNode::get_singleton()->hide_unused_editors();
} }
get_root_inspector()->set_follow_focus(true); get_root_inspector()->set_follow_focus(was_following);
} }
void EditorInspector::update_property(const String &p_prop) { void EditorInspector::update_property(const String &p_prop) {
@@ -4742,6 +4743,15 @@ void EditorInspector::_notification(int p_what) {
update_tree(); update_tree();
} }
} break; } 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;
} }
} }
@@ -4898,7 +4908,6 @@ EditorInspector::EditorInspector() {
base_vbox->add_child(main_vbox); base_vbox->add_child(main_vbox);
set_horizontal_scroll_mode(SCROLL_MODE_DISABLED); set_horizontal_scroll_mode(SCROLL_MODE_DISABLED);
set_follow_focus(true);
changing = 0; changing = 0;
search_box = nullptr; search_box = nullptr;