macOS: minor refactoring in mouse handlers for nsview/systemtrayicon

Use new helper functions for mouse events

Change-Id: I01e83a228deb16cbdb1d7c8c628a92d48055ee2b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

1 files changed, 14 insertions, 1 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.mm b/src/plugins/platforms/cocoa/qcocoahelpers.mm
index 12be222ab3..7ba7908d27 100644
--- a/src/plugins/platforms/cocoa/qcocoahelpers.mm
+++ b/src/plugins/platforms/cocoa/qcocoahelpers.mm
@@ -287,12 +287,25 @@ Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum)
   and "no button". Only NSEvents that describes mouse press/release/dragging
   events (e.g NSEventTypeOtherMouseDown) will contain a valid
   button number.
+
+  \note Wacom tablet might not return the correct button number for NSEvent buttonNumber
+  on right clicks. Decide here that the button is the "right" button.
 */
 Qt::MouseButton cocoaButton2QtButton(NSEvent *event)
 {
-    if (event.type == NSMouseMoved)
+    switch (event.type) {
+    case NSMouseMoved:
         return Qt::NoButton;
 
+    case NSRightMouseUp:
+    case NSRightMouseDown:
+    case NSRightMouseDragged:
+        return Qt::RightButton;
+
+    default:
+        break;
+    }
+
     return cocoaButton2QtButton(event.buttonNumber);
 }