diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-08-02 19:11:47 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-08-02 19:11:47 -0300 |
| commit | 3d1d190dcd2993f87d5804de8a60e8bf5fc2cf49 (patch) | |
| tree | aa2c814b744ab970ae79931b419908ff7ebc850e /scene/gui/graph_edit.cpp | |
| parent | ad313097ebcb2a0c02c956fdf74a6610c3f7c9a8 (diff) | |
| parent | cea949180688add09eb9e69f5e405f361dc96d40 (diff) | |
| download | redot-engine-3d1d190dcd2993f87d5804de8a60e8bf5fc2cf49.tar.gz | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'scene/gui/graph_edit.cpp')
| -rw-r--r-- | scene/gui/graph_edit.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp index d24c59a21f..adda54ad70 100644 --- a/scene/gui/graph_edit.cpp +++ b/scene/gui/graph_edit.cpp @@ -592,7 +592,9 @@ void GraphEdit::_input_event(const InputEvent& p_ev) { if (p_ev.type==InputEvent::MOUSE_MOTION && dragging) { just_selected=true; - drag_accum+=Vector2(p_ev.mouse_motion.relative_x,p_ev.mouse_motion.relative_y); + // TODO: Remove local mouse pos hack if/when InputEventMouseMotion is fixed to support floats + //drag_accum+=Vector2(p_ev.mouse_motion.relative_x,p_ev.mouse_motion.relative_y); + drag_accum = get_local_mouse_pos() - drag_origin; for(int i=get_child_count()-1;i>=0;i--) { GraphNode *gn=get_child(i)->cast_to<GraphNode>(); if (gn && gn->is_selected()) @@ -709,6 +711,7 @@ void GraphEdit::_input_event(const InputEvent& p_ev) { dragging = true; drag_accum = Vector2(); + drag_origin = get_local_mouse_pos(); just_selected = !gn->is_selected(); if(!gn->is_selected() && !Input::get_singleton()->is_key_pressed(KEY_CONTROL)) { for (int i = 0; i < get_child_count(); i++) { |