From 0e015f6023ae2069f0cb66978a679b59577d320c Mon Sep 17 00:00:00 2001 From: toger5 Date: Fri, 18 May 2018 18:47:39 +0200 Subject: fixed scrolling in new ispector when using trackpad pan gesture --- scene/main/viewport.cpp | 2 ++ 1 file changed, 2 insertions(+) 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 &p_inpu mb->get_button_index() == BUTTON_WHEEL_UP || mb->get_button_index() == BUTTON_WHEEL_LEFT || mb->get_button_index() == BUTTON_WHEEL_RIGHT)); + Ref pn = p_input; + cant_stop_me_now = pn.is_valid() || cant_stop_me_now; bool ismouse = ev.is_valid() || Object::cast_to(*p_input) != NULL; -- cgit v1.2.3