asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Insert new key helper is back to 2D editor, missed it?

Browse source
This commit is contained in:
Juan Linietsky 2016-02-09 16:09:29 -03:00
parent 52326ac672
commit f51c26c025
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tools/editor/animation_editor.cpp
View file

@ -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: {

6
tools/editor/plugins/canvas_item_editor_plugin.cpp
View file

@ -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;