summaryrefslogtreecommitdiffstats
path: root/src/compositor/compositor_api/qwaylandtouch.cpp
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@theqtcompany.com>2015-09-14 12:35:52 +0200
committerPaul Olav Tvete <paul.tvete@theqtcompany.com>2015-09-14 12:17:05 +0000
commitf5f06c709937b657c66ca4e35f4e3065ba390153 (patch)
tree1019883bf566cc7de6d86b9cd2ab4f43b342b26c /src/compositor/compositor_api/qwaylandtouch.cpp
parent2deffa537c82e2f21e01dff5c8f5ba283dd06032 (diff)
Remove global coordinates
This involves removing: - pickView and mapView from QWaylandOutput - requestedPos[X,Y] from QWaylandView Change-Id: Ie53eef434ac6ae7d0d5474f649f78a59ae857167 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
Diffstat (limited to 'src/compositor/compositor_api/qwaylandtouch.cpp')
-rw-r--r--src/compositor/compositor_api/qwaylandtouch.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/compositor/compositor_api/qwaylandtouch.cpp b/src/compositor/compositor_api/qwaylandtouch.cpp
index 61a018b03..e417ab8ea 100644
--- a/src/compositor/compositor_api/qwaylandtouch.cpp
+++ b/src/compositor/compositor_api/qwaylandtouch.cpp
@@ -200,12 +200,10 @@ void QWaylandTouch::sendFullTouchEvent(QTouchEvent *event)
return;
const int pointCount = points.count();
- QPointF pos = d->seat->mouseFocus()->requestedPosition();
for (int i = 0; i < pointCount; ++i) {
const QTouchEvent::TouchPoint &tp(points.at(i));
// Convert the local pos in the compositor window to surface-relative.
- QPointF p = tp.pos() - pos;
- sendTouchPointEvent(tp.id(), p, tp.state());
+ sendTouchPointEvent(tp.id(), tp.pos(), tp.state());
}
sendFrameEvent();
}