From e539b62aa7f14717122dea9f9b611c6402413677 Mon Sep 17 00:00:00 2001 From: Eric M Date: Sun, 23 Mar 2025 00:04:56 +1000 Subject: [PATCH] Fix EditorProperty shortcuts being global and unintentionally triggering --- editor/editor_inspector.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp index d9bead1e78..5611d00814 100644 --- a/editor/editor_inspector.cpp +++ b/editor/editor_inspector.cpp @@ -579,6 +579,12 @@ void EditorProperty::_notification(int p_what) { } } break; case NOTIFICATION_ENTER_TREE: { + EditorInspector *inspector = get_parent_inspector(); + if (inspector) { + inspector = inspector->get_root_inspector(); + } + set_shortcut_context(inspector); + if (has_borders) { get_parent()->connect(SceneStringName(theme_changed), callable_mp(this, &EditorProperty::_update_property_bg)); _update_property_bg();