diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-02-09 16:09:29 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-02-09 16:09:58 -0300 |
| commit | f51c26c0252c65bec7a14ebf4f10efc07e8a936a (patch) | |
| tree | c3df646110a38ceee8a7ec653cc9e4856cf52802 /tools/editor | |
| parent | 52326ac67244672011d97778cb8de315d0365b05 (diff) | |
Insert new key helper is back to 2D editor, missed it?
Diffstat (limited to 'tools/editor')
| -rw-r--r-- | tools/editor/animation_editor.cpp | 1 | ||||
| -rw-r--r-- | tools/editor/plugins/canvas_item_editor_plugin.cpp | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tools/editor/animation_editor.cpp b/tools/editor/animation_editor.cpp index dfb09e38fc..668a135bc8 100644 --- a/tools/editor/animation_editor.cpp +++ b/tools/editor/animation_editor.cpp @@ -2857,6 +2857,7 @@ void AnimationKeyEditor::_notification(int p_what) { case NOTIFICATION_VISIBILITY_CHANGED: { EditorNode::get_singleton()->update_keying(); + emit_signal("keying_changed"); } break; case NOTIFICATION_ENTER_TREE: { diff --git a/tools/editor/plugins/canvas_item_editor_plugin.cpp b/tools/editor/plugins/canvas_item_editor_plugin.cpp index ef2df539e8..f3ff001d84 100644 --- a/tools/editor/plugins/canvas_item_editor_plugin.cpp +++ b/tools/editor/plugins/canvas_item_editor_plugin.cpp @@ -409,7 +409,7 @@ void CanvasItemEditor::_node_removed(Node *p_node) { void CanvasItemEditor::_keying_changed() { - if (AnimationPlayerEditor::singleton->get_key_editor()->has_keying()) + if (AnimationPlayerEditor::singleton->get_key_editor()->is_visible()) animation_hb->show(); else animation_hb->hide(); @@ -2233,6 +2233,8 @@ void CanvasItemEditor::_notification(int p_what) { p->add_icon_item(get_icon("ControlAlignWide","EditorIcons"),"Full Rect",ANCHOR_ALIGN_WIDE); + AnimationPlayerEditor::singleton->get_key_editor()->connect("visibility_changed",this,"_keying_changed"); + _keying_changed(); } if (p_what==NOTIFICATION_READY) { @@ -3477,7 +3479,7 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) { box_selecting=false; //zoom=0.5; singleton=this; - AnimationPlayerEditor::singleton->get_key_editor()->connect("keying_changed",this,"_keying_changed"); + set_process_unhandled_key_input(true); can_move_pivot=false; drag=DRAG_NONE; |