diff options
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/debugger/editor_debugger_tree.cpp | 6 | ||||
| -rw-r--r-- | editor/editor_inspector.cpp | 14 | ||||
| -rw-r--r-- | editor/editor_inspector.h | 2 | ||||
| -rw-r--r-- | editor/editor_properties.cpp | 2 | ||||
| -rw-r--r-- | editor/plugins/tiles/tile_map_editor.cpp | 2 |
5 files changed, 10 insertions, 16 deletions
diff --git a/editor/debugger/editor_debugger_tree.cpp b/editor/debugger/editor_debugger_tree.cpp index 351af4508f..05f7dc9725 100644 --- a/editor/debugger/editor_debugger_tree.cpp +++ b/editor/debugger/editor_debugger_tree.cpp @@ -158,7 +158,11 @@ void EditorDebuggerTree::update_scene_tree(const SceneDebuggerTree *p_tree, int const SceneDebuggerTree::RemoteNode &node = p_tree->nodes[i]; TreeItem *item = create_item(parent); item->set_text(0, node.name); - item->set_tooltip_text(0, TTR("Type:") + " " + node.type_name); + if (node.scene_file_path.is_empty()) { + item->set_tooltip_text(0, node.name + "\n" + TTR("Type:") + " " + node.type_name); + } else { + item->set_tooltip_text(0, node.name + "\n" + TTR("Instance:") + " " + node.scene_file_path + "\n" + TTR("Type:") + " " + node.type_name); + } Ref<Texture2D> icon = EditorNode::get_singleton()->get_class_icon(node.type_name, ""); if (icon.is_valid()) { item->set_icon(0, icon); diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp index 9a3eb75416..9037851127 100644 --- a/editor/editor_inspector.cpp +++ b/editor/editor_inspector.cpp @@ -2586,7 +2586,7 @@ bool EditorInspector::_is_property_disabled_by_feature_profile(const StringName return false; } -void EditorInspector::_update_tree() { +void EditorInspector::update_tree() { //to update properly if all is refreshed StringName current_selected = property_selected; int current_focusable = -1; @@ -3305,10 +3305,6 @@ void EditorInspector::_update_tree() { } } -void EditorInspector::update_tree() { - update_tree_pending = true; -} - void EditorInspector::update_property(const String &p_prop) { if (!editor_property_map.has(p_prop)) { return; @@ -3365,10 +3361,7 @@ void EditorInspector::set_keying(bool p_active) { return; } keying = p_active; - // Propagate the keying state to its editor properties. - Array args; - args.append(keying); - main_vbox->propagate_call(SNAME("set_keying"), args, true); + update_tree(); } void EditorInspector::set_read_only(bool p_read_only) { @@ -3906,9 +3899,10 @@ void EditorInspector::_notification(int p_what) { changing++; if (update_tree_pending) { + update_tree(); update_tree_pending = false; pending.clear(); - _update_tree(); + } else { while (pending.size()) { StringName prop = *pending.begin(); diff --git a/editor/editor_inspector.h b/editor/editor_inspector.h index 53490f0880..df8493308a 100644 --- a/editor/editor_inspector.h +++ b/editor/editor_inspector.h @@ -542,8 +542,6 @@ class EditorInspector : public ScrollContainer { void _show_add_meta_dialog(); void _check_meta_name(const String &p_name); - void _update_tree(); - protected: static void _bind_methods(); void _notification(int p_what); diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp index 8c5db444ab..4c9b18efe7 100644 --- a/editor/editor_properties.cpp +++ b/editor/editor_properties.cpp @@ -4121,8 +4121,6 @@ void EditorPropertyResource::update_property() { if (use_editor) { // Open editor directly and hide other such editors which are currently open. - // The opened editor is the one that edits the sub-resource, so keying state will be toggled to false. - sub_inspector->set_keying(false); _open_editor_pressed(); if (is_inside_tree()) { get_tree()->call_deferred(SNAME("call_group"), "_editor_resource_properties", "_fold_other_editors", this); diff --git a/editor/plugins/tiles/tile_map_editor.cpp b/editor/plugins/tiles/tile_map_editor.cpp index 414c3a2759..7c3c3e571e 100644 --- a/editor/plugins/tiles/tile_map_editor.cpp +++ b/editor/plugins/tiles/tile_map_editor.cpp @@ -2268,7 +2268,7 @@ TileMapEditorTilesPlugin::TileMapEditorTilesPlugin() { patterns_item_list->set_v_size_flags(Control::SIZE_EXPAND_FILL); patterns_item_list->connect("gui_input", callable_mp(this, &TileMapEditorTilesPlugin::_patterns_item_list_gui_input)); patterns_item_list->connect("item_selected", callable_mp(this, &TileMapEditorTilesPlugin::_update_selection_pattern_from_tileset_pattern_selection).unbind(1)); - patterns_item_list->connect("item_activated", callable_mp(this, &TileMapEditorTilesPlugin::_update_selection_pattern_from_tileset_pattern_selection)); + patterns_item_list->connect("item_activated", callable_mp(this, &TileMapEditorTilesPlugin::_update_selection_pattern_from_tileset_pattern_selection).unbind(1)); patterns_item_list->connect("empty_clicked", callable_mp(this, &TileMapEditorTilesPlugin::patterns_item_list_empty_clicked)); patterns_bottom_panel->add_child(patterns_item_list); |