diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-01-08 19:54:19 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-01-08 19:54:19 -0300 |
| commit | 94ee7798ced5bc79196c971921c3109e299f8306 (patch) | |
| tree | e74a933ee4879a742f90aead5fb1001c6531d07a /scene/main/viewport.cpp | |
| parent | 4fd464a4c5fc83c34377450935671b7be868333c (diff) | |
| download | redot-engine-94ee7798ced5bc79196c971921c3109e299f8306.tar.gz | |
-removed stop mouse and ignore mouse from control, which were confusing, replaced by mouse filter
Diffstat (limited to 'scene/main/viewport.cpp')
| -rw-r--r-- | scene/main/viewport.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index 4c7114d093..8d8e41812b 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -1615,7 +1615,7 @@ void Viewport::_gui_call_input(Control *p_control,const InputEvent& p_input) { break; if (gui.key_event_accepted) break; - if (!cant_stop_me_now && control->data.stop_mouse && (ev.type==InputEvent::MOUSE_BUTTON || ev.type==InputEvent::MOUSE_MOTION)) + if (!cant_stop_me_now && control->data.mouse_filter==Control::MOUSE_FILTER_STOP && (ev.type==InputEvent::MOUSE_BUTTON || ev.type==InputEvent::MOUSE_MOTION)) break; } @@ -1724,7 +1724,7 @@ Control* Viewport::_gui_find_control_at_pos(CanvasItem* p_node,const Point2& p_g matrix.affine_invert(); //conditions for considering this as a valid control for return - if (!c->data.ignore_mouse && c->has_point(matrix.xform(p_global)) && (!gui.drag_preview || (c!=gui.drag_preview && !gui.drag_preview->is_a_parent_of(c)))) { + if (c->data.mouse_filter!=Control::MOUSE_FILTER_IGNORE && c->has_point(matrix.xform(p_global)) && (!gui.drag_preview || (c!=gui.drag_preview && !gui.drag_preview->is_a_parent_of(c)))) { r_inv_xform=matrix; return c; } else |