diff options
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/animation_bezier_editor.cpp | 3 | ||||
| -rw-r--r-- | editor/plugins/animation_blend_tree_editor_plugin.cpp | 2 | ||||
| -rw-r--r-- | editor/plugins/animation_state_machine_editor.cpp | 9 | ||||
| -rw-r--r-- | editor/plugins/animation_state_machine_editor.h | 1 |
4 files changed, 13 insertions, 2 deletions
diff --git a/editor/animation_bezier_editor.cpp b/editor/animation_bezier_editor.cpp index f0dc3ce305..6f9e7308c3 100644 --- a/editor/animation_bezier_editor.cpp +++ b/editor/animation_bezier_editor.cpp @@ -408,7 +408,8 @@ void AnimationBezierTrackEdit::_notification(int p_what) { } //draw edited curve - _draw_track(track, accent); + const Color highlight = get_color("highlight_color", "Editor"); + _draw_track(track, highlight); } //draw editor handles diff --git a/editor/plugins/animation_blend_tree_editor_plugin.cpp b/editor/plugins/animation_blend_tree_editor_plugin.cpp index 06c2db74af..1e5a116f47 100644 --- a/editor/plugins/animation_blend_tree_editor_plugin.cpp +++ b/editor/plugins/animation_blend_tree_editor_plugin.cpp @@ -356,7 +356,7 @@ void AnimationNodeBlendTreeEditor::_connection_request(const String &p_from, int undo_redo->create_action("Nodes Connected"); undo_redo->add_do_method(blend_tree.ptr(), "connect_node", p_to, p_to_index, p_from); - undo_redo->add_undo_method(blend_tree.ptr(), "disconnect_node", p_to, p_to_index, p_from); + undo_redo->add_undo_method(blend_tree.ptr(), "disconnect_node", p_to, p_to_index); undo_redo->add_do_method(this, "_update_graph"); undo_redo->add_undo_method(this, "_update_graph"); undo_redo->commit_action(); diff --git a/editor/plugins/animation_state_machine_editor.cpp b/editor/plugins/animation_state_machine_editor.cpp index 8efd12ecf9..ee30294fe7 100644 --- a/editor/plugins/animation_state_machine_editor.cpp +++ b/editor/plugins/animation_state_machine_editor.cpp @@ -1064,6 +1064,7 @@ void AnimationNodeStateMachineEditor::_open_editor(const String &p_name) { } void AnimationNodeStateMachineEditor::_removed_from_graph() { + EditorNode::get_singleton()->edit_item(NULL); } @@ -1099,7 +1100,13 @@ void AnimationNodeStateMachineEditor::_name_edited(const String &p_text) { name_edit->hide(); } +void AnimationNodeStateMachineEditor::_name_edited_focus_out() { + + _name_edited(name_edit->get_text()); +} + void AnimationNodeStateMachineEditor::_scroll_changed(double) { + if (updating) return; @@ -1217,6 +1224,7 @@ void AnimationNodeStateMachineEditor::_bind_methods() { ClassDB::bind_method("_add_animation_type", &AnimationNodeStateMachineEditor::_add_animation_type); ClassDB::bind_method("_name_edited", &AnimationNodeStateMachineEditor::_name_edited); + ClassDB::bind_method("_name_edited_focus_out", &AnimationNodeStateMachineEditor::_name_edited_focus_out); ClassDB::bind_method("_removed_from_graph", &AnimationNodeStateMachineEditor::_removed_from_graph); @@ -1356,6 +1364,7 @@ AnimationNodeStateMachineEditor::AnimationNodeStateMachineEditor() { state_machine_draw->add_child(name_edit); name_edit->hide(); name_edit->connect("text_entered", this, "_name_edited"); + name_edit->connect("focus_exited", this, "_name_edited_focus_out"); name_edit->set_as_toplevel(true); open_file = memnew(EditorFileDialog); diff --git a/editor/plugins/animation_state_machine_editor.h b/editor/plugins/animation_state_machine_editor.h index 7b8a4a0e94..964f0e7cb8 100644 --- a/editor/plugins/animation_state_machine_editor.h +++ b/editor/plugins/animation_state_machine_editor.h @@ -143,6 +143,7 @@ class AnimationNodeStateMachineEditor : public AnimationTreeNodeEditorPlugin { String prev_name; void _name_edited(const String &p_text); + void _name_edited_focus_out(); void _open_editor(const String &p_name); void _scroll_changed(double); |