diff options
| author | Max Hilbrunner <mhilbrunner@users.noreply.github.com> | 2018-07-05 00:22:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-05 00:22:06 +0200 |
| commit | a8a318161bec25bf6e1c1a0421a255f017d9f41b (patch) | |
| tree | 04b6351180a37728049a08d3d93e016175dc3f5e /scene | |
| parent | d988d188adcfd7060c59b40fe8e3a5d4c4ad7538 (diff) | |
| parent | 0e015f6023ae2069f0cb66978a679b59577d320c (diff) | |
Merge pull request #19015 from toger5/fixed_scrolling_with_trackpad_in_new_inspector
fixed scrolling in new ispector when using trackpad pan gesture
Diffstat (limited to 'scene')
| -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 1c837c0a8f..01302d4214 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -1404,6 +1404,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; |