diff options
| author | Mikhail Svetkin <mikhail.svetkin@qt.io> | 2018-04-27 12:05:06 +0200 |
|---|---|---|
| committer | Mikhail Svetkin <mikhail.svetkin@qt.io> | 2018-05-08 11:39:32 +0000 |
| commit | c427ba53aa0ee1a71aa670783f65bcfd230da653 (patch) | |
| tree | a5cf855fede3d5639e2d4d182bb95809a7eb5101 /src/plugins/platforms/cocoa/qnsview_mouse.mm | |
| parent | 60457e6cd04486f5503b94864d898a91a4df79e0 (diff) | |
macOS: Transition to new QPA dag-and-drop API
The new API allows us to pass the mouse buttons and
keyboard modifiers along with the QWSI event.
Task-number: QTBUG-57168
Change-Id: Ic54c012d1593d922e7dcd31facab2f2c630c7996
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa/qnsview_mouse.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qnsview_mouse.mm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/plugins/platforms/cocoa/qnsview_mouse.mm b/src/plugins/platforms/cocoa/qnsview_mouse.mm index a101b5ab6f..34ac1126ad 100644 --- a/src/plugins/platforms/cocoa/qnsview_mouse.mm +++ b/src/plugins/platforms/cocoa/qnsview_mouse.mm @@ -201,9 +201,14 @@ QCocoaDrag* nativeDrag = QCocoaIntegration::instance()->drag(); nativeDrag->setLastMouseEvent(theEvent, self); - Qt::KeyboardModifiers keyboardModifiers = [QNSView convertKeyModifiers:[theEvent modifierFlags]]; - QWindowSystemInterface::handleMouseEvent(targetView->m_platformWindow->window(), timestamp, qtWindowPoint, qtScreenPoint, - m_buttons, keyboardModifiers, Qt::MouseEventNotSynthesized); + const auto modifiers = [QNSView convertKeyModifiers:theEvent.modifierFlags]; + const auto buttons = currentlyPressedMouseButtons(); + const auto button = cocoaButton2QtButton(theEvent); + const auto eventType = cocoaEvent2QtMouseEvent(theEvent); + + QWindowSystemInterface::handleMouseEvent(targetView->m_platformWindow->window(), + timestamp, qtWindowPoint, qtScreenPoint, + buttons, button, eventType, modifiers); } - (bool)handleMouseDownEvent:(NSEvent *)theEvent withButton:(int)buttonNumber |