AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cocoa: Adjust touch point rectangle by -0.5.

Browse Source 
The actual touch point is supposed to be in the center of the rectangle,
and since the rectangle is 1x1 it means we have to subtract 0.5 from x
and y.

Change-Id: Ica4aba26dbe61328c8e7cbdcf8b02c96e2f41a40
Reviewed-on: http://codereview.qt-project.org/5256
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bjørn Erik Nilsen <bjorn.nilsen@nokia.com>
This commit is contained in:
Bjørn Erik Nilsen 2011-09-20 15:45:29 +02:00 committed by Qt by Nokia
parent 4d310b52ee
commit 6a56b95b30
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/platforms/cocoa/qmultitouch_mac.mm
View File

@ -87,12 +87,19 @@ void QCocoaTouch::updateTouchData(NSTouch *nstouch, NSTouchPhase phase)
_screenReferencePos = qt_mac_flipPoint([NSEvent mouseLocation]);
}
QPointF screenPos = _screenReferencePos;
NSSize dsize = [nstouch deviceSize];
float ppiX = (qnpos.x() - _trackpadReferencePos.x()) * dsize.width;
float ppiY = (qnpos.y() - _trackpadReferencePos.y()) * dsize.height;
QPointF relativePos = _trackpadReferencePos - QPointF(ppiX, ppiY);
screenPos -= relativePos;
// Mac does not support area touch, only points, hence set width/height to 1.
_touchPoint.area = QRectF(_screenReferencePos - relativePos, QSize(1, 1));
// The touch point is supposed to be in the center of '_touchPoint.area', and
// since width/height is 1 it means we must subtract 0.5 from x and y.
screenPos.rx() -= 0.5;
screenPos.ry() -= 0.5;
_touchPoint.area = QRectF(screenPos, QSize(1, 1));
}
QCocoaTouch *QCocoaTouch::findQCocoaTouch(NSTouch *nstouch)