From 29b29d1b70bf8b019363884f59766f5b97cac478 Mon Sep 17 00:00:00 2001 From: Morten Sorvig Date: Tue, 7 Jun 2011 10:48:21 +0200 Subject: Fix Cocoa mouse position handling. I'm not sure what "local" and "global" means for QWindowSystemInterface::handleMouseEvent. Sending the mouse position in window coordinates for both works. --- src/plugins/platforms/cocoa/qnsview.mm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/plugins/platforms/cocoa') diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm index ba53bff3cf..5d7fd05b1f 100644 --- a/src/plugins/platforms/cocoa/qnsview.mm +++ b/src/plugins/platforms/cocoa/qnsview.mm @@ -137,14 +137,14 @@ - (void)handleMouseEvent:(NSEvent *)theEvent; { - NSPoint point = [self convertPoint: [theEvent locationInWindow] fromView: nil]; - QPoint qt_localPoint(point.x,point.y); + NSPoint windowPoint = [self convertPoint: [theEvent locationInWindow] fromView: nil]; + QPoint qt_windowPoint(windowPoint.x, windowPoint.y); NSTimeInterval timestamp = [theEvent timestamp]; ulong qt_timestamp = timestamp * 1000; - QWindowSystemInterface::handleMouseEvent(m_window,qt_timestamp,qt_localPoint,QPoint(),m_buttons); - + // ### Should the points be windowPoint and screenPoint? + QWindowSystemInterface::handleMouseEvent(m_window, qt_timestamp, qt_windowPoint, qt_windowPoint, m_buttons); } - (void)mouseDown:(NSEvent *)theEvent -- cgit v1.2.3