Skip to content

Commit fd27e4f

Browse files
committed
Merge pull request #104485 from EricEzaM/2025-shortcut-context-improvements
Fix EditorProperty shortcuts being global and unintentionally triggering
2 parents cc72179 + e539b62 commit fd27e4f

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

editor/editor_inspector.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -579,6 +579,12 @@ void EditorProperty::_notification(int p_what) {
579579
}
580580
} break;
581581
case NOTIFICATION_ENTER_TREE: {
582+
EditorInspector *inspector = get_parent_inspector();
583+
if (inspector) {
584+
inspector = inspector->get_root_inspector();
585+
}
586+
set_shortcut_context(inspector);
587+
582588
if (has_borders) {
583589
get_parent()->connect(SceneStringName(theme_changed), callable_mp(this, &EditorProperty::_update_property_bg));
584590
_update_property_bg();

0 commit comments

Comments
 (0)