浏览代码

Merge pull request #19015 from toger5/fixed_scrolling_with_trackpad_in_new_inspector

fixed scrolling in new ispector when using trackpad pan gesture
Max Hilbrunner 7 年之前
父节点
当前提交
a8a318161b
共有 1 个文件被更改,包括 2 次插入0 次删除
  1. 2 0
      scene/main/viewport.cpp

+ 2 - 0
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;