summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/cocoa
diff options
context:
space:
mode:
authorMorten Sorvig <morten.sorvig@nokia.com>2011-06-07 10:48:21 +0200
committerMorten Sorvig <morten.sorvig@nokia.com>2011-06-07 10:53:37 +0200
commit29b29d1b70bf8b019363884f59766f5b97cac478 (patch)
tree4da9e7d31078e0e5b7858f4144453ec9a1ed3340 /src/plugins/platforms/cocoa
parentbc6f4d14f71867b9de8307e36668ddac1c12ca07 (diff)
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.
Diffstat (limited to 'src/plugins/platforms/cocoa')
-rw-r--r--src/plugins/platforms/cocoa/qnsview.mm8
1 files changed, 4 insertions, 4 deletions
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