From 3c0b66bf8fa6a3325e58deb7a14b13a8e5cd3e4a Mon Sep 17 00:00:00 2001 From: Mika Viskari Date: Mon, 4 Mar 2024 15:10:47 +0200 Subject: [PATCH] Changed Editable Children menu action to be keyboard shortcuttable --- editor/scene_tree_dock.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index 66b82ee6483..d206ac37772 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -152,6 +152,8 @@ void SceneTreeDock::shortcut_input(const Ref &p_event) { _tool_selected(TOOL_SHOW_IN_FILE_SYSTEM); } else if (ED_IS_SHORTCUT("scene_tree/toggle_unique_name", p_event)) { _tool_selected(TOOL_TOGGLE_SCENE_UNIQUE_NAME); + } else if (ED_IS_SHORTCUT("scene_tree/toggle_editable_children", p_event)) { + _tool_selected(TOOL_SCENE_EDITABLE_CHILDREN); } else if (ED_IS_SHORTCUT("scene_tree/delete", p_event)) { _tool_selected(TOOL_ERASE); } else { @@ -1068,10 +1070,20 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { } List selection = editor_selection->get_selected_node_list(); + if (selection.size() != 1) { + break; + } + List::Element *e = selection.front(); if (e) { Node *node = e->get(); if (node) { + bool is_external = (!node->get_scene_file_path().is_empty()); + bool is_top_level = node->get_owner() == nullptr; + if (!is_external || is_top_level) { + break; + } + bool editable = EditorNode::get_singleton()->get_edited_scene()->is_editable_instance(node); if (editable) { @@ -3453,6 +3465,8 @@ void SceneTreeDock::_tree_rmb(const Vector2 &p_menu_pos) { bool placeholder = selection[0]->get_scene_instance_load_placeholder(); if (profile_allow_editing) { menu->add_check_item(TTR("Editable Children"), TOOL_SCENE_EDITABLE_CHILDREN); + menu->set_item_shortcut(-1, ED_GET_SHORTCUT("scene_tree/toggle_editable_children")); + menu->add_check_item(TTR("Load as Placeholder"), TOOL_SCENE_USE_PLACEHOLDER); menu->add_item(TTR("Make Local"), TOOL_SCENE_MAKE_LOCAL); } @@ -4186,6 +4200,7 @@ SceneTreeDock::SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selec ED_SHORTCUT("scene_tree/copy_node_path", TTR("Copy Node Path"), KeyModifierMask::CMD_OR_CTRL | KeyModifierMask::SHIFT | Key::C); ED_SHORTCUT("scene_tree/show_in_file_system", TTR("Show in FileSystem")); ED_SHORTCUT("scene_tree/toggle_unique_name", TTR("Toggle Access as Unique Name")); + ED_SHORTCUT("scene_tree/toggle_editable_children", TTR("Toggle Editable Children")); ED_SHORTCUT("scene_tree/delete_no_confirm", TTR("Delete (No Confirm)"), KeyModifierMask::SHIFT | Key::KEY_DELETE); ED_SHORTCUT("scene_tree/delete", TTR("Delete"), Key::KEY_DELETE);