godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8955 from mcanders/mcanders/AnimationEditorInputFix

Browse Source 
Fix incorrect input event reference in animation_editor.cpp
This commit is contained in:
Rémi Verschelde 2017-05-27 11:35:48 +02:00 committed by GitHub
commit 9130f0a89f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
editor/animation_editor.cpp
View File

@ -2601,7 +2601,7 @@ void AnimationKeyEditor::_track_editor_gui_input(const Ref<InputEvent> &p_input)
float clickp = click.at.x - ofs.x; float clickp = click.at.x - ofs.x;
float dif = base - clickp; float dif = base - clickp;
float target = mb->get_pos().x + dif - ofs.x; float target = mm->get_pos().x + dif - ofs.x;
float ratio = target / settings_limit; float ratio = target / settings_limit;
@ -2615,7 +2615,7 @@ void AnimationKeyEditor::_track_editor_gui_input(const Ref<InputEvent> &p_input)
} break; } break;
case ClickOver::CLICK_DRAG_TIMELINE: { case ClickOver::CLICK_DRAG_TIMELINE: {
Point2 mpos = mb->get_pos() - ofs; Point2 mpos = mm->get_pos() - ofs;
/* /*
if (mpos.x<name_limit) if (mpos.x<name_limit)
mpos.x=name_limit; mpos.x=name_limit;
@ -2646,7 +2646,7 @@ void AnimationKeyEditor::_track_editor_gui_input(const Ref<InputEvent> &p_input)
} break; } break;
case ClickOver::CLICK_SELECT_KEYS: { case ClickOver::CLICK_SELECT_KEYS: {
click.to = mb->get_pos(); click.to = mm->get_pos();
if (click.to.y < h && click.at.y > h && mm->get_relative().y < 0) { if (click.to.y < h && click.at.y > h && mm->get_relative().y < 0) {
float prev = v_scroll->get_value(); float prev = v_scroll->get_value();
@ -2665,22 +2665,22 @@ void AnimationKeyEditor::_track_editor_gui_input(const Ref<InputEvent> &p_input)
} break; } break;
case ClickOver::CLICK_MOVE_KEYS: { case ClickOver::CLICK_MOVE_KEYS: {
click.to = mb->get_pos(); click.to = mm->get_pos();
} break; } break;
default: {} default: {}
} }
return; return;
} else if (mb->get_button_mask() & BUTTON_MASK_MIDDLE) { } else if (mm->get_button_mask() & BUTTON_MASK_MIDDLE) {
int rel = mm->get_relative().x; int rel = mm->get_relative().x;
float relf = rel / _get_zoom_scale(); float relf = rel / _get_zoom_scale();
h_scroll->set_value(h_scroll->get_value() - relf); h_scroll->set_value(h_scroll->get_value() - relf);
} }
if (mb->get_button_mask() == 0) { if (mm->get_button_mask() == 0) {
Point2 mpos = mb->get_pos() - ofs; Point2 mpos = mm->get_pos() - ofs;
if (mpos.y < h) { if (mpos.y < h) {
#if 0 #if 0