From c8cb385443f01e085e53dfd5c79911453bcf28ee Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Fri, 9 Oct 2020 15:15:26 +0000
Subject: [PATCH] CtrlCore: MacOS fixed issue with trackpad scroll event

git-svn-id: svn://ultimatepp.org/upp/trunk@15226 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CtrlCore/CtrlMouse.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/uppsrc/CtrlCore/CtrlMouse.cpp b/uppsrc/CtrlCore/CtrlMouse.cpp
index ee506678b..08ba75fc2 100644
--- a/uppsrc/CtrlCore/CtrlMouse.cpp
+++ b/uppsrc/CtrlCore/CtrlMouse.cpp
@@ -513,6 +513,8 @@ bool sDblTime(int time)
 
 Image Ctrl::DispatchMouse(int e, Point p, int zd) {
 	GuiLock __;
+	if(e == MOUSEWHEEL && !zd) // ignore non-scroll wheel events
+		return Null;
 	if(e == MOUSEMOVE && repeatTopCtrl == this) {
 		if(sDistMin(leftmousepos, p) > GUI_DragDistance() && GetMouseLeft()) {
 			DispatchMouseEvent(LEFTDRAG, leftmousepos, 0);