godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Remove get_local_mouse_position() hack in GraphEdit

Browse Source
This commit is contained in:
smartin015
2020-05-04 20:36:52 +02:00
parent 988dd09047
commit 00457c68bc
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scene/gui/graph_edit.cpp
View File

@@ -768,9 +768,7 @@ void GraphEdit::_gui_input(const Ref<InputEvent> &p_ev) {
if (mm.is_valid() && dragging) { if (mm.is_valid() && dragging) {
just_selected = true; just_selected = true;
// TODO: Remove local mouse pos hack if/when InputEventMouseMotion is fixed to support floats drag_accum += mm->get_relative();
//drag_accum+=Vector2(mm->get_relative().x,mm->get_relative().y);
drag_accum = get_local_mouse_position() - drag_origin;
for (int i = get_child_count() - 1; i >= 0; i--) { for (int i = get_child_count() - 1; i >= 0; i--) {
GraphNode *gn = Object::cast_to<GraphNode>(get_child(i)); GraphNode *gn = Object::cast_to<GraphNode>(get_child(i));
if (gn && gn->is_selected()) { if (gn && gn->is_selected()) {
@@ -789,7 +787,7 @@ void GraphEdit::_gui_input(const Ref<InputEvent> &p_ev) {
} }
if (mm.is_valid() && box_selecting) { if (mm.is_valid() && box_selecting) {
box_selecting_to = get_local_mouse_position(); box_selecting_to = mm->get_position();
box_selecting_rect = Rect2(MIN(box_selecting_from.x, box_selecting_to.x), box_selecting_rect = Rect2(MIN(box_selecting_from.x, box_selecting_to.x),
MIN(box_selecting_from.y, box_selecting_to.y), MIN(box_selecting_from.y, box_selecting_to.y),
@@ -849,7 +847,7 @@ void GraphEdit::_gui_input(const Ref<InputEvent> &p_ev) {
if (gn) { if (gn) {
Rect2 r = gn->get_rect(); Rect2 r = gn->get_rect();
r.size *= zoom; r.size *= zoom;
if (r.has_point(get_local_mouse_position())) { if (r.has_point(b->get_position())) {
gn->set_selected(false); gn->set_selected(false);
} }
} }
@@ -887,7 +885,7 @@ void GraphEdit::_gui_input(const Ref<InputEvent> &p_ev) {
continue; continue;
} }
if (gn_selected->has_point(gn_selected->get_local_mouse_position())) { if (gn_selected->has_point(b->get_position() - gn_selected->get_position())) {
gn = gn_selected; gn = gn_selected;
break; break;
} }
@@ -901,7 +899,6 @@ void GraphEdit::_gui_input(const Ref<InputEvent> &p_ev) {
dragging = true; dragging = true;
drag_accum = Vector2(); drag_accum = Vector2();
drag_origin = get_local_mouse_position();
just_selected = !gn->is_selected(); just_selected = !gn->is_selected();
if (!gn->is_selected() && !Input::get_singleton()->is_key_pressed(KEY_CONTROL)) { if (!gn->is_selected() && !Input::get_singleton()->is_key_pressed(KEY_CONTROL)) {
for (int i = 0; i < get_child_count(); i++) { for (int i = 0; i < get_child_count(); i++) {
@@ -939,7 +936,7 @@ void GraphEdit::_gui_input(const Ref<InputEvent> &p_ev) {
} }
box_selecting = true; box_selecting = true;
box_selecting_from = get_local_mouse_position(); box_selecting_from = b->get_position();
if (b->get_control()) { if (b->get_control()) {
box_selection_mode_additive = true; box_selection_mode_additive = true;
previus_selected.clear(); previus_selected.clear();

1
scene/gui/graph_edit.h
View File

@@ -97,7 +97,6 @@ private:
bool dragging; bool dragging;
bool just_selected; bool just_selected;
Vector2 drag_accum; Vector2 drag_accum;
Point2 drag_origin; // Workaround for GH-5907
float zoom; float zoom;