diff options
| author | toger5 <toger5@hotmail.de> | 2018-05-18 18:47:39 +0200 |
|---|---|---|
| committer | toger5 <toger5@hotmail.de> | 2018-05-18 18:47:39 +0200 |
| commit | 0e015f6023ae2069f0cb66978a679b59577d320c (patch) | |
| tree | a3f293975af9369845148c9b2862b5f0d1feac71 | |
| parent | 5e997c9483e7409e67f3430b667b2982f75b2418 (diff) | |
fixed scrolling in new ispector when using trackpad pan gesture
| -rw-r--r-- | scene/main/viewport.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index f631fd6f3a..b9f6a41aa7 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -1380,6 +1380,8 @@ void Viewport::_gui_call_input(Control *p_control, const Ref<InputEvent> &p_inpu mb->get_button_index() == BUTTON_WHEEL_UP || mb->get_button_index() == BUTTON_WHEEL_LEFT || mb->get_button_index() == BUTTON_WHEEL_RIGHT)); + Ref<InputEventPanGesture> pn = p_input; + cant_stop_me_now = pn.is_valid() || cant_stop_me_now; bool ismouse = ev.is_valid() || Object::cast_to<InputEventMouseMotion>(*p_input) != NULL; |