Multitouch, Cocoa: Added Qt::WA_TouchPadAcceptSingleTouchEvents

By default this is set to false, meaning you will only get multitouch
events. The reason why this is important is that we use the first
touch of a new touch sequence to find out which widget to send
the subsequent touches to. And on a touchpad, you normally want
this to be the widget under the cursor when more than one finger
is pressed on the pad.

1 files changed, 8 insertions, 4 deletions

diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
index e8e52f9..827094d 100644
--- a/src/gui/kernel/qcocoaview_mac.mm
+++ b/src/gui/kernel/qcocoaview_mac.mm
@@ -873,22 +873,26 @@ extern "C" {
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
 - (void)touchesBeganWithEvent:(NSEvent *)event; 
 {
-    qt_translateRawTouchEvent(QCocoaTouch::getCurrentTouchPointList(event, true), qwidget);
+    bool all = qwidget->testAttribute(Qt::WA_TouchPadAcceptSingleTouchEvents);
+    qt_translateRawTouchEvent(QCocoaTouch::getCurrentTouchPointList(event, all), qwidget);
 }
 
 - (void)touchesMovedWithEvent:(NSEvent *)event;
 {
-    qt_translateRawTouchEvent(QCocoaTouch::getCurrentTouchPointList(event, true), qwidget);
+    bool all = qwidget->testAttribute(Qt::WA_TouchPadAcceptSingleTouchEvents);
+    qt_translateRawTouchEvent(QCocoaTouch::getCurrentTouchPointList(event, all), qwidget);
 }
 
 - (void)touchesEndedWithEvent:(NSEvent *)event;
 {
-    qt_translateRawTouchEvent(QCocoaTouch::getCurrentTouchPointList(event, true), qwidget);
+    bool all = qwidget->testAttribute(Qt::WA_TouchPadAcceptSingleTouchEvents);
+    qt_translateRawTouchEvent(QCocoaTouch::getCurrentTouchPointList(event, all), qwidget);
 }
 
 - (void)touchesCancelledWithEvent:(NSEvent *)event;
 {
-    qt_translateRawTouchEvent(QCocoaTouch::getCurrentTouchPointList(event, true), qwidget);
+    bool all = qwidget->testAttribute(Qt::WA_TouchPadAcceptSingleTouchEvents);
+    qt_translateRawTouchEvent(QCocoaTouch::getCurrentTouchPointList(event, all), qwidget);
 }
 
 - (void)magnifyWithEvent:(NSEvent *)event;