diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-07-26 18:49:51 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-26 18:49:51 -0300 |
| commit | 542bd81e760c4fcd271e95120978f6ddfa730ad5 (patch) | |
| tree | 851581861aa69aa38a66df736bec97f06c9cd44f /scene | |
| parent | 548a69aca7d843654ccc554da436bd03f2d59a7b (diff) | |
| parent | 60e19f77519caee64842319443cd19e20c699d81 (diff) | |
Merge pull request #5926 from akien-mga/pr-graphedit-drag
Fix GraphEdit dragging issues at scales != 1
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/gui/graph_edit.cpp | 5 | ||||
| -rw-r--r-- | scene/gui/graph_edit.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp index 06b1c42690..9ad621b7aa 100644 --- a/scene/gui/graph_edit.cpp +++ b/scene/gui/graph_edit.cpp @@ -548,7 +548,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()) @@ -665,6 +667,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++) { diff --git a/scene/gui/graph_edit.h b/scene/gui/graph_edit.h index ac4e71ba49..ed6838ac1d 100644 --- a/scene/gui/graph_edit.h +++ b/scene/gui/graph_edit.h @@ -92,6 +92,7 @@ private: bool dragging; bool just_selected; Vector2 drag_accum; + Point2 drag_origin; // Workaround for GH-5907 float zoom; |